metro 0.0.3 → 0.0.5

data/lib/metro/scene_actor.rb

@@ -0,0 +1,26 @@
+module Metro
+  class SceneActor
+
+    attr_reader :name, :options
+
+    def initialize(name,options)
+      @name = name.to_s.downcase
+      @options = options
+    end
+
+    def create(contents = {})
+      contents = {} unless contents
+      actor_instance = class_for_actor(contents['model']).new
+      actor_instance._load(contents)
+      actor_instance
+    end
+
+    def load_from_previous_scene?
+      options[:from] == :previous_scene
+    end
+
+    def class_for_actor(model_name)
+      Model.model(model_name || name)
+    end
+  end
+end

data/lib/metro/scene_view/scene_view.rb

@@ -2,9 +2,6 @@ require_relative 'yaml_view'
 require_relative 'json_view'
 require_relative 'no_view'
 
-require_relative 'drawers/drawer'
-require_relative 'drawers/composite_drawer'
-
 module Metro
 
   #
@@ -15,23 +12,17 @@ module Metro
 
     #
     # When the module is included insure that all the class helper methods are added
-    # at the same time. As well as re-defining the {Scene#base_draw} method to allow
-    # for the use of the view_drawer.
+    # at the same time.
     #
     def self.included(base)
       base.extend ClassMethods
-
-      base.send :define_method, :base_draw do
-        view_drawer.draw(view)
-        draw
-      end
     end
 
     #
     # Supported view formats
     #
     def _view_parsers
-      [ YAMLView, JSONView, NoView ]
+      self.class._view_parsers
     end
 
     #
@@ -41,21 +32,7 @@ module Metro
     # @return a Hash of view content.
     #
     def view
-      @view ||= begin
-        parser = _view_parsers.find { |parser| parser.exists? self.class.view_name }
-        parser.parse self.class.view_name
-      end
-    end
-
-    #
-    # @return an instance of a SceneView::Drawer that is capable of drawing
-    #   the Scene.
-    def view_drawer
-      @view_drawer ||= begin
-        drawer = SceneView::CompositeDrawer.new(self)
-        drawer.draw_debug = Game.debug?
-        drawer
-      end
+      self.class.view
     end
 
     module ClassMethods
@@ -69,7 +46,7 @@ module Metro
       #     class ClosingScene < Metro::Scene
       #       view_name 'alternative'
       #     end
-      # 
+      #
       #     ClosingScene.view_name # => views/alternative
       #
       def view_name(filename = nil)
@@ -80,6 +57,26 @@ module Metro
         end
       end
 
+      #
+      # Supported view formats
+      #
+      def _view_parsers
+        [ YAMLView, JSONView, NoView ]
+      end
+
+      #
+      # Loads and caches the view content based on the avilable view parsers and
+      # the view files defined.
+      #
+      # @return a Hash of view content.
+      #
+      def view
+        @view ||= begin
+          parser = _view_parsers.find { |parser| parser.exists? view_name }
+          parser.parse view_name
+        end
+      end
+
     end
 
   end

data/lib/metro/version.rb

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

data/lib/metro/window.rb

@@ -35,7 +35,7 @@ module Metro
     #
     def update
       scene.fire_events_for_held_buttons
-      scene.update
+      scene.base_update
     end
 
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metro
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -41,6 +41,7 @@ files:
 - README.md
 - Rakefile
 - bin/metro
+- lib/gosu_ext/color.rb
 - lib/metro.rb
 - lib/metro/animation/animation.rb
 - lib/metro/animation/easing.rb
@@ -48,14 +49,13 @@ files:
 - lib/metro/event_relay.rb
 - lib/metro/game.rb
 - lib/metro/game/dsl.rb
-- lib/metro/model.rb
+- lib/metro/models/generic.rb
+- lib/metro/models/image.rb
+- lib/metro/models/label.rb
+- lib/metro/models/model.rb
+- lib/metro/models/select.rb
 - lib/metro/scene.rb
-- lib/metro/scene_view/drawers/artists_block.rb
-- lib/metro/scene_view/drawers/composite_drawer.rb
-- lib/metro/scene_view/drawers/drawer.rb
-- lib/metro/scene_view/drawers/image.rb
-- lib/metro/scene_view/drawers/label.rb
-- lib/metro/scene_view/drawers/select.rb
+- lib/metro/scene_actor.rb
 - lib/metro/scene_view/json_view.rb
 - lib/metro/scene_view/no_view.rb
 - lib/metro/scene_view/scene_view.rb

data/lib/metro/model.rb

@@ -1,12 +0,0 @@
-module Metro
-  class Model
-
-    def initialize(window)
-      after_initialize
-    end
-
-    def after_initialize
-    end
-
-  end
-end

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

@@ -1,17 +0,0 @@
-module Metro
-  module SceneView
-
-    #
-    # This Drawer draws nothing. This is a nod to the age old struggle that
-    # as artists we struggle with the impetus and ability to convey a message
-    # but simply lack the message.
-    #
-    # It is the fallback drawer when no suitable drawer can be found.
-    #
-    class ArtistsBlock < Drawer
-      def self.draw(view)
-        # log.warn "The component #{view['type']} does not have a supported drawer."
-      end
-    end
-  end
-end

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

@@ -1,87 +0,0 @@
-require_relative 'artists_block'
-require_relative 'label'
-require_relative 'select'
-require_relative 'image'
-
-module Metro
-  module SceneView
-
-    #
-    # The CompositeDrawer is a special drawer that looks at all the created drawers
-    # that have been defined and then determines which one should be used when drawing
-    # for a particular view type.
-    #
-    # This Drawer is used in the SceneView to handle the multitude of view objects
-    # that are thrown at it.
-    #
-    # @see SceneView
-    #
-    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']
-
-          if not content.key?('debug') or (content['debug'] and draw_debug)
-            drawers[type].draw(content.merge 'name' => name)
-          end
-
-        end
-      end
-
-      #
-      # Given all the registered drawers map the things that they can draw
-      # to the particular drawer.
-      #
-      # @return a Hash which maps the types of things that can be drawn to
-      #   the specific drawer.
-      #
-      def drawers
-        @drawers ||= begin
-
-          # By default fall back to having artist's block when you do not know
-          # how to draw a particular view component.
-
-          hash = Hash.new(ArtistsBlock)
-
-          Drawer.drawers.each do |drawer|
-            drawer.draws_types.each do |type|
-
-              if not hash.key?(type) or (hash.key?(type) and override_on_conflict?(drawer,type))
-                hash[type] = drawer.new(scene)
-              end
-
-            end
-          end
-
-          hash
-        end
-      end
-
-      #
-      # @return true if the drawer should override the existing drawer, false if the drawer
-      #   should leave the existing drawer in it's place.
-      #
-      def override_on_conflict?(drawer,type)
-        if drawer.draw_options[:override]
-          true
-        else
-          log.warn override_warning_message(drawer,type)
-          false
-        end
-      end
-
-      def override_warning_message(drawer,type)
-        [ "Drawer Attempting to Override Existing Drawer For '#{type}'",
-          "#{drawer} will NOT be drawing '#{type}' as it is being handled by another Drawer.",
-          "To override this in the #{drawer.class} class specify the parameter \"draws '#{type}', overrides: true\"" ].join("\n")
-      end
-
-    end
-  end
-end

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

@@ -1,115 +0,0 @@
-module Metro
-  module SceneView
-
-    #
-    # A Drawer subclass does all the artistic work defined in the view granted by
-    # the {SceneView}. A Drawer at it's core defines a subclass which species
-    # the things that it can draw and then the draw method which it will draw
-    # those things.
-    #
-    # @example Creating a drawer to handle lines
-    #
-    #     class Line < Metro::SceneView::Drawer
-    #       draws :lines
-    #
-    #       def draw(view)
-    #         # Code would draw a line from:
-    #         #    view['x1'],view['y1'] to view['x2'],view['y2']
-    #         # with a thickness of view['thickness']
-    #       end
-    #     end
-    #
-    class Drawer
-
-      #
-      # Allows a Drawer to specify what 'type' components it is able to draw. The
-      # 'type' is defined within the view objects.
-      #
-      #     class LabelDrawer < Metro::SceneView::Drawer
-      #       draws 'labels', 'shiny-labels', 'pulsing-labels'
-      #     end
-      #
-      # @param [String,Array<String>] args a list of 'types' that this drawer is capable
-      #   of drawing.
-      #
-      def self.draws(*args)
-        @draws_types = args.flatten.compact.reject {|arg| arg.is_a? Hash }
-        @draws_options = args.flatten.compact.find {|arg| arg.is_a? Hash }
-      end
-
-      #
-      # This method is called right after initialization. Allowing for additional
-      # configuration.
-      #
-      # @note This method should be implemented in the Drawer subclass.
-      #
-      def after_initialize ; end
-
-      #
-      # This method is called on the Drawer so that it renders content.
-      #
-      # @note This method should be implemented in the Drawer subclass.
-      #
-      # @param [Hash] view the hash content of the view.
-      #
-      def draw(view) ; end
-
-      #
-      # @return the instance of window that is often necessary to create Gosu
-      #   components for rendering.
-      #
-      attr_reader :window
-
-      #
-      # @return the scene that is being drawn. This is required if the view content
-      #   requires live information from the scene or if the drawing is effected
-      #   by the state of the scene.
-      #
-      attr_reader :scene
-
-      #
-      # Captures all classes that subclass Drawer.
-      #
-      def self.inherited(base)
-        drawers << base
-      end
-
-      #
-      # All subclasses of Drawer, this should be all the defined scenes within the game.
-      #
-      # @return an Array of Drawer subclasses
-      #
-      def self.drawers
-        @drawers ||= []
-      end
-
-      #
-      # @return an array of all the types of components that this Drawer
-      #   is able to handle drawing.
-      #
-      def self.draws_types
-        Array(@draws_types)
-      end
-      
-      def self.draw_options
-        @draws_options || {}
-      end
-
-      #
-      # This initialize sets up the drawer. If a subclass Drawer needs to perform
-      # some customization, it is prefered to call {#after_initialize}.
-      #
-      # @see #after_initialize
-      #
-      # @param [Scene] scene the scene that this Drawer is going to be drawing. A
-      #   window is retrieved from the scene.
-      #
-      def initialize(scene)
-        @scene = scene
-        @window = scene.window
-        after_initialize
-      end
-
-    end
-  end
-end

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

@@ -1,31 +0,0 @@
-module Metro
-  module SceneView
-
-    class Image < Drawer
-      draws 'image'
-
-      attr_reader :images
-
-      def after_initialize
-        @images = {}
-
-        content_images = scene.view.find_all { |name,content| self.class.draws_types.include?(content['type']) }
-
-        content_images.each do |name,content|
-          @images[name] = create_image(content)
-        end
-      end
-
-      def create_image(content)
-        Gosu::Image.new(window,asset_path(content['path']))
-      end
-
-      def draw(view)
-        image = images[view['name']]
-        image.draw(view['x'] - image.width / 2.0,view['y'] - image.height / 2.0,1)
-      end
-
-    end
-
-  end
-end