gamebox 0.4.0 → 0.4.1

data/README.md

@@ -30,8 +30,8 @@ The reason I wrote Gamebox is twofold: first, to aid in 48 hour game writing com
 
 To create a new Gamebox project run:
 
-```bash
-gamebox zapper
+```
+$ gamebox new zapper
 ```
 
 This will create the directory structure and needed files to get a basic actor up on the screen:
@@ -61,10 +61,10 @@ zapper
 
 To run your game:
 
-```bash
-cd zapper
-bundle
-rake
+```
+$ cd zapper
+$ bundle
+$ rake
 ```
 
 ## Stages

data/lib/gamebox.rb

@@ -26,7 +26,7 @@ end
 
 require "#{GAMEBOX_PATH}/version.rb"
 require 'require_all'
-directory_load_order = %w(lib core post_setup_handlers actors behaviors views stagehands)
+directory_load_order = %w(lib core post_setup_handlers actors behaviors views)
 directory_load_order.each do |dir|
   require_all "#{GAMEBOX_PATH}/#{dir}/**/*.rb"
 end

data/lib/gamebox/actors/fps.rb

@@ -1,4 +1,4 @@
-Behavior.define :fps_label_updater do
+define_behavior :fps_label_updater do
   requires :director, :stage
   setup do
     @label = stage.create_actor :label, actor.attributes
@@ -6,10 +6,12 @@ Behavior.define :fps_label_updater do
       @label.text = Gosu.fps
     end
   end
-  react_to do |msg, *args|
-    @label.remove if msg == :remove
+
+  remove do
+    @label.remove
   end
 end
-Actor.define :fps do
+
+define_actor :fps do
   has_behavior :fps_label_updater
 end

data/lib/gamebox/core/actor.rb

@@ -20,18 +20,34 @@ class Actor
     has_attributes opts
   end
 
-  # Used by BehaviorFactory#add_behavior.
-  # That's probably what you want to use from within another behavior
+  # Adds the behavior object to the Actor. You should never use
+  # this method in your game.
   def add_behavior(name, behavior)
     @behaviors[name] = behavior
   end
   
+  # Removes the behavior object from the Actor. 
+  # Sends :remove reaction to the removed behavior.
+  # You should never use this method in your game.
   def remove_behavior(name)
     @behaviors.delete(name).tap do |behavior|
       behavior.react_to :remove if behavior
     end
   end
 
+  # Returns true if the Actor has the named behavior.
+  #
+  # This is mostly used internally by Gamebox. You should favor
+  # not knowing behaviors if possible and instead look at the
+  # Actor's attributes via #do_or_do_not
+  def has_behavior?(name)
+    @behaviors[name]
+  end
+
+  # Propogates the reaction to all behaviors of the Actor.
+  # Any behavior can react to these messages.
+  #
+  # @see Behavior#reacts_with
   def react_to(message, *opts, &blk)
     # TODO cache the values array?
     @behaviors.values.each do |behavior|
@@ -40,20 +56,18 @@ class Actor
     nil
   end
 
-  def has_behavior?(name)
-    @behaviors[name]
-  end
-
   def emit(event, *args)
     fire event, *args
   end
 
-  # Tells the actor's Director that he wants to be removed; and unsubscribes
-  # the actor from all input events.
+  # Sets the Actor to no longer being alive. 
+  # 
+  # Sends a :remove reaction to all the Actor's behaviors.
+  # Emits a :remove_me event.
   def remove
     self.alive = false
     react_to :remove
-    fire :remove_me
+    emit :remove_me
   end
 
   def input

data/lib/gamebox/core/actor_definition.rb

@@ -5,6 +5,18 @@ class ActorDefinition
     @attributes = []
   end
 
+  # Setup default behaviors for this Actor
+  # 
+  #  # takes a block with method missing magic
+  #  has_behaviors do
+  #    shooter range: 12
+  #  end
+  #
+  #  # takes a list of optionless behaviors
+  #  has_behaviors :jumper, :shielded
+  #
+  #  # takes a hash of behavior name to options
+  #  has_behaviors shooter: {range: 12}
   def has_behaviors(*behaviors, &blk)
     if block_given?
       collector = MethodMissingCollector.new
@@ -23,6 +35,13 @@ class ActorDefinition
   end
   alias has_behavior has_behaviors
 
+  # Setup observable attributes for the Actor and optionally default values
+  #
+  #  # takes list of attributes (values will be nil)
+  #  has_attributes :x, :y
+  #  
+  #  # takes hash of attributes with values
+  #  has_attributes x: 5, y: 12
   def has_attributes(*attributes)
     attributes.each do |att|
       @attributes << att
@@ -30,10 +49,23 @@ class ActorDefinition
   end
   alias has_attribute has_attributes
 
+  # Defines an ActorView for this Actor with the correct name. 
+  # 
+  # Exactly the same as calling define_actor_view with :my_actor_view.
+  #
+  # Do not call more than once.
+  #
+  # @see GameboxDSL#define_actor_view
   def view(&blk)
     @view_blk = blk
   end
 
+  # Defines a Behavior with the Actor type as the name and adds it to the Actor.
+  #
+  # Exactly the same as calling define_behavior with :my_actor, and adding the
+  # behavior to the Actor.
+  #
+  # Do not call more than once.
   def behavior(&blk)
     @behavior_blk = blk
   end

data/lib/gamebox/core/actor_view_definition.rb

@@ -1,17 +1,45 @@
 class ActorViewDefinition
   attr_accessor :draw_block, :setup_block, :required_injections, :helpers_block, :source
+
+  # Sets the dependencies for this ActorView.
+  #
+  # These will be pulled from the Actor's object context at view construction time.
+  #
+  #  requires :resource_manager
+  #
   def requires(*injections_needed)
     @required_injections = injections_needed
   end
 
+  # Setup callback that is called when the view is constructed. The actor will
+  # be set before your setup block is executed.
+  #
+  #  setup do
+  #    resource_manager.load_image('something.png')
+  #  end
+  #  
   def setup(&setup_block)
     @setup_block = setup_block
   end
 
+  # Draw callback that is called when the view needs to draw.
+  # 
+  #  draw do |screen, x_offset, y_offset, z|
+  #    ...
+  #  end
+  #
   def draw(&draw_block)
     @draw_block = draw_block
   end
 
+  # Define methods and include modules for use by your view.
+  #  helpers do
+  #    include MyHelper
+  #    def do_some_view_calc
+  #      ...
+  #    end
+  #  end
+  #  
   def helpers(&helper_block)
     @helpers_block = helper_block
   end

data/lib/gamebox/core/arbiter.rb

@@ -3,11 +3,15 @@ module Arbiter
   attr_reader :checks, :collisions
 
   def register_collidable(actor)
-    stagehand(:spatial_tree).add(actor)
+    aabb_tree.add(actor)
   end
 
   def unregister_collidable(actor)
-    stagehand(:spatial_tree).remove(actor)
+    aabb_tree.remove(actor)
+  end
+
+  def aabb_tree
+    @aabb_tree ||= SpatialTree.new(self)
   end
 
   def on_collision_of(first_objs, second_objs, &block)
@@ -59,7 +63,6 @@ module Arbiter
   end
 
   def find_collisions
-    aabb_tree = stagehand(:spatial_tree)
     collidable_actors = aabb_tree.moved_items.values
 
     collisions = {}

data/lib/gamebox/core/behavior.rb

@@ -4,30 +4,48 @@ class Behavior
 
   attr_accessor :opts
 
-  def configure(opts={})
-    @opts = opts
-    setup
-  end
-
-  def setup
-  end
-
+  # Specifies messages that your behavior is interested in and
+  # that you have defined methods for in your helpers block.
+  #
+  #  reacts_with :remove
+  #
+  #  helpers do
+  #    def remove
+  #      input_manager.unsubscribe_all self
+  #    end
+  #  end
   def reacts_with(*messages_with_methods)
-    # TODO do a merge here..
-    @message_handlers = messages_with_methods
+    @message_handlers ||= Set.new
+    @message_handlers.merge(messages_with_methods)
   end
 
+  # Dispatches reactions to helper methods based on name.
+  # See BehaviorDefinition to see how to override this.
+  # 
+  # @see BehaviorDefinition
+  # @see Actor#react_to
   def react_to(message_type, *opts, &blk)
-    # TODO perf analysis, should I use a hash here?
     if @message_handlers && @message_handlers.include?(message_type)
       send message_type, *opts, &blk
     end
   end
 
+  # Builds and adds a behavior based on the name and options passed in.
+  #
+  #  actor.input.when :shields_up do
+  #    add_behavior :invincible, duration: actor.shield_charge
+  #  end
+  #
   def add_behavior(behavior_name, opts = {})
     behavior_factory.add_behavior actor, behavior_name, opts
   end
 
+  # Removes the behavior by name. Any added attributes will remain on the actor.
+  #
+  #  actor.input.when :shields_down do
+  #    remove_behavior :invincible
+  #  end
+  #
   def remove_behavior(behavior_name)
     actor.remove_behavior(behavior_name)
   end

data/lib/gamebox/core/behavior_definition.rb

@@ -1,23 +1,73 @@
 class BehaviorDefinition
-  attr_accessor :setup_block, :required_injections, :react_to_block, :required_behaviors,
+  attr_accessor :setup_block, :remove_block, :required_injections, :react_to_block, :required_behaviors,
     :helpers_block, :source
 
+  # Sets the dependencies for this Behavior.
+  #
+  # These will be pulled from the Actor's object context at view construction time.
+  #
+  #  requires :input_manager, :timer_manager, :director
+  #
   def requires(*injections_needed)
     @required_injections = injections_needed
   end
 
+  # Sets the behavior dependencies for this Behavior.
+  #
+  # Any behaviors listed here that are not on the actor will be constructed and added without any opts.
+  #
+  #  requires_behaviors :positioned
+  #
   def requires_behaviors(*behaviors_needed)
     @required_behaviors = behaviors_needed
   end
 
+  # Setup callback that is called when the behavior is added. The actor will
+  # be set before your setup block is executed, and the opts method will be available.
+  #
+  #  setup do
+  #    actor.has_attributes speed: opts[:speed]
+  #    input_manager.when :down, KbSpace do
+  #      jump
+  #    end
+  #  end
+  #  
   def setup(&setup_block)
     @setup_block = setup_block
   end
 
+  # Remove callback that is called when the behavior is removed. The actor will
+  # still be available.
+  #
+  #  remove do
+  #    input_manager.unsubscribe_all self
+  #  end
+  #  
+  def remove(&remove_block)
+    @remove_block = remove_block
+  end
+
+  # Override the default react_to method of the behavior. You should probably not be doing this and should be calling #reacts_with in #setup.
+  #
+  #  react_to do |message_type, *opts, &blk|
+  #    case message_type
+  #    when :blow_up
+  #      ..
+  #  end
+  #  
+  # @see Behavior#reacts_with
   def react_to(&react_to_block)
     @react_to_block = react_to_block
   end
 
+  # Define methods and include modules for use by your behavior.
+  #  helpers do
+  #    include MyHelper
+  #    def jump
+  #      ...
+  #    end
+  #  end
+  #  
   def helpers(&helpers_block)
     @helpers_block = helpers_block
   end

data/lib/gamebox/core/behavior_factory.rb

@@ -44,8 +44,15 @@ class BehaviorFactory
             add_behavior actor, beh unless actor.has_behavior?(beh)
           end
         end
-        behavior.configure(opts)
+
+        behavior.opts = opts
         behavior.instance_eval &behavior_definition.setup_block if behavior_definition.setup_block
+
+        if behavior_definition.remove_block
+          behavior.define_singleton_method :remove, behavior_definition.remove_block 
+          behavior.reacts_with :remove
+        end
+
         actor.add_behavior behavior_name, behavior
       end
     end

data/lib/gamebox/core/core.rb

@@ -1,4 +1,6 @@
 module Gamebox
+  include GameboxDSL
+
   # Returns the global configuration object
   def self.configuration
     @configuration ||= Configuration.new
@@ -9,24 +11,6 @@ module Gamebox
     yield configuration if block_given?
   end
 
-  def define_stage(name, &blk)
-    Stage.define name, &blk
-  end
-
-  def define_behavior(name, &blk)
-    Behavior.define name, &blk
-  end
-
-  def define_actor(name, &blk)
-    Actor.define name, &blk
-  end
-
-  def define_actor_view(name, &blk)
-    ActorView.define name, &blk
-  end
-
-  # module_function :define_behavior, :define_actor, :define_actor_view
-
 
 end
 

data/lib/gamebox/core/director.rb

@@ -9,6 +9,8 @@ class Director
 
   def clear_subscriptions
     @subscriptions = Hash[@update_slots.map { |slot| [slot, []] }]
+    @new_subscriptions = []
+    @unsubscriptions = []
   end
 
   def pause
@@ -24,27 +26,36 @@ class Director
   end
 
   def when(event=:update, &callback)
-    @subscriptions[event] ||= []
-    @subscriptions[event] << callback
+    @new_subscriptions << [event, callback]
   end
 
   def update(time)
+    @new_subscriptions.each do |(event, callback)|
+      @subscriptions[event] ||= []
+      @subscriptions[event] << callback
+    end
+    @new_subscriptions.clear
+
+    @unsubscriptions.each do |listener|
+      for slot in @subscriptions.keys
+        @subscriptions[slot].delete_if do |block|
+          eval('self',block.binding).equal?(listener)
+        end
+      end
+    end
+    @unsubscriptions.clear
+
     time_in_seconds = time / 1000.to_f
     @update_slots.each do |slot|
       @subscriptions[slot].each do |callback|
         callback.call time, time_in_seconds
       end
     end
+
   end
 
   def unsubscribe_all(listener)
-    if @subscriptions
-      for slot in @subscriptions.keys
-        @subscriptions[slot].delete_if do |block|
-          eval('self',block.binding).equal?(listener)
-        end
-      end
-    end
+    @unsubscriptions << listener
   end
 
 end

data/lib/gamebox/core/gamebox_dsl.rb

@@ -0,0 +1,129 @@
+module GameboxDSL
+
+  # Defines a stage; a stage is a game mode. (ie :main_menu, :play, or :credits)
+  #
+  # Raises an erorr if the stage already exists
+  # 
+  #  define_stage :main_menu do
+  #    # injects your dependencies; will construct if needed
+  #    requires :input_manager, :customer_monkey_factory
+  #
+  #    # callback for stage setup
+  #    curtain_up &block
+  #
+  #    # callback for stage teardown
+  #    curtain_down &block
+  #
+  #    # redefine the renderer for this stage, Gamebox has a default Renderer
+  #    # if unspecified 
+  #    render_with :my_custom_renderer
+  #
+  #    # define any helper methods and include any needed modules
+  #    helpers &block
+  #  
+  #  end
+  #
+  # @see StageDefinition
+  # @see Stage
+  def define_stage(name, &blk)
+    Stage.define name, &blk
+  end
+
+  # Defines a behavior type. (ie :jumper or :shooter)
+  #
+  # Raises an erorr if the behavior already exists
+  # 
+  #  define_behavior :jumper do
+  #    # injects your dependencies; will construct if needed
+  #    requires :input_manager, :timer_manager, :stage
+  #
+  #    # adds the required behaviors to your actor if not present
+  #    # NOTE: no options can be passed to the added behavior
+  #    required_behaviors :positioned
+  #
+  #    # callback when your behavior has been added to an actor
+  #    # #opts will be populated with any args that were specified on behavior
+  #    # addition 
+  #    setup &block
+  #
+  #    # callback when your behavior has been removed from an actor
+  #    remove &block
+  #
+  #    # define a custom handler for reacting to your actor's messages
+  #    # @see Behavior#reacts_with for recommended message dispatch
+  #    react_to &block
+  #
+  #    # define any helper methods and include any needed modules
+  #    helpers &block
+  #  
+  #  end
+  #
+  # @see BehaviorDefinition
+  # @see Behavior
+  def define_behavior(name, &blk)
+    Behavior.define name, &blk
+  end
+
+  # Defines an actor type, (ie :plumber). Optionally adding attributes, behaviors and a view.
+  #
+  # Raises an erorr if the actor already exists
+  # 
+  #  define_actor :plumber do
+  #    # define default attributes and values
+  #    has_attribute(s) x: 7, y: 12
+  #
+  #    # define default behaviors and their options options can be
+  #    #   - list of behavior names
+  #    #   - hash of behavior names to options for each behavior
+  #    #   - block form
+  #    has_behavior :postitioned
+  #    has_behaviors do
+  #      jumper max: 12, double: true
+  #    end
+  #  
+  #    # Allows the inlining of one behavior in this actor.
+  #    # It is equivalent to creating a behavior with the same name as the actor,
+  #    # and adding it to the actor.
+  #    #
+  #    # The block works the same as calling #define_behavior.
+  #    behavior
+  #      
+  #    # Allows the inline of a view in this actor
+  #    # It is equivalent to creating an actor view with the same name as the actor.
+  #    # 
+  #    # The block works the same as calling #define_actor_view.
+  #    view
+  #  
+  #  end
+  #
+  # @see ActorDefinition
+  # @see Actor
+  def define_actor(name, &blk)
+    Actor.define name, &blk
+  end
+
+  # Defines an actor view type. (ie :plumber_view).
+  # Constructed when any actor with matching name is created
+  # ie: :ship_view will be created and shown for any actor :ship that is created
+  #
+  # Raises an erorr if the actor view already exists
+  # 
+  #  define_actor :plumber_view do
+  #    # injects your dependencies; will construct if needed
+  #    requires :input_manager, :customer_monkey_factory
+  #
+  #    # callback when your view is created
+  #    # #actor will be available at this time
+  #    setup &block
+  #
+  #    # define any helper methods and include any needed modules
+  #    helpers &block
+  #  
+  #  end
+  #
+  # @see ActorViewDefinition
+  # @see ActorView
+  def define_actor_view(name, &blk)
+    ActorView.define name, &blk
+  end
+end

data/lib/gamebox/core/physics.rb

@@ -19,8 +19,8 @@ else
   end
 end
 
-ZERO_VEC_2 = vec2(0,0)
+ZERO_VEC_2 = vec2(0,0) unless defined? ZERO_VEC_2
 
 module Math
-  HALF_PI = PI / 2.0
+  HALF_PI = PI / 2.0 unless defined? HALF_PI
 end

data/lib/gamebox/{stagehands/spatial_tree_stagehand.rb → core/spatial_tree.rb}

@@ -1,10 +1,11 @@
-class SpatialTreeStagehand < Stagehand
+class SpatialTree
   extend Forwardable
   def_delegators :@tree, :calculate_bb, :to_s, :each, :collisions, :query, :valid?
 
-  attr_reader :moved_items
+  attr_reader :moved_items, :stage
 
-  def setup
+  def initialize(stage)
+    @stage
     @dead_actors = {}
     @moved_items = {}
     @tree = AABBTree.new

data/lib/gamebox/core/stage.rb

@@ -14,7 +14,6 @@ class Stage
   def configure(backstage, opts)
     viewport.reset
 
-    @stagehands = {}
     @backstage = backstage
     @opts = opts
     renderer.clear_drawables
@@ -25,32 +24,6 @@ class Stage
   end
   alias :spawn :create_actor 
 
-  # extract all the params from a node that are needed to construct an actor
-  def create_actors_from_svg svg_doc
-    float_keys = ["x","y"]
-    dynamic_actors ||= {}
-    layer = svg_doc.find_group_by_label("actors")
-
-    unless layer.nil?
-      # each image in the layer is an actor
-      layer.images.each do |actor_def|
-        klass = actor_def.game_class.to_sym
-        handle = actor_def.game_handle
-        new_opts = {}
-        actor_def.node.attributes.each do |k,v|
-          v = v.to_f if float_keys.include? k
-          new_opts[k.to_sym] = v
-        end
-
-        actor = create_actor klass, new_opts
-        dynamic_actors[handle.to_sym] = actor if handle
-      end
-    end
-    alias :spawn_from_svg :create_actors_from_svg
-
-    dynamic_actors
-  end
-  
   def draw(target)
     renderer.draw target
   end
@@ -58,9 +31,6 @@ class Stage
   def update(time)
     director.update time
     viewport.update time
-    @stagehands.each do |name, stagehand|
-      stagehand.update time 
-    end
     find_collisions
     timer_manager.update time
   end
@@ -107,10 +77,6 @@ class Stage
     @paused = true
   end
 
-  def stagehand(stagehand_sym, opts={})
-    @stagehands[stagehand_sym] ||= create_stagehand(stagehand_sym, opts)
-  end
-
   # pauses the current stage, creates an actor using args, unpauses on actor death
   #
   # Example:
@@ -129,11 +95,6 @@ class Stage
   end
 
   private
-  def create_stagehand(name, opts)
-    underscored_class = "#{name}_stagehand"
-    klass = ClassFinder.find underscored_class
-    klass.new self, opts
-  end
 
   class << self
 

data/lib/gamebox/core/stage_definition.rb

@@ -4,56 +4,57 @@ class StageDefinition
 
   # Required objects that you need for your specific stage
   # The objects will be created for you.
-  # example:
+  #
   # define_stage :main_menu do
-  #   require :magic_thinger
+  #   requires :magic_thinger
   # end
   def requires(*injections_needed)
-    # kid.construct_with *self.object_definition.component_names
     @required_injections = injections_needed
   end
 
   # Define a block of code to run when your stage is and ready to play
-  # example:
-  # define_stage :main_menu do
-  #   curtain_up do
-  #     @info = load_some_info
-  #   end
-  # end
+  # 
+  #  define_stage :main_menu do
+  #    curtain_up do
+  #      @info = load_some_info
+  #    end
+  #  end
   def curtain_up(&curtain_up_block)
     @curtain_up_block = curtain_up_block
   end
 
   # Define a block of code to run when your stage has been shutdown
-  # example:
-  # define_stage :main_menu do
-  #   curtain_down do
-  #     @info = load_some_info
-  #   end
-  # end
+  # 
+  #  define_stage :main_menu do
+  #    curtain_down do
+  #      @info = load_some_info
+  #    end
+  #  end
   def curtain_down(&curtain_down_block)
     @curtain_down_block = curtain_down_block
   end
 
   # Replaces the default renderer with your own.
-  # example:
-  #   define_stage :main_menu do
-  #     render_with :my_render
-  #     ...
-  #   end
+  # 
+  #  define_stage :main_menu do
+  #    render_with :my_render
+  #    ...
+  #  end
   def render_with(render_class_name)
     @renderer = render_class_name
   end
 
   # Define any helper methods / include modules here
   # These will be available for curtain_up / update / draw to use.
-  # example:
-  # define_stage :main_menu do
-  #   include MinMaxHelpers
-  #   def calculate_thinger
-  #     ...
-  #   end
-  # end
+  #
+  #  define_stage :main_menu do
+  #    helpers do
+  #      include MinMaxHelpers
+  #      def calculate_thinger
+  #        ...
+  #      end
+  #    end
+  #  end
   def helpers(&helpers_block)
     @helpers_block = helpers_block
   end

data/lib/gamebox/lib/observable_attributes.rb

@@ -24,6 +24,17 @@ module ObservableAttributes
     end
   end
 
+  # Adds attributes that are not currently set. 
+  # Takes a list of symbols or a hash of symbols => default values
+  #
+  # examples:
+  #
+  # foo.has_attributes :x, :y
+  # # adds x, x=, y, y= methods
+  # #fires events x_changed, y_changed when the values change
+  #
+  # foo.has_attributes x: 5, y: 3
+  # # this form provides default values if these are new attributes
   def has_attributes(*names)
     if names.first.is_a? Hash
       names.first.each do |name, default|
@@ -36,6 +47,8 @@ module ObservableAttributes
     end
   end
 
+  # singular form of has_attributes
+  # takes the symbol name and an optional default value
   def has_attribute(name, value=nil)
     @evented_attributes ||= []
     unless has_attribute? name
@@ -48,10 +61,12 @@ module ObservableAttributes
     end
   end
 
+  # Returns true if the passed in symbol is an attr on this object
   def has_attribute?(name)
     @evented_attributes && @evented_attributes.include?(name)
   end
 
+  # Returns a new hash containing the attr keys and values
   def attributes
     {}.tap do |atts|
       if @evented_attributes

data/lib/gamebox/lib/vector2.rb

@@ -193,6 +193,7 @@ class Vector2
   # of error to compensate for floating point imprecision).
   # 
   def ==( vector )
+    return false if vector.nil?
     _nearly_equal?(@x, vector.at(0)) and _nearly_equal?(@y, vector.at(1))
   end
 
@@ -201,23 +202,29 @@ class Vector2
   # [x,y] Array.
   # 
   def []( index )
-    [@x, @y][index]
+    case index
+    when 0
+      @x
+    when 1
+      @y
+    else
+      nil
+    end
   end
 
   alias :at :[]
 
 
   def hash # :nodoc:
-    @hash ||= (((@x - @x.modulo(1E-10)).hash << 2) +
-               ((@y - @y.modulo(1E-10)).hash << 1) +
-               self.class.hash)
+    @hash ||= [@x, @y, self.class].hash
   end
 
 
   # Iterates over this vector as if it were an [x,y] Array.
   # 
-  def each( &block )
-    [@x, @y].each( &block )
+  def each
+    yield @x
+    yield @y
   end
 
 

data/lib/gamebox/spec/helper.rb

@@ -33,6 +33,7 @@ module GameboxSpecHelpers
         @_req_mocks = create_mocks(*reqs)
       }
       let (:opts) { {} }
+      let (:actor) { @actor }
       subject { 
 
         # TODO so much duplication here from the *Factories
@@ -61,7 +62,7 @@ module GameboxSpecHelpers
           #     _add_behavior actor, beh unless actor.has_behavior?(beh)
           #   end
           # end
-          behavior.configure(opts)
+          behavior.opts = opts
           behavior.instance_eval &@behavior_definition.setup_block if @behavior_definition.setup_block
         end
       }

data/lib/gamebox/version.rb

@@ -2,7 +2,7 @@ module Gamebox
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 4
-    TINY  = 0
+    TINY  = 1
     RC    = 0
 
     if RC > 0

data/script/perf_aabb.rb

@@ -27,7 +27,7 @@ end
 NUM = 1_000
 Benchmark.bm(60) do |b|
   b.report("full") do
-    tree = SpatialTreeStagehand.new :thing, :thing
+    tree = SpatialTree.new :thing
 
     thing = BoxedActor.new 1, 2, 3, 4
     tree.add thing

data/spec/actors/label_spec.rb

@@ -30,11 +30,11 @@ describe :label do
       @font_style_factory.stubs(:build).with('fonty.ttf', 22, :red).returns(:stylish_font)
       @actor.expects(:has_attributes).with(font_style: :stylish_font)
      
-      subject.setup
+      subject
     end
 
     it 'listens for text changes' do
-      subject.setup
+      subject
       @actor.stubs(text: "foo")
 
       font_style = stub(height: 13)
@@ -48,7 +48,7 @@ describe :label do
     end
 
     it 'listens for font color changes' do
-      subject.setup
+      subject
       font_style = stub
       font_style.expects(:color=).with(:red)
       @actor.stubs(font_style: font_style, color: :red)
@@ -57,7 +57,7 @@ describe :label do
     end
 
     it 'listens for font name changes' do
-      subject.setup
+      subject
       @actor.stubs(text: "foo", font_name: "asimov.ttf")
 
       font_style = stub(height: 13)
@@ -74,7 +74,7 @@ describe :label do
     end
 
     it 'listens for font size changes' do
-      subject.setup
+      subject
       @actor.stubs(text: "foo", font_size: 14)
 
       font_style = stub(height: 13)

data/spec/core/behavior_factory_spec.rb

@@ -4,18 +4,18 @@ describe BehaviorFactory do
   let(:some_behavior) { stub('some behavior', required_behaviors: []) }
   let(:object_context) { mock('object context') }
   let(:some_actor) { stub('some actor', add_behavior: nil, this_object_context: object_context) }
+  let(:some_block) { Proc.new }
 
   before do
     Behavior.define :shootable
-
     object_context.stubs(:[]).with(:behavior).returns(some_behavior)
     object_context.stubs(:in_subcontext).yields(object_context)
-    some_behavior.stubs(:configure)
+    some_behavior.stubs(:opts=)
   end
 
   describe "#add_behavior" do
     it 'creates the behavior based on the actor and symbol behavior_def' do
-      some_behavior.expects(:configure).with({})
+      some_behavior.expects(:opts=).with({})
 
       subject.add_behavior some_actor, :shootable
     end
@@ -27,7 +27,7 @@ describe BehaviorFactory do
 
     it 'configures the behavior with the given opts' do
       opts = {some: 'opts'}
-      some_behavior.expects(:configure).with(opts)
+      some_behavior.expects(:opts=).with(opts)
 
       subject.add_behavior some_actor, :shootable, opts 
     end

data/spec/core/behavior_spec.rb

@@ -5,6 +5,9 @@ describe Behavior do
 
   it 'should auto-require behaviors that it depends on' 
   it 'has default react_to impl'
+  describe "#reacts_with" do
+    it 'adds together reactions for multiple calls'
+  end
   describe "#add_behavior" do
     it 'uses the behavior factory to add the behavior to the actor'
   end

data/spec/{stagehands/spatial_tree_stagehand_spec.rb → core/spatial_tree_spec.rb}

@@ -1,7 +1,7 @@
 require 'helper'
 
-describe SpatialTreeStagehand do
-  subject { SpatialTreeStagehand.new :stage, {} }
+describe SpatialTree do
+  subject { SpatialTree.new :stage }
   let(:tree) { stub('tree') }
 
   before do

data/spec/core/stage_spec.rb

@@ -53,7 +53,6 @@ describe Stage do
       subject.update(:time)
     end
 
-    it 'updates stagehands'
     it 'checks for collisions'
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gamebox
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-28 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -401,6 +401,7 @@ files:
 - lib/gamebox/core/font_style.rb
 - lib/gamebox/core/font_style_factory.rb
 - lib/gamebox/core/game.rb
+- lib/gamebox/core/gamebox_dsl.rb
 - lib/gamebox/core/hooked_gosu_window.rb
 - lib/gamebox/core/input_manager.rb
 - lib/gamebox/core/input_mapper.rb
@@ -409,16 +410,15 @@ files:
 - lib/gamebox/core/renderer.rb
 - lib/gamebox/core/resource_manager.rb
 - lib/gamebox/core/sound_manager.rb
+- lib/gamebox/core/spatial_tree.rb
 - lib/gamebox/core/stage.rb
 - lib/gamebox/core/stage_definition.rb
 - lib/gamebox/core/stage_factory.rb
 - lib/gamebox/core/stage_manager.rb
-- lib/gamebox/core/stagehand.rb
 - lib/gamebox/core/svg_document.rb
 - lib/gamebox/core/timer_manager.rb
 - lib/gamebox/core/viewport.rb
 - lib/gamebox/core/wrapped_screen.rb
-- lib/gamebox/data/config/objects.yml
 - lib/gamebox/data/fonts/Asimov.ttf
 - lib/gamebox/data/fonts/GAMEBOX_FONTS_GO_HERE
 - lib/gamebox/data/graphics/GAMEBOX_GRAPHICS_GO_HERE
@@ -448,7 +448,6 @@ files:
 - lib/gamebox/post_setup_handlers/gamebox_debug_helpers.rb
 - lib/gamebox/post_setup_handlers/pry_remote_server.rb
 - lib/gamebox/spec/helper.rb
-- lib/gamebox/stagehands/spatial_tree_stagehand.rb
 - lib/gamebox/tasks/gamebox_tasks.rake
 - lib/gamebox/version.rb
 - lib/gamebox/views/graphical_actor_view.rb
@@ -491,6 +490,7 @@ files:
 - spec/core/physics_manager_spec.rb
 - spec/core/renderer_spec.rb
 - spec/core/resource_manager_spec.rb
+- spec/core/spatial_tree_spec.rb
 - spec/core/stage_definition_spec.rb
 - spec/core/stage_manager_spec.rb
 - spec/core/stage_spec.rb
@@ -504,7 +504,6 @@ files:
 - spec/fixtures/snelpling/jump/3.png
 - spec/helper.rb
 - spec/lib/class_finder_spec.rb
-- spec/stagehands/spatial_tree_stagehand_spec.rb
 - spec/views/graphical_actor_view_spec.rb
 - templates/actor_template.erb
 - templates/app/.gitignore
@@ -539,7 +538,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3641316874806944504
+      hash: 3939132703427340795
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -548,7 +547,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3641316874806944504
+      hash: 3939132703427340795
 requirements: []
 rubyforge_project: gamebox
 rubygems_version: 1.8.25
@@ -589,6 +588,7 @@ test_files:
 - spec/core/physics_manager_spec.rb
 - spec/core/renderer_spec.rb
 - spec/core/resource_manager_spec.rb
+- spec/core/spatial_tree_spec.rb
 - spec/core/stage_definition_spec.rb
 - spec/core/stage_manager_spec.rb
 - spec/core/stage_spec.rb
@@ -602,5 +602,4 @@ test_files:
 - spec/fixtures/snelpling/jump/3.png
 - spec/helper.rb
 - spec/lib/class_finder_spec.rb
-- spec/stagehands/spatial_tree_stagehand_spec.rb
 - spec/views/graphical_actor_view_spec.rb

data/lib/gamebox/core/stagehand.rb

@@ -1,14 +0,0 @@
-class Stagehand
-  attr_accessor :opts, :stage
-  def initialize(stage, opts)
-    @stage = stage
-    @opts = opts
-    setup
-  end
-
-  def setup
-  end
-
-  def update(time)
-  end
-end

data/lib/gamebox/data/config/objects.yml

@@ -1,39 +0,0 @@
-game:
-  compose:
-    - wrapped_screen
-    - input_manager
-    - sound_manager
-    - stage_manager
-resource_manager:
-  auto_require: false
-  compose:
-    - wrapped_screen
-stage_manager:
-  auto_require: false
-  compose:
-    - input_manager
-    - resource_manager
-    - sound_manager
-    - config_manager
-    - actor_factory
-sound_manager:
-  auto_require: false
-  compose:
-    - resource_manager
-    - config_manager
-input_manager:
-  auto_require: false
-  compose:
-    - wrapped_screen
-    - config_manager
-wrapped_screen:
-  auto_require: false
-  compose:
-    - config_manager
-config_manager:
-  auto_require: false
-actor_factory:
-  auto_require: false
-  compose:
-    - input_manager
-    - wrapped_screen