metro-ld26 0.3.4 → 0.3.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTU1OTI4NDhhNmM2NmFkZDM2YjJlMGJhMjhmMmIxMmZiMmVlODczNA==
+    MWM3NGYwOGRlMWEyYWQ0YmIzMTg2ZDBjOTc5Zjg2MTE0MTQwM2Q2ZA==
   data.tar.gz: !binary |-
-    YWVmMzRkYTNmYzIxM2YwNmI0MTBlNTc2MWVlNGY3MTU4ZjQyYTU0Ng==
+    ZDRiYzMwYzExZmVjNDRmNmNkZTQ5ZjRjM2VkYTA1NzBkZjA0NmM1OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2VmMWMyNGM4ZWM4NTBlNDFkYTM1NzQ2MTcwYjg5NTZmMmE1YWJjNDdkMjcz
-    MzAxN2NiZGUzMDQxNDk5NGEzOTdmOTAzOTY2NDI0MjA2ZTI4YmNmODgzZDM2
-    MDU4NzQzMWM1Mjk0MTdhNWYxY2FiOWVjNzg1ODkwNGViM2JjOGE=
+    MzA3ODExZmVmNWFjMTA4MTczNGFmMWZiNDkxOWJkZTc1NmFkYzg2OWI3MzQ3
+    MGNiN2NhOWY5ZDhjODE5ZTlhMGVjZWY2NTFiMzUwNzI2YjZlNzExZTcwMWY0
+    ZmI5NjZkNGI5NjdhNWRkNjNlODI2OGRjMjEwMWFmNmM0YTEyYWE=
   data.tar.gz: !binary |-
-    NjM0N2FiYmU3YTI4NTA1MmM2NGEzZmEyMDA3NjBkZjBkYjlmMTcyNTcyZWIy
-    ZmNmMDJiYmNlNzVmMDRjYjUzYjQ5Zjk3MDg5NzFlZmQyZmUwYmVkMDlkY2E0
-    Zjk3Mjc4ODY2ZjE5NTdkZGJhYWMzODQ5MGVmMGZhMzY4NTRkNzc=
+    Yzk5ODBjM2ZiNmI1MjExNzM1NmY5MzBkNDc2MDNjNjY0ZGFjYTBjYWVlYjgw
+    ZmFkZmQyZWEzYzAyYjNlOWQzNDY0Y2UyNGRiNzU2OGEzZjBkZDE4MDc0NTA2
+    ODNkYjAwYjYzYjMzOTUxZjA3YmU2MmYzYmFkOTkxYWYxMzU3ODQ=

data/lib/metro.rb

@@ -21,7 +21,6 @@ require 'gosu_ext/color'
 require 'gosu_ext/gosu_constants'
 require 'tmx_ext/tile_set'
 require 'tmx_ext/object'
-require 'tmx_ext/object_shape'
 
 require 'locale/locale'
 

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"]
-  
+
   def self.changes_for_version(version)
 
     change = Struct::Changes.new(nil,[])
@@ -28,5 +28,5 @@ module Metro
 
     change
   end
-  
+
 end

data/lib/tmx_ext/object.rb

@@ -8,9 +8,37 @@ module Tmx
     end
 
     def shape
-      @shape ||= Tmx::ObjectShape.create_from_tmx_object(self)
+      @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
@@ -20,6 +48,13 @@ module Tmx
       Float::INFINITY
     end
 
+    def default_elasticity
+      0.0
+    end
+
+    def default_shape_attach_point
+      CP::Vec2::ZERO
+    end
 
   end
 

data/spec/tmx_ext/object_spec.rb

@@ -1,14 +1,10 @@
 require 'spec_helper'
 
 describe Tmx::Object do
-  context "when created with a polygon" do
+  context "when created with standard parameters" do
 
     let(:object) do
-      Tmx::Object.new contents.merge(contents: contents)
-    end
-
-    let(:contents) do
-      { 'points' => points, 'type' => "rock", 'shape' => "polygon" }
+      Tmx::Object.new points: points, type: "rock"
     end
 
     #
@@ -50,47 +46,4 @@ describe Tmx::Object do
     end
   end
 
-  context "when created with a ellipse" do
-
-    let(:object) do
-      Tmx::Object.new contents.merge(contents: contents)
-    end
-
-    let(:contents) do
-      { 'type' => "mushroom", 'shape' => "ellipse", 'x' => 256, 'y' => 224, 'width' => 32, 'height' => 32 }
-    end
-
-    describe "#body" do
-      let(:body) { object.body }
-
-      it "has infinite mass" do
-        expect(body.m).to eq Float::INFINITY
-      end
-
-      it "has infinite moment of interia" do
-        expect(body.i).to eq Float::INFINITY
-      end
-    end
-
-    describe "#shape" do
-      let(:shape) { object.shape }
-
-      it "body should be the same body" do
-        expect(shape.body).to eq object.body
-      end
-
-      it "has correct collision type" do
-        expect(shape.collision_type).to eq :mushroom
-      end
-
-      it "not a sensor" do
-        expect(shape).to_not be_sensor
-      end
-
-      it "has no elasticity" do
-        expect(shape.e).to eq 0.0
-      end
-    end
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metro-ld26
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Franklin Webber
@@ -322,11 +322,8 @@ metadata: {}
 post_install_message: ! "    ______  ___      _____\n    ___   |/  /_____ __  /_______________\n
   \   __  /|_/ / _  _ \\_  __/__  ___/_  __ \\\n    _  /  / /  /  __// /_  _  /    /
   /_/ /\n    /_/  /_/   \\___/  \\__/ /_/     \\____/\n\n  Thank you for installing
-  metro 0.3.4 / 2012-12-14.\n  ---------------------------------------------------------------------\n
-  \ Changes:\n    \n  * `metro::ui::sprite` and `metro::ui::animated_sprite` model
-  classes\n    to make it easier to take care of all the basic model attributes.\n
-  \ * Event Management changed in the background. The API remains the\n    same.\n
-  \   \n\n  ---------------------------------------------------------------------\n"
+  metro 0.3.5 / .\n  ---------------------------------------------------------------------\n
+  \ Changes:\n  \n  ---------------------------------------------------------------------\n"
 rdoc_options: []
 require_paths:
 - lib