gamebox 0.4.0.rc5 → 0.4.0.rc11

data/lib/gamebox/core/actor_definition.rb

@@ -0,0 +1,41 @@
+class ActorDefinition
+  attr_accessor :behaviors, :attributes, :view_blk, :behavior_blk, :source
+  def initialize
+    @behaviors = []
+    @attributes = []
+  end
+
+  def has_behaviors(*behaviors, &blk)
+    if block_given?
+      collector = MethodMissingCollector.new
+      collector.instance_eval &blk
+      collector.calls.each do |name, args|
+        if args.empty?
+          @behaviors << name
+        else
+          @behaviors << {name => args.first}
+        end
+      end
+    end
+    behaviors.each do |beh|
+      @behaviors << beh
+    end
+  end
+  alias has_behavior has_behaviors
+
+  def has_attributes(*attributes)
+    attributes.each do |att|
+      @attributes << att
+    end
+  end
+  alias has_attribute has_attributes
+
+  def view(&blk)
+    @view_blk = blk
+  end
+
+  def behavior(&blk)
+    @behavior_blk = blk
+  end
+end
+

data/lib/gamebox/core/actor_view.rb

@@ -1,6 +1,7 @@
 class ActorView
-  construct_with :stage, :wrapped_screen, :resource_manager, :actor
-  public :stage, :wrapped_screen, :resource_manager, :actor
+  # TODO remove stage
+  construct_with :renderer, :wrapped_screen, :resource_manager, :actor, :stage
+  public :wrapped_screen, :resource_manager, :actor, :stage
 
   attr_accessor :layer, :parallax
   def initialize
@@ -15,11 +16,11 @@ class ActorView
   end
 
   def register
-    stage.register_drawable self
+    renderer.register_drawable self
   end
   
   def unregister
-    stage.unregister_drawable self
+    renderer.unregister_drawable self
   end
 
   def screen_width
@@ -34,6 +35,7 @@ class ActorView
     def define(actor_view_type, &blk)
       @definitions ||= {}
       definition = ActorViewDefinition.new
+      definition.source = caller.detect{|c|!c.match /core/}
       definition.instance_eval &blk if block_given?
       @definitions[actor_view_type] = definition
     end
@@ -43,21 +45,4 @@ class ActorView
     end
   end
 
-  # TODO can these defs be unified?
-  class ActorViewDefinition
-    attr_accessor :draw_block, :configure_block, :required_injections
-    def requires(*injections_needed)
-      @required_injections = injections_needed
-    end
-
-    def configure(&configure_block)
-      @configure_block = configure_block
-    end
-
-    def draw(&draw_block)
-      @draw_block = draw_block
-    end
-  end
-
-
 end

data/lib/gamebox/core/actor_view_definition.rb

@@ -0,0 +1,19 @@
+class ActorViewDefinition
+  attr_accessor :draw_block, :setup_block, :required_injections, :helpers_block, :source
+  def requires(*injections_needed)
+    @required_injections = injections_needed
+  end
+
+  def setup(&setup_block)
+    @setup_block = setup_block
+  end
+
+  def draw(&draw_block)
+    @draw_block = draw_block
+  end
+
+  def helpers(&helper_block)
+    @helpers_block = helper_block
+  end
+end
+

data/lib/gamebox/core/actor_view_factory.rb

@@ -27,9 +27,15 @@ class ActorViewFactory
       end
 
       view.define_singleton_method :draw, &view_definition.draw_block if view_definition.draw_block
-      if view_definition.configure_block
-        view.define_singleton_method :configure, &view_definition.configure_block 
-        view.configure
+      if view_definition.setup_block
+        view.define_singleton_method :setup, &view_definition.setup_block 
+        view.setup
+      end
+
+      helpers = view_definition.helpers_block
+      if helpers
+        helpers_module = Module.new &helpers
+        view.extend helpers_module
       end
 
       behavior_factory.add_behavior(actor, :visible, view: view)

data/lib/gamebox/core/behavior.rb

@@ -13,13 +13,14 @@ class Behavior
   end
 
   def reacts_with(*messages_with_methods)
+    # TODO do a merge here..
     @message_handlers = messages_with_methods
   end
 
-  def react_to(message_type, *opts)
+  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
+      send message_type, *opts, &blk
     end
   end
 
@@ -27,11 +28,16 @@ class Behavior
     behavior_factory.add_behavior actor, behavior_name, opts
   end
 
+  def remove_behavior(behavior_name)
+    actor.remove_behavior(behavior_name)
+  end
+
   class << self
 
     def define(behavior_type, &blk)
       @definitions ||= {}
       definition = BehaviorDefinition.new
+      definition.source = caller.detect{|c|!c.match /core/}
       definition.instance_eval &blk if block_given?
       @definitions[behavior_type] = definition
     end
@@ -40,29 +46,4 @@ class Behavior
       @definitions ||= {}
     end
   end
-
-  class BehaviorDefinition
-    attr_accessor :setup_block, :required_injections, :react_to_block, :required_behaviors,
-      :helpers_block
-
-    def requires(*injections_needed)
-      @required_injections = injections_needed
-    end
-
-    def requires_behaviors(*behaviors_needed)
-      @required_behaviors = behaviors_needed
-    end
-
-    def setup(&setup_block)
-      @setup_block = setup_block
-    end
-
-    def react_to(&react_to_block)
-      @react_to_block = react_to_block
-    end
-
-    def helpers(&helpers_block)
-      @helpers_block = helpers_block
-    end
-  end
 end

data/lib/gamebox/core/behavior_definition.rb

@@ -0,0 +1,24 @@
+class BehaviorDefinition
+  attr_accessor :setup_block, :required_injections, :react_to_block, :required_behaviors,
+    :helpers_block, :source
+
+  def requires(*injections_needed)
+    @required_injections = injections_needed
+  end
+
+  def requires_behaviors(*behaviors_needed)
+    @required_behaviors = behaviors_needed
+  end
+
+  def setup(&setup_block)
+    @setup_block = setup_block
+  end
+
+  def react_to(&react_to_block)
+    @react_to_block = react_to_block
+  end
+
+  def helpers(&helpers_block)
+    @helpers_block = helpers_block
+  end
+end

data/lib/gamebox/core/config_manager.rb

@@ -1,42 +1,57 @@
 class ConfigManager
 
-  attr_accessor :settings
-  GAME_SETTINGS_FILE = "game"
+  def settings
+    @settings ||= base_configuration.merge(user_configuration)
+  end
 
-  def initialize
-    @settings = load_config(GAME_SETTINGS_FILE)
+  def [](key)
+    settings[key]
   end
 
-  def save
-    save_settings(GAME_SETTINGS_FILE, @settings)
+  def []=(key,val)
+    settings[key] = val
   end
 
-  def [](key)
-    @settings[key]
+
+  def game_settings_file
+    "game.yml"
   end
 
-  def []=(key,val)
-    @settings[key] = val
-  end
-
-  # TODO make this path include that app name?
-  def load_config(name)
-    conf = YAML::load_file("#{Gamebox.configuration.config_path}#{name}.yml")
-    user_file = "#{ENV['HOME']}/.gamebox/#{name}.yml"
-    if File.exist? user_file
-      user_conf = YAML::load_file user_file
-      conf = conf.merge user_conf
-    end
-    conf
-  end
-
-  def save_settings(name, settings)
-    user_gamebox_dir = "#{ENV['HOME']}/.gamebox"
-    FileUtils.mkdir_p user_gamebox_dir
-    user_file = "#{ENV['HOME']}/.gamebox/#{name}.yml"
-    File.open user_file, "w" do |f|
-      f.write settings.to_yaml
-    end
+  def user_configuration_directory
+    File.join(ENV['HOME'], ".gamebox")
+  end
+
+  def base_configuration_directory
+    Gamebox.configuration.config_path
+  end
+
+  def user_configuration_filepath
+    File.join(user_configuration_directory, game_settings_file)
+  end
+
+  def base_configuration_filepath
+    File.join(base_configuration_directory, game_settings_file)
+  end
+
+  def base_configuration
+    load base_configuration_filepath
+  end
+
+  def user_configuration
+    load user_configuration_filepath
+  end
+
+  def load(configuration_filepath)
+    File.exist?(configuration_filepath) ? YAML::load_file(configuration_filepath) : {}
+  end
+
+  def save
+    save_to_file(user_configuration_filepath,settings.to_yaml)
+  end
+
+  def save_to_file(filepath,settings)
+    FileUtils.mkdir_p File.dirname(filepath)
+    File.write(filepath,settings)
   end
 
 end

data/lib/gamebox/core/configuration.rb

@@ -28,9 +28,14 @@ module Gamebox
     add_setting :gb_fonts_path
   
     add_setting :game_name, default: "Untitled Game"
+    add_setting :needs_cursor, default: false
 
     add_setting :stages, default: [:demo]
 
+    add_setting :default_font_size, default: 30
+    add_setting :default_font_name, default: "Asimov.ttf"
+    add_setting :default_font_color, default: [250,250,250,255]
+
     def settings
       @settings ||= {}
     end

data/lib/gamebox/core/core.rb

@@ -9,6 +9,10 @@ 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

data/lib/gamebox/core/debug_helpers.rb

@@ -0,0 +1,46 @@
+module DebugHelpers
+  def actors(type=nil)
+    matching_actors = []
+    ObjectSpace.each_object do |obj|
+      if obj.class == Actor 
+        if type.nil? || obj.actor_type == type
+          matching_actors << obj 
+        end
+      end
+    end
+    log "found #{matching_actors.size} actors"
+    matching_actors
+  end
+
+  def current_stage
+    game.stage_manager.current_stage
+  end
+
+  def reload_behavior(behavior_name)
+    behavior = behavior_name.to_sym
+    log "reloading behavior: [#{behavior}]"
+    load "behaviors/#{behavior}.rb"
+
+    actors.each do |act|
+
+      if act.has_behavior?(behavior)
+        behaviors = act.instance_variable_get('@behaviors')
+        beh_opts = behaviors[behavior].opts
+
+        factory = act.this_object_context[:behavior_factory]
+        act.remove_behavior behavior
+
+        factory.add_behavior(act, behavior, beh_opts)
+      end
+    end
+  end
+
+  def load_actor(actor_type)
+    type = actor_type.to_sym
+    log "loading actor: [#{type}]"
+    load "actors/#{type}.rb"
+  end
+
+  module_function :reload_behavior, :actors, :load_actor
+
+end

data/lib/gamebox/core/director.rb

@@ -1,12 +1,19 @@
 # Directors manage actors.
 class Director
-  extend Publisher
-  can_fire_anything
-  attr_accessor :actors
+  attr_accessor :actors, :update_slots
+
+  def initialize
+    @update_slots = [ :pre_update, :update, :post_update ]
+    clear_subscriptions
+  end
+
+  def clear_subscriptions
+    @subscriptions = Hash[@update_slots.map { |slot| [slot, []] }]
+  end
 
   def pause
     @paused_subscriptions = @subscriptions
-    @subscriptions = {}
+    clear_subscriptions
   end
 
   def unpause
@@ -16,8 +23,28 @@ class Director
     end
   end
 
+  def when(event=:update, &callback)
+    @subscriptions[event] ||= []
+    @subscriptions[event] << callback
+  end
+
   def update(time)
     time_in_seconds = time / 1000.to_f
-    fire :update, time, time_in_seconds
+    @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
+  end
+
 end

data/lib/gamebox/core/event_symbols.rb

@@ -0,0 +1,214 @@
+KbRangeBegin = 0 unless defined?(KbRangeBegin)
+KbRangeEnd = 0xffff unless defined?(KbRangeEnd)
+MsRangeBegin = MsLeft unless defined?(MsRangeBegin)
+MsRangeEnd = MsWheelDown unless defined?(MsRangeEnd)
+GpRangeBegin = GpLeft unless defined?(GpRangeBegin)
+GpRangeEnd = Gp3Button15 unless defined?(GpRangeEnd)
+
+BUTTON_ID_TO_SYM = {
+  KbRangeBegin => :keyboard_begin,
+  KbEscape => :escape,
+  KbF1 => :f1,
+  KbF2 => :f2,
+  KbF3 => :f3,
+  KbF4 => :f4,
+  KbF5 => :f5,
+  KbF6 => :f6,
+  KbF7 => :f7,
+  KbF8 => :f8,
+  KbF9 => :f9,
+  KbF10 => :f10,
+  KbF11 => :f11,
+  KbF12 => :f12,
+  Kb1 => :one,
+  Kb2 => :two,
+  Kb3 => :three,
+  Kb4 => :four,
+  Kb5 => :five,
+  Kb6 => :six,
+  Kb7 => :seven,
+  Kb8 => :eight,
+  Kb9 => :nine,
+  Kb0 => :zero,
+  KbA => :a,
+  KbB => :b,
+  KbC => :c,
+  KbD => :d,
+  KbE => :e,
+  KbF => :f,
+  KbG => :g,
+  KbH => :h,
+  KbI => :i,
+  KbJ => :j,
+  KbK => :k,
+  KbL => :l,
+  KbM => :m,
+  KbN => :n,
+  KbO => :o,
+  KbP => :p,
+  KbQ => :q,
+  KbR => :r,
+  KbS => :s,
+  KbT => :t,
+  KbU => :u,
+  KbV => :v,
+  KbW => :w,
+  KbX => :x,
+  KbY => :y,
+  KbZ => :z,
+  KbTab => :tab,
+  KbReturn => :return,
+  KbSpace => :space,
+  KbLeftShift => :left_shift,
+  KbRightShift => :right_shift,
+  KbLeftControl => :left_control,
+  KbRightControl => :right_control,
+  KbLeftAlt => :left_alt,
+  KbRightAlt => :right_alt,
+  KbLeftMeta => :left_meta,
+  KbRightMeta => :right_meta,
+  KbBackspace => :backspace,
+  KbLeft => :left,
+  KbRight => :right,
+  KbUp => :up,
+  KbDown => :down,
+  KbHome => :home,
+  KbEnd => :end,
+  KbInsert => :insert,
+  KbDelete => :delete,
+  KbPageUp => :page_up,
+  KbPageDown => :page_down,
+  KbEnter => :enter,
+  KbNumpad1 => :numpad_1,
+  KbNumpad2 => :numpad_2,
+  KbNumpad3 => :numpad_3,
+  KbNumpad4 => :numpad_4,
+  KbNumpad5 => :numpad_5,
+  KbNumpad6 => :numpad_6,
+  KbNumpad7 => :numpad_7,
+  KbNumpad8 => :numpad_8,
+  KbNumpad9 => :numpad_9,
+  KbNumpad0 => :numpad_0,
+  KbNumpadAdd => :numpad_add,
+  KbNumpadSubtract => :numpad_subtract,
+  KbNumpadMultiply => :numpad_multiply,
+  KbNumpadDivide => :numpad_divide,
+  KbRangeEnd => :keyboard_end,
+  MsRangeBegin => :mouse_begin,
+  MsLeft => :mouse_left,
+  MsRight => :mouse_right,
+  MsMiddle => :mouse_middle,
+  MsWheelUp => :mouse_wheel_up,
+  MsWheelDown => :mouse_wheel_down,
+  MsRangeEnd => :mouse_end,
+  GpRangeBegin => :gp_begin,
+  GpLeft => :gp_left,
+  GpRight => :gp_right,
+  GpUp => :gp_up,
+  GpDown => :gp_down,
+  GpButton0 => :gp_button_0,
+  GpButton1 => :gp_button_1,
+  GpButton2 => :gp_button_2,
+  GpButton3 => :gp_button_3,
+  GpButton4 => :gp_button_4,
+  GpButton5 => :gp_button_5,
+  GpButton6 => :gp_button_6,
+  GpButton7 => :gp_button_7,
+  GpButton8 => :gp_button_8,
+  GpButton9 => :gp_button_9,
+  GpButton10 => :gp_button_10,
+  GpButton11 => :gp_button_11,
+  GpButton12 => :gp_button_12,
+  GpButton13 => :gp_button_13,
+  GpButton14 => :gp_button_14,
+  GpButton15 => :gp_button_15,
+  GpRangeEnd => :gp_end,
+}
+
+BUTTON_ID_TO_SYM.merge!({
+  Gp0Left => :gp0_left,
+  Gp0Right => :gp0_right,
+  Gp0Up => :gp0_up,
+  Gp0Down => :gp0_down,
+  Gp0Button0 => :gp0_button_0,
+  Gp0Button1 => :gp0_button_1,
+  Gp0Button2 => :gp0_button_2,
+  Gp0Button3 => :gp0_button_3,
+  Gp0Button4 => :gp0_button_4,
+  Gp0Button5 => :gp0_button_5,
+  Gp0Button6 => :gp0_button_6,
+  Gp0Button7 => :gp0_button_7,
+  Gp0Button8 => :gp0_button_8,
+  Gp0Button9 => :gp0_button_9,
+  Gp0Button10 => :gp0_button_10,
+  Gp0Button11 => :gp0_button_11,
+  Gp0Button12 => :gp0_button_12,
+  Gp0Button13 => :gp0_button_13,
+  Gp0Button14 => :gp0_button_14,
+  Gp0Button15 => :gp0_button_15,
+
+  Gp1Left => :gp1_left,
+  Gp1Right => :gp1_right,
+  Gp1Up => :gp1_up,
+  Gp1Down => :gp1_down,
+  Gp1Button0 => :gp1_button_0,
+  Gp1Button1 => :gp1_button_1,
+  Gp1Button2 => :gp1_button_2,
+  Gp1Button3 => :gp1_button_3,
+  Gp1Button4 => :gp1_button_4,
+  Gp1Button5 => :gp1_button_5,
+  Gp1Button6 => :gp1_button_6,
+  Gp1Button7 => :gp1_button_7,
+  Gp1Button8 => :gp1_button_8,
+  Gp1Button9 => :gp1_button_9,
+  Gp1Button10 => :gp1_button_10,
+  Gp1Button11 => :gp1_button_11,
+  Gp1Button12 => :gp1_button_12,
+  Gp1Button13 => :gp1_button_13,
+  Gp1Button14 => :gp1_button_14,
+  Gp1Button15 => :gp1_button_15,
+
+  Gp2Left => :gp2_left,
+  Gp2Right => :gp2_right,
+  Gp2Up => :gp2_up,
+  Gp2Down => :gp2_down,
+  Gp2Button0 => :gp2_button_0,
+  Gp2Button1 => :gp2_button_1,
+  Gp2Button2 => :gp2_button_2,
+  Gp2Button3 => :gp2_button_3,
+  Gp2Button4 => :gp2_button_4,
+  Gp2Button5 => :gp2_button_5,
+  Gp2Button6 => :gp2_button_6,
+  Gp2Button7 => :gp2_button_7,
+  Gp2Button8 => :gp2_button_8,
+  Gp2Button9 => :gp2_button_9,
+  Gp2Button10 => :gp2_button_10,
+  Gp2Button11 => :gp2_button_11,
+  Gp2Button12 => :gp2_button_12,
+  Gp2Button13 => :gp2_button_13,
+  Gp2Button14 => :gp2_button_14,
+  Gp2Button15 => :gp2_button_15,
+
+  Gp3Left => :gp3_left,
+  Gp3Right => :gp3_right,
+  Gp3Up => :gp3_up,
+  Gp3Down => :gp3_down,
+  Gp3Button0 => :gp3_button_0,
+  Gp3Button1 => :gp3_button_1,
+  Gp3Button2 => :gp3_button_2,
+  Gp3Button3 => :gp3_button_3,
+  Gp3Button4 => :gp3_button_4,
+  Gp3Button5 => :gp3_button_5,
+  Gp3Button6 => :gp3_button_6,
+  Gp3Button7 => :gp3_button_7,
+  Gp3Button8 => :gp3_button_8,
+  Gp3Button9 => :gp3_button_9,
+  Gp3Button10 => :gp3_button_10,
+  Gp3Button11 => :gp3_button_11,
+  Gp3Button12 => :gp3_button_12,
+  Gp3Button13 => :gp3_button_13,
+  Gp3Button14 => :gp3_button_14,
+  Gp3Button15 => :gp3_button_15,
+}) if defined?(Gp0Left) # if multi gp support
+
+BUTTON_SYM_TO_ID = BUTTON_ID_TO_SYM.invert