gamebox 0.3.4 → 0.4.0.rc1

data/lib/gamebox/version.rb

@@ -1,10 +1,15 @@
 module Gamebox
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 3
-    TINY  = 4
+    MINOR = 4
+    TINY  = 0
+    RC    = 1
 
-    ARRAY = [MAJOR, MINOR, TINY]
+    if RC > 0
+      ARRAY = [MAJOR, MINOR, TINY, "rc#{RC}"]
+    else
+      ARRAY = [MAJOR, MINOR, TINY]
+    end
     STRING = ARRAY.join('.')
   end
 end

data/lib/gamebox/views/graphical_actor_view.rb

@@ -1,47 +1,40 @@
 
+ActorView.define :graphical_actor_view do
+
+  draw do |target, x_off, y_off, z|
+    img = actor.do_or_do_not(:image)
+    return if img.nil?
 
-class GraphicalActorView < ActorView
-  def draw(target, x_off, y_off, z)
     x = actor.x
     y = actor.y
 
     offset_x = x+x_off
     offset_y = y+y_off
 
-    img = actor.image
-    return if img.nil?
-
-    alpha = actor.respond_to?(:alpha) ? actor.alpha : 0xFF
+    alpha = actor.do_or_do_not(:alpha) || 0xFF
     color = Color.new(alpha,0xFF,0xFF,0xFF)
 
+    x_scale = actor.do_or_do_not(:x_scale) || 1
+    y_scale = actor.do_or_do_not(:y_scale) || 1
 
-    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
+    # 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
       img_w = img.width
       img_h = img.height
-
-      img.draw_rot offset_x, offset_y, z, actor.rotation, 0.5, 0.5, x_scale, y_scale
-    else
-      graphical_behavior = actor.graphical if actor.is? :graphical
-      if graphical_behavior && graphical_behavior.tiled?
-        x_tiles = graphical_behavior.num_x_tiles
-        y_tiles = graphical_behavior.num_y_tiles
-        img_w = img.width
-        img_h = img.height
-        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
-          end
+      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
         end
+      end
+    else
+      if actor.respond_to? :rotation
+        rot = actor.rotation || 0.0
+        img.draw_rot offset_x, offset_y, z, rot, 0.5, 0.5, x_scale, y_scale, color
       else
-        if actor.respond_to? :rotation
-          rot = actor.rotation || 0.0
-          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
-        end
+        img.draw offset_x, offset_y, z, x_scale, y_scale, color
       end
     end
   end

data/script/perf_aabb.rb

@@ -0,0 +1,56 @@
+require 'benchmark'
+require '../lib/gamebox'
+
+class BoxedActor
+  include Kvo
+  kvo_attr_accessor :x, :y
+  attr_accessor :w, :h
+
+  can_fire_anything
+
+  def initialize(x,y,w,h)
+    @kvo_x = x
+    @kvo_y = y
+    @w = w
+    @h = h
+  end
+
+end
+require 'perftools'
+PerfTools::CpuProfiler.start("/tmp/perf.txt")
+
+
+NUM = 1_000
+# Benchmark.bm(60) do |b|
+#   b.report("full") do
+    tree = SpatialTreeStagehand.new :thing, :thing
+
+    thing = BoxedActor.new 1, 2, 3, 4
+    tree.add thing
+    things = []
+    100.times do |i|
+      t = BoxedActor.new i, i, i, i
+      things << t
+      tree.add t
+    end
+
+    NUM.times do 
+      it = BoxedActor.new 1, 2, 3, 4
+      tree.add it
+
+      thing.x + 1
+      things[20..40].each do |t|
+        t.x += rand(40)-20
+      end
+
+      tree.neighbors_of thing do
+      end
+      tree.remove it
+    end
+#   end
+# end
+
+PerfTools::CpuProfiler.stop
+# be pprof.rb --text /tmp/perf.txt
+
+

data/script/perf_array_access.rb

@@ -0,0 +1,16 @@
+require 'benchmark'
+NUM = 10_000_000
+Benchmark.bm(60) do |b|
+  it = [4,6]
+  b.report("[]") do
+    NUM.times do 
+      it[0]
+    end
+  end
+  b.report("at") do
+    NUM.times do 
+      it.at(0)
+    end
+  end
+end
+

data/script/perf_collisions.rb

@@ -3,25 +3,22 @@ $: << File.dirname(__FILE__)+"/../lib/gamebox"
 require 'gamebox'
 
 
-NUM_RUNS = 800
-PROFILE = true
+NUM_RUNS = 1000
+PROFILE = false
+class FakeInput
+  def unsubscribe_all(*args);end
+end
 
 def run
   config = {
     screen_resolution: [800,600]
   }
 
-  af = ActorFactory.new input_manager: :input_manager, wrapped_screen: :wrapped_screen
+  fake_input = FakeInput.new
+  af = ActorFactory.new input_manager: fake_input, 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
 
@@ -31,16 +28,38 @@ def run
         require 'perftools'
         PerfTools::CpuProfiler.start("/tmp/gamebox_perf.txt")
       end
+      things = []
+      200.times do |i|
+        50.times do |j|
+          things << stage.spawn(:thinger, x: i*40, y: j*40)
+        end
+      end
+
 
+      stage.on_collision_of :thinger, :thinger do |a,b|
+        # no op, just want something to call
+      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
+        # move some around
+        dist = 10
+        [0,2,5,7,13,19].each do |i|
+          thing = things[i]
+          thing.x = thing.x + dist
+          thing.y = thing.y + dist
+        end
+
+        stage.update(20)
+
+        [0,2,5,7,13,19].each do |i|
+          thing = things[i]
+          thing.x = thing.x - dist
+          thing.y = thing.y - dist
+        end
+        stage.update(20)
+
+        to_kill = things.pop
+        things << stage.spawn(:thinger, x: to_kill.x, y: to_kill.y)
+        to_kill.remove_self
         stage.update(20)
 # 
 #         puts "\nGARBAGE COLLECTION"

data/script/perf_struct_vs_array.rb

@@ -1,13 +1,13 @@
 require 'benchmark'
 
 # Point = Struct.new :x, :y
-class Point
-  attr_accessor :x, :y
-  def initialize(x,y)
-    @x = x
-    @y = y
-  end
-end
+# class Point
+#   attr_accessor :x, :y
+#   def initialize(x,y)
+#     @x = x
+#     @y = y
+#   end
+# end
 NUM = 10_000_000
 Benchmark.bm(60) do |b|
   b.report("array") do

data/spec/acceptance/animation_spec.rb

@@ -0,0 +1,65 @@
+require 'helper'
+
+describe "Using animation", acceptance: true do
+
+  let!(:snelpling_idle_png) { mock_image('snelpling/idle/1.png') }
+  let!(:snelpling_jump_1_png) { mock_image('snelpling/jump/1.png') }
+  let!(:snelpling_jump_2_png) { mock_image('snelpling/jump/2.png') }
+  let!(:snelpling_jump_3_png) { mock_image('snelpling/jump/3.png') }
+
+  define_behavior :jump_on_j do
+    requires :input_manager
+    setup do
+      input_manager.reg :down, KbJ do
+        actor.action = :jump
+      end
+    end
+  end
+  define_actor_view :snelpling_view do
+    draw do |target, x_off, y_off, z|
+      actor.image.draw #offset_x, offset_y, z, x_scale, y_scale, color
+    end
+  end
+  define_actor :snelpling do
+    has_behavior :jump_on_j
+    has_behavior :animated
+  end
+
+  it 'animates correctly' do
+    game.stage do |stage| # instance of TestingStage
+      create_actor :snelpling
+    end
+
+    see_actor_attrs :snelpling, 
+      action: :idle,
+      image: snelpling_idle_png
+
+    draw
+    see_image_drawn snelpling_idle_png
+
+    update 60
+    draw
+    see_image_drawn snelpling_idle_png
+
+    press_key KbJ
+    draw
+
+    see_image_drawn snelpling_jump_1_png
+    update 60
+    draw
+
+    see_image_drawn snelpling_jump_2_png
+    update 60
+    draw
+
+    see_image_drawn snelpling_jump_3_png
+    update 60
+    draw
+
+    see_image_drawn snelpling_jump_1_png
+
+    pending "add callback checks?"
+  end
+
+end
+

data/spec/acceptance/basic_actor_lifecycle_spec.rb

@@ -0,0 +1,92 @@
+require 'helper'
+
+describe "The basic life cycle of an actor", acceptance: true do
+  before do
+    Gamebox.configure do |config|
+      config.config_path = "spec/fixtures/"
+      config.music_path = "spec/fixtures/"
+      config.sound_path = "spec/fixtures/"
+      config.stages = [:testing]
+    end
+
+    Conject.instance_variable_set '@default_object_context', nil
+    HookedGosuWindow.stubs(:new).returns(gosu)
+  end
+  let(:gosu) { MockGosuWindow.new }
+  let!(:mc_bane_png) { mock_image('mc_bane.png') }
+
+  define_behavior :shooty do |beh|
+    beh.requires :director
+    beh.setup do
+      actor.has_attribute :bullets, opts[:bullets]
+      director.when :update do |time|
+        actor.bullets -= time
+      end
+    end
+  end
+
+  define_behavior :death_on_d do
+    requires :input_manager
+    # TODO can we rename this to configure?
+    setup do
+      input_manager.reg :up, KbD do
+        actor.remove
+      end
+    end
+  end
+
+  define_actor_view :mc_bane_view do
+    requires :resource_manager # needs these injected
+    configure do
+      @image = resource_manager.load_actor_image(actor)
+    end
+
+    draw do |target, x_off, y_off, z|
+      # TODO TRACK THESE DRAWINGS
+      @image.draw #offset_x, offset_y, z, x_scale, y_scale, color
+    end
+  end
+
+  # no code is allowed in the actor!
+  # all done through behaviors
+  define_actor :mc_bane do
+    has_behavior  shooty: { bullets: 50 }
+    has_behavior :death_on_d
+    # actor.has_behavior :graphical
+
+    # FEATURE REQUEST
+    # actor.has_view do |view|
+    #   view.uses :resource_manager
+    #   view.configure do
+    #   end
+
+    #   view.draw do |target, x_off, y_off, z|
+    #   end
+    # end
+  end
+
+
+  it 'creates an actor from within stage with the correct behaviors and updates' do
+    # going for a capybara style "page" reference for the game
+    game.stage do |stage| # instance of TestingStage
+      create_actor :mc_bane, x: 250, y: 400
+    end
+    see_actor_attrs :mc_bane, bullets: 50
+
+    update 10
+    see_image_not_drawn mc_bane_png
+
+    draw
+    see_image_drawn mc_bane_png
+
+    see_actor_attrs :mc_bane, bullets: 40
+    game.should have_actor(:mc_bane)
+
+    release_key KbD
+
+    # should have removed himself
+    game.should_not have_actor(:mc_bane)
+
+  end
+end
+

data/spec/acceptance/built_in_collision_handling_spec.rb

@@ -0,0 +1,55 @@
+require 'helper'
+
+describe "Using gamebox's built in collision handling", acceptance: true do
+
+  define_actor :frickin_laser do
+    has_behavior :projectile
+    has_behavior collidable: {shape: :polygon, points: [[0,0],[10,7],[20,10]]}
+  end
+
+  define_actor :alien do
+    has_behavior collidable: {shape: :circle, radius: 10}
+  end
+
+  it 'shows that two overlapping objects collide' do
+    #scope cheatzys
+    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
+      alien = create_actor :alien, x: 0, y: 0
+      on_collision_of :frickin_laser, :alien do |collision_laser, collision_alien|
+        @collision_laser = collision_laser
+        @collision_alien = collision_alien
+      end
+    end
+    see_stage_ivars collision_laser: nil, collision_alien: nil
+    update 1
+    # TODO not sure about this one..
+    update 1
+    see_stage_ivars collision_laser: laser, collision_alien: alien
+  end
+
+  it 'shows that an object in motion can collide' 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
+      alien = create_actor :alien, x: 31, y: 0
+      on_collision_of :frickin_laser, :alien do |collision_laser, collision_alien|
+        @collision_laser = collision_laser
+        @collision_alien = collision_alien
+      end
+    end
+    see_stage_ivars collision_laser: nil, collision_alien: nil
+    # now the laser moved and will be checked for collisions _next_ update
+    update 1
+    # trigger the next round of collision detection
+    update 2000
+    # TODO not sure about this one..
+    update 1
+    see_stage_ivars collision_laser: laser, collision_alien: alien
+  end
+
+end
+