tmx 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGY5ZWFiM2U3NWQ1M2NjYzUxYzI3ODkxNTMyMTllZWFmZDA1YzM1Nw==
+    OTA3ZjIyZjNjZGZhYTg0ZGVjNWY0NjkyZDQ2MjcwYTM2YmRkZmY3NA==
   data.tar.gz: !binary |-
-    ZGZhODNjYzFjYWMzMjc5ZmZlZGMxNWVjODY4MGUzODYzZmNhZjRmYw==
+    ODA2YWY5OTJjN2FiMzFlOTYyN2M3YWIwODgxY2Q5ODc4MjQ2ZDRlNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjZjZDljYzVmZmM5ODJjNGYzNzRiNmEyMzZiYzcxOTRhZmZjODI0MjQ0MjA1
-    ZmYxMmNmOTA1Zjc5MmI1NGEzYWFjNWUxYTdjMjhiZTViYzg2Y2QyNzAyMjRh
-    OTUwZDk3NmQwOTViYWRlZjk2OWQwZWVhNjRlNzZhODA5OGJhYzk=
+    MjBlM2NhZTU3OTZjYzZkZjcyMjU4ZmVhNjIyNDE1ZjFlMjY1OTgwMzIwMzFk
+    Y2NjYTE1Mjg4NGMzNjZiYzc5OTc5M2M0M2Y5ZDM1NGRhYWRiNzg3ODQ3ZjQ0
+    YTc0NmQzNjU5NDU4ZDI5NTNlYTkwZTViZjMzOTFhNTQ2ZGM4ZjY=
   data.tar.gz: !binary |-
-    MWU1Y2QxMzEyOWY5MDJjOWUzMjU5NjcyZDY0ZWRmZWYxODNmNzU2MjczZTc1
-    N2QxNjQyZmU1MGZjNTQzZmVkY2I1NWI4MzBjNmY5NzkyMTQ0OWRlNWJkZTY3
-    MWZjMjRiM2MwMzFhOTkyNTNhMzI5YWNmNjM5NmIxZTAwZjNhNWM=
+    ODIyZGIzNmJkOTI2NzExZTc0YzA3YmJjMzdiNzY3YjA5NzM2NTExMTliMzIw
+    NGRmN2M0ZDgyMTg4Yzk0YTc4ZGMxY2Q5OWY3MTMwOThiNDkyOTIwOThhYTlm
+    OTQ1MzQ2ZWRlNzE3MmQyYzkyM2RmOTI3NDRmNzk3YTlmYjAzMDI=

data/README.md

@@ -1,6 +1,6 @@
 # Tmx
 
-A library for parsing the **[Tiled Map Editor](http://www.mapeditor.org/)** file format.
+A library for parsing the **[Tiled Map Editor](http://www.mapeditor.org/)** file format (version 0.9).
 
 ## Support
 

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/lib/tmx/image_layer.rb

@@ -0,0 +1,5 @@
+module Tmx
+  class ImageLayer < OpenStruct
+
+  end
+end

data/lib/tmx/map.rb

@@ -1,5 +1,8 @@
 require 'tmx/tile_set'
 require 'tmx/layer'
+require 'tmx/object_group'
+require 'tmx/object'
+require 'tmx/image_layer'
 
 module Tmx
 
@@ -11,5 +14,13 @@ module Tmx
     def tilesets
       @tilesets ||= Array(contents['tilesets']).map {|set| TileSet.new set.merge(contents: set) }
     end
+
+    def object_groups
+      @object_groups ||= Array(contents['object_groups']).map {|group| ObjectGroup.new group.merge(contents: group) }
+    end
+
+    def image_layers
+      @object_groups ||= Array(contents['image_layers']).map {|layer| ImageLayer.new layer.merge(contents: layer) }
+    end
   end
 end

data/lib/tmx/object.rb

@@ -0,0 +1,5 @@
+module Tmx
+  class Object < OpenStruct
+
+  end
+end

data/lib/tmx/object_group.rb

@@ -0,0 +1,9 @@
+module Tmx
+  class ObjectGroup < OpenStruct
+
+    def objects
+      Array(contents['objects']).map {|object| Tmx::Object.new(object.merge(contents: object)) }
+    end
+
+  end
+end

data/lib/tmx/parsers/json.rb

@@ -14,8 +14,56 @@ module Tmx
       end
 
       def parse(contents)
-        Oj.load(contents)
+        parsed_contents = Oj.load(contents)
+
+        object_layers = parsed_contents["layers"].find_all do |layer|
+          layer["type"] == "objectgroup"
+        end
+
+        parsed_contents["object_groups"] = object_layers
+
+        object_layers.each do |object_layer|
+          parse_object_layer(object_layer)
+        end
+
+        image_layers = parsed_contents["layers"].find_all do |layer|
+          layer["type"] == "imagelayer"
+        end
+
+        parsed_contents["image_layers"] = image_layers
+
+        parsed_contents["layers"].reject! {|layer| layer["type"] != "tilelayer" }
+
+        parsed_contents
+
       end
+
+      private
+
+      def parse_object_layer(object_layer)
+        object_layer["objects"].each do |object|
+
+          if object["ellipse"]
+            object["shape"] = "ellipse"
+          elsif object["polyline"]
+            object["shape"] = "polyline"
+            object["points"] = object["polyline"].map {|h| "#{h["x"]},#{h["y"]}" }
+          elsif object["polygon"]
+            object["shape"] = "polygon"
+            object["points"] = object["polygon"].map {|h| "#{h["x"]},#{h["y"]}" }
+          else
+            x = object["x"]
+            y = object["y"]
+            width = object["width"]
+            height = object["height"]
+
+            object["shape"] = "polygon"
+            object["points"] = [ "#{x},#{y}", "#{x + width},#{y}", "#{x + width},#{y + height}", "#{x},#{y + height}" ]
+          end
+        end
+      end
+
+
     end
 
   end

data/lib/tmx/parsers/tmx.rb

@@ -32,7 +32,9 @@ module Tmx
           "tileheight" => map_attr(xml,"tileheight").to_i,
           "properties" => properties(xml.xpath("/map")),
           "layers" => map_layers(xml),
-          "tilesets" => map_tilesets(xml)
+          "tilesets" => map_tilesets(xml),
+          "object_groups" => map_object_groups(xml),
+          "image_layers" => map_image_layers(xml)
         }
       end
 
@@ -133,8 +135,64 @@ module Tmx
             "properties" => properties(xml)
           }
         end
+      end
+
+      def map_object_groups(xml)
+        xml.xpath("map/objectgroup").map do |object_group|
+
+          objects = object_group.xpath("object").map do |object|
+            properties = {
+              "name" => object.xpath("@name").text,
+              "type" => object.xpath("@type").text,
+              "x" => object.xpath("@x").text.to_i,
+              "y" => object.xpath("@y").text.to_i,
+              "width" => object.xpath("@width").text.to_i,
+              "height" => object.xpath("@height").text.to_i,
+              "visible" => (object.xpath("@visible").text =~ /^false$/ ? false : true),
+              "properties" => properties(object)
+            }
+
+            properties.merge(object_shape(object))
+          end
+
+          {
+            "name" => object_group.xpath("@name").text,
+            "width" => object_group.xpath("@width").text.to_i,
+            "height" => object_group.xpath("@height").text.to_i,
+            "opacity" => (object_group.xpath("@opacity").text == "" ? 1.0 : object_group.xpath("@opacity").text.to_f),
+            "objects" => objects
+          }
+        end
+      end
+
+      def object_shape(object)
+        if not object.xpath("ellipse").empty?
+          { "shape" => "ellipse" }
+        elsif not object.xpath("polyline").empty?
+          points = object.xpath("polyline/@points").text.split(" ")
+          { "shape" => "polyline", "points" => points }
+        elsif not object.xpath("polygon").empty?
+          points = object.xpath("polygon/@points").text.split(" ")
+          { "shape" => "polygon", "points" => points }
+        else
+          x = object.xpath("@x").text.to_i
+          y = object.xpath("@y").text.to_i
+          width = object.xpath("@width").text.to_i
+          height = object.xpath("@height").text.to_i
+          { "shape" => "polygon", "points" => [ "#{x},#{y}", "#{x + width},#{y}", "#{x + width},#{y + height}", "#{x},#{y + height}" ] }
+        end
+      end
 
+      def map_image_layers(xml)
+        xml.xpath("map/imagelayer").map do |image_layer|
 
+          {
+            "name" => image_layer.xpath("@name").text,
+            "width" => image_layer.xpath("@width").text.to_i,
+            "height" => image_layer.xpath("@height").text.to_i
+          }
+
+        end
       end
 
     end

data/lib/tmx/version.rb

@@ -1,3 +1,3 @@
 module Tmx
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/features/json_format_spec.rb

@@ -15,8 +15,8 @@ describe Tmx, "JSON Format" do
   its(:height) { should eq 12 }
   its(:width) { should eq 16 }
 
-  its(:tileheight) { should eq 50 }
-  its(:tilewidth) { should eq 50 }
+  its(:tileheight) { should eq 32 }
+  its(:tilewidth) { should eq 32 }
 
   its(:orientation) { should eq "orthogonal" }
 
@@ -39,7 +39,7 @@ describe Tmx, "JSON Format" do
 
       let(:subject) { map.layers.first }
 
-      its(:name) { should eq "Tile Layer 1" }
+      its(:name) { should eq "Layer" }
       its(:opacity) { should eq 1 }
       its(:type) { should eq "tilelayer" }
       its(:visible) { should be_true }
@@ -48,7 +48,7 @@ describe Tmx, "JSON Format" do
       its(:x) { should eq 0 }
       its(:y) { should eq 0 }
 
-      its(:data) { should eq [ 3, 3, 3, 3, 3, 3, 2, 5, 5, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 4, 4, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 4, 4, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 4, 4, 7, 18, 9, 9, 17, 3, 3, 3, 3, 3, 3, 3, 3, 2, 4, 4, 15, 14, 4, 6, 7, 3, 3, 3, 3, 3, 3, 3, 3, 2, 4, 4, 4, 4, 4, 6, 7, 3, 3, 3, 3, 3, 18, 9, 17, 2, 4, 4, 10, 13, 4, 10, 11, 3, 3, 3, 3, 18, 14, 6, 7, 2, 4, 4, 7, 16, 8, 11, 3, 3, 3, 3, 3, 2, 4, 4, 15, 14, 4, 4, 7, 3, 3, 3, 3, 3, 3, 3, 3, 2, 4, 4, 4, 4, 4, 4, 7, 3, 3, 3, 3, 3, 3, 3, 3, 16, 8, 8, 8, 13, 4, 4, 7, 3, 3, 3, 3, 3, 3, 3, 3, 12, 12, 12, 12, 16, 8, 8, 11, 3, 3, 3, 3, 3, 3] }
+      its(:data) { should eq [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 141, 142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 141, 142, 20, 0, 0, 0, 141, 142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 29, 30, 0, 0, 0, 0, 0, 25, 26, 27, 0, 0, 0, 0, 0, 46, 47, 48, 0, 0, 0, 0, 0, 43, 44, 45, 0, 0, 0, 0, 0, 0, 65, 0, 0, 8, 8, 8, 23, 0, 80, 0, 137, 138, 0, 0, 0, 0, 83, 0, 0, 0, 0, 50, 0, 0, 80, 0, 191, 192, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 19, 37, 38, 37, 37, 37, 38, 37, 37, 37, 37, 37, 19, 37, 37, 37, 37, 37, 37, 37, 37] }
     end
   end
 
@@ -62,14 +62,122 @@ describe Tmx, "JSON Format" do
 
       its(:firstgid) { should eq 1 }
       its(:image) { should eq "tiles.png" }
-      its(:imageheight) { should eq 250 }
-      its(:imagewidth) { should eq 200 }
-      its(:margin) { should eq 0 }
+      its(:imageheight) { should eq 400 }
+      its(:imagewidth) { should eq 640 }
+      its(:margin) { should eq 2 }
       its(:name) { should eq "tiles" }
-      its(:spacing) { should eq 0 }
-      its(:tileheight) { should eq 50 }
-      its(:tilewidth) { should eq 50 }
-      its(:properties) { should eq({}) }
+      its(:spacing) { should eq 2 }
+      its(:tileheight) { should eq 32 }
+      its(:tilewidth) { should eq 32 }
+      its(:properties) { should eq({ "alpha" => "1" }) }
+    end
+  end
+
+  describe '#object_groups' do
+    it "has the correct number of object groups" do
+      expect(subject.object_groups).to have(1).item
+    end
+
+    context "when evaluating the first object group" do
+
+      let(:subject) { map.object_groups.first }
+
+      its(:name) { should eq "Objects" }
+      its(:width) { should eq 16 }
+      its(:height) { should eq 12 }
+      its(:objects) { should have(6).items }
+      its(:opacity) { should eq 1 }
+
+      context "when evaluating a rectangluar object" do
+        let(:subject) { map.object_groups.first.objects.first }
+
+        its(:name) { should eq "ground" }
+        its(:type) { should eq "floor" }
+        its(:x) { should eq 0 }
+        its(:y) { should eq 256 }
+        its(:width) { should eq 512 }
+        its(:height) { should eq 32 }
+        its(:visible) { should be_true }
+
+        its(:properties) { should have(1).item }
+
+        its(:shape) { should eq "polygon" }
+        its(:points) { should eq [ "0,256", "512,256", "512,288", "0,288" ]}
+
+        it "has the correct properties" do
+          expect(subject.properties["type"]).to eq "sand"
+        end
+      end
+
+      context "when evaluating a circular object" do
+
+        let(:subject) { map.object_groups.first.objects[2] }
+
+        its(:name) { should eq "mushroom" }
+        its(:type) { should eq "mushroom" }
+        its(:x) { should eq 256 }
+        its(:y) { should eq 224 }
+        its(:width) { should eq 32 }
+        its(:height) { should eq 32 }
+        its(:visible) { should be_true }
+
+        its(:properties) { should have(1).item }
+
+        its(:shape) { should eq "ellipse" }
+
+        it "has the correct properties" do
+          expect(subject.properties["player.life.bonus"]).to eq "1"
+        end
+
+      end
+
+      context "when evaluating a polygon (triangle)" do
+
+        let(:subject) { map.object_groups.first.objects[3] }
+
+        its(:name) { should eq "danger" }
+        its(:type) { should eq "sign" }
+        its(:x) { should eq 448 }
+        its(:y) { should eq 192 }
+        its(:shape) { should eq "polygon" }
+        its(:points) { should eq [ "0,0", "32,64", "-32,64", "0,0"] }
+        its(:visible) { should be_true }
+
+        its(:properties) { should have(0).items }
+
+      end
+
+      context "when evaluating a polyline (line segments)" do
+
+        let(:subject) { map.object_groups.first.objects[4] }
+
+        its(:name) { should eq "dirt" }
+        its(:type) { should eq "underground" }
+        its(:x) { should eq 32 }
+        its(:y) { should eq 320 }
+        its(:visible) { should be_true }
+
+        its(:properties) { should have(3).items }
+
+        its(:shape) { should eq "polyline" }
+        its(:points) { should eq ["0,0", "448,0", "448,64", "0,64", "0,0"]}
+
+      end
+    end
+
+  end
+
+  describe '#image_layers' do
+    it "has the correct number of image layers" do
+      expect(subject.image_layers).to have(1).item
+    end
+
+    context "when evaluating the first image layer" do
+      let(:subject) { map.image_layers.first }
+
+      its(:name) { should eq "Image Layer" }
+      its(:width) { should eq 16 }
+      its(:height) { should eq 12 }
     end
   end
 

data/spec/features/json_isometric_format_spec.rb

@@ -0,0 +1,76 @@
+# require 'spec_helper'
+
+# describe Tmx, "JSON Format" do
+
+#   let(:fixture_file) { File.join File.dirname(__FILE__), "..", "fixtures", "map-isometric.json" }
+
+#   let(:map) do
+#     described_class.load(fixture_file)
+#   end
+
+#   let(:subject) { map }
+
+#   its(:version) { should eq 1 }
+
+#   its(:height) { should eq 12 }
+#   its(:width) { should eq 16 }
+
+#   its(:tileheight) { should eq 50 }
+#   its(:tilewidth) { should eq 50 }
+
+#   its(:orientation) { should eq "orthogonal" }
+
+#   describe '#properties' do
+#     it "has the correct number of properties" do
+#       expect(subject.properties).to have(1).item
+#     end
+
+#     it "property values are correct" do
+#       expect(subject.properties["hero.position"]).to eq "400,525,1"
+#     end
+#   end
+
+#   describe '#layers' do
+#     it "has the correct number of layers" do
+#       expect(subject.layers).to have(1).item
+#     end
+
+#     context "when evaluating the first layer" do
+
+#       let(:subject) { map.layers.first }
+
+#       its(:name) { should eq "Tile Layer 1" }
+#       its(:opacity) { should eq 1 }
+#       its(:type) { should eq "tilelayer" }
+#       its(:visible) { should be_true }
+#       its(:height) { should eq 12 }
+#       its(:width) { should eq 16 }
+#       its(:x) { should eq 0 }
+#       its(:y) { should eq 0 }
+
+#       its(:data) { should eq [ 3, 3, 3, 3, 3, 3, 2, 5, 5, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 4, 4, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 4, 4, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 4, 4, 7, 18, 9, 9, 17, 3, 3, 3, 3, 3, 3, 3, 3, 2, 4, 4, 15, 14, 4, 6, 7, 3, 3, 3, 3, 3, 3, 3, 3, 2, 4, 4, 4, 4, 4, 6, 7, 3, 3, 3, 3, 3, 18, 9, 17, 2, 4, 4, 10, 13, 4, 10, 11, 3, 3, 3, 3, 18, 14, 6, 7, 2, 4, 4, 7, 16, 8, 11, 3, 3, 3, 3, 3, 2, 4, 4, 15, 14, 4, 4, 7, 3, 3, 3, 3, 3, 3, 3, 3, 2, 4, 4, 4, 4, 4, 4, 7, 3, 3, 3, 3, 3, 3, 3, 3, 16, 8, 8, 8, 13, 4, 4, 7, 3, 3, 3, 3, 3, 3, 3, 3, 12, 12, 12, 12, 16, 8, 8, 11, 3, 3, 3, 3, 3, 3] }
+#     end
+#   end
+
+#   describe '#tilesets' do
+#     it "has the correct number of tilesets" do
+#       expect(subject.tilesets).to have(1).item
+#     end
+
+#     context "when evaluating the first tileset" do
+#       let(:subject) { map.tilesets.first }
+
+#       its(:firstgid) { should eq 1 }
+#       its(:image) { should eq "tiles.png" }
+#       its(:imageheight) { should eq 250 }
+#       its(:imagewidth) { should eq 200 }
+#       its(:margin) { should eq 0 }
+#       its(:name) { should eq "tiles" }
+#       its(:spacing) { should eq 0 }
+#       its(:tileheight) { should eq 50 }
+#       its(:tilewidth) { should eq 50 }
+#       its(:properties) { should eq({}) }
+#     end
+#   end
+
+# end