gamebox 0.0.6 → 0.0.7

data/lib/gamebox/actor_view.rb

@@ -1,7 +1,7 @@
 class ActorView
-  attr_accessor :actor, :mode, :layer, :parallax
-  def initialize(mode,actor)
-    @mode = mode
+  attr_accessor :actor, :stage, :layer, :parallax
+  def initialize(stage, actor)
+    @stage = stage
     @actor = actor
 
     @layer = 0
@@ -12,15 +12,15 @@ class ActorView
     end
 
     actor.when :remove_me do
-      @mode.unregister_drawable self
+      @stage.unregister_drawable self
     end
     
     actor.when :hide_me do
-      @mode.unregister_drawable self
+      @stage.unregister_drawable self
     end
     
     actor.when :show_me do
-      @mode.register_drawable self
+      @stage.register_drawable self
     end
     
     setup

data/lib/gamebox/{score.rb → actors/score.rb}

@@ -3,7 +3,7 @@ class ScoreView < ActorView
     text = @actor.score.to_s
     text = '0'*(6-text.size)+text
 
-    font = @mode.resource_manager.load_font 'Asimov.ttf', 30
+    font = @stage.resource_manager.load_font 'Asimov.ttf', 30
     text_image = font.render text, true, [250,250,250,255]
 
     x = @actor.x
@@ -13,6 +13,7 @@ class ScoreView < ActorView
   end
 end
 class Score < Actor
+  has_behavior :layered => {:layer => 999}
   attr_accessor :score
 
   def setup

data/lib/gamebox/{svg_actor.rb → actors/svg_actor.rb}

@@ -15,12 +15,11 @@ class SvgActor < Actor
     
     my_layer = @svg_doc.find_group_by_label(@name.to_s)
     build_from_vertices my_layer.path.vertices
-    hide unless my_layer.path.visible?
   end
   
   def build_from_vertices(vertices)
     
-    moment_of_inertia,mass = Float::Infinity,Float::Infinity
+    moment_of_inertia,mass = Float::INFINITY,Float::INFINITY
     terrain_body = CP::Body.new(mass,moment_of_inertia)
     elasticity = 0
     friction = 0.7
@@ -33,7 +32,7 @@ class SvgActor < Actor
       seg.u = friction
       seg.group = :terrain
       @segments << [a,b]
-      @level.space.add_static_shape(seg)
+      @stage.space.add_static_shape(seg)
     end
   end
 end
@@ -46,4 +45,4 @@ class SvgActorView < ActorView
       target.draw_line_s [p1.x+x_off,p1.y+y_off], [p2.x+x_off,p2.y+y_off], [25,255,25,255], 6
     end
   end
-end
+end

data/lib/gamebox/ai/polaris.rb

@@ -10,6 +10,8 @@ class Polaris
     @nodes_considered = 0
   end
   
+  # Returns the path without the from location. 
+  # Returns nil if max_depth is hit or if no path exists.
   def guide(from, to, unit_type=nil, max_depth=400)
     return nil if @map.blocked?(from, unit_type) || @map.blocked?(to, unit_type)
     from_element = PathElement.new(from)

data/lib/gamebox/behavior.rb

@@ -11,6 +11,9 @@ class Behavior
   def setup
   end
 
+  def removed
+  end
+
   def update(time)
   end
 end

data/lib/gamebox/{animated.rb → behaviors/animated.rb}

@@ -4,11 +4,11 @@ require 'behavior'
 # by default it expects images to be:
 # data/graphics/classname/action/01..n.png
 class Animated < Behavior
-  FRAME_UPDATE_TIME = 60
-
-  attr_accessor :frame_time, :frame_num, :animating
+  attr_accessor :frame_time, :frame_num, :animating, :frame_update_time
   def setup
     @images = {}
+    @frame_update_time = @opts[:frame_update_time]
+    @frame_update_time ||= 60
     @frame_time = 0
     
     # all animated actors have to have an idle animation
@@ -29,6 +29,9 @@ class Animated < Behavior
         define_method :stop_animating do
           animated_obj.stop_animating
         end
+        define_method :action do
+          animated_obj.action
+        end
         define_method :action= do |action_sym|
           animated_obj.action = action_sym
         end
@@ -43,9 +46,9 @@ class Animated < Behavior
   def update(time)
     return unless @animating
     @frame_time += time
-    if @frame_time > FRAME_UPDATE_TIME
+    if @frame_time > @frame_update_time
       next_frame
-      @frame_time = @frame_time-FRAME_UPDATE_TIME
+      @frame_time = @frame_time-@frame_update_time
     end
   end
 
@@ -58,6 +61,10 @@ class Animated < Behavior
     @actor.resource_manager.load_animation_set @actor, action 
   end
 
+  def action
+    @action
+  end
+
   def action=(new_action)
     @images[new_action] ||= load_action(new_action)
     if @images[new_action].size > 1
@@ -81,4 +88,5 @@ class Animated < Behavior
   def stop_animating
     @animating = false
   end
+
 end

data/lib/gamebox/{graphical.rb → behaviors/graphical.rb}

@@ -4,10 +4,15 @@ require 'behavior'
 # data/graphics/classname.png
 class Graphical < Behavior
 
-  attr_accessor :image
+  attr_accessor :image, :num_x_tiles, :num_y_tiles
   def setup
 
     @image = @actor.resource_manager.load_actor_image @actor
+    @tiled = @opts[:tiled]
+    @num_x_tiles = @opts[:num_x_tiles]
+    @num_y_tiles = @opts[:num_y_tiles]
+    @num_x_tiles ||= 1
+    @num_y_tiles ||= 1
 
     graphical_obj = self
     @actor.instance_eval do
@@ -21,4 +26,9 @@ class Graphical < Behavior
       end
     end
   end
+
+  def tiled?
+    @tiled
+  end
+
 end

data/lib/gamebox/{layered.rb → behaviors/layered.rb}

@@ -19,6 +19,12 @@ class Layered < Behavior
     layered_obj = self
     @actor.instance_eval do
       (class << self; self; end).class_eval do
+        define_method :layer= do |new_layer|
+          layered_obj.layer = new_layer
+        end
+        define_method :parallax= do |new_parallax|
+          layered_obj.parallax = new_parallax
+        end
         define_method :layer do 
           layered_obj.layer
         end
@@ -31,4 +37,12 @@ class Layered < Behavior
       end
     end
   end
+
+  def parallax=(new_parallax)
+    @parallax = new_parallax
+  end
+
+  def layer=(new_layer)
+    @layer = new_layer
+  end
 end

data/lib/gamebox/{physical.rb → behaviors/physical.rb}

@@ -2,8 +2,21 @@ require 'physics'
 require 'behavior'
 require 'inflector'
 require 'publisher'
+
+# Physical behavior will place your Actor in a physical world.
+# example:
+# :physical => {
+#    :shape => :poly,
+#    :parts => [
+#      :nario_feet => {:verts => [[-13,20],[-13,21],[13,21],[13,20]],:shape=>:poly, :offset => vec2(0,6)},
+#      :nario_hat => {:verts => [[-8,20],[-8,21],[8,21],[8,20]],:shape=>:poly, :offset => vec2(0,-46)}
+#      ],
+#    :mass => 200,
+#    :friction => 0.4,
+#    :moment => Float::INFINITY,
+#    :verts => [[-15,-20],[-15,20],[15,20],[15,-20]]}
 class Physical < Behavior
-  attr_accessor :shapes, :body, :opts, :parts
+  attr_accessor :shapes, :body, :opts, :parts, :segments_groups
 
   def shape
     @shapes.first if @shapes
@@ -12,9 +25,10 @@ class Physical < Behavior
   def setup
     # TODO add defaults?
     @mass = @opts[:mass]
-    @mass ||= Float::Infinity
+    @mass ||= Float::INFINITY
     @parts = {}
     @shapes = []
+    @segments_groups = []
 
     moment_of_inertia = @opts[:moment]
 
@@ -22,16 +36,19 @@ class Physical < Behavior
     when :circle
       @radius = @opts[:radius]
 
-      moment_of_inertia ||= @opts[:fixed] ? Float::Infinity : moment_for_circle(@mass, @radius, 0, ZeroVec2)
+      moment_of_inertia ||= @opts[:fixed] ? Float::INFINITY : moment_for_circle(@mass, @radius, 0, ZERO_VEC_2)
       @body = Body.new(@mass, moment_of_inertia)
-      @shape = Shape::Circle.new(@body, @radius, ZeroVec2)
+      @shape = Shape::Circle.new(@body, @radius, ZERO_VEC_2)
 
     when :poly
       shape_array = @opts[:verts].collect{|v| vec2(v[0],v[1])}
 
-      moment_of_inertia ||= @opts[:fixed] ? Float::Infinity : moment_for_poly(@mass, shape_array, ZeroVec2)
+      moment_of_inertia ||= @opts[:fixed] ? Float::INFINITY : moment_for_poly(@mass, shape_array, ZERO_VEC_2)
       @body = Body.new(@mass, moment_of_inertia)
-      @shape = Shape::Poly.new(@body, shape_array, ZeroVec2)
+      @shape = Shape::Poly.new(@body, shape_array, ZERO_VEC_2)
+      verts = @opts[:verts].dup
+      verts << @opts[:verts][0]
+      @segments_groups << verts
     end
 
     collision_type = @opts[:collision_group]
@@ -46,15 +63,19 @@ class Physical < Behavior
     start_x ||= @actor.x
     start_y ||= @actor.y
     @shape.body.p = vec2(start_x,start_y)
-    @shape.e = 0
+
+    elasticity = @opts[:elasticity]
+    elasticity ||= 0.1
+    @shape.e = elasticity
+
     friction = @opts[:friction]
     friction ||= 0.4
     @shape.u = friction
     
     @shapes << @shape
 
-    if @opts[:parts]
-      for obj in @opts[:parts]
+    if @opts[:shapes]
+      for obj in @opts[:shapes]
         for part_name, part_def in obj
           # add another shape here
           part_shape_array = part_def[:verts].collect{|v| vec2(v[0],v[1])}
@@ -63,6 +84,9 @@ class Physical < Behavior
           # TODO pass all physics params to parts (ie u and e)
           part_shape.u = friction
           @shapes << part_shape
+          verts = part_def[:verts].dup
+          verts << part_def[:verts][0]
+          @segments_groups << verts
         end
       end
     end
@@ -70,14 +94,14 @@ class Physical < Behavior
 
     physical_obj = self
 
-    if @actor.level.respond_to? :register_physical_object
+    if @actor.stage.respond_to? :register_physical_object
       if @opts[:fixed]
-        @actor.level.register_physical_object physical_obj, true
+        @actor.stage.register_physical_object physical_obj, true
       else
-        @actor.level.register_physical_object physical_obj
+        @actor.stage.register_physical_object physical_obj
       end
     else
-      raise "physical actor in a non-physical level!"
+      raise "physical actor in a non-physical stage!"
     end
 
     # write code here to keep physics and x,y of actor in sync
@@ -114,7 +138,10 @@ class Physical < Behavior
         end
         define_method :warp do |new_p|
           physical_obj.body.p = new_p
-          @level.space.rehash_static if physical_obj.opts[:fixed]
+          @stage.space.rehash_static if physical_obj.opts[:fixed]
+        end
+        define_method :segment_groups do 
+          physical_obj.segments_groups
         end
         define_method :physical do 
           physical_obj

data/lib/gamebox/{updatable.rb → behaviors/updatable.rb}

@@ -5,4 +5,4 @@ class Updatable < Behavior
   def setup
     @actor.director.add_actor @actor
   end
-end
+end

data/lib/gamebox/{templates/template_app → data}/config/objects.yml

@@ -3,9 +3,9 @@ game:
     - wrapped_screen
     - input_manager
     - sound_manager
-    - mode_manager
+    - stage_manager
 resource_manager:
-mode_manager:
+stage_manager:
   compose:
     - input_manager
     - resource_manager
@@ -17,6 +17,8 @@ sound_manager:
     - resource_manager
     - config_manager
 input_manager:
+  compose:
+    - config_manager
 wrapped_screen:
   compose:
     - config_manager

data/lib/gamebox/event_compat.rb

@@ -0,0 +1,285 @@
+
+# Basic event compatibility layer. Should allow most Gamebox games
+# that use old-style Rubygame events to run using new-style events
+# under the hood without even knowing it.
+
+
+ExposeEvent      = Rubygame::Events::WindowExposed
+KeyDownEvent     = Rubygame::Events::KeyPressed
+KeyUpEvent       = Rubygame::Events::KeyReleased
+MouseDownEvent   = Rubygame::Events::MousePressed
+MouseUpEvent     = Rubygame::Events::MouseReleased
+MouseMotionEvent = Rubygame::Events::MouseMoved
+QuitEvent        = Rubygame::Events::QuitRequested
+ResizeEvent      = Rubygame::Events::WindowResized
+
+
+
+
+K_BACKSPACE    = :backspace
+K_TAB          = :tab
+K_CLEAR        = :clear
+K_RETURN       = :return
+K_PAUSE        = :pause
+K_ESCAPE       = :escape
+K_SPACE        = :space
+K_EXCLAIM      = :exclamation_mark
+K_QUOTEDBL     = :double_quote
+K_HASH         = :hash
+K_DOLLAR       = :dollar
+K_AMPERSAND    = :ampersand
+K_QUOTE        = :quote
+K_LEFTPAREN    = :left_parenthesis
+K_RIGHTPAREN   = :right_parenthesis
+K_ASTERISK     = :asterisk
+K_PLUS         = :plus
+K_COMMA        = :comma
+K_MINUS        = :minus
+K_PERIOD       = :period
+K_SLASH        = :slash
+K_0            = :number_0
+K_1            = :number_1
+K_2            = :number_2
+K_3            = :number_3
+K_4            = :number_4
+K_5            = :number_5
+K_6            = :number_6
+K_7            = :number_7
+K_8            = :number_8
+K_9            = :number_9
+K_COLON        = :colon
+K_SEMICOLON    = :semicolon
+K_LESS         = :less_than
+K_EQUALS       = :equals
+K_GREATER      = :greater_than
+K_QUESTION     = :question_mark
+K_AT           = :at
+K_LEFTBRACKET  = :left_bracket
+K_BACKSLASH    = :backslash
+K_RIGHTBRACKET = :right_bracket
+K_CARET        = :caret
+K_UNDERSCORE   = :underscore
+K_BACKQUOTE    = :backquote
+K_A            = :a
+K_B            = :b
+K_C            = :c
+K_D            = :d
+K_E            = :e
+K_F            = :f
+K_G            = :g
+K_H            = :h
+K_I            = :i
+K_J            = :j
+K_K            = :k
+K_L            = :l
+K_M            = :m
+K_N            = :n
+K_O            = :o
+K_P            = :p
+K_Q            = :q
+K_R            = :r
+K_S            = :s
+K_T            = :t
+K_U            = :u
+K_V            = :v
+K_W            = :w
+K_X            = :x
+K_Y            = :y
+K_Z            = :z
+K_DELETE       = :delete
+
+
+# International keyboard symbols
+K_WORLD_0  = :world_0
+K_WORLD_1  = :world_1
+K_WORLD_2  = :world_2
+K_WORLD_3  = :world_3
+K_WORLD_4  = :world_4
+K_WORLD_5  = :world_5
+K_WORLD_6  = :world_6
+K_WORLD_7  = :world_7
+K_WORLD_8  = :world_8
+K_WORLD_9  = :world_9
+K_WORLD_10 = :world_10
+K_WORLD_11 = :world_11
+K_WORLD_12 = :world_12
+K_WORLD_13 = :world_13
+K_WORLD_14 = :world_14
+K_WORLD_15 = :world_15
+K_WORLD_16 = :world_16
+K_WORLD_17 = :world_17
+K_WORLD_18 = :world_18
+K_WORLD_19 = :world_19
+K_WORLD_20 = :world_20
+K_WORLD_21 = :world_21
+K_WORLD_22 = :world_22
+K_WORLD_23 = :world_23
+K_WORLD_24 = :world_24
+K_WORLD_25 = :world_25
+K_WORLD_26 = :world_26
+K_WORLD_27 = :world_27
+K_WORLD_28 = :world_28
+K_WORLD_29 = :world_29
+K_WORLD_30 = :world_30
+K_WORLD_31 = :world_31
+K_WORLD_32 = :world_32
+K_WORLD_33 = :world_33
+K_WORLD_34 = :world_34
+K_WORLD_35 = :world_35
+K_WORLD_36 = :world_36
+K_WORLD_37 = :world_37
+K_WORLD_38 = :world_38
+K_WORLD_39 = :world_39
+K_WORLD_40 = :world_40
+K_WORLD_41 = :world_41
+K_WORLD_42 = :world_42
+K_WORLD_43 = :world_43
+K_WORLD_44 = :world_44
+K_WORLD_45 = :world_45
+K_WORLD_46 = :world_46
+K_WORLD_47 = :world_47
+K_WORLD_48 = :world_48
+K_WORLD_49 = :world_49
+K_WORLD_50 = :world_50
+K_WORLD_51 = :world_51
+K_WORLD_52 = :world_52
+K_WORLD_53 = :world_53
+K_WORLD_54 = :world_54
+K_WORLD_55 = :world_55
+K_WORLD_56 = :world_56
+K_WORLD_57 = :world_57
+K_WORLD_58 = :world_58
+K_WORLD_59 = :world_59
+K_WORLD_60 = :world_60
+K_WORLD_61 = :world_61
+K_WORLD_62 = :world_62
+K_WORLD_63 = :world_63
+K_WORLD_64 = :world_64
+K_WORLD_65 = :world_65
+K_WORLD_66 = :world_66
+K_WORLD_67 = :world_67
+K_WORLD_68 = :world_68
+K_WORLD_69 = :world_69
+K_WORLD_70 = :world_70
+K_WORLD_71 = :world_71
+K_WORLD_72 = :world_72
+K_WORLD_73 = :world_73
+K_WORLD_74 = :world_74
+K_WORLD_75 = :world_75
+K_WORLD_76 = :world_76
+K_WORLD_77 = :world_77
+K_WORLD_78 = :world_78
+K_WORLD_79 = :world_79
+K_WORLD_80 = :world_80
+K_WORLD_81 = :world_81
+K_WORLD_82 = :world_82
+K_WORLD_83 = :world_83
+K_WORLD_84 = :world_84
+K_WORLD_85 = :world_85
+K_WORLD_86 = :world_86
+K_WORLD_87 = :world_87
+K_WORLD_88 = :world_88
+K_WORLD_89 = :world_89
+K_WORLD_90 = :world_90
+K_WORLD_91 = :world_91
+K_WORLD_92 = :world_92
+K_WORLD_93 = :world_93
+K_WORLD_94 = :world_94
+K_WORLD_95 = :world_95
+
+
+# Numeric keypad symbols
+K_KP0         = :keypad_0
+K_KP1         = :keypad_1
+K_KP2         = :keypad_2
+K_KP3         = :keypad_3
+K_KP4         = :keypad_4
+K_KP5         = :keypad_5
+K_KP6         = :keypad_6
+K_KP7         = :keypad_7
+K_KP8         = :keypad_8
+K_KP9         = :keypad_9
+K_KP_PERIOD   = :keypad_period
+K_KP_DIVIDE   = :keypad_divide
+K_KP_MULTIPLY = :keypad_multiply
+K_KP_MINUS    = :keypad_minus
+K_KP_PLUS     = :keypad_plus
+K_KP_ENTER    = :keypad_enter
+K_KP_EQUALS   = :keypad_equals
+
+
+# Arrows + Home/End pad
+K_UP       = :up
+K_DOWN     = :down
+K_RIGHT    = :right
+K_LEFT     = :left
+K_INSERT   = :insert
+K_HOME     = :home
+K_END      = :end
+K_PAGEUP   = :pageup
+K_PAGEDOWN = :pagedown
+
+
+# Function keys
+K_F1  = :f1
+K_F2  = :f2
+K_F3  = :f3
+K_F4  = :f4
+K_F5  = :f5
+K_F6  = :f6
+K_F7  = :f7
+K_F8  = :f8
+K_F9  = :f9
+K_F10 = :f10
+K_F11 = :f11
+K_F12 = :f12
+K_F13 = :f13
+K_F14 = :f14
+K_F15 = :f15
+
+
+# Key state modifier keys
+K_NUMLOCK   = :numlock
+K_CAPSLOCK  = :capslock
+K_SCROLLOCK = :scrollock
+K_RSHIFT    = :right_shift
+K_LSHIFT    = :left_shift
+K_RCTRL     = :right_ctrl
+K_LCTRL     = :left_ctrl
+K_RALT      = :right_alt
+K_LALT      = :left_alt
+K_RMETA     = :right_meta
+K_LMETA     = :left_meta
+K_LSUPER    = :left_super
+K_RSUPER    = :right_super
+K_MODE      = :mode
+
+
+# Miscellaneous keys
+K_HELP   = :help
+K_PRINT  = :print
+K_SYSREQ = :sysreq
+K_BREAK  = :break
+K_MENU   = :menu
+K_POWER  = :power
+K_EURO   = :euro
+
+
+
+# Mouse constants
+MOUSE_LEFT   = :mouse_left
+MOUSE_MIDDLE = :mouse_middle
+MOUSE_RIGHT  = :mouse_right
+
+
+
+# Joystick constants  
+HAT_CENTERED  = nil
+HAT_UP        = :up
+HAT_RIGHT     = :right
+HAT_DOWN      = :down
+HAT_LEFT      = :left
+HAT_RIGHTUP   = :up_right
+HAT_RIGHTDOWN = :down_right
+HAT_LEFTUP    = :up_left
+HAT_LEFTDOWN  = :down_left