gamebox 0.3.2 → 0.3.3

data/lib/gamebox/stage.rb

@@ -94,12 +94,15 @@ class Stage
 
   def draw(target)
     z = 0
-    @drawables.keys.sort.reverse.each do |parallax_layer|
+    # TODO PERF cache this array and invalidate when new layers come in?
+    @parallax_layers.each do |parallax_layer|
+    # @drawables.keys.sort.reverse.each do |parallax_layer|
 
       drawables_on_parallax_layer = @drawables[parallax_layer]
 
-      unless drawables_on_parallax_layer.nil?
-        drawables_on_parallax_layer.keys.sort.each do |layer|
+      if drawables_on_parallax_layer
+        @layer_orders[parallax_layer].each do |layer|
+        # drawables_on_parallax_layer.keys.sort.each do |layer|
 
           trans_x = @viewport.x_offset parallax_layer
           trans_y = @viewport.y_offset parallax_layer
@@ -125,13 +128,20 @@ class Stage
 
   def clear_drawables
     @drawables = {}
+    @layer_orders = {}
   end
 
   def register_drawable(drawable)
     layer = drawable.layer
     parallax = drawable.parallax
-    @drawables[parallax] ||= {}
-    @drawables[parallax][layer] ||= []
+    unless @drawables[parallax]
+      @drawables[parallax] = {}
+      @parallax_layers = @drawables.keys.sort.reverse
+    end
+    unless @drawables[parallax][layer]
+      @drawables[parallax][layer] = []
+      @layer_orders[parallax] = @drawables[parallax].keys.sort
+    end
     @drawables[parallax][layer] << drawable
   end
 
@@ -140,6 +150,7 @@ class Stage
   def move_layer(from_parallax, from_layer, to_parallax, to_layer)
     drawable_list = @drawables[from_parallax].delete from_layer
 
+
     if drawable_list
       prev_drawable_list = @drawables[to_parallax].delete to_layer
       @drawables[to_parallax][to_layer] = drawable_list

data/lib/gamebox/version.rb

@@ -2,7 +2,7 @@ module Gamebox
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 2
+    TINY  = 3
 
     ARRAY = [MAJOR, MINOR, TINY]
     STRING = ARRAY.join('.')

data/lib/gamebox/views/graphical_actor_view.rb

@@ -14,9 +14,9 @@ class GraphicalActorView < ActorView
     alpha = actor.respond_to?(:alpha) ? actor.alpha : 0xFF
     color = Color.new(alpha,0xFF,0xFF,0xFF)
 
-    x_scale = actor.x_scale
-    y_scale = actor.y_scale
 
+    x_scale = actor.respond_to?(:x_scale) ? actor.x_scale : 1
+    y_scale = actor.respond_to?(:y_scale) ? actor.y_scale : 1
     if actor.is? :physical
       img_w = img.width
       img_h = img.height

data/lib/gamebox/wrapped_screen.rb

@@ -103,6 +103,7 @@ class WrappedScreen
   end
 
   def convert_color(color)
+    return color if color.is_a? Gosu::Color
     @colors ||= {}
     c = @colors[color]
     if c.nil?

data/script/perf_collisions.rb

@@ -0,0 +1,72 @@
+require 'benchmark'
+$: << File.dirname(__FILE__)+"/../lib/gamebox"
+require 'gamebox'
+
+
+NUM_RUNS = 800
+PROFILE = true
+
+def run
+  config = {
+    screen_resolution: [800,600]
+  }
+
+  af = ActorFactory.new input_manager: :input_manager, wrapped_screen: :wrapped_screen
+  af.director = FakeUpdate.new
+  stage = Stage.new :input_manager, af, :resource_manager, :sound_manager, config, :backstage, {}
+
+  things = []
+  20.times do |i|
+    5.times do |j|
+      things << stage.spawn(:thinger, x: i*40, y: j*40)
+    end
+  end
+
+  Benchmark.bm(60) do |b|
+    b.report("update loop") do
+
+      runs = NUM_RUNS
+      if PROFILE
+        # runs = 100
+        require 'perftools'
+        PerfTools::CpuProfiler.start("/tmp/gamebox_perf.txt")
+      end
+
+      runs.times do 
+        things[0].x = things[0].x + 1
+        things[2].x = things[0].x + 1
+        things[0].x = things[2].x - 1
+        things[2].x = things[2].x - 1
+        things[0].y = things[0].y + 1
+        things[2].y = things[0].y + 1
+        things[0].y = things[2].y - 1
+        things[2].y = things[2].y - 1
+        stage.update(20)
+# 
+#         puts "\nGARBAGE COLLECTION"
+#         # Not even close to exact, but gives a rough idea of what's being collected
+#         old_objects = ObjectSpace.count_objects.dup
+#         ObjectSpace.garbage_collect
+#         new_objects = ObjectSpace.count_objects
+# 
+#         old_objects.each do |k,v|
+#           diff = v - new_objects[k]
+#           puts "#{k} #{diff} diff" if diff != 0
+#         end
+#                 
+# 
+      end
+      PerfTools::CpuProfiler.stop if PROFILE
+
+    end
+  end
+end
+class FakeUpdate
+  def update(dt);end
+end
+
+class Thinger < Actor
+  has_behavior :collidable => {:shape => :circle, :radius => 34}
+end
+
+run

data/script/perf_drawables.rb

@@ -0,0 +1,51 @@
+require 'benchmark'
+$: << File.dirname(__FILE__)+"/../lib/gamebox"
+require 'gamebox'
+
+
+NUM_LAYERS = 12
+NUM_P_LAYERS = 3
+NUM_RUNS = 200_000
+PROFILE = true
+
+def run
+  config = {
+    screen_resolution: [800,600]
+  }
+
+  af = Struct.new(:director).new
+  stage = Stage.new :input_manager, af, :resource_manager, :sound_manager, config, :backstage, {}
+  NUM_P_LAYERS.times do |pl|
+    NUM_LAYERS.times do |l|
+      stage.register_drawable FakeDrawable.new(l+1, pl+1)
+    end
+  end
+
+  
+  Benchmark.bm(60) do |b|
+    b.report("drawing loop") do
+
+      if PROFILE
+        require 'perftools'
+        PerfTools::CpuProfiler.start("/tmp/gamebox_perf.txt")
+      end
+
+      NUM_RUNS.times do 
+        stage.draw :target
+      end
+      PerfTools::CpuProfiler.stop if PROFILE
+
+    end
+  end
+end
+
+class FakeDrawable
+  def initialize(l, pl)
+    @layer = l
+    @parallax = pl
+  end
+  def draw(target,xoff,yoff,z);end
+  attr_accessor :layer, :parallax
+end
+
+run

data/spec/physical_spec.rb

@@ -1,134 +1,137 @@
 require File.join(File.dirname(__FILE__),'helper')
 
-class CircleActor < Actor
-  has_behaviors :physical => {:shape => :circle, 
-    :mass => 500,
-    :radius => 10}
-end
+# Only run these if the user has chipmunk installed
+if defined? CP
+  class CircleActor < Actor
+    has_behaviors :physical => {:shape => :circle, 
+      :mass => 500,
+      :radius => 10}
+  end
 
-describe 'A new physical behavior' do
-  before do
-    @stage = stub(:load_animation_set => ['1.png_img_obj','2.png_img_obj'],:register_physical_object => true)
+  describe 'A new physical behavior' do
+    before do
+      @stage = stub(:load_animation_set => ['1.png_img_obj','2.png_img_obj'],:register_physical_object => true)
 
-    @opts = {:stage=>@stage, :input=>"input", :resources=>"rm"}
-    @actor = CircleActor.new @opts
-    @physical = @actor.physical
-  end
+      @opts = {:stage=>@stage, :input=>"input", :resources=>"rm"}
+      @actor = CircleActor.new @opts
+      @physical = @actor.physical
+    end
 
-  it 'should add methods to its actor' do
-    @actor.should.respond_to? :x
-    pending 'add shared example for relegates'
-  end
+    it 'should add methods to its actor' do
+      @actor.should.respond_to? :x
+      pending 'add shared example for relegates'
+    end
 
-  describe "#pivot" do
-    it 'creates a new PivotJoint and adds it to the space' do
-      other = CircleActor.new @opts
-      v1 = vec2(2,3)
-      v2 = vec2(4,5)
-      CP::Constraint::PivotJoint.expects(:new).with(@physical.body, other.body, v1, v2).returns(:joint)
-      @stage.expects(:register_physical_constraint).with(:joint)
+    describe "#pivot" do
+      it 'creates a new PivotJoint and adds it to the space' do
+        other = CircleActor.new @opts
+        v1 = vec2(2,3)
+        v2 = vec2(4,5)
+        CP::Constraint::PivotJoint.expects(:new).with(@physical.body, other.body, v1, v2).returns(:joint)
+        @stage.expects(:register_physical_constraint).with(:joint)
 
-      @actor.pivot(v1, other, v2).should == :joint
+        @actor.pivot(v1, other, v2).should == :joint
+      end
     end
-  end
 
-  describe "#pin" do
-    it 'creates a new PinJoint and adds it to the space' do
-      other = CircleActor.new @opts
-      v1 = vec2(2,3)
-      v2 = vec2(4,5)
-      CP::Constraint::PinJoint.expects(:new).with(@physical.body, other.body, v1, v2).returns(:joint)
-      @stage.expects(:register_physical_constraint).with(:joint)
+    describe "#pin" do
+      it 'creates a new PinJoint and adds it to the space' do
+        other = CircleActor.new @opts
+        v1 = vec2(2,3)
+        v2 = vec2(4,5)
+        CP::Constraint::PinJoint.expects(:new).with(@physical.body, other.body, v1, v2).returns(:joint)
+        @stage.expects(:register_physical_constraint).with(:joint)
 
-      @actor.pin(v1, other, v2).should == :joint
+        @actor.pin(v1, other, v2).should == :joint
+      end
     end
-  end
 
-  describe "#spring" do
-    it 'creates a new DampedSpring and adds it to the space' do
-      other = CircleActor.new @opts
-      v1 = vec2(2,3)
-      v2 = vec2(4,5)
-      CP::Constraint::DampedSpring.expects(:new).with(@physical.body, other.body, v1, v2, 1,2,3).returns(:spring)
-      @stage.expects(:register_physical_constraint).with(:spring)
+    describe "#spring" do
+      it 'creates a new DampedSpring and adds it to the space' do
+        other = CircleActor.new @opts
+        v1 = vec2(2,3)
+        v2 = vec2(4,5)
+        CP::Constraint::DampedSpring.expects(:new).with(@physical.body, other.body, v1, v2, 1,2,3).returns(:spring)
+        @stage.expects(:register_physical_constraint).with(:spring)
 
-      @actor.spring(v1, other, v2, 1, 2, 3).should == :spring
+        @actor.spring(v1, other, v2, 1, 2, 3).should == :spring
+      end
     end
-  end
 
 
 
-  describe "#groove" do
-    it 'creates a new GrooveJoint and adds it to the space' do
-      other = CircleActor.new @opts
-      v1 = vec2(2,3)
-      v2 = vec2(4,5)
-      v3 = vec2(9,7)
-      CP::Constraint::GrooveJoint.expects(:new).with(@physical.body, other.body, v1, v2, v3).returns(:groove)
-      @stage.expects(:register_physical_constraint).with(:groove)
+    describe "#groove" do
+      it 'creates a new GrooveJoint and adds it to the space' do
+        other = CircleActor.new @opts
+        v1 = vec2(2,3)
+        v2 = vec2(4,5)
+        v3 = vec2(9,7)
+        CP::Constraint::GrooveJoint.expects(:new).with(@physical.body, other.body, v1, v2, v3).returns(:groove)
+        @stage.expects(:register_physical_constraint).with(:groove)
 
-      @actor.groove(v1, v2, other, v3).should == :groove
+        @actor.groove(v1, v2, other, v3).should == :groove
+      end
     end
-  end
 
-  describe "#rotary_spring" do
-    it 'creates a new DampedRotarySpring and adds it to the space' do
-      other = CircleActor.new @opts
-      CP::Constraint::DampedRotarySpring.expects(:new).with(@physical.body, other.body, 3.14, 10, 50).returns(:rotary_spring)
-      @stage.expects(:register_physical_constraint).with(:rotary_spring)
-      @actor.rotary_spring(other, 3.14, 10, 50).should == :rotary_spring
+    describe "#rotary_spring" do
+      it 'creates a new DampedRotarySpring and adds it to the space' do
+        other = CircleActor.new @opts
+        CP::Constraint::DampedRotarySpring.expects(:new).with(@physical.body, other.body, 3.14, 10, 50).returns(:rotary_spring)
+        @stage.expects(:register_physical_constraint).with(:rotary_spring)
+        @actor.rotary_spring(other, 3.14, 10, 50).should == :rotary_spring
+      end
     end
-  end
 
-  describe "#rotary_limit" do
-    it 'creates a new RotaryLimitJoint and adds it to the space' do
-      other = CircleActor.new @opts
-      CP::Constraint::RotaryLimitJoint.expects(:new).with(@physical.body, other.body, 0, 3).returns(:rotary_limit)
-      @stage.expects(:register_physical_constraint).with(:rotary_limit)
-      @actor.rotary_limit(other, 0, 3).should == :rotary_limit
+    describe "#rotary_limit" do
+      it 'creates a new RotaryLimitJoint and adds it to the space' do
+        other = CircleActor.new @opts
+        CP::Constraint::RotaryLimitJoint.expects(:new).with(@physical.body, other.body, 0, 3).returns(:rotary_limit)
+        @stage.expects(:register_physical_constraint).with(:rotary_limit)
+        @actor.rotary_limit(other, 0, 3).should == :rotary_limit
+      end
     end
-  end
 
-  describe "#ratchet" do
-    it 'creates a new RatchetJoint and adds it to the space' do
-      other = CircleActor.new @opts
-      CP::Constraint::RatchetJoint.expects(:new).with(@physical.body, other.body, 0, 0.3).returns(:ratchet)
-      @stage.expects(:register_physical_constraint).with(:ratchet)
-      @actor.ratchet(other, 0, 0.3).should == :ratchet
+    describe "#ratchet" do
+      it 'creates a new RatchetJoint and adds it to the space' do
+        other = CircleActor.new @opts
+        CP::Constraint::RatchetJoint.expects(:new).with(@physical.body, other.body, 0, 0.3).returns(:ratchet)
+        @stage.expects(:register_physical_constraint).with(:ratchet)
+        @actor.ratchet(other, 0, 0.3).should == :ratchet
+      end
     end
-  end
 
-  describe "#gear" do
-    it 'creates a new GearJoint and adds it to the space' do
-      other = CircleActor.new @opts
-      CP::Constraint::GearJoint.expects(:new).with(@physical.body, other.body, 0, 0.3).returns(:gear)
-      @stage.expects(:register_physical_constraint).with(:gear)
-      @actor.gear(other, 0, 0.3).should == :gear
+    describe "#gear" do
+      it 'creates a new GearJoint and adds it to the space' do
+        other = CircleActor.new @opts
+        CP::Constraint::GearJoint.expects(:new).with(@physical.body, other.body, 0, 0.3).returns(:gear)
+        @stage.expects(:register_physical_constraint).with(:gear)
+        @actor.gear(other, 0, 0.3).should == :gear
+      end
     end
-  end
 
-  describe "#motor" do
-    it 'creates a new SimpleMotor and adds it to the space' do
-      other = CircleActor.new @opts
-      CP::Constraint::SimpleMotor.expects(:new).with(@physical.body, other.body, 40).returns(:motor)
-      @stage.expects(:register_physical_constraint).with(:motor)
-      @actor.motor(other, 40).should == :motor
+    describe "#motor" do
+      it 'creates a new SimpleMotor and adds it to the space' do
+        other = CircleActor.new @opts
+        CP::Constraint::SimpleMotor.expects(:new).with(@physical.body, other.body, 40).returns(:motor)
+        @stage.expects(:register_physical_constraint).with(:motor)
+        @actor.motor(other, 40).should == :motor
+      end
     end
-  end
 
-  describe "#slide" do
-    it 'creates the slide joint and adds it to the space' do
-      other = CircleActor.new @opts
-      v1 = vec2(2,3)
-      v2 = vec2(4,5)
-      min = 2.0
-      max = 3.0
-      CP::Constraint::SlideJoint.expects(:new).with(@physical.body, other.body, v1, v2, min, max).returns(:joint)
+    describe "#slide" do
+      it 'creates the slide joint and adds it to the space' do
+        other = CircleActor.new @opts
+        v1 = vec2(2,3)
+        v2 = vec2(4,5)
+        min = 2.0
+        max = 3.0
+        CP::Constraint::SlideJoint.expects(:new).with(@physical.body, other.body, v1, v2, min, max).returns(:joint)
 
-      @stage.expects(:register_physical_constraint).with(:joint)
+        @stage.expects(:register_physical_constraint).with(:joint)
 
-      @actor.slide(v1, other, v2, min, max).should == :joint
+        @actor.slide(v1, other, v2, min, max).should == :joint
+      end
     end
-  end
 
+  end
 end

data/spec/spatial_hash_spec.rb

@@ -13,20 +13,20 @@ describe 'a new SpacialHash' do
   it 'can add a point' do
     pt = Point.new 2, 3
     @hash.add pt
-    @hash.instance_variable_get('@buckets')[0][0].first.should == pt
+    @hash.buckets[0][0].first.should == pt
   end
 
   it 'can add a neg point' do
     pt = Point.new -2, 3
     @hash.add pt
-    @hash.instance_variable_get('@buckets')[-1][0].first.should == pt
+    @hash.buckets[-1][0].first.should == pt
   end
 
   it 'can add a square' do
     box = Item.new 2, 3, 12, 13
     @hash.add box
 
-    buckets = @hash.instance_variable_get('@buckets')
+    buckets = @hash.buckets
 
     buckets[0][0].first.should == box
     buckets[0][1].first.should == box
@@ -38,33 +38,38 @@ describe 'a new SpacialHash' do
     box = Item.new 3, 3, 12, 2
     @hash.add box
 
-    buckets = @hash.instance_variable_get('@buckets')
+    buckets = @hash.buckets
     buckets[0][0].first.should == box
     buckets[1][0].first.should == box
 
-    buckets[1][1].should be_nil
     buckets[0][1].should be_nil
+    buckets[1][1].should be_nil
 
   end
 
   it 'can remove points' do
     pt = Point.new -2, 3
     @hash.add pt
+    @hash.buckets[-1][0].should_not be_empty
     @hash.remove pt
 
-    @hash.instance_variable_get('@buckets')[-1][0].should be_empty
+    @hash.buckets[-1][0].should be_empty
   end
 
   it 'can remove boxes' do
     box = Item.new 2, 3, 12, 13
     @hash.add box
+    @hash.buckets[0][0].should_not be_empty
+    @hash.buckets[0][1].should_not be_empty
+    @hash.buckets[1][0].should_not be_empty
+    @hash.buckets[1][1].should_not be_empty
 
     @hash.remove box
 
-    @hash.instance_variable_get('@buckets')[0][0].should be_empty
-    @hash.instance_variable_get('@buckets')[0][1].should be_empty
-    @hash.instance_variable_get('@buckets')[1][0].should be_empty
-    @hash.instance_variable_get('@buckets')[1][1].should be_empty
+    @hash.buckets[0][0].should be_empty
+    @hash.buckets[0][1].should be_empty
+    @hash.buckets[1][0].should be_empty
+    @hash.buckets[1][1].should be_empty
   end
 
   it 'can lookup objects for an x,y location' do
@@ -79,7 +84,7 @@ describe 'a new SpacialHash' do
     @hash.add box
     @hash.rehash
 
-    buckets = @hash.instance_variable_get('@buckets')
+    buckets = @hash.buckets
     buckets[0][0].first.should == box
     buckets[0][1].first.should == box
     buckets[1][0].first.should == box