metro 0.1.4 → 0.1.5

data/lib/metro/models/label.rb

@@ -3,10 +3,10 @@ module Metro
 
     #
     # Draws a string of text
-    # 
+    #
     # @example Using the Label in a view file
     #    model: "metro::models::label"
-    # 
+    #
     class Label < Model
 
       attr_accessor :x, :y, :x_factor, :y_factor, :z_order
@@ -20,19 +20,35 @@ module Metro
         @size = 20
         @font_family = Gosu::default_font_name
       end
-      
+
       def font
         @font ||= Gosu::Font.new(window, font_family, size)
       end
-      
+
       def x
         @x || (Game.width/2 - font.text_width(text)/2)
       end
-      
+
       def y
         @y || (Game.height/2 - font.height/2)
       end
-      
+
+      def bounds
+        Bounds.new x, y, x + width, y + height
+      end
+
+      def width
+        font.text_width(text) * x_factor
+      end
+
+      def height
+        font.height * y_factor
+      end
+
+      def contains?(x,y)
+        bounds.contains?(x,y)
+      end
+
       def text
         scene.instance_eval( "\"#{@text}\"" )
       end

data/lib/metro/models/menu.rb

@@ -56,6 +56,26 @@ module Metro
         @font ||= Gosu::Font.new(window, Gosu::default_font_name, 20)
       end
 
+      def contains?(x,y)
+        bounds.contains?(x,y)
+      end
+
+      def bounds
+        Metro::Models::Bounds.new x, y, x + width, y + height
+      end
+
+      def width
+        font.text_width(longest_option_text)# * x_factor
+      end
+
+      def longest_option_text
+        longest = options.map {|opt| opt }.inject("") {|longest,opt| opt.length > longest.length ? opt : longest }
+      end
+
+      def height
+        options.length * font.height + (options.length - 1) * padding
+      end
+
       attr_reader :highlight_color
 
       def highlight_color=(value)

data/lib/metro/models/model.rb

@@ -1,4 +1,5 @@
 require_relative 'key_value_coding'
+require_relative 'rectangle_bounds'
 
 module Metro
 
@@ -98,6 +99,21 @@ module Metro
       color.alpha = value.to_i
     end
 
+    def saveable?
+      true
+    end
+
+    # Belongs to positionable items only
+    def contains?(x,y)
+      false
+    end
+    
+    # Belongs to positionable items only
+    def offset(x,y)
+      self.x += x
+      self.y += y
+    end
+
     #
     # Create an instance of a model.
     #
@@ -121,7 +137,7 @@ module Metro
       options.each do |raw_key,value|
 
         key = raw_key.to_s.dup
-        key = key.gsub(/-/,'_').snake_case
+        key = key.gsub(/-/,'_').underscore
 
         unless respond_to? key
           self.class.send :define_method, key do
@@ -153,17 +169,38 @@ module Metro
     # to another model.
     #
     def _save
-      data_export = @_loaded_options.map {|option| [ option, send(option) ] }.flatten
+      data_export = _loaded_options.map {|option| [ option, send(option) ] }.flatten
       Hash[*data_export]
     end
 
+    #
+    # Generate a hash representation of the model. Currently this is ugly
+    #
+    def to_hash
+      export = _loaded_options.map {|option| [ option, send(option) ] }
+      export_with_name = export.reject {|item| item.first == "name" }
+
+      hash = export_with_name.inject({}) {|hash,elem| hash[elem.first] = elem.last ; hash }
+
+      # TODO:: color is a class that cannot be yamlized as it is and needs to be turned into a string.
+      # TODO: Hack to save the Gosu::Color class as a string value (this is
+      # what I hoped that the properties would solve)
+      hash.each do |subkey,subvalue|
+        if subvalue.is_a? Gosu::Color
+          hash[subkey] = subvalue.to_s
+        end
+      end
+
+      { name => hash }
+    end
+
     #
     # Captures all classes that subclass Model.
     #
     # @see #self.scenes
     #
     def self.inherited(base)
-      models << base
+      models << base.to_s
     end
 
     #
@@ -182,12 +219,15 @@ module Metro
     def self.model(name)
       @models_hash ||= begin
 
-        hash = Hash.new(Models::Generic)
+        hash = Hash.new("Metro::Models::Generic")
 
         models.each do |model|
-          common_name = model.to_s.snake_case
+          common_name = model.to_s.underscore
+          hash[model.to_s] = model
+          hash[model.downcase] = model
           hash[common_name] = model
         end
+
         hash
       end
 
@@ -201,4 +241,5 @@ require_relative 'generic'
 require_relative 'label'
 require_relative 'menu'
 require_relative 'image'
-require_relative 'rectangle'
+require_relative 'rectangle'
+require_relative 'grid_drawer'

data/lib/metro/models/model_factory.rb

@@ -8,7 +8,7 @@ module Metro
       @options = options
     end
 
-    def create(contents = {})
+    def create
       contents = {} unless contents
       actor_class = class_for_actor(model_name(contents))
       instance = actor_class.new
@@ -25,7 +25,7 @@ module Metro
     end
 
     def class_for_actor(model_name)
-      Model.model(model_name)
+      Model.model(model_name).constantize
     end
   end
 end

data/lib/metro/models/rectangle_bounds.rb

@@ -0,0 +1,28 @@
+module Metro
+  module Models
+
+    class RectangleBounds
+
+      attr_reader :min_x, :min_y, :max_x, :max_y
+
+      def initialize(min_x,min_y,max_x,max_y)
+        @min_x = min_x
+        @min_y = min_y
+        @max_x = max_x
+        @max_y = max_y
+      end
+
+      def contains?(x,y)
+        x > min_x and x < max_x and y > min_y and y < max_y
+      end
+
+      def to_s
+        "(#{min_x},#{min_y}) to (#{max_x},#{max_y})"
+      end
+
+    end
+
+    Bounds = RectangleBounds
+
+  end
+end

data/lib/metro/scene.rb

@@ -1,4 +1,4 @@
-require_relative 'scene_view/scene_view'
+require_relative 'views/scene_view'
 
 require_relative 'events/has_events'
 require_relative 'events/event_relay'
@@ -172,14 +172,16 @@ module Metro
     # @see #after_initialize
     #
     def initialize
+      add_actors_to_scene
+      after_initialize
+    end
+
+    def add_actors_to_scene
       self.class.actors.each do |scene_actor|
-        actor_data = { 'name' => scene_actor.name }.merge (view[scene_actor.name] || {})
-        actor_instance = scene_actor.create(actor_data)
+        actor_instance = scene_actor.create
         actor_instance.scene = self
         send "#{scene_actor.name}=", actor_instance
       end
-
-      after_initialize
     end
 
     #
@@ -259,12 +261,9 @@ module Metro
     # @example Retrieving the default scene name
     #
     #     class ExampleScene
-    #       def show
-    #         puts "Showing Scene: #{self.class.scene_name}"
-    #       end
     #     end
     #
-    #     ExampleScene.scene_name
+    #     ExampleScene.scene_name # => "example"
     #
     # @example Setting a custom name for the Scene
     #
@@ -272,6 +271,8 @@ module Metro
     #       scene_name "credits"
     #     end
     #
+    #     RollingCreditsScene.scene_name # => "credits"
+    #
     # @param [String] scene_name when specified it will set the scene name for the class
     #   to the value specified.
     #
@@ -280,12 +281,30 @@ module Metro
     #
     def self.scene_name(scene_name=nil)
       @scene_name ||= begin
-        to_s.gsub(/_?Scene$/i,'').snake_case
+        to_s.gsub(/_?Scene$/i,'').underscore
       end
 
       scene_name ? @scene_name = scene_name.to_s : @scene_name
     end
 
+
+    #
+    # Allows you to set or retrieve the scene name for the Scene.
+    #
+    # @example Retrieving the default scene name
+    #
+    #     class ExampleScene
+    #       def show
+    #         puts "Showing Scene: #{self.scene_name}" # => Showing Scene: example
+    #       end
+    #     end
+    #
+    # @return the string name of the Scene.
+    #
+    def scene_name
+      self.class.scene_name
+    end
+
     #
     # @return the string representation of a scene, this is used for debugging.
     #
@@ -299,7 +318,7 @@ module Metro
     # @see #self.scenes
     #
     def self.inherited(base)
-      scenes << base
+      scenes << base.to_s
     end
 
     #
@@ -356,6 +375,7 @@ module Metro
     def base_update
       updaters.each { |updater| updater.update }
       update
+      updaters.reject! { |updater| updater.completed? }
     end
 
     #
@@ -476,5 +496,20 @@ module Metro
       end
     end
 
+
+    #
+    # A Scene represented as a hash currently only contains the drawers
+    #
+    # @return a hash of all the drawers
+    #
+    def to_hash
+      drawn = drawers.find_all{|draw| draw.saveable? }.inject({}) do |hash,drawer|
+        drawer_hash = drawer.to_hash
+        hash.merge drawer_hash
+      end
+
+      drawn
+    end
+
   end
 end

data/lib/metro/scenes.rb

@@ -34,12 +34,12 @@ module Metro
     #
     def find(scene_name)
       found_scene = scenes_hash[scene_name]
-
-      unless found_scene
-        found_scene = create_missing_scene(scene_name)
+      
+      if found_scene
+        found_scene.constantize
+      else
+        create_missing_scene(scene_name)
       end
-
-      found_scene
     end
 
     def create_missing_scene(scene_name)
@@ -87,11 +87,12 @@ module Metro
     #   as well as the class name constants to allow for the scenes to be found.
     #
     def scenes_hash
-      @scenes_hash ||= Scene.scenes.inject({}) do |dict,scene|
+      @scenes_hash ||= Scene.scenes.inject({}) do |dict,scene_classname|
+        scene = scene_classname.constantize
         name = scene.scene_name
-        dict[name] = scene
-        dict[name.to_sym] = scene
-        dict[scene] = scene
+        dict[name] = scene_classname
+        dict[name.to_sym] = scene_classname
+        dict[scene] = scene_classname
         dict
       end
     end

data/lib/metro/transitions/edit_transition_scene.rb

@@ -0,0 +1,73 @@
+require_relative '../events/hit_list'
+
+module Metro
+
+  class EditTransitionScene < Metro::TransitionScene
+
+    def initialize
+      #
+      # The EditTransitionScene needs to have all the drawers
+      # cleared from the class because it may still have
+      # drawers from other things that this was executed.
+      #
+      # This is a product of using the classes to store the definitions
+      # of scene. This means we need to change this so that it is much
+      # easier to dup scenes.
+      #
+      self.class.drawings.clear
+      self.class.draw :overlay, model: "Metro::Models::GridDrawer"
+      add_actors_to_scene
+      after_initialize
+    end
+
+    def prepare_transition_from(old_scene)
+      next_scene.prepare_transition_from(old_scene)
+      @previous_scene = old_scene
+
+      # Set the view name to the previous scene's view name
+      self.class.view_name old_scene.view_name
+      self.class.view.format = old_scene.class.view.format
+
+      # import all the actors from the previous scene into the current scene.
+      old_scene.class.actors.each do |scene_actor|
+        self.class.draw scene_actor.name, scene_actor.options
+      end
+
+      add_actors_to_scene
+    end
+
+    def show
+      window.show_cursor
+    end
+
+    event :on_up, KbE do
+      transition_to next_scene.scene_name
+    end
+
+    #
+    # Generate a hitlist which manages the click start, hold, and release
+    # of the mouse button.
+    #
+    def hitlist
+      @hitlist ||= HitList.new(drawers)
+    end
+
+    event :on_down, MsLeft do |event|
+      hitlist.hit(event)
+    end
+
+    event :on_hold, MsLeft do |event|
+      hitlist.update(event)
+    end
+
+    event :on_up, MsLeft do |event|
+      hitlist.release(event)
+    end
+
+    event :on_up, KbS do
+      save_view
+    end
+
+  end
+
+end