punks 0.3.2 → 0.3.3

data/lib/punks/punks.rb

@@ -1,15 +1,45 @@
 
-
 module Punk
 
+  class Spritesheet
+    def self.builtin
+      @builtin ||= SpritesheetEx.read(  "#{Pixelart::Module::Punks.root}/config/punks-24x24.png",
+                                        "#{Pixelart::Module::Punks.root}/config/punks-24x24.csv",
+                                        width:  24,
+                                        height: 24 )
+    end
+
+    ## note: for now class used for "namespace" only
+    def self.find_by( name:, gender: nil, size: nil, warn: true )  ## return archetype/attribute image by name
+       # note: pass along name as q (query string)
+       builtin.find_by( name: name,
+                        gender: gender,
+                        size:   size,
+                        warn:   warn )
+    end
+    def self.find( name, gender: nil, size: nil )  ## return archetype/attribute image by name
+      puts "!!! [WARN] deprecated method call Punk::Spritesheet.find use find_by( name: ) !!!!"
+      builtin.find_by( name: name,
+                       gender: gender,
+                       size:   size )
+    end
+    ## helpers
+    def self.normalize_key( str ) Pixelart::SpritesheetEx.normalize_key( str ); end
+ end  # class Spritesheet
+
+
+  ## add convenience (alternate spelling) alias - why? why not?
+  SpriteSheet = Spritesheet
+  Sheet       = Spritesheet
+  Sprite      = Spritesheet
+
+
+
   class Image < Pixelart::Image
     def self.generator
-      ### todo/fix:  break out/ split off spritesheet from generator!!!!
-      @generator ||= Generator.new(  "#{Pixelart::Module::Punks.root}/config/punks-24x24.png",
-                                     "#{Pixelart::Module::Punks.root}/config/punks-24x24.csv", image_class: Image )
+      @generator ||= GeneratorEx.use( Sheet.builtin, image_class: Image )
     end
 
-
     def self.generate( *values, style: nil, patch: nil )
 
      if values[0].is_a?( String )
@@ -31,7 +61,7 @@ module Punk
      ##      Eyes   =>  Eyes B&W
      ##      Smile  =>  Smile B&W
      ##      ....
-      archetype_key =  Generator.normalize_key( values[0] )
+      archetype_key =  Sheet.normalize_key( values[0] )
        if archetype_key.end_with?( 'bw' ) ||  ## e.g. B&W
           archetype_key.end_with?( '1bit')    ## e.g. 1-Bit or 1Bit
 
@@ -39,7 +69,7 @@ module Punk
              if attribute.is_a?( Pixelart::Image )
                 attribute
              else
-                attribute_key = Generator.normalize_key( attribute )
+                attribute_key = Sheet.normalize_key( attribute )
                 if ['wildhair'].include?( attribute_key )   ## pass through known b&w attributes by "default"
                    attribute
                 elsif attribute_key.index( "black" )
@@ -73,7 +103,7 @@ module Punk
         if attribute.is_a?( Pixelart::Image )
           attribute
         else
-          attribute_key = Generator.normalize_key( attribute )
+          attribute_key = Sheet.normalize_key( attribute )
 
           if attribute_key == 'smile' || attribute_key == 'frown'
              attribute +=   if    archetype_key.index( 'zombiefemale' ) then ' Zombie'
@@ -96,28 +126,6 @@ module Punk
        generator.generate( *values, style: style, patch: patch )
      end # method Image.generate
   end # class Image
-
-
-
-  class Spritesheet
-    def self.builtin
-       ## for now get spritesheet via generator
-       Image.generator
-    end
-    ## note: for now class used for "namespace" only
-    def self.find_by( name:, gender: nil, size: nil )  ## return archetype/attribute image by name
-       # note: pass along name as q (query string)
-       builtin.find( name,
-                     gender: gender,
-                     size:   size )
-    end
-  end  # class Spritesheet
-  ## add convenience (alternate spelling) alias - why? why not?
-  SpriteSheet = Spritesheet
-  Sheet       = Spritesheet
-  Sprite      = Spritesheet
 end #  module Punk
 
 
-
-

data/lib/punks/version.rb

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

data/lib/punks.rb

@@ -7,7 +7,9 @@ require 'artfactory/base'
 ## our own code
 require 'punks/version'    # note: let version always go first
 
-require 'punks/generator'
+
+require 'punks/pixelart/spritesheet'
+require 'punks/pixelart/generator'
 
 
 ## --- 24x24 series
@@ -18,7 +20,9 @@ require 'punks/philips'
 require 'punks/saudis'
 ## --- 32x32 series
 require 'punks/punks_xl'
-
+require 'punks/bodies_32'
+## --- 40x40 series
+require 'punks/bodies_40'
 
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: punks
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pixelart
@@ -104,15 +104,20 @@ files:
 - config/philip-24x24.png
 - config/punks-24x24.csv
 - config/punks-24x24.png
+- config/punks-32x32.csv
+- config/punks-32x32.png
 - config/punks_xl-32x32.csv
 - config/punks_xl-32x32.png
 - config/saudis-24x24.csv
 - config/saudis-24x24.png
 - lib/punks.rb
-- lib/punks/generator.rb
+- lib/punks/bodies_32.rb
+- lib/punks/bodies_40.rb
 - lib/punks/marilyns.rb
 - lib/punks/philips.rb
 - lib/punks/phunks.rb
+- lib/punks/pixelart/generator.rb
+- lib/punks/pixelart/spritesheet.rb
 - lib/punks/punks.rb
 - lib/punks/punks_xl.rb
 - lib/punks/saudis.rb