opal-phaser 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4873e726f3744eff28476ab8ebe398f2b4b12001
-  data.tar.gz: 47f4dd07619d9a6243b903ab6cf5ca20f9aa41ac
+  metadata.gz: 8589a0a3e72edb51e873d7999ba396cdf629b778
+  data.tar.gz: 2d959cb0539e2f4003f9acee00523a9820fa5efd
 SHA512:
-  metadata.gz: e4d43d58ada4ed74e1f975b66a57b64bbb0db8067a772caf436504cbade717dca0e4b64a9b396b868406acacc986455988ecc1b36d6d04ae29d61fb2cfc27c8a
-  data.tar.gz: 77dfa6968cfdf015710ac6b82588c29cdb595a7eac0c0c375c3ea5a6f123164c056a381be91dfe0bde3b9ea49f2b7dd50bf8e30292781f20493b3bb32bbad9d6
+  metadata.gz: 7c931b68ea98a3108dcb6f2965294be18fd65fbbb14a67283239f63401a0aeb7c586345f8eb622603ceb790eb49ebcea0a3ab048cd72c8dd22bcffd61d11a2cc
+  data.tar.gz: fce3428b28b12522a962c98bc12c5dbef6f0368b0b34195fa92d018f47b9a27756497c2ccba301dc870335b5d9a57eee3491122732ee4e347cd2929a7850a7f0

data/demo/app/main.rb

@@ -159,29 +159,26 @@ class Game
   end
 
   def run
-    preload
-    create_game
-    update_game
-
-    Phaser::Game.new(width: 800, height: 600, renderer: Phaser::AUTO, parent: '', state: state, transparent: false, antialias: true, physics: nil)
+    game = Phaser::Game.new
+    state = MainLevel.new(game)
+    game.state.add(:main, state, true)
   end
+end
 
-  private
-
+class MainLevel < Phaser::State
   def preload
-    state.preload do |game|
-      initialize_entities(game)
-      entities_call :preload
-    end
+    pp game
+    puts "preload"
+    initialize_entities
+    entities_call :preload
   end
 
-  def create_game
-    state.create do
-      entities_call :create
-    end
+  def create
+    puts "create"
+    entities_call :create
   end
 
-  def update_game
+  def update
     collect_star = proc do |player, star, score|
       star = Phaser::Sprite.new(star)
       star.kill
@@ -190,20 +187,24 @@ class Game
       @score.scoreText.text = "score: #{@score.score}"
     end
 
-    state.update do |game|
-      game.physics.arcade.collide(@player.player, @platforms.platforms)
-      game.physics.arcade.collide(@star.stars, @platforms.platforms)
-      game.physics.arcade.overlap(@player.player, @star.stars, collect_star)
+    game.physics.arcade.collide(@player.player, @platforms.platforms)
+    game.physics.arcade.collide(@star.stars, @platforms.platforms)
+    game.physics.arcade.overlap(@player.player, @star.stars, collect_star)
 
-      @player.update
-    end
+    @player.update
   end
 
-  def state
-    @state ||= Phaser::State.new
+  private
+
+  def collect_star(player, star, score)
+    star = Phaser::Sprite.new(star)
+    star.kill
+
+    @score.score += 10
+    @score.scoreText.text = "score: #{@score.score}"
   end
 
-  def initialize_entities(game)
+  def initialize_entities
     @sky       = Sky.new(game)
     @platforms = Platforms.new(game)
     @player    = Player.new(game)

data/lib/opal/phaser/animation/animation.rb

@@ -1,3 +1,4 @@
+require 'opal/phaser/core/signal'
 module Phaser
   class Animation
     include Native

data/lib/opal/phaser/animation/animation_manager.rb

@@ -1,3 +1,4 @@
+require 'opal/phaser/animation/animation'
 module Phaser
   class AnimationManager
     include Native

data/lib/opal/phaser/core/camera.rb

@@ -0,0 +1,10 @@
+module Phaser
+  class Camera
+    include Native
+
+    alias_native :x
+    alias_native :x=
+    alias_native :y
+    alias_native :y=
+  end
+end

data/lib/opal/phaser/core/files.rb

@@ -6,3 +6,4 @@ require 'opal/phaser/core/anchor'
 require 'opal/phaser/core/group'
 require 'opal/phaser/core/signal'
 require 'opal/phaser/core/world'
+require 'opal/phaser/core/stage'

data/lib/opal/phaser/core/game.rb

@@ -1,3 +1,12 @@
+require 'opal/phaser/loader/cache'
+require 'opal/phaser/game_objects/game_object_factory'
+require 'opal/phaser/core/world'
+require 'opal/phaser/core/stage'
+require 'opal/phaser/core/state_manager'
+require 'opal/phaser/input/input'
+require 'opal/phaser/math/random_data_generator'
+require 'opal/phaser/core/camera'
+
 module Phaser
   AUTO   = `Phaser.AUTO`
   WEBGL  = `Phaser.WEBGL`
@@ -8,22 +17,21 @@ module Phaser
 
     def initialize(arg_hash = {}, &block)
 
-      width       = arg_hash[:width]
-      height      = arg_hash[:height]
-      renderer    = arg_hash[:renderer]
-      parent      = arg_hash[:parent]
-      state       = arg_hash[:state]
-      transparent = arg_hash[:transparent]
-      antialias   = arg_hash[:antialias]
-      physics     = arg_hash[:physics]
+      width       = arg_hash.fetch(:width) { 800 }
+      height      = arg_hash.fetch(:height) { 600 }
+      renderer    = arg_hash.fetch(:renderer) { Phaser::AUTO }
+      parent      = arg_hash.fetch(:parent) { "" }
+      state       = arg_hash.fetch(:state) { nil }
+      transparent = arg_hash.fetch(:transparent) { false }
+      antialias   = arg_hash.fetch(:antialias) { true }
+      physics     = arg_hash.fetch(:physics) { nil }
 
       if state
         state.game = self
-      else
-        state = State.new(self)
       end
 
       if block_given?
+        state = State.new(self) if state.nil?
         state.instance_eval(&block)
       end
 
@@ -33,17 +41,21 @@ module Phaser
       }
     end
 
-    alias_native :cache,   :cache,   as: Cache
-    alias_native :add,     :add,     as: GameObjectFactory
-    alias_native :world,   :world,   as: World
-    alias_native :physics, :physics, as: Physics
-    alias_native :input,   :input,   as: Input
-    alias_native :time,    :time,    as: Time
-    alias_native :rnd,     :rnd,     as: RandomDataGenerator
-
+    alias_native :cache,    :cache,    as: Cache
+    alias_native :add,      :add,      as: GameObjectFactory
+    alias_native :world,    :world,    as: World
+    alias_native :stage,    :stage,    as: Stage
+    alias_native :state,    :state,    as: StateManager
+    alias_native :physics,  :physics,  as: Physics
+    alias_native :input,    :input,    as: Input
+    alias_native :time,     :time,     as: Time
+    alias_native :rnd,      :rnd,      as: RandomDataGenerator
+    alias_native :camera,   :camera,   as: Camera
+
+    alias_native :make
     alias_native :load
-    alias_native :stage
     alias_native :debug
     alias_native :width
+    alias_native :stage
   end
 end

data/lib/opal/phaser/core/group.rb

@@ -1,3 +1,4 @@
+require 'opal/phaser/game_objects/sprite'
 module Phaser
   class Group
     include Native
@@ -7,8 +8,13 @@ module Phaser
     alias_native :enable_body_debug, :enableBodyDebug
     alias_native :add_child, :addChild
     alias_native :set_all,   :setAll
+    alias_native :call_all,  :callAll
     alias_native :children
-    alias_native :create
+    # alias_native :create
+    alias_native :create, :create, as: Sprite
+    alias_native :destroy
+    alias_native :remove
+    alias_native :total
 
     alias_native :enable_body?, :enableBody
 

data/lib/opal/phaser/core/stage.rb

@@ -0,0 +1,9 @@
+module Phaser
+  class Stage
+    include Native
+    
+    def background_color=(color)
+      `#@native.backgroundColor = color`
+    end
+  end
+end

data/lib/opal/phaser/core/state.rb

@@ -1,41 +1,47 @@
+require 'pp'
+require 'opal/phaser/core/game'
 module Phaser
   class State
-    attr_writer :game
+    include Native
     def initialize(game = nil, &block)
-      @game    = game
       @native  = `new Phaser.State`
-
-      @preload = proc {}
-      @create  = proc {}
-      @update  = proc {}
-      @render  = proc {}
+      self.game    = game
 
       if block_given?
         block.call(@game)
       end
+      super(@native)
+    end
+
+    def game=(g_)
+      @game = g_
+      `#@native.game = #@game`
     end
 
+    def game
+      @game
+    end
 
-    def preload(&block)
-      @preload = proc { block.call(@game) }
+    def preload
     end
 
-    def create(&block)
-      @create = proc { block.call(@game) }
+    def create
     end
 
-    def update(&block)
-      @update = proc { block.call(@game) }
+    def update
     end
 
-    def render(&block)
-      @render = proc { block.call(@game) }
+    def render
     end
 
     def to_n
+      _preload = proc { preload }
+      _create = proc { create }
+      _update = proc { update }
+      _render = proc { render }
       %x{
-        var obj = { preload: #@preload, create: #@create, update: #@update,
-                    render: #@render }
+        var obj = { preload: #{_preload}, create: #{_create}, update: #{_update},
+                    render: #{_render} }
       }
 
       return %x{ obj }

data/lib/opal/phaser/core/state_manager.rb

@@ -0,0 +1,7 @@
+module Phaser
+  class StateManager
+    include Native
+
+    alias_native :add
+  end
+end

data/lib/opal/phaser/core/world.rb

@@ -1,11 +1,15 @@
 module Phaser
   class World
     include Native
-    
+
     alias_native :width
     alias_native :height
-    
+
+    alias_native :set_bounds, :setBounds
+
     alias_native :x_center, :centerX
     alias_native :y_center, :centerY
+    alias_native :random_y, :randomY
+    alias_native :random_x, :randomX
   end
 end

data/lib/opal/phaser/game_objects/bitmap_data.rb

@@ -0,0 +1,10 @@
+module Phaser
+  class BitmapData
+    include Native
+
+    alias_native :draw
+    alias_native :rect
+    alias_native :fill
+    alias_native :canvas
+  end
+end

data/lib/opal/phaser/game_objects/events.rb

@@ -1,7 +1,22 @@
+require 'opal/phaser/core/signal'
+
 module Phaser
   class Events
     include Native
-    
+
     alias_native :on_input_down, :onInputDown, as: Signal
+
+    def on(type, context, &block)
+      case type.to_sym
+      when :up
+        `#@native.onInputUp.add(#{block.to_n}, #{context})`
+      when :down
+        `#@native.onInputDown.add(#{block.to_n}, #{context})`
+      when :out
+        `#@native.onInputOut.add(#{block.to_n}, #{context})`
+      when :over
+        `#@native.onInputOver.add(#{block.to_n}, #{context})`
+      end
+    end
   end
 end

data/lib/opal/phaser/game_objects/files.rb

@@ -4,4 +4,5 @@ require 'opal/phaser/game_objects/sprite'
 require 'opal/phaser/game_objects/tile_sprite'
 require 'opal/phaser/game_objects/text'
 require 'opal/phaser/game_objects/image'
+require 'opal/phaser/game_objects/bitmap_data'
 require 'opal/phaser/game_objects/game_object_factory'

data/lib/opal/phaser/game_objects/game_object_factory.rb

@@ -1,3 +1,11 @@
+require 'opal/phaser/game_objects/sprite'
+require 'opal/phaser/core/group'
+require 'opal/phaser/game_objects/text'
+require 'opal/phaser/game_objects/image'
+require 'opal/phaser/game_objects/bitmap_data'
+require 'opal/phaser/tween/tween'
+require 'opal/phaser/game_objects/tile_sprite'
+
 module Phaser
   class GameObjectFactory
     include Native
@@ -6,6 +14,7 @@ module Phaser
     alias_native :group,       :group,      as: Group
     alias_native :text,        :text,       as: Text
     alias_native :image,       :image,      as: Image
+    alias_native :bitmap_data, :bitmapData, as: BitmapData
     alias_native :tween,       :tween,      as: Tween
     alias_native :tile_sprite, :tileSprite, as: TileSprite
   end

data/lib/opal/phaser/game_objects/image.rb

@@ -1,14 +1,18 @@
 module Phaser
   class Image
     include Native
-    
+
     alias_native :x
     alias_native :y
     alias_native :x=
     alias_native :y=
-    
+    alias_native :height
+
     alias_native :scale
+    alias_native :destroy
     
+    alias_native :load_texture, :loadTexture
+
     def smoothed=(bool)
       `#@native.smoothed = bool`
     end

data/lib/opal/phaser/game_objects/sprite.rb

@@ -1,11 +1,19 @@
+require 'opal/phaser/physics/physics'
+require 'opal/phaser/core/anchor'
+require 'opal/phaser/animation/animation_manager'
+require 'opal/phaser/game_objects/events'
+
 module Phaser
   class Sprite
     include Native
 
+    alias_native :key
     alias_native :scale
     alias_native :bounce
 
     alias_native :kill
+    alias_native :destroy
+    alias_native :play
 
     alias_native :visible=
     alias_native :exists=
@@ -23,15 +31,15 @@ module Phaser
     def input_enabled=(bool)
       `#@native.inputEnabled = bool`
     end
-    
+
     def smoothed=(bool)
       `#@native.smoothed = bool`
     end
-    
+
     def frame_name=(name)
       `#@native.frameName = name`
     end
-    
+
     alias_native :load_texture, :loadTexture
 
     alias_native :body,       :body,       as: Physics::Arcade::Body

data/lib/opal/phaser/game_objects/text.rb

@@ -2,6 +2,8 @@ module Phaser
   class Text
     include Native
     
+    alias_native :destroy
+    
     def text=(text)
       `#@native.text = text`
     end

data/lib/opal/phaser/game_objects/tile_sprite.rb

@@ -1,7 +1,13 @@
-class TileSprite
-  include Native
-  
-  alias_native :auto_scroll, :autoScroll
-  alias_native :stop_scroll, :stopScroll
-  alias_native :body
+require 'opal/phaser/geometry/point'
+module Phaser
+  class TileSprite
+    include Native
+
+    alias_native :auto_scroll, :autoScroll
+    alias_native :stop_scroll, :stopScroll
+    alias_native :tile_position, :tilePosition, as: Point
+    alias_native :destroy
+
+    alias_native :body
+  end
 end

data/lib/opal/phaser/geometry/point.rb

@@ -0,0 +1,20 @@
+module Phaser
+  class Point
+    include Native
+
+    # When its automatically aliased we just pass the object to super
+    def initialize(_x = 0, _y = 0)
+      if `typeof(#{_x})` == "object"
+        super(_x)
+      else
+        @native = `new Phaser.Point(#{_x}, #{_y})`
+        super(@native)
+      end
+    end
+
+    alias_native :x
+    alias_native :x=
+    alias_native :y
+    alias_native :y=
+  end
+end

data/lib/opal/phaser/input/input.rb

@@ -1,13 +1,27 @@
+require 'opal/phaser/input/keyboard'
+require 'opal/phaser/input/pointer'
 module Phaser
   class Input
     include Native
-    
+
     alias_native :x
     alias_native :y
-    
-    alias_native :keyboard, :keyboard, as: Keyboard
-    
-    alias_native :on_down, :onDown, as: Signal
+
+    alias_native :keyboard,       :keyboard,      as: Keyboard
+    alias_native :mouse_pointer,  :mousePointer,  as: Pointer
+
+    def on(type, &block)
+      case type.to_sym
+      when :down
+        `#@native.onDown.add(#{block.to_n})`
+      when :up
+        `#@native.onUp.add(#{block.to_n})`
+      when :tap
+        `#@native.onTap.add(#{block.to_n})`
+      when :hold
+        `#@native.onHold.add(#{block.to_n})`
+      end
+    end
     alias_native :active_pointer, :activePointer
   end
 end

data/lib/opal/phaser/input/key.rb

@@ -2,7 +2,15 @@ module Phaser
   class Key
     include Native
     
-    alias_native :on_down, :onDown, as: Signal
+    def on(type, &block)
+      case type.to_sym
+      when :down
+        `#@native.onDown.add(#{block.to_n})`
+      when :up
+        `#@native.onUp.add(#{block.to_n})`
+      end
+    end
+    
     alias_native :down?, :isDown
   end
 end

data/lib/opal/phaser/input/keyboard.rb

@@ -1,16 +1,18 @@
+require 'opal/phaser/input/key'
 module Phaser
   class Keyboard
     include Native
-    
+
     SPACEBAR = `Phaser.Keyboard.SPACEBAR`
     LEFT     = `Phaser.Keyboard.LEFT`
     RIGHT    = `Phaser.Keyboard.RIGHT`
     A        = `Phaser.Keyboard.A`
     D        = `Phaser.Keyboard.D`
-    
+    ESC      = `Phaser.Keyboard.ESC`
+
     alias_native :create_cursor_keys, :createCursorKeys
     alias_native :remove_key, :removeKey
-    
+
     alias_native :add_key, :addKey, as: Key
   end
 end

data/lib/opal/phaser/input/pointer.rb

@@ -0,0 +1,13 @@
+require 'opal/phaser/geometry/point'
+module Phaser
+  class Pointer
+    include Native
+
+    alias_native :down?,  :isDown
+    alias_native :up?,    :isUp
+
+    alias_native :target_object, :targetObject
+
+    alias_native :position, :position, as: Point
+  end
+end

data/lib/opal/phaser/loader/cache.rb

@@ -1,5 +1,9 @@
+require 'opal/phaser/game_objects/image'
 module Phaser
   class Cache
     include Native
+
+    alias_native :add_sprite_sheet, :addSpriteSheet
+    alias_native :get_image, :getImage, as: Image
   end
 end

data/lib/opal/phaser/version.rb

@@ -1,5 +1,5 @@
 module Opal
     module Phaser
-        VERSION = '0.1.6'
+        VERSION = '0.2.0'
     end
 end

data/opal-phaser.gemspec

@@ -15,6 +15,6 @@ Gem::Specification.new do |s|
   s.test_files     = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths  = ['lib']
 
-  s.add_runtime_dependency 'opal'
+  s.add_runtime_dependency 'opal', '>= 0.7.2'
   s.add_development_dependency 'rake'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-phaser
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - George Plymale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -69,12 +69,16 @@ files:
 - lib/opal/phaser/animation/files.rb
 - lib/opal/phaser/animation/frame.rb
 - lib/opal/phaser/core/anchor.rb
+- lib/opal/phaser/core/camera.rb
 - lib/opal/phaser/core/files.rb
 - lib/opal/phaser/core/game.rb
 - lib/opal/phaser/core/group.rb
 - lib/opal/phaser/core/signal.rb
+- lib/opal/phaser/core/stage.rb
 - lib/opal/phaser/core/state.rb
+- lib/opal/phaser/core/state_manager.rb
 - lib/opal/phaser/core/world.rb
+- lib/opal/phaser/game_objects/bitmap_data.rb
 - lib/opal/phaser/game_objects/events.rb
 - lib/opal/phaser/game_objects/files.rb
 - lib/opal/phaser/game_objects/game_object_factory.rb
@@ -82,10 +86,12 @@ files:
 - lib/opal/phaser/game_objects/sprite.rb
 - lib/opal/phaser/game_objects/text.rb
 - lib/opal/phaser/game_objects/tile_sprite.rb
+- lib/opal/phaser/geometry/point.rb
 - lib/opal/phaser/input/files.rb
 - lib/opal/phaser/input/input.rb
 - lib/opal/phaser/input/key.rb
 - lib/opal/phaser/input/keyboard.rb
+- lib/opal/phaser/input/pointer.rb
 - lib/opal/phaser/loader/cache.rb
 - lib/opal/phaser/loader/files.rb
 - lib/opal/phaser/math/files.rb
@@ -120,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Opal access to phaser