metro 0.0.2 → 0.0.3

data/lib/metro/animation/animation.rb

@@ -0,0 +1,65 @@
+class Animation
+
+  attr_reader :current_step
+
+  def initialize(options)
+    @current_step = 0
+
+    options.each do |key,value|
+      send :instance_variable_set, "@#{key}".to_sym, value
+      self.class.send :define_method, key do
+        instance_variable_get("@#{key}")
+      end
+    end
+    after_initialize
+  end
+
+  def completed?
+    current_step >= interval
+  end
+
+  def step!
+    return if completed?
+
+    execute_step
+    next_step
+
+    complete! if completed?
+  end
+
+  def next_step
+    @current_step = current_step + step_interval
+  end
+
+  def step_interval
+    1
+  end
+
+  def execute_block_in_context(block_name)
+    if respond_to? block_name
+      block_to_execute = send(block_name)
+      context.instance_eval(&block_to_execute)
+    else
+      instance_variable_get("@#{block_name}").call
+    end
+  end
+
+  def execute_step
+    execute_block_in_context(:step_block)
+  end
+
+  def complete!
+    execute_block_in_context(:completed)
+  end
+
+  def step(&block)
+    @step_block = block if block
+  end
+
+  def completed(&block)
+    @completed = block if block
+  end
+
+end
+
+require_relative 'implicit_animation'

data/lib/metro/animation/easing.rb

@@ -0,0 +1,28 @@
+module Easing
+  module Linear
+    extend self
+
+    def linear(moment,start,change,interval)
+      change * moment / interval + start
+    end
+
+    def calculate(start,final,interval)
+      change = final - start
+      (1..interval).map { |time| linear(time,start,change,interval) }
+    end
+  end
+
+  module EaseIn
+    extend self
+
+    def ease_in_quad(moment,start,change,interval)
+      change * (moment = moment / interval) * moment + start
+    end
+
+    def calculate(start,final,interval)
+      change = final - start
+      (1..interval).map { |time| ease_in_quad(time,start,change,interval) }
+    end
+  end
+end
+

data/lib/metro/animation/implicit_animation.rb

@@ -0,0 +1,43 @@
+require_relative 'easing'
+
+class ImplicitAnimation < Animation
+
+  attr_reader :attributes
+  attr_reader :deltas
+
+  def delta_for_step(attribute)
+    deltas[attribute].at(current_step)
+  end
+
+  def stepping(stepping)
+    @steppings ||= begin
+      hash = Hash.new(Easing::Linear)
+      hash.merge! linear: Easing::Linear,
+        ease_in: Easing::EaseIn
+    end
+    @steppings[stepping]
+  end
+
+  def easing
+    @easing || :linear
+  end
+
+  def after_initialize
+    @deltas = {}
+
+    @attributes = to.map { |attribute,final| attribute }
+
+    to.each do |attribute,final|
+      start = actor.send(attribute)
+      deltas[attribute] = stepping(easing).calculate(start,final,interval)
+    end
+
+    step do
+      attributes.each do |attribute|
+        actor.send "#{attribute}=", delta_for_step(attribute)
+      end
+    end
+
+  end
+
+end

data/lib/metro/game.rb

@@ -33,6 +33,10 @@ module Metro
     def fullscreen?
       !!config.fullscreen
     end
+    
+    def debug?
+      !!config.debug
+    end
 
     # TODO: ZOrder related constants that belong to Starry Knight
     Background, Stars, Players, UI = *0..3

data/lib/metro/game/dsl.rb

@@ -27,6 +27,10 @@ module Metro
       def fullscreen(set_fullscreen = nil)
         set_fullscreen.nil? ? @fullscreen : @fullscreen = set_fullscreen
       end
+      
+      def debug(set_debug = nil)
+        set_debug.nil? ? @debug : @debug = set_debug
+      end
 
     end
   end

data/lib/metro/scene.rb

@@ -1,5 +1,6 @@
 require_relative 'scene_view/scene_view'
 require_relative 'event_relay'
+require_relative 'animation/animation'
 
 module Metro
 
@@ -64,7 +65,19 @@ module Metro
     # @param [Scene] new_scene this is the instance of the scene that is about to replace
     #   the current scene.
     #
-    def prepare_transition(new_scene) ; end
+    def prepare_transition_to(new_scene) ; end
+
+    #
+    # Before a scene is transisitioned to it is called with the previous scene. This
+    # allows for the new scene to rerieve any data from the previous scene to assist
+    # with the layout of the current scene.
+    #
+    # @note This method should be implemented in the Scene subclass.
+    #
+    # @param [Scene] old_scene this is the instance of the scene that is being moved
+    #   away from.
+    #
+    def prepare_transition_from(old_scene) ; end
 
     #
     # The window is the main instance of the game. Using window can access a lot of
@@ -120,7 +133,14 @@ module Metro
     #   or for generating the appropriate view information.
     #
     def self.scene_name(scene_name=nil)
-      @scene_name ||= to_s[/^(.+)Scene$/,1].downcase
+      @scene_name ||= begin
+        root_name = to_s[/^(.+)Scene$/,1]
+        root_name.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
+        root_name.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+        root_name.downcase!
+        root_name
+      end
+
       scene_name ? @scene_name = scene_name.to_s : @scene_name
     end
 
@@ -187,7 +207,8 @@ module Metro
     #
     def _prepare_transition(new_scene)
       log.debug "Preparing to transition from scene #{self} to #{new_scene}"
-      prepare_transition(new_scene)
+      prepare_transition_to(new_scene)
+      new_scene.prepare_transition_from(self)
     end
 
     #

data/lib/metro/scene_view/drawers/composite_drawer.rb

@@ -18,13 +18,19 @@ module Metro
     #
     class CompositeDrawer < Drawer
 
+      attr_accessor :draw_debug
+
       #
       # Render all the view elements defined that are supported by this drawer.
       #
       def draw(view)
         view.each do |name,content|
           type = content['type']
-          drawers[type].draw(content.merge 'name' => name)
+
+          if not content.key?('debug') or (content['debug'] and draw_debug)
+            drawers[type].draw(content.merge 'name' => name)
+          end
+
         end
       end
 

data/lib/metro/scene_view/drawers/image.rb

@@ -21,7 +21,8 @@ module Metro
       end
 
       def draw(view)
-        images[view['name']].draw(view['x'],view['y'],1)
+        image = images[view['name']]
+        image.draw(view['x'] - image.width / 2.0,view['y'] - image.height / 2.0,1)
       end
 
     end

data/lib/metro/scene_view/scene_view.rb

@@ -51,7 +51,11 @@ module Metro
     # @return an instance of a SceneView::Drawer that is capable of drawing
     #   the Scene.
     def view_drawer
-      @view_drawer ||= SceneView::CompositeDrawer.new(self)
+      @view_drawer ||= begin
+        drawer = SceneView::CompositeDrawer.new(self)
+        drawer.draw_debug = Game.debug?
+        drawer
+      end
     end
 
     module ClassMethods

data/lib/metro/scenes.rb

@@ -31,7 +31,15 @@ module Metro
     # @return the Scene class that is found matching the specified scene name.
     #
     def find(scene_name)
-      scenes_hash[scene_name]
+      found_scene = scenes_hash[scene_name]
+      log.error missing_scene_error_message(scene_name) unless found_scene
+      found_scene
+    end
+
+    def missing_scene_error_message(scene_name)
+      scene_names = Scene.scenes.map(&:scene_name).join(", ")
+      [ "Could not find scene with name '#{scene_name}'",
+        "Known scenes: #{scene_name}" ].join("\n")
     end
 
     #

data/lib/metro/version.rb

@@ -1,3 +1,3 @@
 module Metro
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metro
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -42,6 +42,9 @@ files:
 - Rakefile
 - bin/metro
 - lib/metro.rb
+- lib/metro/animation/animation.rb
+- lib/metro/animation/easing.rb
+- lib/metro/animation/implicit_animation.rb
 - lib/metro/event_relay.rb
 - lib/metro/game.rb
 - lib/metro/game/dsl.rb