gamebox 0.4.0.rc4 → 0.4.0.rc5

data/TODO.txt

@@ -1,5 +1,4 @@
 TAKE YOUR PICK:
- - convert generators to thor
  - update README.rdoc in template app
  - generate sample Gemfile with current gamebox version
 
@@ -7,7 +6,6 @@ TAKE YOUR PICK:
  - game.yml settings ..                 ^^^
 
  - nice helpers for testing behaviors
-
  - add define_style that defines a bucket of behaviors
  - add helper for has_required_attributes on an actor from a behavior (checking that opts for the behavior has said key)
 

data/bin/gamebox

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'active_support'
-require 'rubigen'
+require 'thor'
 require 'gamebox'
 
 def print_version
@@ -13,6 +12,30 @@ if ARGV.include?('-v') || ARGV.include?('--version')
   exit 0
 end
 
-require 'rubigen/scripts/generate'
-RubiGen::Base.use_application_sources!
-RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'gamebox')
+class GameboxThorCommand < Thor
+  include Thor::Actions
+
+  def self.source_root
+    File.join(File.dirname(__FILE__), "../templates/")
+  end
+
+  desc "new PATH", "Generates a new gamebox game at PATH."
+  def new(*args)
+    game_name = args[0]
+    self.destination_root = game_name
+
+    if Gamebox::VERSION::RC > 0
+      @gamebox_version = Gamebox::VERSION::STRING
+    else
+      @gamebox_version = "~> "+[Gamebox::VERSION::MAJOR, Gamebox::VERSION::MINOR, '0'].join('.')
+    end
+
+    directory "app", "."
+
+  end
+  
+
+
+end
+
+GameboxThorCommand.start

data/gamebox.gemspec

@@ -22,9 +22,8 @@ Gem::Specification.new do |s|
   s.add_dependency "publisher"
   s.add_dependency "conject", ">= 0.0.5"
   s.add_dependency "tween"
-  s.add_dependency "activesupport", '3.0.0'
   s.add_dependency "i18n"
-  s.add_dependency "rubigen"
+  s.add_dependency "thor", ">= 0.15.2"
   s.add_dependency "require_all"
   s.add_dependency "kvo", ">= 0.0.2"
 

data/lib/gamebox.rb

@@ -16,6 +16,10 @@ end
 begin
   require 'pry'
   require 'pry-remote'
+rescue LoadError
+end
+
+begin
   require 'chipmunk'
 rescue LoadError
 end

data/lib/gamebox/behaviors/{input_stater.rb → input_mapper.rb}

@@ -1,4 +1,4 @@
-define_behavior :input_stater do
+define_behavior :input_mapper do
   requires :input_manager
 
   setup do

data/lib/gamebox/behaviors/physical.rb

@@ -105,6 +105,13 @@ Behavior.define :physical do
         verts = @opts[:verts].dup
         verts << @opts[:verts][0]
         actor.segment_groups << verts
+
+      when :segment
+        @radius = @opts[:radius] || 0
+        @endpoints = @opts[:endpoints].collect{ |pt| vec2(*pt.to_a) }
+        @moment_of_inertia ||= @opts[:fixed] ? Float::INFINITY : CP::moment_for_segment(@mass, @endpoints[0], @endpoints[1])
+        actor.body = CP::Body.new(@mass, @moment_of_inertia)
+        actor.shape = CP::Shape::Segment.new(actor.body, @endpoints[0], @endpoints[1], @radius)
       end
 
       actor.shape.actor = actor
@@ -133,6 +140,10 @@ Behavior.define :physical do
               actor.segment_groups << verts
             when :circle
               part_shape = CP::Shape::Circle.new(actor.body, part_def[:radius], part_def[:offset])
+            when :segment
+              radius = part_def[:radius] || 0
+              endpoints = part_def[:endpoints].collect{ |pt| vec2(*pt.to_a) }
+              part_shape = CP::Shape::Segment.new(endpoints[0], endpoints[1], radius)
             else
               raise "unsupported sub shape type"
             end

data/lib/gamebox/core/actor.rb

@@ -19,6 +19,8 @@ class Actor
     self.actor_type = opts[:actor_type]
   end
 
+  # Used by BehaviorFactory#add_behavior.
+  # That's probably what you want to use from within another behavior
   def add_behavior(name, behavior)
     @behaviors[name] = behavior
   end

data/lib/gamebox/core/behavior_factory.rb

@@ -5,10 +5,9 @@
 #   or by dynamically creating one at runtime via another behavior.
 class BehaviorFactory
 
-  # Build a behavior. Takes a symbol or a Hash.
-  #  add_behavior(:shootable) or add_behavior(:shootable => {:range=>3})
-  #  this will create a new instance of Shootable and pass
-  #  :range=>3 to it
+  # Build a behavior.
+  #  add_behavior(actor, :shootable) or add_behavior(actor, :shootable, :range=>3)
+  #  this will create a new instance of Shootable and pass :range=>3 to it
   def add_behavior(actor, behavior_name, opts = {})
     raise "nil actor" if actor.nil?
     raise "nil behavior definition" if behavior_name.nil?

data/lib/gamebox/core/configuration.rb

@@ -13,7 +13,6 @@ module Gamebox
       end
     end
 
-    # add_setting :output, :alias => :output_stream
     add_setting :config_path
     add_setting :data_path
     add_setting :music_path

data/lib/gamebox/core/hooked_gosu_window.rb

@@ -1,4 +1,5 @@
 module GosuWindowAPI
+  MAX_UPDATE_SIZE_IN_MILLIS = 500
   def initialize(width, height, fullscreen)
     super(width, height, fullscreen)
   end
@@ -7,7 +8,14 @@ module GosuWindowAPI
     millis = Gosu::milliseconds
 
     # ignore the first update
-    fire :update, (millis - @last_millis) if @last_millis
+    if @last_millis
+      delta = millis
+      delta -= @last_millis if millis > @last_millis
+      delta = MAX_UPDATE_SIZE_IN_MILLIS if delta > MAX_UPDATE_SIZE_IN_MILLIS
+
+      fire :update, delta
+    end
+
     @last_millis = millis
   end
 

data/lib/gamebox/core/physics_manager.rb

@@ -1,27 +1,56 @@
 # PhysicsManager creates and manages chipmunks space.
 class PhysicsManager
   extend Forwardable
-  def_delegators :@space, :elastic_iterations=, :damping=, :gravity=
+  def_delegators( :@space,
+                  :damping,            :damping=,
+                  :gravity,            :gravity=,
+                  :iterations,         :iterations= )
 
   attr_accessor :space
+
+  # Time per physics step, in milliseconds (default 15). Small steps
+  # make the simulation more stable than large steps, but if the step
+  # is too small, it may negatively affect performance, i.e. cause
+  # very high CPU use and/or low framerate.
+  attr_reader :step_size
+  def step_size=(new_step_size)
+    @step_size = new_step_size.to_f
+    @step_size_seconds = @step_size / 1000
+  end
+
+
   def configure
     @space = CP::Space.new
-    @space.iterations = 20
-    @space.elastic_iterations = 5
+    @space.iterations = 10
+    self.step_size = 15
+    @leftover_step_time = 0
+  end
+
+
+  def update(time)
+    update_physics time 
   end
 
-  PHYSICS_STEP = 25.0
   def update_physics(time)
     unless @physics_paused
-      steps = (time/PHYSICS_STEP).ceil
-      # from chipmunk demo
-      dt = 1.0/60/steps
+      @leftover_step_time += time
+      steps = (@leftover_step_time / @step_size).ceil
       steps.times do
-        @space.step dt
+        @space.step @step_size_seconds
       end
+      @leftover_step_time -= (steps * @step_size).round
     end
   end
   
+
+  def pause
+    pause_physics
+  end
+
+  def unpause
+    restart_physics
+  end
+
   def pause_physics
     @physics_paused = true
   end
@@ -30,9 +59,6 @@ class PhysicsManager
     @physics_paused = false
   end
 
-  def update(time)
-    update_physics time 
-  end
 
   # allows for passing arrays of collision types not just single ones
   # add_collision_func([:foo,:bar], [:baz,:yar]) becomes:
@@ -71,6 +97,7 @@ class PhysicsManager
     end
   end
 
+
   def register_physical_constraint(constraint)
     @space.add_constraint constraint
   end
@@ -93,6 +120,7 @@ class PhysicsManager
     end
   end
 
+
   # Find any / all objects who's bounding box currently contains
   # the passed in screen position. Requires a block as this sets
   # a callback all the way down in Chipmunk and could be called
@@ -105,12 +133,4 @@ class PhysicsManager
   #     block.call(actor)
   #   end
   # end
-
-  def pause
-    pause_physics
-  end
-
-  def unpause
-    restart_physics
-  end
 end

data/lib/gamebox/core/stage.rb

@@ -13,7 +13,7 @@ class Stage
     kid.construct_with *self.object_definition.component_names
   end
 
-  attr_accessor :drawables, :opts, :viewport, :backstage
+  attr_accessor :opts, :viewport, :backstage
 
   def configure(backstage, opts)
     res = config_manager[:screen_resolution]
@@ -133,19 +133,14 @@ class Stage
   # move all actors from one layer to another
   # note, this will remove all actors in that layer!
   def move_layer(from_parallax, from_layer, to_parallax, to_layer)
-    drawable_list = @drawables[from_parallax].delete from_layer
+    drawable_list = @drawables[from_parallax][from_layer].dup
 
-
-    if drawable_list
-      prev_drawable_list = @drawables[to_parallax].delete to_layer
-      @drawables[to_parallax][to_layer] = drawable_list
-      drawable_list.each do |drawable|
-        drawable.parallax = to_parallax
-        drawable.layer = to_layer
-      end
+    drawable_list.each do |drawable|
+      unregister_drawable drawable      
+      drawable.parallax = to_parallax
+      drawable.layer = to_layer
+      register_drawable drawable      
     end
-    prev_drawable_list
-
   end
 
   def on_pause(&block)
@@ -194,7 +189,7 @@ class Stage
   #  modal_actor :dialog, x: 40, y: 50, message: "WOW"
   def modal_actor(*args)
     on_pause do
-      pause_actor = spawn *args
+      pause_actor = create_actor *args
       pause_actor.when :remove_me do
         @pause_listeners = nil
         unpause

data/lib/gamebox/spec/helper.rb

@@ -272,6 +272,12 @@ module GameboxAcceptanceSpecHelpers
       game.current_stage.unpause
     end
 
+    def remove_actor(actor_type)
+      act = game.actor(actor_type)
+      act.should be
+      act.remove
+    end
+
     def see_actor_attrs(actor_type, attrs)
       act = game.actor(actor_type)
       act.should be

data/lib/gamebox/version.rb

@@ -3,7 +3,7 @@ module Gamebox
     MAJOR = 0
     MINOR = 4
     TINY  = 0
-    RC    = 4
+    RC    = 5
 
     if RC > 0
       ARRAY = [MAJOR, MINOR, TINY, "rc#{RC}"]

data/spec/acceptance/basic_actor_lifecycle_spec.rb

@@ -65,6 +65,10 @@ describe "The basic life cycle of an actor", acceptance: true do
     end
   end
 
+  define_actor :monkey do
+    has_attributes bananas: 3
+  end
+
 
   it 'creates an actor from within stage with the correct behaviors and updates' do
     game.stage do |stage|
@@ -98,6 +102,12 @@ describe "The basic life cycle of an actor", acceptance: true do
     see_actor_attrs :mc_bane, x: 500, y: 30
   end
 
-  it 'uses default values from actor definition'
+  it 'uses default values from actor definition' do
+    game.stage do |stage|
+      create_actor :monkey
+    end
+    see_actor_attrs :monkey, bananas: 3
+  end
+
 end
 

data/spec/acceptance/built_in_collision_handling_spec.rb

@@ -16,7 +16,7 @@ describe "Using gamebox's built in collision handling", acceptance: true do
     laser = nil
     alien = nil
     game.stage do |stage| # instance of TestingStage
-      laser = create_actor :frickin_laser, x: 0, y: 0, vel_x: 5, vel_y: 1
+      laser = create_actor :frickin_laser, x: 0, y: 0, vel_x: 50, vel_y: 1
       alien = create_actor :alien, x: 0, y: 0
       on_collision_of :frickin_laser, :alien do |collision_laser, collision_alien|
         @collision_laser = collision_laser
@@ -34,7 +34,7 @@ describe "Using gamebox's built in collision handling", acceptance: true do
     laser = nil
     alien = nil
     game.stage do |stage| # instance of TestingStage
-      laser = create_actor :frickin_laser, x: 0, y: 0, vel_x: 5, vel_y: 0
+      laser = create_actor :frickin_laser, x: 0, y: 0, vel_x: 50, vel_y: 0
       alien = create_actor :alien, x: 31, y: 0
       on_collision_of :frickin_laser, :alien do |collision_laser, collision_alien|
         @collision_laser = collision_laser
@@ -45,7 +45,7 @@ describe "Using gamebox's built in collision handling", acceptance: true do
     # now the laser moved and will be checked for collisions _next_ update
     update 1
     # trigger the next round of collision detection
-    update 2000
+    update 200
     # TODO not sure about this one..
     update 1
     see_stage_ivars collision_laser: laser, collision_alien: alien

data/spec/acceptance/chipmunk_collision_handling_spec.rb

@@ -35,7 +35,6 @@ describe "Using chipmunks collision handling", acceptance: true do
       @physics_manager = this_object_context[:physics_manager]
       @physics_manager.configure
       # TODO move these optionally to configure?
-      @physics_manager.elastic_iterations = 4
       @physics_manager.damping = 0.4
 
       rock = create_actor :rock, x: 0, y: 0
@@ -63,7 +62,6 @@ describe "Using chipmunks collision handling", acceptance: true do
       @physics_manager = this_object_context[:physics_manager]
       @physics_manager.configure
       # TODO move these optionally to configure?
-      @physics_manager.elastic_iterations = 4
       @physics_manager.damping = 0.4
       @physics_manager.gravity = vec2(0,500)
 

data/spec/acceptance/{input_stater_spec.rb → input_mapper_spec.rb}

@@ -4,7 +4,7 @@ describe "Using input stater", acceptance: true do
 
 
   define_actor :foxy do
-    has_behavior input_stater: {
+    has_behavior input_mapper: {
       [KbLeft] => :move_left,
       [KbRight, KbD] => :move_right
     }

data/spec/acceptance/pausing_spec.rb

@@ -6,7 +6,7 @@ describe "pausing in gamebox", acceptance: true do
     beh.requires :timer_manager
     beh.setup do
       actor.has_attributes rocks_shot: 0
-      timer_manager.add_timer 'shoot_rock', 1_000 do
+      timer_manager.add_timer 'shoot_rock', 100 do
         actor.react_to :shoot_rock
       end
     end
@@ -22,9 +22,9 @@ describe "pausing in gamebox", acceptance: true do
 
 
   it 'allows timers and all updates from the director to be paused / unpaused' do
-    game.stage do |stage| # instance of TestingStage
+    game.stage do |stage|
       @counter = 0
-      timer_manager.add_timer 'stage_timer', 2000 do
+      timer_manager.add_timer 'stage_timer', 200 do
         @counter += 1
       end
       create_actor :mountain
@@ -48,30 +48,51 @@ describe "pausing in gamebox", acceptance: true do
     see_actor_attrs :mountain, rocks_shot: 0
     see_stage_ivars counter: 0
 
-    update 100
+    update 10
     see_actor_attrs :mountain, rocks_shot: 0
     see_stage_ivars counter: 0
 
-    update 901
+    update 91
     see_actor_attrs :mountain, rocks_shot: 1
     see_stage_ivars counter: 0
 
     press_key KbP
     game.should have_actor(:label)
-    update 2001
+    update 201
     see_actor_attrs :mountain, rocks_shot: 1
     see_stage_ivars counter: 0
 
-    update 2001
+    update 201
     see_actor_attrs :mountain, rocks_shot: 1
     see_stage_ivars counter: 0
 
     press_key KbP
     game.should_not have_actor(:label)
-    update 2001
+    update 201
     see_actor_attrs :mountain, rocks_shot: 2
     see_stage_ivars counter: 1
   end
 
+  it 'modal actor pauses, shows actor, unpauses when that actor dies' do
+    game.stage do |stage|
+      modal_actor :label, text: "pause" do
+        @some_unpause_indicator = true
+      end
+    end
+
+    see_stage_ivars some_unpause_indicator: nil
+    game.should have_actor(:label)
+    see_actor_attrs :label, text: "pause"
+
+    remove_actor :label
+
+    game.should_not have_actor(:label)
+    see_stage_ivars some_unpause_indicator: true
+  end
+
 end
 
+
+
+
+

data/spec/acceptance/timer_usage_spec.rb

@@ -6,7 +6,7 @@ describe "Using timers", acceptance: true do
     beh.requires :timer_manager
     beh.setup do
       actor.has_attributes rocks_shot: 0
-      timer_manager.add_timer 'shoot_rock', 1_000 do
+      timer_manager.add_timer 'shoot_rock', 100 do
         actor.react_to :shoot_rock
       end
     end
@@ -24,7 +24,7 @@ describe "Using timers", acceptance: true do
   it 'allows behaviors to get fired from timers' do
     game.stage do |stage| # instance of TestingStage
       @counter = 0
-      timer_manager.add_timer 'stage_timer', 2000 do
+      timer_manager.add_timer 'stage_timer', 200 do
         @counter += 1
       end
       create_actor :volcano
@@ -32,15 +32,15 @@ describe "Using timers", acceptance: true do
     see_actor_attrs :volcano, rocks_shot: 0
     see_stage_ivars counter: 0
 
-    update 100
+    update 10
     see_actor_attrs :volcano, rocks_shot: 0
     see_stage_ivars counter: 0
 
-    update 901
+    update 91
     see_actor_attrs :volcano, rocks_shot: 1
     see_stage_ivars counter: 0
 
-    update 2001
+    update 201
     see_actor_attrs :volcano, rocks_shot: 2
     see_stage_ivars counter: 1
 

data/spec/behaviors/animated_spec.rb

@@ -1,8 +1,6 @@
 require 'helper'
 
 describe :animated do
-  it 'needs updated tests'
-
   let(:opts) { {} }
   subject { subcontext[:behavior_factory].add_behavior actor, :animated, opts }
   let(:director) { evented_stub(stub_everything('director')) }

data/spec/behaviors/positioned_spec.rb

@@ -1,6 +1,45 @@
 require 'helper'
 
 describe :positioned do
-  it 'defines x,y on actor'
-  it 'rolls up x and y changes to position_changed on update'
+
+  subject { subcontext[:behavior_factory].add_behavior actor, :positioned, opts }
+  let(:director) { evented_stub(stub_everything('director')) }
+  let(:subcontext) do 
+    it = nil
+    Conject.default_object_context.in_subcontext{|ctx|it = ctx}; 
+    _mocks = create_mocks *(Actor.object_definition.component_names + ActorView.object_definition.component_names - [:actor, :behavior, :this_object_context])
+    _mocks.each do |k,v|
+      it[k] = v
+      it[:director] = director
+    end
+    it
+  end
+  let!(:actor) { subcontext[:actor] }
+  let(:opts) { {} }
+
+  context "empty options" do
+    it 'defines x,y on actor' do
+      subject
+      actor.x.should == 0
+      actor.y.should == 0
+    end
+  end
+
+  it 'rolls up x and y changes to position_changed on update' do
+    subject
+    actor.x = 99
+
+    expects_event(actor, :position_changed) do
+      director.fire :update, 50
+    end
+  end
+
+  context "options passed in" do
+    let(:opts) { { x: 5, y: 8} }
+    it 'defines x,y on actor' do
+      subject
+      actor.x.should == 5
+      actor.y.should == 8
+    end
+  end
 end

data/spec/core/arbiter_spec.rb

@@ -241,7 +241,25 @@ describe 'Arbiter' do
   end
 
   describe '#collide_aabb_circle' do
-    it 'should collide overlapping box and circle' 
+    it 'should collide overlapping box and circle' do
+      a = stub(:center_x => 0, :center_y => 0, :width => 30, :height => 20, 
+          :shape_type => :aabb, :radius => 10,
+          :cw_world_points => [
+            [-15,10],[15,10],
+            [15,-10], [-15,10]
+          ],
+          :cw_world_lines => [
+            [[-15,10],[15,10]],
+            [[15,10],[15,-10]],
+            [[15,-10],[-15,10]],
+            [[-15,10],[-15,10]]
+          ],
+          :cw_world_edge_normals => [[1,0],[0,1]])
+      b = stub(:center_x => 5, :center_y => 5, :width => 10, :height => 2, 
+          :shape_type => :circle, :radius => 10)
+
+      @arbiter.collide_aabb_circle?(a,b).should be_true
+    end
   end
 
   describe "#find_collisions" do

data/spec/core/hooked_gosu_window_spec.rb

@@ -28,6 +28,16 @@ describe HookedGosuWindow do
       end
     end
 
+    it 'truncates an update to 500 millis in case of computer sleep' do
+      subject.instance_variable_set('@last_millis', 0)
+      Gosu.stubs(:milliseconds).returns 501
+
+      expects_event subject, :update, [[500]] do
+        subject.update
+      end
+
+    end
+
     it 'fires initial update with deltas' do
       subject.instance_variable_set('@last_millis', 30)
       Gosu.stubs(:milliseconds).returns 58

data/spec/core/stage_spec.rb

@@ -4,15 +4,35 @@ describe Stage do
   inject_mocks :input_manager, :actor_factory, :resource_manager, 
     :sound_manager, :config_manager, :director, :this_object_context,
     :timer_manager
-  FakeDrawable = Struct.new :layer, :parallax
+
+  let(:a) { stub('a', layer: 0, parallax: 0) }
+  let(:b) { stub('b', layer: 0, parallax: 0) }
+
+  let(:c) { stub('c', layer: 1, parallax: 0) }
+  let(:d) { stub('d', layer: 2, parallax: 0) }
+  let(:e) { stub('e', layer: 3, parallax: 0) }
+  let(:f) { stub('f', layer: 4, parallax: 0) }
+
+  let(:x) { stub('x', layer: 0, parallax: 1) }
+  let(:y) { stub('y', layer: 2, parallax: 1) }
+
+  let(:z) { stub('z', layer: 0, parallax: 3) }
+  let(:target) { stub }
+  let(:viewport) { stub }
 
   before do
     @config_manager.stubs(:[]).with(:screen_resolution).returns([800,600])
     @actor_factory.stubs(:director=)
-    @viewport = stub
-    Viewport.stubs(:new).with(800, 600).returns(@viewport)
-    @this_object_context.expects(:[]=).with(:viewport, @viewport)
+    Viewport.stubs(:new).with(800, 600).returns(viewport)
+    @this_object_context.expects(:[]=).with(:viewport, viewport)
     subject.configure(:backstage, {})
+
+    viewport.stubs(:x_offset).with(0).returns(:trans_x_zero)
+    viewport.stubs(:y_offset).with(0).returns(:trans_y_zero)
+    viewport.stubs(:x_offset).with(1).returns(:trans_x_one)
+    viewport.stubs(:y_offset).with(1).returns(:trans_y_one)
+    viewport.stubs(:x_offset).with(3).returns(:trans_x_three)
+    viewport.stubs(:y_offset).with(3).returns(:trans_y_three)
   end
 
   it 'should construct' do
@@ -23,51 +43,59 @@ describe Stage do
     subject.backstage.should == :backstage
   end
 
-  it 'should register drawables by parallax and layer'
-  it 'should unregister drawables by parallax and layer'
-  it 'should draw drawables by parallax and layers' do
-    a = FakeDrawable.new
-    b = FakeDrawable.new
-    c = FakeDrawable.new
-    d = FakeDrawable.new
-    e = FakeDrawable.new
-    f = FakeDrawable.new
-    x = FakeDrawable.new
-    y = FakeDrawable.new
-    z = FakeDrawable.new
-    subject.drawables = {
-      2 => {3=> [a,b,c]},
-      6 => {7=> [d,e,f]},
-      9 => {13=> [x,y,z]},
-    }
-    subject.move_layer(2, 3, 6, 7).should == [d,e,f]
-    subject.drawables[6][7].should_not be_nil
-    subject.drawables[6][7].should == [a,b,c]
-    subject.drawables[2][3].should be_nil
+  it 'registers and draws drawables by parallax and layers' do
+    subject.register_drawable a
+    subject.register_drawable b
+    subject.register_drawable c
+    subject.register_drawable d
+    subject.register_drawable e
+    subject.register_drawable f
+    subject.register_drawable x
+    subject.register_drawable y
+    subject.register_drawable z
+
+    a.expects(:draw).with(target, :trans_x_zero, :trans_y_zero, 4)
+    b.expects(:draw).with(target, :trans_x_zero, :trans_y_zero, 4)
+    c.expects(:draw).with(target, :trans_x_zero, :trans_y_zero, 5)
+    d.expects(:draw).with(target, :trans_x_zero, :trans_y_zero, 6)
+    e.expects(:draw).with(target, :trans_x_zero, :trans_y_zero, 7)
+    f.expects(:draw).with(target, :trans_x_zero, :trans_y_zero, 8)
+    x.expects(:draw).with(target, :trans_x_one, :trans_y_one, 2)
+    y.expects(:draw).with(target, :trans_x_one, :trans_y_one, 3)
+    z.expects(:draw).with(target, :trans_x_three, :trans_y_three, 1)
+
+    subject.draw(target)
   end
-  it 'should move drawables layers' do 
 
-    a = FakeDrawable.new
-    b = FakeDrawable.new
-    c = FakeDrawable.new
-    d = FakeDrawable.new
-    e = FakeDrawable.new
-    f = FakeDrawable.new
-    x = FakeDrawable.new
-    y = FakeDrawable.new
-    z = FakeDrawable.new
-    subject.drawables = {
-      2 => {3=> [a,b,c]},
-      6 => {7=> [d,e,f]},
-      9 => {13=> [x,y,z]},
-    }
-    subject.move_layer(2, 3, 6, 7).should == [d,e,f]
-    subject.drawables[6][7].should_not be_nil
-    subject.drawables[6][7].should == [a,b,c]
-    subject.drawables[2][3].should be_nil
+  it 'should unregister drawables by parallax and layer' do
+    subject.register_drawable a
+    subject.register_drawable b
+
+    subject.unregister_drawable a
+    b.expects(:draw).with(target, :trans_x_zero, :trans_y_zero, 1)
+
+    subject.draw(target)
   end
 
-  describe "#modal_actor" do
-    it 'pauses, shows actor, unpauses when that actor dies; ug, how to test this?'
+  it 'should move drawables layers' do 
+    subject.register_drawable a
+    subject.register_drawable b
+    subject.register_drawable x
+    subject.register_drawable y
+
+    a.expects(:parallax=).with(1)
+    b.expects(:parallax=).with(1)
+    a.expects(:layer=).with(4)
+    b.expects(:layer=).with(4)
+
+    subject.move_layer 0, 0, 1, 4
+
+    a.expects(:draw).with(target, :trans_x_zero, :trans_y_zero, 3)
+    b.expects(:draw).with(target, :trans_x_zero, :trans_y_zero, 3)
+    x.expects(:draw).with(target, :trans_x_one, :trans_y_one, 1)
+    y.expects(:draw).with(target, :trans_x_one, :trans_y_one, 2)
+
+    subject.draw(target)
   end
+
 end

data/{app_generators/templates/Gemfile → templates/app/Gemfile.tt}

@@ -2,6 +2,6 @@ source "http://rubygems.org"
 # uncomment for chipmunk
 # gem 'chipmunk'
 gem 'require_all'
-gem "gamebox", '>= 0.4.0'
+gem "gamebox", '<%= @gamebox_version %>'
 gem "conject"
 gem "rspec"

data/{app_generators/templates → templates/app}/config/environment.rb

@@ -8,14 +8,14 @@ Gamebox.configure do |config|
   config.music_path = APP_ROOT + "data/music/"
   config.sound_path = APP_ROOT + "data/sounds/"
   config.gfx_path = APP_ROOT + "data/graphics/"
-  config.fonts_path = APP_ROOT + "data/fonts"
+  config.fonts_path = APP_ROOT + "data/fonts/"
 
   config.gb_config_path = GAMEBOX_PATH + "config/"
   config.gb_data_path = GAMEBOX_PATH + "data/"
   config.gb_music_path = GAMEBOX_PATH + "data/music/"
   config.gb_sound_path = GAMEBOX_PATH + "data/sounds/"
   config.gb_gfx_path = GAMEBOX_PATH + "data/graphics/"
-  config.gb_fonts_path = GAMEBOX_PATH + "data/fonts"
+  config.gb_fonts_path = GAMEBOX_PATH + "data/fonts/"
   
   # config.stages = [:demo]
   # config.game_name = "Untitled Game"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gamebox
 version: !ruby/object:Gem::Version
-  version: 0.4.0.rc4
+  version: 0.4.0.rc5
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -77,22 +77,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -110,13 +94,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubigen
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -124,7 +108,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.2
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -344,28 +328,6 @@ files:
 - README.md
 - Rakefile
 - TODO.txt
-- app_generators/gamebox_generator.rb
-- app_generators/templates/.gitignore
-- app_generators/templates/Gemfile
-- app_generators/templates/NEXT_STEPS.txt
-- app_generators/templates/README.rdoc
-- app_generators/templates/Rakefile
-- app_generators/templates/config/boot.rb
-- app_generators/templates/config/environment.rb
-- app_generators/templates/config/game.yml
-- app_generators/templates/data/fonts/FONTS_GO_HERE
-- app_generators/templates/data/graphics/GRAPHICS_GO_HERE
-- app_generators/templates/data/music/MUSIC_GOES_HERE
-- app_generators/templates/data/sounds/SOUND_FX_GO_HERE
-- app_generators/templates/script/actor.erb
-- app_generators/templates/script/actor_spec.erb
-- app_generators/templates/script/actor_view.erb
-- app_generators/templates/script/actor_view_spec.erb
-- app_generators/templates/script/generate
-- app_generators/templates/spec/helper.rb
-- app_generators/templates/src/actors/player.rb
-- app_generators/templates/src/app.rb
-- app_generators/templates/src/demo_stage.rb
 - bin/gamebox
 - component_generators/actor_generator.rb
 - docs/CODE_REVIEW
@@ -392,7 +354,7 @@ files:
 - lib/gamebox/behaviors/collidable/polygon_collidable.rb
 - lib/gamebox/behaviors/emitting.rb
 - lib/gamebox/behaviors/graphical.rb
-- lib/gamebox/behaviors/input_stater.rb
+- lib/gamebox/behaviors/input_mapper.rb
 - lib/gamebox/behaviors/layered.rb
 - lib/gamebox/behaviors/physical.rb
 - lib/gamebox/behaviors/positioned.rb
@@ -473,7 +435,7 @@ files:
 - spec/acceptance/built_in_collision_handling_spec.rb
 - spec/acceptance/chipmunk_collision_handling_spec.rb
 - spec/acceptance/fps_actor_spec.rb
-- spec/acceptance/input_stater_spec.rb
+- spec/acceptance/input_mapper_spec.rb
 - spec/acceptance/pausing_spec.rb
 - spec/acceptance/timer_usage_spec.rb
 - spec/actors/emitter_spec.rb
@@ -513,6 +475,22 @@ files:
 - spec/lib/class_finder_spec.rb
 - spec/stagehands/spatial_tree_stagehand_spec.rb
 - spec/views/graphical_actor_view_spec.rb
+- templates/app/.gitignore
+- templates/app/Gemfile.tt
+- templates/app/NEXT_STEPS.txt
+- templates/app/README.rdoc
+- templates/app/Rakefile
+- templates/app/config/boot.rb
+- templates/app/config/environment.rb
+- templates/app/config/game.yml
+- templates/app/data/fonts/FONTS_GO_HERE
+- templates/app/data/graphics/GRAPHICS_GO_HERE
+- templates/app/data/music/MUSIC_GOES_HERE
+- templates/app/data/sounds/SOUND_FX_GO_HERE
+- templates/app/spec/helper.rb
+- templates/app/src/actors/player.rb
+- templates/app/src/app.rb
+- templates/app/src/demo_stage.rb
 homepage: http://shawn42.github.com/gamebox
 licenses: []
 post_install_message: 
@@ -543,7 +521,7 @@ test_files:
 - spec/acceptance/built_in_collision_handling_spec.rb
 - spec/acceptance/chipmunk_collision_handling_spec.rb
 - spec/acceptance/fps_actor_spec.rb
-- spec/acceptance/input_stater_spec.rb
+- spec/acceptance/input_mapper_spec.rb
 - spec/acceptance/pausing_spec.rb
 - spec/acceptance/timer_usage_spec.rb
 - spec/actors/emitter_spec.rb

data/app_generators/gamebox_generator.rb

@@ -1,95 +0,0 @@
-require 'rbconfig'
-
-class GameboxGenerator < RubiGen::Base
-  DEFAULT_SHEBANG = File.join(RbConfig::CONFIG['bindir'],
-                              RbConfig::CONFIG['ruby_install_name'])
-
-  default_options   :shebang => DEFAULT_SHEBANG
-
-  attr_reader :app_name, :module_name
-
-  def initialize(runtime_args, runtime_options = {})
-    super
-    usage if args.empty?
-    @destination_root = args.shift
-    @app_name     = File.basename(File.expand_path(@destination_root))
-    @module_name  = app_name.camelize
-    extract_options
-  end
-
-  def manifest
-    # Use /usr/bin/env if no special shebang was specified
-    script_options     = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] }
-    windows            = (RUBY_PLATFORM =~ /dos|win32|cygwin/i) || (RUBY_PLATFORM =~ /(:?mswin|mingw)/)
-
-    record do |m|
-      # Root directory and all subdirectories.
-      m.directory ''
-      BASEDIRS.each { |path| m.directory path }
-
-      # Root
-      m.template_copy_each %w( Rakefile 
-                               README.rdoc 
-                               config/environment.rb
-                             )
-
-      m.file_copy_each     %w( 
-                               Gemfile
-                               config/boot.rb
-                               config/game.yml
-
-                               data/fonts/FONTS_GO_HERE
-                               data/graphics/GRAPHICS_GO_HERE
-                               data/music/MUSIC_GOES_HERE
-                               data/sounds/SOUND_FX_GO_HERE
-                              
-                               spec/helper.rb
-
-                               src/app.rb
-                               src/demo_stage.rb
-                               src/actors/player.rb
-                             )
-
-      m.readme 'NEXT_STEPS.txt'
-
-      # Scripts
-      # %w( generate ).each do |file|
-      #   m.template "script/#{file}",        "script/#{file}", script_options
-      #   # m.template "script/win_script.cmd", "script/#{file}.cmd", 
-      #   #   :assigns => { :filename => file } if windows
-      # end
-
-    end
-  end
-
-  protected
-    def banner
-      <<-EOS
-Create a stub for a gamebox game.
-
-Usage: gamebox /path/to/your/app [options]"
-EOS
-    end
-
-    def add_options!(opts)
-      opts.separator ''
-      opts.separator "Gamebox options:"
-      opts.on("-v", "--version", "Show the #{File.basename($0)} version number.")
-    end
-
-    def extract_options
-    end
-
-  # Installation skeleton.  Intermediate directories are automatically
-  # created so don't sweat their absence here.
-  BASEDIRS = %w(
-    src/actors
-    spec
-    data/fonts
-    data/graphics
-    data/music
-    data/sounds
-    config
-  )
-end
-

data/app_generators/templates/script/actor.erb

@@ -1,10 +0,0 @@
-class <%= @actor_name %> < Actor
-  <% if @behaviors %>
-      has_baviors <%= @behaviors.join "," %> 
-  <% end %>
-
-  def setup
-    # register for events here
-    # or pull stuff out of @opts
-  end
-end

data/app_generators/templates/script/actor_spec.erb

@@ -1,11 +0,0 @@
-require 'helper'
-require '<%= Inflector.underscore @actor_name %>'
-
-describe 'a new <%= @actor_name %>' do
-  before do 
-#    opts = {:stage=>"stage", :input=>"input", :resources=>"resource"}
-#    @test_me = <%= @actor_name %>.new opts
-  end
-
-  it 'should do something'
-end

data/app_generators/templates/script/actor_view.erb

@@ -1,6 +0,0 @@
-class <%= @actor_view_name %> < ActorView
-
-  def draw(target,x_off,y_off,z)
-    # put in custom draw code here using @actor as the model
-  end
-end

data/app_generators/templates/script/actor_view_spec.erb

@@ -1,10 +0,0 @@
-require 'helper'
-require '<%= Inflector.underscore @actor_view_name %>'
-
-describe 'a new <%= @actor_view_name %>' do
-  before do 
-    #@test_me = <%= @actor_view_name %>.new "stage", "actor"
-  end
-
-  it 'should do something'
-end

data/app_generators/templates/script/generate

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.join(File.dirname(__FILE__), '..')
-
-require 'active_support'
-require 'rubigen'
-require APP_ROOT + '/config/environment'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-
-require 'rubigen/scripts/generate'
-RubiGen::Base.use_component_sources!
-RubiGen::Scripts::Generate.new.run(ARGV, source: GAMEBOX_PATH + '/component_generators/templates' )