metro 0.0.5 → 0.0.6

data/lib/metro/models/generic.rb

@@ -7,6 +7,15 @@ module Metro
     #
     class Generic < Model
 
+      def draw
+        raise cannot_draw_message
+      end
+
+      def cannot_draw_message
+        [ "Unable to draw #{name} in #{scene}",
+          "The actor named '#{name}' could not find a suitable model so it could not be drawn in the scene #{scene}" ].join("\n")
+      end
+
     end
   end
 end

data/lib/metro/models/image.rb

@@ -11,6 +11,13 @@ module Metro
 
       attr_accessor :angle, :center_x, :center_y, :x_factor, :y_factor
 
+      def after_initialize
+        @angle = 0
+        @center_x = @center_y = 0.5
+        @x_factor = @y_factor = 1
+        @z_order = 0
+      end
+
       def image
         @image ||= Gosu::Image.new(window,asset_path(path))
       end

data/lib/metro/models/label.rb

@@ -11,7 +11,8 @@ module Metro
 
       attr_accessor :x, :y, :x_factor, :y_factor, :z_order
 
-      def initialize
+      def after_initialize
+        @text = ""
         @x_factor = @y_factor = 1.0
       end
 

data/lib/metro/models/{select.rb → menu.rb}

@@ -2,25 +2,25 @@ module Metro
   module Models
 
     #
-    # Draws a a menu of options. It is called a Select as it is named after the HTML
-    # element select. A select model also inserts itself into the scene as an event
+    # Draws a a menu of options. A menu model inserts itself into the scene as an event
     # target as it needs to maintain the state of the menu. When an option is selected
     # an event is fired based on the name of the option.
     #
-    # @note Only one 'select' can be defined for a given scene.
+    # @note Only one 'menu' can be defined for a given scene.
     #
-    class Select < Model
-      attr_accessor :selected_index, :options
+    class Menu < Model
+      attr_reader :selected_index, :menu_options
 
-      def initialize
+      def after_initialize
         @selected_index = 0
       end
 
       def window=(value)
         @window = value
+        @menu_options = options.map {|option| Option.new option }
         events
       end
-      
+
       def events
         relay = EventRelay.new(self,window)
 
@@ -32,7 +32,7 @@ module Metro
       end
 
       def selection
-        scene_method = options[selected_index].downcase.gsub(/\s/,'_')
+        scene_method = option_at_index(selected_index).method
         scene.send scene_method
       end
 
@@ -61,17 +61,44 @@ module Metro
         highlight_color.alpha = value.floor
       end
 
+      def option_at_index(index)
+        menu_options[index]
+      end
+
       def draw
         options.each_with_index do |option,index|
 
+          option_name = option_at_index(index).name
+
           draw_color = color
           draw_color = highlight_color if index == selected_index
 
           y_position = y + padding * index
-          font.draw option, x, y_position, Metro::Game::UI, 1.0, 1.0, draw_color
+          font.draw option_name, x, y_position, Metro::Game::UI, 1.0, 1.0, draw_color
         end
       end
 
+      class Option
+
+        attr_reader :data
+
+        attr_accessor :name, :method
+
+        def initialize(data)
+          @data = data
+
+          if data.is_a?(Hash)
+            @name = data.keys.first
+            @method = data.values.first
+          else
+            @name = data
+            @method = data.to_s.downcase.gsub(/\s/,'_').gsub(/^[^a-zA-Z]*/,'').gsub(/[^a-zA-Z0-9\s_]/,'')
+          end
+
+        end
+
+      end
+
     end
   end
 end

data/lib/metro/models/model.rb

@@ -100,7 +100,7 @@ module Metro
 
       options.each do |raw_key,value|
 
-        key = raw_key.dup
+        key = raw_key.to_s.dup
         key.gsub!(/-/,'_')
         key.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
         key.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
@@ -184,5 +184,5 @@ end
 
 require_relative 'generic'
 require_relative 'label'
-require_relative 'select'
+require_relative 'menu'
 require_relative 'image'

data/lib/metro/scene.rb

@@ -254,6 +254,16 @@ module Metro
       @updaters << updater
     end
 
+    #
+    # A simplier syntax to enqueue an animation. At the moment this animation is going
+    # to be an implicit animation.
+    #
+    def animate(options,&block)
+      animation = Metro::ImplicitAnimation.new options.merge(context: self)
+      animation.on_complete(&block) if block
+      enqueue animation
+    end
+
     #
     # The `base_update` method is called by the Game Window. This is to allow for any
     # special update needs to be handled before calling the traditional `update` method

data/lib/metro/scene_actor.rb

@@ -10,17 +10,22 @@ module Metro
 
     def create(contents = {})
       contents = {} unless contents
-      actor_instance = class_for_actor(contents['model']).new
-      actor_instance._load(contents)
-      actor_instance
+      actor_class = class_for_actor(model_name(contents))
+      instance = actor_class.new
+      instance._load options.merge(contents)
+      instance
     end
 
     def load_from_previous_scene?
       options[:from] == :previous_scene
     end
 
+    def model_name(contents = {})
+      contents['model'] || contents[:model] || options['model'] || options[:model] || name
+    end
+
     def class_for_actor(model_name)
-      Model.model(model_name || name)
+      Model.model(model_name)
     end
   end
 end

data/lib/metro/version.rb

@@ -1,3 +1,3 @@
 module Metro
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metro
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-21 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -52,8 +52,8 @@ files:
 - lib/metro/models/generic.rb
 - lib/metro/models/image.rb
 - lib/metro/models/label.rb
+- lib/metro/models/menu.rb
 - lib/metro/models/model.rb
-- lib/metro/models/select.rb
 - lib/metro/scene.rb
 - lib/metro/scene_actor.rb
 - lib/metro/scene_view/json_view.rb