metro 0.2.0 → 0.2.1

data/changelog.md

@@ -1,5 +1,13 @@
 # Metro
 
+## 0.2.1 / 2012-11-08
+
+* FIX Scene fade transition color changing and implicit animations 
+  for colors
+* Games creating custom properties will appear in the property list
+* Properties now correctly default to numeric properties
+* Point objects can be added to other point objects. 
+
 ## 0.2.0 / 2012-11-07
 
 * Views now use position instead of `x`, `y`, and `z-order`

data/lib/metro.rb

@@ -128,7 +128,7 @@ module Metro
   def load_path(path,options = {})
     files = Dir["#{path}/**/*.rb"]
     files.sort! {|file| File.basename(file) == options[:prioritize] ? -1 : 1 }
-    files.each {|model| require_or_load model }
+    files.each {|file| require_or_load file }
   end
 
   def load_game_configuration(filename)

data/lib/metro/animation/implicit_animation.rb

@@ -55,11 +55,14 @@ module Metro
 
         if attribute == :color
           final = Gosu::Color.new final
+          
+          # @TODO: This is not going to work when the color uses a non-standard
+          # name for the color property.
 
-          animations.push build_animation_step(:"color.red",start.red,final.red)
-          animations.push build_animation_step(:"color.green",start.green,final.green)
-          animations.push build_animation_step(:"color.blue",start.blue,final.blue)
-          animations.push build_animation_step(:"color.alpha",start.alpha,final.alpha)
+          animations.push build_animation_step(:red,start.red,final.red)
+          animations.push build_animation_step(:green,start.green,final.green)
+          animations.push build_animation_step(:blue,start.blue,final.blue)
+          animations.push build_animation_step(:alpha,start.alpha,final.alpha)
         else
           animations.push build_animation_step(attribute,start,final)
         end
@@ -89,11 +92,11 @@ module Metro
     #
     def stepping(stepping)
       @steppings ||= begin
-        hash = Hash.new(Easing::Linear)
-        hash.merge! linear: Easing::Linear,
-          ease_in: Easing::EaseIn
+        hash = HashWithIndifferentAccess.new("Metro::Easing::Linear")
+        hash.merge! linear: "Metro::Easing::Linear",
+          ease_in: "Metro::Easing::EaseIn"
       end
-      @steppings[stepping]
+      @steppings[stepping].constantize
     end
 
     #

data/lib/metro/events/event_dictionary.rb

@@ -9,7 +9,7 @@ module Metro
     # All defined events within this dictionary.
     #
     def events
-      @events ||= Hash.new
+      @events ||= HashWithIndifferentAccess.new
     end
 
     #

data/lib/metro/events/event_relay.rb

@@ -89,7 +89,7 @@ module Metro
       @up_actions ||= {}
       @down_actions ||= {}
       @held_actions ||= {}
-      @custom_notifications ||= Hash.new([])
+      @custom_notifications ||= HashWithIndifferentAccess.new([])
     end
 
     attr_reader :target, :window

data/lib/metro/models/model.rb

@@ -275,13 +275,12 @@ module Metro
     def self.model(name)
       @models_hash ||= begin
 
-        hash = Hash.new("Metro::Models::Generic")
+        hash = HashWithIndifferentAccess.new("Metro::Models::Generic")
 
         models.each do |model|
-          common_name = model.to_s.underscore
           hash[model.to_s] = model
           hash[model.downcase] = model
-          hash[common_name] = model
+          hash[model.to_s.underscore] = model
         end
 
         hash

data/lib/metro/models/properties/{color.rb → color_property.rb}

@@ -56,6 +56,9 @@ module Metro
     class ColorProperty < Property
 
       define_property :alpha
+      define_property :red
+      define_property :green
+      define_property :blue
 
       # By default convert the value to the default color if it
       # cannot be processed by the other get filters.

data/lib/metro/models/properties/{font.rb → font_property.rb}

@@ -1,5 +1,3 @@
-require_relative 'text'
-
 module Metro
   class Model
 

data/lib/metro/models/properties/property.rb

@@ -3,7 +3,7 @@ module Metro
 
     class Property
       include Units
-      
+
       attr_reader :model, :options
 
       def initialize(model,options={})
@@ -13,7 +13,7 @@ module Metro
 
       def self.gets
         @gets ||= begin
-          hash = Hash.new { |hash,key| hash["NilClass"] }
+          hash = HashWithIndifferentAccess.new { |hash,key| hash["NilClass"] }
           hash["NilClass"] = lambda { |value| raise "#{self} is not able to translate the #{value} (#{value.class})" }
           hash
         end
@@ -30,7 +30,7 @@ module Metro
 
       def self.sets
         @sets ||= begin
-          hash = Hash.new { |hash,key| hash["NilClass"] }
+          hash = HashWithIndifferentAccess.new { |hash,key| hash["NilClass"] }
           hash["NilClass"] = lambda { |value| raise "#{self} is not able to translate the #{value} (#{value.class})" }
           hash
         end
@@ -59,7 +59,8 @@ module Metro
       end
 
       def self.inherited(subclass)
-        properties << subclass
+        property_name = subclass.to_s.gsub(/Property$/,'').split("::").last.underscore
+        properties_hash[property_name] = subclass.to_s
       end
 
       def self.properties
@@ -67,21 +68,12 @@ module Metro
       end
 
       def self.property(name)
-        properties_hash[name]
+        property_classname = properties_hash[name]
+        property_classname.constantize
       end
 
       def self.properties_hash
-        @properties_hash ||= begin
-          hash = ActiveSupport::HashWithIndifferentAccess.new(NumericProperty)
-          # TODO: do not store classes within the structure - this will misbehave on reloading
-          properties.each do |prop|
-            prop_name = prop.to_s.gsub(/Property$/,'').split("::").last.underscore
-            hash[prop_name] = prop
-            hash[prop_name.to_sym] = prop
-          end
-          # puts hash
-          hash
-        end
+        @properties_hash ||= ActiveSupport::HashWithIndifferentAccess.new { |hash,key| hash[:numeric] }
       end
 
     end
@@ -100,14 +92,13 @@ module Metro
 
 end
 
-require_relative 'angle'
-require_relative 'animation'
-require_relative 'color'
-require_relative 'dimensions'
-require_relative 'font'
-require_relative 'image'
-require_relative 'numeric'
-require_relative 'position'
-require_relative 'scale'
-require_relative 'text'
-require_relative 'velocity'
+require_relative 'numeric_property'
+require_relative 'text_property'
+
+require_relative 'animation_property'
+require_relative 'color_property'
+require_relative 'dimensions_property'
+require_relative 'font_property'
+require_relative 'image_property'
+require_relative 'position_property'
+require_relative 'scale_property'

data/lib/metro/transitions/scene_transitions.rb

@@ -26,7 +26,7 @@ module Metro
 
     def supported_transitions
       @supported_transitions ||= begin
-        hash = Hash.new("Metro::FadeTransitionScene")
+        hash = HashWithIndifferentAccess.new("Metro::FadeTransitionScene")
         hash[:edit] = "Metro::EditTransitionScene"
         hash
       end

data/lib/metro/units/point.rb

@@ -20,6 +20,11 @@ module Metro
         "#{x},#{y},#{z}"
       end
 
+      def +(value)
+        raise "Unabled to add point to #{value} #{value.class}" if [ :x, :y, :z ].find { |method| ! value.respond_to?(method) }
+        self.class.new((x + value.x),(y + value.y),(z + value.z))
+      end
+
     end
   end
 end

data/lib/metro/version.rb

@@ -1,5 +1,5 @@
 module Metro
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
   WEBSITE = "https://github.com/burtlo/metro"
   CONTACT_EMAILS = ["franklin.webber@gmail.com"]
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metro
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -156,18 +156,16 @@ files:
 - lib/metro/models/models/label.rb
 - lib/metro/models/models/menu.rb
 - lib/metro/models/models/rectangle.rb
-- lib/metro/models/properties/angle.rb
-- lib/metro/models/properties/animation.rb
-- lib/metro/models/properties/color.rb
-- lib/metro/models/properties/dimensions.rb
-- lib/metro/models/properties/font.rb
-- lib/metro/models/properties/image.rb
-- lib/metro/models/properties/numeric.rb
-- lib/metro/models/properties/position.rb
+- lib/metro/models/properties/animation_property.rb
+- lib/metro/models/properties/color_property.rb
+- lib/metro/models/properties/dimensions_property.rb
+- lib/metro/models/properties/font_property.rb
+- lib/metro/models/properties/image_property.rb
+- lib/metro/models/properties/numeric_property.rb
+- lib/metro/models/properties/position_property.rb
 - lib/metro/models/properties/property.rb
-- lib/metro/models/properties/scale.rb
-- lib/metro/models/properties/text.rb
-- lib/metro/models/properties/velocity.rb
+- lib/metro/models/properties/scale_property.rb
+- lib/metro/models/properties/text_property.rb
 - lib/metro/models/rectangle_bounds.rb
 - lib/metro/scene.rb
 - lib/metro/scenes.rb
@@ -225,13 +223,11 @@ licenses: []
 post_install_message: ! "    ______  ___      _____\n    ___   |/  /_____ __  /_______________\n
   \   __  /|_/ / _  _ \\_  __/__  ___/_  __ \\\n    _  /  / /  /  __// /_  _  /    /
   /_/ /\n    /_/  /_/   \\___/  \\__/ /_/     \\____/\n\n  Thank you for installing
-  metro 0.2.0 / 2012-11-07.\n  ---------------------------------------------------------------------\n
-  \ Changes:\n    \n  * Views now use position instead of `x`, `y`, and `z-order`\n
-  \ * Point, Scale, and Dimensions is available in model and scenes.\n  * Events are
-  shared from superclasses to subclases.\n  * Templates updated to use GameScene and
-  GameModel for each game.\n  * Models are automatically added to the update loop\n
-  \ * Model properties now make it easier to store/retrieve various\n    common numeric,
-  position font, image, and animation properties.\n  \n  \n\n  ---------------------------------------------------------------------\n"
+  metro 0.2.1 / 2012-11-08.\n  ---------------------------------------------------------------------\n
+  \ Changes:\n    \n  * FIX Scene fade transition color changing and implicit animations
+  \n    for colors\n  * Games creating custom properties will appear in the property
+  list\n  * Properties now correctly default to numeric properties\n  * Point objects
+  can be added to other point objects. \n  \n\n  ---------------------------------------------------------------------\n"
 rdoc_options: []
 require_paths:
 - lib

data/lib/metro/models/properties/angle.rb

@@ -1,43 +0,0 @@
-module Metro
-  class Model
-
-    class AngleProperty < Property
-
-      def get(value)
-        value ? value : Angle.new(0.0, options[:step])
-      end
-
-      def set(value)
-        Angle.new(value.to_f, options[:step])
-      end
-
-      class Angle
-
-        attr_reader :value
-
-        def initialize(value = 0.0,step = 1.0)
-          @value = value.to_f
-          @step = step || 1.0
-        end
-
-        def turn(direction)
-          send(direction) if [ :left, :right ].include?(direction)
-        end
-
-        def left
-          @value -= @step
-        end
-
-        def right
-          @value += @step
-        end
-
-        def to_f
-          @value.to_f
-        end
-
-      end
-
-    end
-  end
-end

data/lib/metro/models/properties/velocity.rb

@@ -1,80 +0,0 @@
-module Metro
-  class Model
-
-    class VectorProperty < Property
-      
-      def get(value)
-        value ? value : Vector.new
-      end
-      
-      def set(value)
-        Vector.new value
-      end
-      
-      class Vector
-        
-        def initialize(angle,velocity)
-          @angle = angle
-          @velocity = velocity
-        end
-        
-        def decay!
-          @velocity.decay!
-        end
-        
-        def accelerate(amount,angle)
-          
-        end
-        
-        def apply_x(x_position)
-          
-        end
-        
-        def apply_y(y_position)
-          
-        end
-        
-        
-      end
-      
-    end
-
-    class VelocityProperty < Property
-
-      def get(value)
-        value ? value : Velocity.new(0.0,0.95)
-      end
-
-      def set(value)
-        Velocity.new value
-      end
-
-      class Velocity
-
-        def initialize(value,decay = default_decay)
-          @value = value.to_f
-          @decay = decay || default_decay
-        end
-
-        def default_decay
-          0.95
-        end
-
-        def decay
-          @value *= @decay
-        end
-
-        def accelerate(amount)
-          @value += amount
-        end
-
-        def to_f
-          @value
-        end
-
-      end
-
-    end
-
-  end
-end