gamebox 0.4.0.rc5 → 0.4.0.rc11

data/lib/gamebox/version.rb

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

data/lib/gamebox/views/graphical_actor_view.rb

@@ -1,5 +1,5 @@
 
-ActorView.define :graphical_actor_view do
+define_actor_view :graphical_actor_view do
 
   draw do |target, x_off, y_off, z|
     img = actor.do_or_do_not(:image)
@@ -17,7 +17,6 @@ ActorView.define :graphical_actor_view do
     x_scale = actor.do_or_do_not(:x_scale) || 1
     y_scale = actor.do_or_do_not(:y_scale) || 1
 
-    # TODO add ? ableness to actor attributes
     if actor.do_or_do_not(:tiled)
       x_tiles = actor.num_x_tiles
       y_tiles = actor.num_y_tiles
@@ -26,12 +25,12 @@ ActorView.define :graphical_actor_view do
       x_tiles.times do |col|
         y_tiles.times do |row|
           # TODO why is there a nasty black line between these that jitters?
-          img.draw_rot offset_x+col*img_w, offset_y+row*img_h, z, actor.rotation, x_scale, y_scale
+          img.draw offset_x+col*img_w, offset_y+row*img_h, z, x_scale, y_scale
         end
       end
     else
-      if actor.respond_to? :rotation
-        rot = actor.rotation || 0.0
+      rot = actor.do_or_do_not :rotation
+      if rot
         img.draw_rot offset_x, offset_y, z, rot, 0.5, 0.5, x_scale, y_scale, color
       else
         img.draw offset_x, offset_y, z, x_scale, y_scale, color

data/script/perf_aabb.rb

@@ -15,14 +15,18 @@ class BoxedActor
     @h = h
   end
 
+  def bb
+    @bb ||= Rect.new(x,y,w,h)
+  end
+
 end
-require 'perftools'
-PerfTools::CpuProfiler.start("/tmp/perf.txt")
+# require 'perftools'
+# PerfTools::CpuProfiler.start("/tmp/perf.txt")
 
 
 NUM = 1_000
-# Benchmark.bm(60) do |b|
-#   b.report("full") do
+Benchmark.bm(60) do |b|
+  b.report("full") do
     tree = SpatialTreeStagehand.new :thing, :thing
 
     thing = BoxedActor.new 1, 2, 3, 4
@@ -43,14 +47,15 @@ NUM = 1_000
         t.x += rand(40)-20
       end
 
-      tree.neighbors_of thing do
+      tree.query thing.bb do
       end
+
       tree.remove it
     end
-#   end
-# end
+  end
+end
 
-PerfTools::CpuProfiler.stop
+# PerfTools::CpuProfiler.stop
 # be pprof.rb --text /tmp/perf.txt
 
 

data/spec/acceptance/animation_spec.rb

@@ -26,7 +26,7 @@ describe "Using animation", acceptance: true do
   end
 
   it 'animates correctly' do
-    game.stage do |stage| # instance of TestingStage
+    game.stage do |stage|
       create_actor :snelpling
     end
 
@@ -57,8 +57,6 @@ describe "Using animation", acceptance: true do
     draw
 
     see_image_drawn snelpling_jump_1_png
-
-    pending "add callback checks?"
   end
 
 end

data/spec/acceptance/basic_actor_lifecycle_spec.rb

@@ -45,7 +45,7 @@ describe "The basic life cycle of an actor", acceptance: true do
 
   define_actor_view :mc_bane_view do
     requires :resource_manager # needs these injected
-    configure do
+    setup do
       @image = resource_manager.load_actor_image(actor)
     end
 

data/spec/acceptance/fps_actor_spec.rb

@@ -1,39 +1,35 @@
 require 'helper'
 
 describe "Using fps actor", acceptance: true do
+
+  let!(:arial_20) { mock_font('arial', 20) }
+
   it 'draws and updates the fps label' do
-    game.stage do |stage| # instance of TestingStage
-      @fps = create_actor :fps, font_name: 'arial', font_size: 20
+    game.stage do |stage|
+      @fps = create_actor :fps, font_name: 'arial', font_size: 20, color: Color::RED
     end
 
     game.should have_actor(:fps)
     game.should have_actor(:label)
     draw
-    see_text_drawn "", in: arial_20
+    see_text_drawn "", in: arial_20, color: Color::RED
 
     Gosu.stubs(:fps).returns(99)
     draw
-    see_text_drawn "", in: arial_20
+    see_text_drawn "", in: arial_20, color: Color::RED
 
     update 100
     draw
-    see_text_drawn "99", in: arial_20
+    see_text_drawn "99", in: arial_20, color: Color::RED
 
     remove_fps
 
     game.should_not have_actor(:fps)
     game.should_not have_actor(:label)
-
-    pending "check color of drawn fonts"
-
   end
 
-  let!(:arial_20) { mock_font('arial', 20) }
-
   def remove_fps
     game.current_stage.instance_variable_get("@fps").remove
-    # TODO is this needed?
-    update 1
   end
 
 end

data/spec/acceptance/input_mapper_spec.rb

@@ -1,47 +1,40 @@
 require 'helper'
 
-describe "Using input stater", acceptance: true do
-
+describe "Using input mapper", acceptance: true do
 
   define_actor :foxy do
-    has_behavior input_mapper: {
-      [KbLeft] => :move_left,
-      [KbRight, KbD] => :move_right
-    }
   end
 
   it 'sets actor state based on input' do
     game.stage do |stage| # instance of TestingStage
-      create_actor :foxy
+      foxy = create_actor :foxy
+      foxy.input.map_input 'left' => :move_left,
+                           'right' => :move_right,
+                           'd' => :move_right
     end
 
-    see_actor_attrs :foxy, 
-      move_left: false
-    see_actor_attrs :foxy, 
-      move_right: false
+    input = game.actor(:foxy).input
+    input.move_left?.should be_false
+    input.move_right?.should be_false
 
     press_key KbLeft
     press_key KbD
 
-    see_actor_attrs :foxy, 
-      move_left: true
-
-    see_actor_attrs :foxy, 
-      move_right: true
+    input.move_left?.should be_true
+    input.move_right?.should be_true
 
     release_key KbD
-    see_actor_attrs :foxy, 
-      move_right: false
+    input.move_left?.should be_true
+    input.move_right?.should be_false
 
-    press_key KbRight
 
-    see_actor_attrs :foxy, 
-      move_right: true
+    press_key KbRight
+    input.move_left?.should be_true
+    input.move_right?.should be_true
 
     release_key KbRight
-
-    see_actor_attrs :foxy, 
-      move_right: false
+    input.move_left?.should be_true
+    input.move_right?.should be_false
   end
 
 end

data/spec/acceptance/update_ordering_spec.rb

@@ -0,0 +1,64 @@
+require 'helper'
+
+describe "Updates and their order", acceptance: true do
+
+  define_behavior :double_value do |beh|
+    beh.requires :director
+    beh.setup do
+      actor.has_attributes value: 1
+      director.when :pre_update do |time|
+        actor.value *= 2
+      end
+    end
+  end
+
+  define_behavior :plus_one do |beh|
+    beh.requires :director
+    beh.setup do
+      actor.has_attributes value: 1
+      director.when :update do |time|
+        actor.value += 1
+      end
+    end
+  end
+
+  define_behavior :triple_value do |beh|
+    beh.requires :director
+    beh.setup do
+      actor.has_attributes value: 1
+      director.when :post_update do |time|
+        actor.value *= 3
+      end
+    end
+  end
+
+  define_actor :math_man do
+    has_behaviors :triple_value, :double_value, :plus_one
+  end
+
+
+  it 'updates get fired in the correct order' do
+    game.stage do |stage| # instance of TestingStage
+      create_actor :math_man
+    end
+
+    see_actor_attrs :math_man, value: 1
+    update 10
+
+    see_actor_attrs :math_man, value: 9
+
+  end
+
+  it 'modifies update order from the stage' do
+    game.stage do |stage| # instance of TestingStage
+      director.update_slots = [:update, :post_update, :pre_update ]
+      create_actor :math_man
+    end
+
+    see_actor_attrs :math_man, value: 1
+    update 10
+
+    see_actor_attrs :math_man, value: 12
+
+  end
+end

data/spec/actors/label_spec.rb

@@ -1,10 +1,95 @@
 require 'helper'
 
-describe 'a new Label' do
-  before do 
-#    opts = {:stage=>"stage", :input=>"input", :resources=>"resource"}
-#    @test_me = Label.new opts
+describe :label do
+
+  subjectify_actor(:label)
+
+  it 'has the label behavior' do
+    behaviors = subject.instance_variable_get('@behaviors')
+    behaviors.should include(:label)
   end
 
-  it 'should do something'
+  describe "#behavior" do
+    subjectify_behavior(:label)
+
+    before do
+      @actor.stubs(has_attributes: nil, font_name: "fonty.ttf",
+                   font_size: 22, color: :red)
+      @font_style_factory.stubs(:build)
+    end
+
+    it 'sets up attributes on actor' do
+      @actor.expects(:has_attributes).with(
+        text: "",
+        font_size: 30,
+        font_name: "Asimov.ttf",
+        color:     [250,250,250,255],
+        width:     0,
+        height:    0,
+        layer:     1)
+      @font_style_factory.stubs(:build).with('fonty.ttf', 22, :red).returns(:stylish_font)
+      @actor.expects(:has_attributes).with(font_style: :stylish_font)
+     
+      subject.setup
+    end
+
+    it 'listens for text changes' do
+      subject.setup
+      @actor.stubs(text: "foo")
+
+      font_style = stub(height: 13)
+      font_style.stubs(:calc_width).with("foo").returns(73)
+      @actor.stubs(font_style: font_style)
+
+      @actor.expects(:width=).with(73)
+      @actor.expects(:height=).with(13)
+
+      @actor.fire :text_changed
+    end
+
+    it 'listens for font color changes' do
+      subject.setup
+      font_style = stub
+      font_style.expects(:color=).with(:red)
+      @actor.stubs(font_style: font_style, color: :red)
+
+      @actor.fire :color_changed
+    end
+
+    it 'listens for font name changes' do
+      subject.setup
+      @actor.stubs(text: "foo", font_name: "asimov.ttf")
+
+      font_style = stub(height: 13)
+      font_style.stubs(:calc_width).with("foo").returns(73)
+
+      font_style.expects(:name=).with("asimov.ttf")
+      font_style.expects(:reload)
+      @actor.expects(:width=).with(73)
+      @actor.expects(:height=).with(13)
+
+      @actor.stubs(font_style: font_style)
+
+      @actor.fire :font_name_changed
+    end
+
+    it 'listens for font size changes' do
+      subject.setup
+      @actor.stubs(text: "foo", font_size: 14)
+
+      font_style = stub(height: 13)
+      font_style.stubs(:calc_width).with("foo").returns(73)
+
+      font_style.expects(:size=).with(14)
+      font_style.expects(:reload)
+      @actor.expects(:width=).with(73)
+      @actor.expects(:height=).with(13)
+
+      @actor.stubs(font_style: font_style)
+
+      @actor.fire :font_size_changed
+    end
+
+  end
 end
+

data/spec/behaviors/animated_spec.rb

@@ -7,10 +7,10 @@ describe :animated do
   let(:subcontext) do 
     it = nil
     Conject.default_object_context.in_subcontext{|ctx|it = ctx}; 
+    it[:director] = director
     _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

data/spec/behaviors/collidable_spec.rb

@@ -8,11 +8,15 @@ describe :collidable do
   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 = create_mocks *(
+      [:stage] +
+      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[:director] = director
     it
   end
   let!(:actor) { subcontext[:actor] }
@@ -44,7 +48,7 @@ describe :collidable do
     it 'should recalculate_collidable_cache on position_changed' do
       subject
       actor.shape.expects(:recalculate_collidable_cache)
-      actor.react_to :position_changed
+      actor.send :emit, :position_changed
     end
 
     it 'should calculate center point for circle' do
@@ -105,18 +109,6 @@ describe :collidable do
 
       actor.x = 10
       actor.y = 5
-      actor.cw_world_points.should == [[0,0],[10,7],[20,10]]
-      actor.cw_world_lines.should == [
-        [[0,0],[10,7]],
-        [[10,7],[20,10]],
-        [[20,10],[0,0]]
-      ]
-      actor.cw_world_edge_normals.should == [
-        [-7,10], [-3,10], [10,-20]
-      ]
-
-      # triggers the recalc cache
-      director.fire :update, 4
 
       actor.cw_world_points.should == [[10,5],[20,12],[30,15]]
       actor.cw_world_lines.should == [