gamebox 0.3.4 → 0.4.0.rc1

data/lib/gamebox/core/core.rb

@@ -0,0 +1,30 @@
+module Gamebox
+  # Returns the global configuration object
+  def self.configuration
+    @configuration ||= Configuration.new
+    @configuration
+  end
+
+  def self.configure
+    yield configuration if block_given?
+  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
+
+# EEK... dirty?
+include Gamebox

data/lib/gamebox/core/deprecated.rb

@@ -0,0 +1,15 @@
+class Actor
+  def self.inherited(klass)
+    log "Cannot extend #{self} anymore #{klass}"
+  end
+end
+class Behavior
+  def self.inherited(klass)
+    log "Cannot extend #{self} anymore #{klass}"
+  end
+end
+class ActorView
+  def self.inherited(klass)
+    log "Cannot extend #{self} anymore #{klass}"
+  end
+end

data/lib/gamebox/{director.rb → core/director.rb}

@@ -1,5 +1,7 @@
 # Directors manage actors.
 class Director
+  extend Publisher
+  can_fire_anything
   attr_accessor :actors
 
   def initialize
@@ -16,7 +18,7 @@ class Director
     actor.when :remove_me do
       remove_actor actor
     end
-    actor_added actor
+    fire :actor_added, actor
     actor
   end
 
@@ -24,12 +26,6 @@ class Director
     @dead_actors << actor
   end
 
-  def actor_removed(actor)
-  end
-
-  def actor_added(actor)
-  end
-
   def empty?
     @actors.empty?
   end
@@ -50,11 +46,10 @@ class Director
   def update(time)
     for act in @dead_actors
       @actors.delete act
-      actor_removed act
+      fire :actor_removed, act
     end
     @dead_actors = []
-    for act in @actors
-      act.update time if act.alive?
-    end
+    time_in_seconds = time / 1000.to_f
+    fire :update, time, time_in_seconds
   end
 end

data/lib/gamebox/core/font_style.rb

@@ -0,0 +1,26 @@
+
+class FontStyle
+  construct_with :resource_manager
+
+  attr_accessor :font, :name, :size, :color, :x_scale, :y_scale
+  def configure(name, size, color, x_scale, y_scale)
+    @name = name
+    @size = size
+    @color = color
+    @x_scale = x_scale
+    @y_scale = y_scale
+    reload
+  end
+  
+  def calc_width(text)
+    @font.text_width text
+  end
+  
+  def height
+    @font.height
+  end
+  
+  def reload
+    @font = resource_manager.load_font name, size
+  end
+end

data/lib/gamebox/core/font_style_factory.rb

@@ -0,0 +1,11 @@
+class FontStyleFactory
+  construct_with :this_object_context
+
+  def build(name, size, color, x_scale=1, y_scale=1)
+    this_object_context.in_subcontext do |style_context|
+      style_context["font_style"].tap do |style|
+        style.configure name, size, color, x_scale, y_scale
+      end
+    end
+  end
+end

data/lib/gamebox/core/game.rb

@@ -0,0 +1,19 @@
+class Game
+
+  # BTW: we have extra deps to make sure they are all built at game construction time
+  construct_with :wrapped_screen, :input_manager, :sound_manager,
+    :stage_manager
+
+  def configure
+    stage_manager.change_stage_to stage_manager.default_stage
+  end
+
+  def update(time)
+    stage_manager.update time
+  end
+
+  def draw
+    stage_manager.draw wrapped_screen
+  end
+
+end

data/lib/gamebox/{hooked_gosu_window.rb → core/hooked_gosu_window.rb}

@@ -1,16 +1,12 @@
 require 'publisher'
-
-class HookedGosuWindow < Window
-  extend Publisher
-  can_fire :update, :draw, :button_down, :button_up
-
+module GosuWindowAPI
   def initialize(width, height, fullscreen)
     super(width, height, fullscreen)
   end
 
   def update
     millis = Gosu::milliseconds
-    @last_millis ||= millis
+    @last_millis ||= 0
     fire :update, (millis - @last_millis)
     @last_millis = millis
   end
@@ -27,4 +23,14 @@ class HookedGosuWindow < Window
   def button_up(id)
     fire :button_up, id
   end
+
+  attr_accessor :needs_cursor
+  alias :needs_cursor? :needs_cursor
+end
+
+class HookedGosuWindow < Window
+  include GosuWindowAPI
+  extend Publisher
+  can_fire :update, :draw, :button_down, :button_up
+
 end

data/lib/gamebox/{input_manager.rb → core/input_manager.rb}

@@ -26,111 +26,28 @@ class InputManager
   UP_EVENTS = [:mouse_up, :keyboard_up, :game_pad_up]
 
   attr_accessor :window
-  constructor :config_manager, :wrapped_screen
+  construct_with :config_manager, :wrapped_screen
 
   # Sets up the clock and main event loop. You should never call this method, 
-  # as this class should be initialized by diy.
-  def setup
-    @window = @wrapped_screen.screen
-
-    auto_quit = @config_manager[:auto_quit]
-    @auto_quit = instance_eval(auto_quit) if auto_quit
-
+  # as this class should be initialized by conject.
+  def initialize
     @hooks = {}
     @non_id_hooks = {}
     @down_ids = {}
-  end
-
-  # This gets called from game app and sets up all the
-  # events. (also shows the window)
-  def main_loop(game)
 
-    @window.when :button_up do |button_id|
-      _handle_event button_id, :up
-    end
-    @window.when :button_down do |button_id|
-      _handle_event button_id, :down
-    end
-
-    @window.when :update do |millis|
-
-      if @uses_mouse
-        @last_mouse_x ||= mouse_x
-        @last_mouse_y ||= mouse_y
-
-        x_diff = @last_mouse_x - mouse_x
-        y_diff = @last_mouse_y - mouse_y
-
-        unless x_diff < 0.1 && x_diff > -0.1 && y_diff < 0.1 && y_diff > -0.1
-          _handle_event nil, :motion
-
-          @last_mouse_x = mouse_x
-          @last_mouse_y = mouse_y
-        end
-      end
-
-      game.update millis
-    end
-    @window.when :draw do 
-      game.draw 
-    end
-
-    @window.show
+    setup
   end
 
-  def _handle_event(gosu_id, action) #:nodoc:
-    @window.close if @auto_quit && gosu_id == @auto_quit
-    if action == :down
-      @down_ids[gosu_id] = true 
-    else
-      @down_ids.delete gosu_id
-    end
-
-    event_data = nil
-    mouse_dragged = false
-
-    callback_key = action
-    if gosu_id.nil?
-      event_type = :mouse_motion
-      callback_key = :mouse_motion
-      @mouse_dragging = true if @mouse_down
-      event_data = [mouse_x, mouse_y]
-    elsif gosu_id >= MsRangeBegin && gosu_id <= MsRangeEnd
-      event_type = :mouse
-      event_data = [mouse_x, mouse_y]
-      if action == :up
-        # callback_key = :mouse_up
-        @mouse_down = false
-        mouse_dragged = true if @mouse_dragging
-        @mouse_dragging = false
-      else
-        # callback_key = :mouse_down
-        @mouse_down = true
-        @last_click_x = mouse_x
-        @last_click_y = mouse_y
-      end
-    elsif gosu_id >= KbRangeBegin && gosu_id <= KbRangeEnd
-      event_type = :keyboard
-    elsif gosu_id >= GpRangeBegin && gosu_id <= GpRangeEnd
-      event_type = :game_pad
-    end
-
-    # single threaded.. keep same event
-    @event ||= {}
-    @event[:type] = event_type
-    @event[:id] = gosu_id
-    @event[:action] = action
-    @event[:callback_key] = callback_key
-    @event[:data] = event_data
-
-    fire_event(@event)
+  def setup
+    @window = wrapped_screen.screen
+    auto_quit = config_manager[:auto_quit]
+    @auto_quit = instance_eval(auto_quit) if auto_quit
+  end
 
-    if mouse_dragged
-      drag_data = {:to => [mouse_x, mouse_y], :from => [@last_click_x, @last_click_y]}
-      @event[:data] = drag_data
-      @event[:callback_key] = :mouse_drag
-      fire_event(@event)
-    end
+  def show
+    # Does not return, Gosu uses this to pop up the window
+    # This must be last in the method
+    @window.show
   end
 
   def fire_event(event)
@@ -151,13 +68,13 @@ class InputManager
         end
       end
     end
-    
+
     non_id_event_hooks = @non_id_hooks[event[:callback_key]]
     if non_id_event_hooks
       for callback in non_id_event_hooks
         callback.call event
       end
-    end          
+    end
   end
 
   # registers a block to be called when matching events are pulled from the SDL queue.
@@ -228,7 +145,7 @@ class InputManager
           end
         end
       end
-      
+
       for key in @non_id_hooks.keys.dup
         @non_id_hooks[key].delete_if do |block|
           eval('self',block.binding).equal?(listener)
@@ -268,10 +185,100 @@ class InputManager
     @paused_non_id_hooks = nil
   end
 
+  def register(game)
+    @window.when :button_up do |button_id|
+      handle_event button_id, :up
+    end
+    @window.when :button_down do |button_id|
+      handle_event button_id, :down
+    end
+
+    @window.when :update do |millis|
+
+      if @uses_mouse
+        @last_mouse_x ||= mouse_x
+        @last_mouse_y ||= mouse_y
+
+        x_diff = @last_mouse_x - mouse_x
+        y_diff = @last_mouse_y - mouse_y
+
+        unless x_diff < 0.1 && x_diff > -0.1 && y_diff < 0.1 && y_diff > -0.1
+          handle_event nil, :motion
+
+          @last_mouse_x = mouse_x
+          @last_mouse_y = mouse_y
+        end
+      end
+
+      game.update millis
+    end
+    @window.when :draw do 
+      game.draw 
+    end
+  end
+
   private
+
+  def handle_event(gosu_id, action) #:nodoc:
+    @window.close if @auto_quit && gosu_id == @auto_quit
+    if action == :down
+      @down_ids[gosu_id] = true 
+    else
+      @down_ids.delete gosu_id
+    end
+
+    event_data = nil
+    mouse_dragged = false
+
+    callback_key = action
+    if gosu_id.nil?
+      event_type = :mouse_motion
+      callback_key = :mouse_motion
+      @mouse_dragging = true if @mouse_down
+      event_data = [mouse_x, mouse_y]
+    elsif gosu_id >= MsRangeBegin && gosu_id <= MsRangeEnd
+      event_type = :mouse
+      event_data = [mouse_x, mouse_y]
+      if action == :up
+        # callback_key = :mouse_up
+        @mouse_down = false
+        mouse_dragged = true if @mouse_dragging
+        @mouse_dragging = false
+      else
+        # callback_key = :mouse_down
+        @mouse_down = true
+        @last_click_x = mouse_x
+        @last_click_y = mouse_y
+      end
+    elsif gosu_id >= KbRangeBegin && gosu_id <= KbRangeEnd
+      event_type = :keyboard
+    elsif gosu_id >= GpRangeBegin && gosu_id <= GpRangeEnd
+      event_type = :game_pad
+    end
+
+    # single threaded.. keep same event
+    @event ||= {}
+    @event[:type] = event_type
+    @event[:id] = gosu_id
+    @event[:action] = action
+    @event[:callback_key] = callback_key
+    @event[:data] = event_data
+
+    fire_event(@event)
+
+    if mouse_dragged
+      drag_data = {:to => [mouse_x, mouse_y], :from => [@last_click_x, @last_click_y]}
+      @event[:data] = drag_data
+      @event[:callback_key] = :mouse_drag
+      fire_event(@event)
+    end
+  end
+
+
   def mouse_x
     @window.mouse_x
   end
+
   def mouse_y
     @window.mouse_y
   end

data/lib/gamebox/core/physics.rb

@@ -0,0 +1,22 @@
+if defined? CP
+  ZERO_VEC_2 = vec2(0,0) unless defined? ZERO_VEC_2
+  def vec2(*args)
+    CP::Vec2.new *args
+  end
+
+  class CP::Shape::Circle
+    attr_accessor :actor
+  end
+  class CP::Shape::Poly
+    attr_accessor :actor
+  end
+  class CP::Shape::Segment
+    attr_accessor :actor
+  end
+
+else
+  ZERO_VEC_2 = Ftor.new(0,0)
+  def vec2(*args)
+    Ftor.new *args
+  end
+end