retmx 0.0.2 → 0.0.4

data/lib/retmx.rb

@@ -12,8 +12,7 @@ module RETMX
   include REXML
 
   def RETMX.load(file)
-    doc = Document.new (File.new(file))
-    m = Map.new(doc.root)
+    m = Map.new(file)
   end
 
 
@@ -75,10 +74,19 @@ module RETMX
 
     #Properties on map
     attr_reader :property
- 
+
+    #File where get map
+    attr_reader :file
+
     #REXML internal
     attr_reader :xml
-    def initialize(doc)
+    def initialize(file)
+
+      raise RuntimeError, "Need a .tmx" unless File.exists? file
+      doc = REXML::Document.new(File.new(file)).root
+      
+      
+      @file = file
       @version = doc.attributes['version']
       @orientation = doc.attributes['orientation']
       @width = doc.attributes['width'].to_i
@@ -223,28 +231,29 @@ When the object has a gid set, then it is represented by the image of the tile w
       #REXML internal
       attr_reader :xml
       def initialize(map, xml)
-
+        @map = map
         @name = xml.attributes['name']
         @x =  xml.attributes['x'].nil? ? 0 : xml.attributes['x']
         @y = xml.attributes['y'].nil? ? 0 : xml.attributes['y']
-        @width = xml.attributes['width'].nil? ? xml.parent.attributes['width'].to_i : xml.attributes['width'].to_i
-        @height = xml.attributes['height'].nil? ? xml.parent.attributes['height'].to_i : xml.attributes['height'].to_i
+        @width = xml.attributes['width'].nil? ? map.width : xml.attributes['width'].to_i
+        @height = xml.attributes['height'].nil? ? map.height : xml.attributes['height'].to_i
         @opacity = xml.attributes['opacity'].nil? ? 1 : xml.attributes['opacity'].to_i
         @visible = xml.attributes['visible'].nil? ? 1 : xml.attributes['visible'].to_i
         @opacity = xml.attributes['opacity'].nil? ? 1 : xml.attributes['opacity'].to_f
         @data = nil
-        @map = map
         build(xml)
       end
 
       
       #This function is used for render the layer
       def render(&block) #:yields: block_y, block_x, tileset, index
+        
         @height.times {|by| #block row
-          @width.times {|bx| #block col
-            cell = @data[(by * @height) + bx]
+          @width.times {|bx| #block col 
+            cell = @data[(by * @width) + bx ]
             @map.tilesets.each {|k, t|
               if t.firstgid <= cell.gid
+                cell = cell.clone
                 cell.gid -= t.firstgid
                 block.call(self, bx, by, t, cell)
                 break
@@ -252,6 +261,7 @@ When the object has a gid set, then it is represented by the image of the tile w
             }
           }
         }
+
       end
 
       #This function render partial of layer
@@ -262,9 +272,11 @@ When the object has a gid set, then it is represented by the image of the tile w
       def render_partial(x, y, w, h, &block)
         h.times {|by|
           w.times {|bx|
-            cell = @data[((by + y )  * @height) + (bx + x)]
+            cell = @data[((by + y )  * w) + (bx + x)]
             @map.tilesets.each {|k, t|
+
               if t.firstgid <= cell.gid
+                cell = cell.clone
                 cell.gid -= t.firstgid
                 block.call(self, bx, by, t, cell)
                 break
@@ -282,8 +294,8 @@ When the object has a gid set, then it is represented by the image of the tile w
 
       class Data
         include Enumerable
-        GID_FLIP_X = 1.<< 31
-        GID_FLIP_Y = 1.<< 30 
+        GID_FLIP_X = 0x80000000
+        GID_FLIP_Y = 0x40000000
 
         #The encoding used to encode the tile layer data. When used, it can be "base64" and "csv" at the moment.
         attr_reader :encoding
@@ -307,7 +319,7 @@ When the object has a gid set, then it is represented by the image of the tile w
           @raw = []
           @raw_data = xml.text
           @data = []
-          
+
           #decoding
           case @encoding
             when 'base64'
@@ -341,9 +353,11 @@ When the object has a gid set, then it is represented by the image of the tile w
           end
 
           get_data
-
         end
 
+        def size
+          @data.size
+        end
 
         def [] (i)
           @data[i]

data/lib/retmx_sdl.rb

@@ -20,7 +20,7 @@
 
 
 require 'sdl'
-require 'retmx'
+
 
 module RETMX
 
@@ -39,11 +39,12 @@ module RETMX
         raise RuntimeError, "Need a RETMX::Map or path to .tmx" unless tmx.kind_of? Map
       end
 
-
+      @data_dir = File.dirname(@tmx.file)
       @tileset_images = {}
       @tmx.tilesets.each {|k,t|
-        if File.exists? t.image.source or !@tileset_imagen.include? t.name
-          image = SDL::Surface.load(t.image.source)
+        fimage = File.join(@data_dir, t.image.source)
+        if File.exists? fimage or !@tileset_images.include? t.name
+          image = SDL::Surface.load(fimage)
           image.setColorKey(SDL::SRCCOLORKEY, t.image.trans.hex) unless t.image.trans.nil?
           @tileset_images[t.name] = image
         end
@@ -83,6 +84,12 @@ module RETMX
       }
     end
 
+    def blit_layers(sx, sy, sw, sh, surface, dx, dy)
+      @tmx.layers.each {|name, layer|
+        blit_layer(name, sx, sy, sw, sh, surface, dx, dy)
+      }
+    end
+
     #Perfoms a blit from layer at (+sx+,+sy+,+sw+,+sh+) to +surface+ at (+dx+, +dy)
     #:sx: on tiles
     #:sy: on tiles
@@ -123,8 +130,9 @@ if $0 == __FILE__
 
   $screen = SDL.setVideoMode(tmx.width * tmx.tilewidth, tmx.height * tmx.tileheight, 0, 0)
 
+
   #Blit specific layer
-  #tmxsdl.blit_layer('Ground', 0,0,8,8, $screen, 0, 0)
+  #tmxsdl.blit_layers(0,0,9,8, $screen, 0, 0)
   tmxsdl.put_layers($screen, 0, 0)
   $screen.flip
   until $quit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: retmx
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-10 00:00:00.000000000 Z
+date: 2011-12-16 00:00:00.000000000 Z
 dependencies: []
-description: 
+description: Library for work with .tmx of mapeditor.org, generic work, see doc
 email: info@manadalibre.org
 executables: []
 extensions: []