resedit 1.3.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eabff0ab69b6b4b0518043c87df22ab64975fd75
-  data.tar.gz: 00d3c5fa263598370ea4f0ad4c26c745db7c0e01
+  metadata.gz: c6ddbe66a77c0195afafaaff1c2756e915f38614
+  data.tar.gz: c97154c36b5753121497f2d01ef6ce38fc0d1fc0
 SHA512:
-  metadata.gz: 6cd69c1fc4bfc35d4c07089eeea46842c493882e8d65b7ae84ed8b288d45daf5d092eb66b75e0bdb2c72280f27d9063342e6cb06e8d292dd899d4ef866a83b45
-  data.tar.gz: 554a4024f40a615059eb46190808fcc2c3711ce590b650a344df47e0f30eae78c062a59d7395c9bfa06f28d8e02dd4ba48c3b9096f846dc0f55db2c91c5584f5
+  metadata.gz: e9d0e7a836d85b455f4b2172b4d891f9f938f55c38b275f8e7aaa0c88e36b362e9bb4601927fed859a48c1a2767f414092f1adc38672f115e84e1633cdf10127
+  data.tar.gz: 60b8f1b47633ea8520649b2be11592ec057e53f682caa1e98cb3ca5a9ab2429d7e20111d8a6a2f687a39e0ad994877ce1a58cf0cfabbea643f39ebb4accf2874

data/lib/resedit.rb

@@ -13,5 +13,5 @@ require 'resedit/mz/mz'
 
 
 module Resedit
-    VERSION = "1.3.3"
+    VERSION = "1.4"
 end

data/lib/resedit/font/font.rb

@@ -5,7 +5,7 @@ module Resedit
 
     class Font
         attr_reader :count, :width, :height
-        attr_accessor :gridColor, :charColor, :userData, :widthColor
+        attr_accessor :gridColor, :charColor, :userData, :widthColor, :bgColor
 
         # charWidth, charHeight, characters count
         def initialize(width, height, count=256)
@@ -18,9 +18,9 @@ module Resedit
             @userData = nil
         end
 
-        def setChar(id, data, width=nil)
+        def setChar(id, data, width=nil, flags=nil)
             width=@width if !width
-            @chars[id] = FontChar.new(@width, @height, id, data, width)
+            @chars[id] = FontChar.new(@width, @height, id, data, width, flags)
         end
 
         def getChar(id)
@@ -40,6 +40,11 @@ module Resedit
             return @chars[id].realWidth ? @chars[id].realWidth : @width
         end
 
+        def charFlags(id)
+            return nil if !@chars[id]
+            return @chars[id].flags
+        end
+
         def save(filename)
             rows = @count/16 + (@count%16 == 0 ? 0 : 1)
             img = Resedit.createImage(@width*16+17 , @height*rows+rows+1, filename)
@@ -72,7 +77,7 @@ module Resedit
                 x += 1+x*@width
                 y += 1+y*@height
                 c = FontChar.new(width,height,idx)
-                c.scan(img, @charColor, x, y, @widthColor)
+                c.scan(img, @charColor, x, y, @widthColor, [@bgColor, @gridColor])
                 @chars[c.index] = c if c.data
             end
         end

data/lib/resedit/font/font_char.rb

@@ -1,11 +1,12 @@
 module Resedit
 
     class FontChar
-        attr_accessor :index, :data, :realWidth
+        attr_accessor :index, :data, :realWidth, :flags
 
-        def initialize(width, height, index, data=nil, realWidth=nil)
+        def initialize(width, height, index, data=nil, realWidth=nil, flags=nil)
             @width, @height, @index = width, height, index
             @realWidth=realWidth
+            @flags = flags
             @data=data if (data && data.length==width*height)
         end
 
@@ -19,12 +20,34 @@ module Resedit
                     image.setPixel(x+i, y+j, color) if hasPixel(i,j)
                 end
             end
-            if @realWidth && @realWidth<@width
-                image.setPixel(x+realWidth, y, wColor)
+            if @realWidth
+                image.setPixel(x+@realWidth, y, wColor)
+            end
+            if @flags && @flags.length>0
+                for i in 0..@flags.length-1
+                    image.setPixel(x+@realWidth, y+i+1, @flags[i])
+                end
             end
         end
 
-        def scan(image, color, x, y, wColor)
+        def readFlags(image, x, y, bgcolors)
+            empty = true
+            flags = []
+            for i in 0..@height-2
+                flags += [bgcolors[0]]
+                col = image.getPixel(x, y+i)
+                if bgcolors.include?(col)
+                    next
+                end
+                empty=false
+                flags[i] = col
+            end
+            return nil if empty
+            return flags
+        end
+
+
+        def scan(image, color, x, y, wColor, bgcolors)
             @data=[0]*@width*@height
             @realWidth = nil
             _hasData = false
@@ -40,6 +63,8 @@ module Resedit
                     end
                 end
             end
+            fx = x + (@realWidth ? @realWidth : @width)
+            @flags = readFlags(image, fx, y+1, bgcolors)
             @data=nil if !_hasData
             return @data!=nil
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resedit
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: '1.4'
 platform: ruby
 authors:
 - bjfn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-05 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png