artbase 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 549b31d6f628fcb714c22fd03f179b75fd9b99e9c2bbe8532b1e79660e4f1ade
-  data.tar.gz: aadb6b67430375da20a83e94362562405dfca370dac2b8cfe514086a926ff2df
+  metadata.gz: 28781910e6461bf7c03b8c27a1845633c07681798180edd50f873ec029b9921f
+  data.tar.gz: c19bf7185dfbfe51c0f7ab14b25f4dbecd29314b0ca6088660ab55b4a4c5d40c
 SHA512:
-  metadata.gz: c7d1a745322df0250841c03975135d35f0f4ab4a9b8258e36482258e14b1847cece236b09755fd8962b6e942b21ed1ee5b28449c0d0b4d32f9f3c7c08e508533
-  data.tar.gz: 735c9079a101dd5aea55d5cb8458256082864e07bcaef81dff178cdeabb583df381ff9880d6aca7871c094a7f529342a9a206f4a4d877efe9c9b6b6b2600c27f
+  metadata.gz: 17b24d4328ba8fac495134954a686b59324e7f635d878c2b1ce1c085ad9b21a3a767f87773d7dfccdb7516c47a9cf57621bec10e11daab16ae8610c2670f7ed3
+  data.tar.gz: e009b91051805e13358b6cb172e32ce256f04d03d0eda912dc7f6b73c35a58c6d556c4e9cb301ac8f4f88aa8d9d6e43bf6b376e2509ae856689d7224584f6bee

data/lib/artbase/collection/base.rb

@@ -34,11 +34,17 @@ end
 
 
 
-def make_composite
+def make_composite( limit: nil,
+                    mirror: false )
   ### use well-known / pre-defined (default) grids
   ##        (cols x rows) for now - why? why not?
 
-  composite_count = @count - @excludes.size
+  composite_count = if limit
+                      limit
+                    else
+                      @count - @excludes.size
+                    end
+
   cols, rows = case composite_count
                when    99 then   [10,  10]
                when   100 then   [10,  10]
@@ -59,6 +65,7 @@ def make_composite
                when  6666 then   [100, 67]   # 6700 (34 left empty)
                when  6688 then   [100, 67]   # 6700 (12 left empty)
                when  6969 then   [100, 70]   # 7000 (31 left empty)
+               when  7500 then   [100, 75]
                when  8888 then   [100, 89]
                when  9969 then   [100,100]
                when 10000 then   [100,100]
@@ -70,17 +77,33 @@ def make_composite
                                   width:  @width,
                                   height: @height )
 
+
+  count = 0
   each_image do |img, id|
     puts "==> #{id}"
-    composite << img
+    composite <<    if mirror
+                      img.mirror
+                    else
+                      img
+                    end
+
+    count += 1
+    break if limit && count >= limit
   end
 
 
+  slug = "#{@slug}"
+  slug += "#{limit}" if limit
+  slug += "_left"    if mirror
 
-  composite.save( "./#{@slug}/tmp/#{@slug}-#{@width}x#{@height}.png" )
+  path = "./#{@slug}/tmp/#{slug}-#{@width}x#{@height}.png"
+  puts "   saving #{path}..."
+  composite.save( path )
 
   if composite_count < 1000
-    composite.zoom(2).save( "./#{@slug}/tmp/#{@slug}-#{@width}x#{@height}@2x.png" )
+    path = "./#{@slug}/tmp/#{slug}-#{@width}x#{@height}@2x.png"
+    puts "   saving 2x #{path}..."
+    composite.zoom(2).save( path )
   end
 end
 

data/lib/artbase/collection/token.rb

@@ -177,7 +177,8 @@ end
   def pixelate( range=_range, exclude: true,
                               force: false,
                               debug: false,
-                              zoom: nil )
+                              zoom: nil,
+                              faster: false )
 
     range.each do |id|
 
@@ -197,6 +198,32 @@ end
 
 
       puts "==> #{id}  - reading / decoding #{id} ..."
+
+
+    if faster
+      ## note: faster for now only supports
+      ##        single /one source format
+      ##         always will use first source format from array for now
+      cmd = "./pixelator "
+      cmd << "./#{@slug}/token-i/#{id}.png"
+      cmd << " " + @sources[0][0].to_s
+      cmd << " " + @sources[0][1].to_s
+      cmd << " " + outpath
+      cmd << " " + @width.to_s
+      cmd << " " + @height.to_s
+      puts "==> #{cmd}..."
+      ret = system( cmd )
+      if ret
+        puts "OK"
+      else
+        puts "!! FAIL"
+        if ret.nil?
+          puts "  command not found"
+        else
+          puts "  exit code: #{$?}"
+        end
+      end
+    else
       start = Time.now
 
       img = Image.read( "./#{@slug}/token-i/#{id}.png" )
@@ -246,6 +273,7 @@ end
         exit 1
       end
     end
+    end
   end
 
 

data/lib/artbase/tool.rb

@@ -16,7 +16,11 @@ class Tool
     puts "==> welcome to collection tool with args:"
     pp args
 
-    options = { }
+
+    options = { faster: false,
+                mirror: false,
+              }
+
     parser = OptionParser.new do |opts|
 
       opts.on("--offset NUM", Integer,
@@ -35,6 +39,15 @@ class Tool
       ##    options[ :range]  = range
       ## end
 
+      opts.on( "--faster", "Use faster (optional) pixelate binary (default: false)") do
+          options[ :faster ] = true
+      end
+
+      opts.on( "--mirror", "Mirror (or flip) images (default: false)" ) do
+          options[ :mirror ] = true
+      end
+
+
       opts.on("-h", "--help", "Prints this help") do
         puts opts
         exit
@@ -58,23 +71,41 @@ class Tool
     command    = args[1]
     subcommand = args[2]
 
-
-    path = if File.exist?( "./#{name}/config.rb" )
-               "./#{name}/config.rb"
-           else
-               "./#{name}/collection.rb"
-           end
-    puts "==> reading collection config >#{path}<..."
-
-    ## note: assume for now global const COLLECTION gets set/defined!!!
-    ##   use/change to a script/dsl loader/eval later!!!
-    load( path )
-
-    ## pp COLLECTION
-
-    ## configure collection  (note: requires self)
-    self.collection = COLLECTION
-
+    if File.exist?( "./#{name}/collection.yml" )
+       path = "./#{name}/collection.yml"
+       puts "==> reading collection config >#{path}<..."
+       config = read_yaml( path )
+
+       ## todo - use TokenCollection.read( ) or such -- why? why not?
+       ##           or TokenCollection.build( hash ) ?? - why? why not?
+       self.collection = TokenCollection.new(
+         config['slug'],
+         config['count'],
+         token_base: config['token_base'],
+         image_base: config['image_base'],
+         format: config['format'],
+         source: config['source'],
+         offset: config['offset'] || 0
+       )
+    else
+      ## todo/check: keep config.rb alternate name - why? why not?
+      ##    or use collection.rb only ???
+      path = if File.exist?( "./#{name}/config.rb" )
+                 "./#{name}/config.rb"
+             else
+                 "./#{name}/collection.rb"
+             end
+      puts "==> reading collection config >#{path}<..."
+
+      ## note: assume for now global const COLLECTION gets set/defined!!!
+      ##   use/change to a script/dsl loader/eval later!!!
+      load( path )
+
+      ## pp COLLECTION
+
+      ## configure collection  (note: requires self)
+      self.collection = COLLECTION
+    end
 
     if ['d','dl','down', 'download'].include?( command )
       if subcommand
@@ -88,7 +119,8 @@ class Tool
         download_images
       end
     elsif ['p', 'px', 'pix', 'pixel', 'pixelate'].include?( command )
-      pixelate( offset: options[ :offset] )
+      pixelate( offset: options[ :offset],
+                faster: options[ :faster] )
     elsif ['m', 'meta'].include?( command )
       download_meta( offset: options[ :offset] )
     elsif ['i', 'img', 'image', 'images'].include?( command )
@@ -100,7 +132,8 @@ class Tool
     elsif ['x', 'exp', 'export'].include?( command )
       export_attributes
     elsif ['c', 'composite'].include?( command )
-      make_composite
+      make_composite( limit: options[ :limit],
+                      mirror: options[ :mirror ])
     elsif ['strip'].include?( command )
       make_strip
     elsif ['t', 'test'].include?( command )
@@ -112,9 +145,9 @@ class Tool
     puts "bye"
   end
 
-  def self.make_composite
+  def self.make_composite( limit: nil, mirror: false )
     puts "==> make composite"
-    @collection.make_composite
+    @collection.make_composite( limit: limit, mirror: mirror )
   end
 
   def self.convert_images
@@ -165,7 +198,9 @@ class Tool
      @collection.download_images( range )
   end
 
-  def self.pixelate( offset: )
+
+  def self.pixelate( offset:,
+                     faster: )
     puts "==> pixelate"
 
     range = if offset
@@ -174,7 +209,7 @@ class Tool
               @collection._range
             end
 
-    @collection.pixelate( range )
+    @collection.pixelate( range, faster: faster )
   end
 end # class Tool
 

data/lib/artbase/version.rb

@@ -3,7 +3,7 @@
 module Artbase
   MAJOR = 0
   MINOR = 2
-  PATCH = 1
+  PATCH = 2
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artbase
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocos