metro 0.1.2 → 0.1.3

data/lib/metro/animation/scene_animation.rb

@@ -0,0 +1,16 @@
+require_relative 'on_update_operation'
+
+module Metro
+
+  module SceneAnimation
+    extend self
+
+    def build(options,&block)
+      animation = Metro::ImplicitAnimation.new options
+      animation.on_complete(&block) if block
+      animation
+    end
+
+  end
+
+end

data/lib/metro/events/control_definition.rb

@@ -0,0 +1,11 @@
+module Metro
+  class ControlDefinition
+    attr_accessor :name, :event, :args
+
+    def initialize(name,event,args)
+      @name = name
+      @event = event
+      @args = args
+    end
+  end
+end

data/lib/metro/events/controls.rb

@@ -0,0 +1,42 @@
+require_relative 'control_definition'
+
+module Metro
+  #
+  # Assists in creating and the storing of ControlDefinitions.
+  #
+  # @see DSL
+  #
+  class Controls
+
+    #
+    # Creation through controls is usually done with an instance_eval
+    # of a block and this allows for a flexible interface.
+    #
+    # @param [String,Symbol] name the name or the alias of the control
+    #   as it will be used within the course of the game.
+    #
+    def method_missing(name,*params,&block)
+      options = params.find {|param| param.is_a? Hash }
+      define_control(name,options)
+    end
+
+    def define_control(name,options)
+      event = _event_type(options)
+      args = _event_args(options)
+
+      defined_controls.push ControlDefinition.new name, event, args
+    end
+
+    def _event_type(options)
+      options[:is]
+    end
+
+    def _event_args(options)
+      options[:with]
+    end
+
+    def defined_controls
+      @defined_controls ||= []
+    end
+  end
+end

data/lib/metro/events/event_relay.rb

@@ -41,6 +41,37 @@ module Metro
   #
   class EventRelay
 
+    #
+    # Defines the provided controls for every EventRelay that is created.
+    #
+    # @see #define_control
+    #
+    # @param [Array<ControlDefinition>] controls the definitions of controls
+    #   that should be added to all EventRelays.
+    #
+    def self.define_controls(controls)
+      controls.each { |control| define_control control }
+    end
+
+    #
+    # Defines a control from a ControlDefinition for all EventRelays. A
+    # control is a way of defining a shortcut for a common event. This
+    # could be the use of a common set of keys for confirmation or canceling.
+    #
+    def self.define_control(control)
+      check_for_already_defined_control!(control)
+
+      define_method control.name do |&block|
+        send(control.event,*control.args,&block)
+      end
+    end
+
+    def self.check_for_already_defined_control!(control)
+      if instance_methods.include? control.name
+        error "error.reserved_control_name", name: control.name
+      end
+    end
+
     #
     # An event relay is created a with a target and optionally a window.
     #
@@ -69,7 +100,7 @@ module Metro
     # @example Registering for a button down event to call a method named 'previous_option'
     #
     #     class ExampleScene
-    #       event :on_down, Gosu::GpLeft, Gosu::GpUp, do: :previous_option
+    #       event :on_down, GpLeft, GpUp, do: :previous_option
     #
     #       def previous_option
     #         @selected_index = @selected_index - 1
@@ -84,7 +115,7 @@ module Metro
     # @example Registering for a button down event with a block of code to execute
     #
     #     class ExampleScene
-    #        event :on_down, Gosu::GpLeft, Gosu::GpUp do
+    #        event :on_down, GpLeft, GpUp do
     #         @selected_index = @selected_index - 1
     #         @selected_index = options.length - 1 if @selected_index <= -1
     #       end
@@ -97,6 +128,8 @@ module Metro
       _on(@down_actions,args,block)
     end
 
+    alias_method :button_down, :on_down
+
     #
     # Register for a button_up event. These events are fired when
     # the button is released (from being pressed down). This event only fires
@@ -105,7 +138,7 @@ module Metro
     # @example Registering for a button down event to call a method named 'next_option'
     #
     #     class ExampleScene
-    #        event :on_up, Gosu::KbEscape, do: :leave_scene
+    #        event :on_up, KbEscape, do: :leave_scene
     #
     #       def leave_scene
     #         transition_to :title
@@ -118,7 +151,7 @@ module Metro
     # @example Registering for a button up event with a block of code to execute
     #
     #     class ExampleScene
-    #       event :on_up, Gosu::KbEscape do
+    #       event :on_up, KbEscape do
     #        transition_to :title
     #       end
     #     end
@@ -130,6 +163,8 @@ module Metro
       _on(@up_actions,args,block)
     end
 
+    alias_method :button_up, :on_up
+
     #
     # Register for a button_held event. These events are fired when
     # the button is currently in the downstate. This event continues to fire at the
@@ -140,15 +175,15 @@ module Metro
     # @example Registering for button held events
     #
     #     class ExampleScene
-    #       event :on_hold Gosu::KbLeft, Gosu::GpLeft do
+    #       event :on_hold KbLeft, GpLeft do
     #         player.turn_left
     #       end
     #
-    #       event :on_hold, Gosu::KbRight, Gosu::GpRight do
+    #       event :on_hold, KbRight, GpRight do
     #         player.turn_right
     #       end
     #
-    #       event :on_hold, Gosu::KbUp, Gosu::GpButton0, do: :calculate_accleration
+    #       event :on_hold, KbUp, Gosu::GpButton0, do: :calculate_accleration
     #
     #       def calculate_acceleration
     #         long_complicated_calculated_result = 0
@@ -162,6 +197,9 @@ module Metro
       _on(@held_actions,args,block)
     end
 
+    alias_method :button_hold, :on_hold
+    alias_method :button_held, :on_hold
+
     #
     # Register for a custom notification event. These events are fired when
     # another object within the game posts a notification with matching criteria.
@@ -214,7 +252,7 @@ module Metro
     # This is called by external or parent source of events, usually a Scene, when a button up event
     # has been triggered.
     #
-    def button_up(id)
+    def fire_button_up(id)
       target.instance_eval( &up_action(id) )
     end
 
@@ -222,7 +260,7 @@ module Metro
     # This is called by external or parent source of events, usually a Scene, when a button down
     # event has been triggered.
     #
-    def button_down(id)
+    def fire_button_down(id)
       target.instance_eval( &down_action(id) )
     end
 
@@ -265,10 +303,10 @@ module Metro
     # An action without any parameters is assumed to be executed within the contexxt
     # of the target. If there are two parameters we will simply execute the action and
     # pass it both the target and the sender.
-    # 
+    #
     # @TODO: Allow for the blocks to be specified with one parameter: source (and executed
     #   within the context of the target)
-    # 
+    #
     # @TODO: Allow for the blocks to be specified with three parameters: source, target, event
     #
     def _fire_event_for_notification(event,sender,action)

data/lib/metro/events/has_events.rb

@@ -6,6 +6,7 @@ module Metro
 
     def self.included(base)
       base.extend ClassMethods
+      base.extend GosuConstants
     end
 
     module ClassMethods
@@ -24,15 +25,15 @@ module Metro
       # @example Registering for button held events
       #
       #     class ExampleScene
-      #       event :on_hold Gosu::KbLeft, Gosu::GpLeft do
+      #       event :on_hold KbLeft, Gosu::GpLeft do
       #         player.turn_left
       #       end
       #
-      #       event :on_hold, Gosu::KbRight, Gosu::GpRight do
+      #       event :on_hold, KbRight, Gosu::GpRight do
       #         player.turn_right
       #       end
       #
-      #       event :on_hold, Gosu::KbUp, Gosu::GpButton0, do: :calculate_accleration
+      #       event :on_hold, KbUp, Gosu::GpButton0, do: :calculate_accleration
       #
       #       def calculate_acceleration
       #         long_complicated_calculated_result = 0
@@ -44,7 +45,7 @@ module Metro
       # @example Registering for a button down event to call a method named 'next_option'
       #
       #     class ExampleScene
-      #        event :on_up, Gosu::KbEscape, do: :leave_scene
+      #        event :on_up, KbEscape, do: :leave_scene
       #
       #       def leave_scene
       #         transition_to :title
@@ -57,7 +58,7 @@ module Metro
       # @example Registering for a button up event with a block of code to execute
       #
       #     class ExampleScene
-      #       event :on_up, Gosu::KbEscape do
+      #       event :on_up, KbEscape do
       #        transition_to :title
       #       end
       #     end

data/lib/metro/game.rb

@@ -11,15 +11,15 @@ module Metro
     attr_reader :config
 
     def first_scene
-      config.first_scene
+      fetch(:first_scene)
     end
 
     def width
-      config.width || 640
+      fetch(:width,640)
     end
 
     def height
-      config.height || 480
+      fetch(:height,480)
     end
 
     def dimensions
@@ -31,31 +31,37 @@ module Metro
     end
 
     def fullscreen?
-      !!config.fullscreen
+      !!fetch(:fullscreen)
     end
 
     def debug?
-      !!config.debug
+      !!fetch(:debug)
     end
 
     def name
-      config.name
+      fetch(:name)
     end
 
     def authors
-      config.authors
+      fetch(:authors)
     end
 
     def website
-      config.website
+      fetch(:website,Metro::WEBSITE)
     end
 
     def contact
-      config.contact
+      fetch(:contact)
+    end
+
+    def controls
+      config.controls.defined_controls
+    end
+
+    def fetch(name,fallback = nil)
+      config.send(name) rescue fallback
     end
 
-    # TODO: ZOrder related constants that belong to Starry Knight
-    Background, Stars, Players, UI = *0..3
 
   end
 end

data/lib/metro/game/dsl.rb

@@ -1,3 +1,5 @@
+require_relative '../events/controls'
+
 module Metro
   module Game
     class DSL
@@ -55,6 +57,12 @@ module Metro
         game_contact ? @contact = game_contact : @contact
       end
 
+      def controls(&block)
+        @controls ||= Controls.new
+        @controls.instance_eval(&block) if block
+        @controls
+      end
+
     end
   end
 end

data/lib/metro/models/image.rb

@@ -9,7 +9,7 @@ module Metro
     # 
     class Image < Model
 
-      attr_accessor :angle, :center_x, :center_y, :x_factor, :y_factor, :z_order
+      attr_accessor :x, :y, :angle, :center_x, :center_y, :x_factor, :y_factor, :z_order
 
       def after_initialize
         @angle = 0
@@ -17,6 +17,8 @@ module Metro
         @x_factor = @y_factor = 1
         @z_order = 0
         @color = Gosu::Color.new "rgba(255,255,255,1.0)"
+        @x = Game.width / 2
+        @y = Game.height / 2
       end
 
       def image

data/lib/metro/models/key_value_coding.rb

@@ -0,0 +1,38 @@
+module Metro
+
+  #
+  # Key-Value coding emulates the functionality found in Objective-C, which allows
+  # for an object to be sent a message which contains the method to return. This is
+  # the same as Ruby. However, Objective-C also supports the use of the dot notation
+  # within the keys to acces the sub-values.
+  #
+  # @example Setting the red value of the color on a Model.
+  #
+  #     class Elf
+  #       include KeyValueCoding
+  #
+  #       attr_accessor :color
+  #     end
+  #
+  #     elf = Elf.new
+  #     elf.color = Gosu::Color.new "rgb(0,0,0)"
+  #
+  #     elf.get("color.red")      # => 0
+  #     elf.set("color.red",255)
+  #     elf.get("color.red")      # => 255
+  #
+  module KeyValueCoding
+
+    def set(name,value)
+      keys = name.to_s.split('.')
+      key_to_set = keys[0..-2].inject(self) {|target,method| target.send(method) }
+      key_to_set.send("#{keys.last}=",value)
+    end
+
+    def get(name)
+      keys = name.to_s.split('.')
+      keys.inject(self) {|target,method| target.send(method) }
+    end
+  end
+
+end

data/lib/metro/models/label.rb

@@ -10,20 +10,35 @@ module Metro
     class Label < Model
 
       attr_accessor :x, :y, :x_factor, :y_factor, :z_order
+      attr_accessor :size, :size, :font_family
 
       def after_initialize
         @text = ""
         @x_factor = @y_factor = 1.0
         @z_order = 0
         @color = Gosu::Color.new "rgba(255,255,255,1.0)"
+        @size = 20
+        @font_family = Gosu::default_font_name
       end
-
+      
       def font
-        @font ||= Gosu::Font.new(window, Gosu::default_font_name, 20)
+        @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 text
+        scene.instance_eval( "\"#{@text}\"" )
       end
 
       def draw
-        label_text = scene.instance_eval( "\"#{text}\"" )
+        label_text = text
         font.draw label_text, x, y, z_order, x_factor, y_factor, color
       end