metro 0.3.4 → 0.3.5

data/lib/metro/scene.rb

@@ -375,7 +375,7 @@ module Metro
     def base_update
       updaters.each { |updater| updater.update }
       update
-      updaters.reject! { |updater| updater.completed? }
+      updaters.reject! { |updater| updater.update_completed? }
     end
 
     #
@@ -394,6 +394,7 @@ module Metro
     def base_draw
       drawers.each { |drawer| drawer.draw }
       draw
+      drawers.reject! { |drawer| drawer.draw_completed? }
     end
 
     # This provides the functionality for view handling.

data/lib/metro/units/rectangle_bounds.rb

@@ -23,24 +23,90 @@ module Metro
         @bottom = params[:bottom].to_f
       end
 
+      #
+      # Move the bounds by the amount specified in the point.
+      #
+      def shift(point)
+        self.left = self.left + point.x
+        self.right = self.right + point.x
+        self.top = self.top + point.y
+        self.bottom = self.bottom + point.y
+      end
+
+      #
+      # Create a new RectangleBounds that is larger than the
+      # current bounds, given the specifed hash of parameters
+      # that contain the amount to expand in the four directions
+      # left, right, top, bottom.
+      #
+      def enlarge(params = {})
+        self.class.new(left: left - params[:left].to_i,
+            right: right + params[:right].to_i,
+            top: top - params[:top].to_i,
+            bottom: bottom + params[:bottom].to_i)
+      end
+
+      def shrink(params = {})
+        self.class.new(left: left + params[:left].to_i,
+            right: right - params[:right].to_i,
+            top: top + params[:top].to_i,
+            bottom: bottom - params[:bottom].to_i)
+      end
+
+      def clamp(point)
+        return point if contains?(point)
+
+        new_point = Point.new(point.x,point.y)
+
+        if point.x < left
+          new_point.x = left
+        end
+
+        if point.x > right
+          new_point.x = right
+        end
+
+        if point.y < top
+          new_point.y = top
+        end
+
+        if point.y > bottom
+          new_point.y = bottom
+        end
+
+        new_point
+      end
+
       def top_left
-        Point.at(left,top)
+        point_at left, top
       end
 
       def top_right
-        Point.at(right,top)
+        point_at right, top
       end
 
       def bottom_right
-        Point.at(right,bottom)
+        point_at right, bottom
       end
 
       def bottom_left
-        Point.at(left,bottom)
+        point_at left, bottom
+      end
+
+      def width
+        (right - left)
+      end
+
+      def height
+        (bottom - top)
+      end
+
+      def center
+        top_left + point_at(width/2,height/2)
       end
 
       def dimensions
-        Dimensions.of (right - left), (bottom - top)
+        Dimensions.of width, height
       end
 
       def ==(value)
@@ -68,6 +134,10 @@ module Metro
 
       private
 
+      def point_at(x,y)
+        Point.at(x,y)
+      end
+
       def calculation_requirements
         [ :left, :right, :top, :bottom ]
       end

data/lib/metro/version.rb

@@ -1,8 +1,8 @@
 module Metro
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
   WEBSITE = "https://github.com/burtlo/metro"
-  CONTACT_EMAILS = ["dev@rubymetro.com"]
-  
+  CONTACT_EMAILS = ["franklin.webber@gmail.com"]
+
   def self.changes_for_version(version)
 
     change = Struct::Changes.new(nil,[])
@@ -28,5 +28,5 @@ module Metro
 
     change
   end
-  
+
 end

data/lib/metro/window.rb

@@ -36,6 +36,7 @@ module Metro
     # This is called every update interval while the window is being shown.
     #
     def update
+      state.fire_events_for_mouse_movement
       state.fire_events_for_held_buttons
       scene.base_update
     end

data/lib/tmx_ext/object.rb

@@ -0,0 +1,61 @@
+module Tmx
+
+  class Object
+
+    # TODO: the mass and moment of interia should configurable through properties
+    def body
+      @body ||= CP::Body.new default_mass, default_moment_of_inertia
+    end
+
+    def shape
+      @poly_shape ||= begin
+        new_shape = CP::Shape::Poly.new(body,poly_vec2s,default_shape_attach_point)
+        new_shape.collision_type = type.to_sym
+        new_shape.e = default_elasticity
+        new_shape.sensor = default_sensor
+        new_shape
+      end
+    end
+
+    private
+
+    #
+    # A TMX object currently has an array of points in a format
+    # list of strings. This will convert the points into
+    # list of CP::Vec2 objects which can be used to create the
+    # proper CP::Shape::Poly for the Object.
+    #
+    # @note this assumes that we want to convert the points into
+    #   a format of vec2s specifically for a CP::Shape::Poly
+    #   shape.
+    #
+    def poly_vec2s
+      points.map do |point|
+        x,y = point.split(",").map {|p| p.to_i }
+        CP::Vec2.new(x,y)
+      end.reverse
+    end
+
+    def default_sensor
+      false
+    end
+
+    def default_mass
+      Float::INFINITY
+    end
+
+    def default_moment_of_inertia
+      Float::INFINITY
+    end
+
+    def default_elasticity
+      0.0
+    end
+
+    def default_shape_attach_point
+      CP::Vec2::ZERO
+    end
+
+  end
+
+end

data/lib/tmx_ext/object_shape.rb

@@ -0,0 +1,93 @@
+module Tmx
+  module ObjectShape
+    extend self
+
+    module ShapeDefaults
+      def default_sensor
+        false
+      end
+
+      def default_elasticity
+        0.0
+      end
+
+      def default_shape_attach_point
+        CP::Vec2::ZERO
+      end
+    end
+
+    class PolyShape
+      include ShapeDefaults
+
+      def match?(object)
+        object.contents['shape'] == 'polygon'
+      end
+
+      def shape(object)
+        new_shape = CP::Shape::Poly.new(object.body,poly_vec2s(object),default_shape_attach_point)
+        new_shape.collision_type = object.type.to_sym
+        new_shape.e = default_elasticity
+        new_shape.sensor = default_sensor
+        new_shape
+      end
+
+      #
+      # A TMX object currently has an array of points in a format
+      # list of strings. This will convert the points into
+      # list of CP::Vec2 objects which can be used to create the
+      # proper CP::Shape::Poly for the Object.
+      #
+      # @note this assumes that we want to convert the points into
+      #   a format of vec2s specifically for a CP::Shape::Poly
+      #   shape.
+      #
+      def poly_vec2s(object)
+        object.points.map do |point|
+          x,y = point.split(",").map {|p| p.to_i }
+          CP::Vec2.new(x,y)
+        end.reverse
+      end
+
+    end
+
+    class CircularShape
+      include ShapeDefaults
+
+      def match?(object)
+        object.contents['shape'] == 'ellipse'
+        # raise "Only circular shapes are allowed to be specified" if (object.width / 2) != (object.height / 2)
+      end
+
+      def shape(object)
+        radius = object.width / 2
+        offset = CP::Vec2.new(0,0)
+        new_shape = CP::Shape::Circle.new(object.body, radius, offset)
+        new_shape.collision_type = object.type.to_sym
+        new_shape.e = default_elasticity
+        new_shape.sensor = default_sensor
+        new_shape
+      end
+
+    end
+
+    class UnknownShape
+      def match?(object)
+        true
+      end
+
+      def shape(object)
+        raise "Invalid Shape defined in Object: #{object}"
+      end
+    end
+
+    def shapes
+      [ PolyShape.new, CircularShape.new, UnknownShape.new ]
+    end
+
+    def create_from_tmx_object(object)
+      shapes.find { |shape| shape.match?(object) }.shape(object)
+    end
+
+  end
+end
+

data/lib/tmx_ext/tile_set.rb

@@ -0,0 +1,41 @@
+module Tmx
+
+  #
+  # Define additional functionaly or override existing functionaliy on
+  # the Tmx class to make it compatible with Metro.
+  #
+  class TileSet
+    attr_accessor :window
+
+    def images
+      @images ||= raw_image_tiles.map {|image| crop_image(image) }
+    end
+
+    private
+
+    def raw_image_tiles
+      Gosu::Image.load_tiles(window, image_path, full_image_width, full_image_height, false)
+    end
+
+    def crop_image(image)
+      Metro::Image.crop window, image, crop_bounds
+    end
+
+    def full_image_width
+      tilewidth + spacing
+    end
+
+    def full_image_height
+      tileheight + spacing
+    end
+
+    def crop_bounds
+      @crop_bounds ||= Metro::Units::RectangleBounds.new left: margin, top: margin,
+                        right: full_image_width, bottom: full_image_height
+    end
+
+    def image_path
+      Metro::AssetPath.with(image).filepath
+    end
+  end
+end

data/metro.gemspec

@@ -25,9 +25,11 @@ Gem::Specification.new do |gem|
   gem.homepage      = Metro::WEBSITE
 
   gem.add_dependency 'gosu', '~> 0.7'
+  gem.add_dependency 'texplay', '~> 0.4'
+  gem.add_dependency 'tmx', '~> 0.1.2'
   gem.add_dependency 'thor', '~> 0.16.0'
   gem.add_dependency 'i18n', '~> 0.6.1'
-  gem.add_dependency 'active_support', '~> 3.0.0'
+  gem.add_dependency 'activesupport', '~> 3.0.0'
   gem.add_dependency 'listen', '~> 0.6.0'
   gem.add_development_dependency 'rspec', '~> 2.11'
 

data/spec/core_ext/numeric_spec.rb

@@ -75,4 +75,32 @@ describe Numeric do
     end
   end
 
+  describe "#to_degrees" do
+    context "when using a Float" do
+      it "converts the radians to degrees" do
+        3.1415.radians.to_degrees.should eq 179.99469134034814
+      end
+    end
+
+    context "when using an Integer" do
+      it "converts the radians to degrees" do
+        4.radians.to_degrees.should eq 229.1831180523293
+      end
+    end
+  end
+
+  describe "#to_radians" do
+    context "when using a Float" do
+      it "converts the degrees to radians" do
+        360.5.degrees.to_radians.should eq 6.291911953439557
+      end
+    end
+
+    context "when using an Integer" do
+      it "converts the degrees to radians" do
+        180.degrees.to_radians.should eq 3.141592653589793
+      end
+    end
+  end
+
 end

data/spec/metro/image_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Metro::Image do
+
+  describe "Class Methods" do
+
+    let(:subject) { described_class }
+
+    describe ".crop" do
+
+      let(:image) { stub('Original Image') }
+      let(:window) { stub('Gosu::Window') }
+      let(:mock_image) { mock("TexPlay Created Image",refresh_cache: nil) }
+      let(:bounds) { Metro::Units::RectangleBounds.new(left: 2,top: 2,right: 30,bottom:30) }
+
+      let(:expected_crop_params) { [ bounds.left, bounds.top, bounds.right, bounds.bottom ]}
+
+      it "crops the image with the bounds provided" do
+        TexPlay.should_receive(:create_image).and_return(mock_image)
+        mock_image.should_receive(:splice).with(image,0,0,crop: expected_crop_params)
+
+        subject.crop(window,image,bounds)
+      end
+
+      it "refreshes the cache for the image so when Metro reloads the images are not corrupt" do
+
+      end
+
+    end
+
+  end
+
+end

data/spec/metro/units/rectangle_bounds_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe RectangleBounds do
+
+  let(:subject) { described_class.new left: 20, top: 30, right: 40, bottom: 60 }
+
+  shared_examples "valid point" do
+    it "correct point" do
+      expect(given_point).to eq expected_point
+    end
+  end
+
+  describe "#top_left" do
+    it_behaves_like "valid point" do
+      let(:given_point) { subject.top_left }
+      let(:expected_point) { Point.at 20, 30 }
+    end
+  end
+
+  describe "#top_right" do
+    it_behaves_like "valid point" do
+      let(:given_point) { subject.top_right }
+      let(:expected_point) { Point.at 40, 30 }
+    end
+  end
+
+  describe "#bottom_left" do
+    it_behaves_like "valid point" do
+      let(:given_point) { subject.bottom_left }
+      let(:expected_point) { Point.at 20, 60 }
+    end
+  end
+
+  describe "#bottom_right" do
+    it_behaves_like "valid point" do
+      let(:given_point) { subject.bottom_right }
+      let(:expected_point) { Point.at 40, 60 }
+    end
+  end
+  
+  describe "#center" do
+    it_behaves_like "valid point" do
+      let(:given_point) { subject.center }
+      let(:expected_point) { Point.at 30, 45 }
+    end
+  end
+  
+
+  describe "#dimensions" do
+    it "correct dimensions" do
+      expect(subject.dimensions).to eq Dimensions.of(20,30)
+    end
+  end
+
+
+end