nuri_game-tmx_reader 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bafedf74686bf3db56b4075b3ee9dba4474f255cc4fe3d08c46c5bd6d2dd588a
-  data.tar.gz: 55d792e678149e79724ce7e70313be8a0be4c400d603c501db60d756bd0da5de
+  metadata.gz: eea7fdfe561aa348894f90fbc92913934b6cab0597346c6f975e0ff041a09b19
+  data.tar.gz: 5d57b7eb3b88bb6648019ad3bd0f10173a47b5289187d666b9ccecbd9d44822f
 SHA512:
-  metadata.gz: 01ae0b8d7d024a892859268448299f17e2a597a8de4466f6057b44ac668a80c5489d3d77016f1db3d562b8cd92a939d37b9a18c271466a2523af36d1dc447cb1
-  data.tar.gz: 10d5816b916b005a63130674539a7eb7b04c1db9e5cc2eec7db60a17e60f52bb8a53656842733a543ba56cf8ac54926de4bbadb50a3df6d29730832f660669a4
+  metadata.gz: 5d37a126a8629082b0fbbb4144152c34bb860eda2d69b501ca576609b62533eb2c012ce61ba4d254c738b239a8bf016bb2554e11822c4a24c2043146b2e9f968
+  data.tar.gz: 8d2f5f61ab2db1bef233553bc7c1da5608d110d4e16ee0eee6fce2099cf57d5a95d44ec710a0f93367bdebe28e0666db974c20aa71142da147210be82210ed47

data/lib/nuri_game/tmx_reader.rb

@@ -39,6 +39,7 @@ module NuriGame
       map = REXML::Document.new(contents).root
       @tilesets = []
       @layers = {}
+      @invert_order = false
       validate_map(map)
       load_map_infos(map)
       load_tilesets(map)
@@ -52,7 +53,7 @@ module NuriGame
     def validate_map(map)
       raise 'Invalid TMX data, root element is not a <map>' if map.name != 'map'
       raise 'Invalid TMX orientation, expect orthogonal' if xml_value(map, 'orientation') != 'orthogonal'
-      raise 'Invalid TMX renderorder, expect left-up' if xml_value(map, 'renderorder') != 'left-up'
+      @render_order = xml_value(map, 'renderorder') || 'right-down'
       raise 'Invalid TMX map format, should not be infinite' if xml_value(map, 'infinite').to_i != 0
     end
 
@@ -78,11 +79,20 @@ module NuriGame
         if layer.name == 'group'
           load_layer_group(layer, xml_value(layer, 'name'))
         elsif layer.name == 'layer'
-          @layers[xml_value(layer, 'name')] = load_layer(layer)
+          @layers[get_layer_name(xml_value(layer, 'name'))] = load_layer(layer)
         end
       end
     end
 
+    # Adjust the layer name to prevent duplicates
+    # @param name [String]
+    # @return [String]
+    def get_layer_name(name)
+      name = name.dup
+      name.prepend('/') while @layers[name]
+      return name
+    end
+
     # Load the layer from a group
     # @param group [REXML::Element]
     # @param groupname [String]
@@ -92,7 +102,7 @@ module NuriGame
           load_layer_group(layer, File.join(groupname, xml_value(layer, 'name')))
         elsif layer.name == 'layer'
           name = File.join(groupname, xml_value(layer, 'name'))
-          @layers[name] = load_layer(layer)
+          @layers[get_layer_name(name)] = load_layer(layer)
         end
       end
     end
@@ -101,10 +111,28 @@ module NuriGame
     # @param layer [REXML::Element]
     def load_layer(layer)
       data = get_layer_data(layer)
+      data = adjust_layer_data(layer, data)
       # Perform stuff if there's offset & co (but shouldn't happen since we don't allow infinite maps)
       return data
     end
 
+    # Adjust the layer data
+    # @param layer [REXML::Element]
+    # @param data [Array]
+    # @return [Array]
+    def adjust_layer_data(layer, data)
+      width = xml_value(layer, 'width').to_i
+      height = xml_value(layer, 'height').to_i
+      if @width != width || @height != height
+        rows = Array.new(@height) do |index|
+          next(Array.new(@width, 0)) unless (row = data[index * width, @width])
+          row.concat(Array.new(@width - row.size, 0)) if row.size < @width
+          next(row)
+        end
+        return [].concat(*rows)
+      end
+      return data
+    end
     # Get the layer data
     # @source https://github.com/shawn42/tmx/blob/master/lib/tmx/parsers/tmx-rexml.rb
     # @param layer [REXML::Element]
@@ -128,7 +156,7 @@ module NuriGame
           return layer_data.split(',').collect(&:to_i)
         end
       end
-      REXML::XPath.match(layer, "data/tile").map { |tile| tile.attributes["gid"].to_i }
+      REXML::XPath.match(layer, 'data/tile').map { |tile| tile.attributes['gid'].to_i }
     end
 
     # Decompress using Zlib

data/lib/nuri_game/tmx_reader/version.rb

@@ -1,5 +1,5 @@
 module NuriGame
   class TmxReader
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuri_game-tmx_reader
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nuri Yuri
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-13 00:00:00.000000000 Z
+date: 2018-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler