punkmaker 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '069854a626106379119b3bd7013fa471c8c127201426e350da67f94848dd449c'
-  data.tar.gz: 7149b329b2e0e8b4b657b2ea6310906f22e868138d71985434c16ab30423e8e7
+  metadata.gz: e12bea3bca70b044ca008b68267c1ecb26defe4dd58874fab9910ea8c128af43
+  data.tar.gz: 75aa29674ac21933d85c085b08f14023c8e15a1274fca827220839a70ebfad3e
 SHA512:
-  metadata.gz: d7b517729f76418692c5c966ea72e698be67834bfdde19c74bbb1996f137c8c3724c08c7c1b412730ebad02708487a23f4e232dcea1b09f712605032c1cda094
-  data.tar.gz: fc5f30b4d5520f91fb8140cef37072042ef7b9d7be6072a7bb8e2182ad095ed00c9a11616acf18498811492a94245fcf9ac6037808f32f15c3ea749fed0754aa
+  metadata.gz: e455114776d390c9948f6ba2226ee96974db4256f79c07d1a54076e4b8c521a0dc2619e5df404b415dd715ea2537d66bdd3b2aedd2ffd2abc6679f1d9750a54c
+  data.tar.gz: a365c4ef9273e33f806685e1dd3f92d2b41ec0aac22c244686922333335ef1efea7c13621a563994d6511859ffc3793270642e7b4cd9abc37a1f95410bc53be8

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.3.2
+### 0.3.3
 ### 0.0.1 / 2023-04-20
 
 * Everything is new. First release

data/Manifest.txt

@@ -6,6 +6,8 @@ config/alien-female.png
 config/alien-male.png
 config/ape-female.png
 config/ape-male.png
+config/colors/eyes.csv
+config/colors/hair.csv
 config/demon-female.png
 config/demon-male.png
 config/human-female4.png
@@ -27,17 +29,18 @@ config/vampire-male.png
 config/zombie-female.png
 config/zombie-male.png
 lib/punkmaker.rb
-lib/punkmaker/alien.rb
-lib/punkmaker/ape.rb
 lib/punkmaker/colors.rb
-lib/punkmaker/demon.rb
+lib/punkmaker/eyes.rb
 lib/punkmaker/hair.rb
-lib/punkmaker/human.rb
-lib/punkmaker/mummy.rb
-lib/punkmaker/orc.rb
-lib/punkmaker/robot.rb
-lib/punkmaker/skeleton.rb
 lib/punkmaker/skintone.rb
-lib/punkmaker/vampire.rb
+lib/punkmaker/type/alien.rb
+lib/punkmaker/type/ape.rb
+lib/punkmaker/type/demon.rb
+lib/punkmaker/type/human.rb
+lib/punkmaker/type/mummy.rb
+lib/punkmaker/type/orc.rb
+lib/punkmaker/type/robot.rb
+lib/punkmaker/type/skeleton.rb
+lib/punkmaker/type/vampire.rb
+lib/punkmaker/type/zombie.rb
 lib/punkmaker/version.rb
-lib/punkmaker/zombie.rb

data/config/colors/eyes.csv

@@ -0,0 +1,8 @@
+color,     names
+
+0x259FAC,   blue | b
+0x8EA226,   green | g
+0x682B15,   brown
+0x792CC7,   purple
+
+0xFF0000,  red | r

data/config/colors/hair.csv

@@ -0,0 +1,16 @@
+color,     names
+
+0x000000,  black
+0x51360c,  brown       # (darker) brown
+0xa66e2c,  brunette    # lighter brown
+      
+0xe65700,  orange
+0xe22626,  red  
+0xff8ebe,  pink  
+0x710cc7,  purple  
+
+0x28b143,  green
+      
+0xfff68e,  blonde
+0xe0e0e0,  silver
+0xffffff,  white

data/lib/punkmaker/eyes.rb

@@ -0,0 +1,12 @@
+
+module Punk
+module Eyes
+
+def self.colors
+  @colors ||= ColorBundle.read( './config/colors/eyes.csv' ) 
+end
+def self.[]( name )  colors.find_by( name: name ); end
+
+end   # module Eyes
+end   # module Punk
+        

data/lib/punkmaker/hair.rb

@@ -2,34 +2,15 @@
 
 module Punk
   module Hair
-   def self.colors
-      @colors ||= begin
-                    {
-        'black'  => '000000',
-      
-        'brown'     => '51360c',   # (darker) brown
-        'brunette'  => 'a66e2c',   # lighter brown
-      
-        'orange'  => 'e65700',
-        'red'     => 'e22626',
-        'pink'    => 'ff8ebe',
-        'purple'  => '710cc7',
-      
-        'green'   => '28b143',
-      
-        'blonde' => 'fff68e',
-        'silver' => 'e0e0e0',
-        'white'  => 'FFFFFF',
-      }.reduce( {} ) do |h, (name, color_hex)|
-         h[ name ] = Color.from_hex( color_hex )
-         h
-        end
-      end
-      @colors
+    def self.colors
+      @colors ||= ColorBundle.read( './config/colors/hair.csv' )
     end
+    def self.[]( name )  colors.find_by( name: name ); end
+
+
 
     def self.derive_color_map( color )
-        color = Color.parse( color )  if color.is_a?( String )
+        color = Color.from_hex( color )  if color.is_a?( String )
   
             h,s,v = Color.to_hsv( color, include_alpha: false )
             h = h % 360    ## make sure h(ue) is always positive!!!
@@ -98,6 +79,7 @@ module Punk
              end
         def find_by( name: )  @sheet.find_by( name: name ); end
          
+
         def make( style, color: 'black' )   ## change name to colorize - why? why not?
             ## pass-through  shavedhead (no colors - alpha only) - why? why not?
             hair = @sheet.find_by( name: style )
@@ -106,16 +88,19 @@ module Punk
               exit 1
             end
      
-            color_key = color.downcase.gsub(' ','')
-            rgba  = @colors[ color_key ]
-            if rgba.nil?
-             puts "!! ERROR - unknow hair color >#{style}<; sorry"
-             exit 1
-            end
-     
-            color_map = Hair.derive_color_map( rgba )
+            color = parse_hair_color( color )
+
+            color_map = Hair.derive_color_map( color )
             hair.change_colors( color_map )
         end
+
+        def parse_hair_color( color )
+          if color.is_a?( String ) 
+            @colors[ color ] || Color.from_hex( color )  
+          else ## assume color is integer - assert - why? why not?
+            color
+          end      
+        end
     end  ## (embedded) class Maker
   end # module Hair
 end # module Punk

data/lib/punkmaker/skintone.rb

@@ -2,15 +2,15 @@
 module Punk
 module Skintone
 
-def self.bundle
-  @bundle ||= ColorBundle.read( 
+def self.colors
+  @colors ||= ColorBundle.read( 
                 './config/skintone/ye_olde_punks.csv',
                 './config/skintone/color_me_human.csv',
                 './config/skintone/dr_ellis_monk.csv',
                 './config/skintone/punks_not_dead.csv' ) 
 end
+def self.[]( name )  colors.find_by( name: name ); end
 
-def self.[]( name )   bundle.find_by( name: name ); end
 end   # module Skintone
 end   # module Punk
         

data/lib/punkmaker/{alien.rb → type/alien.rb}

@@ -7,17 +7,23 @@ module Alien   ## make it a class - why? why not?
   BASE_M = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/alien-male.png" )
   BASE_F = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/alien-female.png" )
   
+
+  def self.base( gender: 'm' )
+    base =  gender == 'm' ? BASE_M : BASE_F
+
+    ## note: make a copy of base 
+    punk = Image.new( base.width, base.height )  
+    punk.compose!( base )  
+    punk
+  end
+
   
   def self.make( color=nil,
                  shine: true,
                  gender: 'm'  )
 
-    base =   gender == 'm' ? BASE_M : BASE_F
-
-    ## note: make a copy of base 
-    punk = Image.new( base.width, base.height )  
-    punk.compose!( base )
-    
+    punk = base( gender: gender )  ## get base image (as a copy to modify)
+                 
     if color    ## change skin tone (& eyebrows)?
       color_map = derive_color_map( color )  
       punk = punk.change_colors( color_map )

data/lib/punkmaker/{human.rb → type/human.rb}

@@ -19,25 +19,29 @@ module Human   ## make it a class - why? why not?
 
   def self.parse_eye_color( color )
     if color.is_a?( String )
-       Color.from_hex( color )
+       Eyes[ color ] || Color.from_hex( color )
     else
        color
     end
   end
 
 
+  def self.base( gender: 'm' )
+    base =  gender == 'm' ? BASE_M : BASE_F
+
+    ## note: make a copy of base 
+    punk = Image.new( base.width, base.height )  
+    punk.compose!( base )  
+    punk
+  end
+
 
   def self.make( color=nil,
                  shine: true,
                  eye_color: nil,
                  gender: 'm'  )
 
-    base =   gender == 'm' ? BASE_M : BASE_F
-
-    ## note: make a copy of base 
-    punk = Image.new( base.width, base.height )  
-    punk.compose!( base )
-
+    punk =  base( gender: gender )
     
     skintone = color ? parse_skintone( color ) : nil 
     if skintone    ## change skin tone (& eyebrows)?

data/lib/punkmaker/version.rb

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

data/lib/punkmaker.rb

@@ -7,18 +7,20 @@ require_relative 'punkmaker/version'  ## let version always go first
 ## support - move to ???
 require_relative 'punkmaker/colors'   ## ColorBundle (color by name lookup and mroe)
 require_relative 'punkmaker/skintone'
+require_relative 'punkmaker/eyes'
+
 
 ## more base / archetypes
-require_relative 'punkmaker/human'
-require_relative 'punkmaker/alien'
-require_relative 'punkmaker/mummy'
-require_relative 'punkmaker/ape'
-require_relative 'punkmaker/skeleton'
-require_relative 'punkmaker/zombie'
-require_relative 'punkmaker/demon'
-require_relative 'punkmaker/orc'
-require_relative 'punkmaker/robot'
-require_relative 'punkmaker/vampire'
+require_relative 'punkmaker/type/human'
+require_relative 'punkmaker/type/alien'
+require_relative 'punkmaker/type/mummy'
+require_relative 'punkmaker/type/ape'
+require_relative 'punkmaker/type/skeleton'
+require_relative 'punkmaker/type/zombie'
+require_relative 'punkmaker/type/demon'
+require_relative 'punkmaker/type/orc'
+require_relative 'punkmaker/type/robot'
+require_relative 'punkmaker/type/vampire'
 
 
 ## more hair (incl. beards & eyebrows)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: punkmaker
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-01 00:00:00.000000000 Z
+date: 2023-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pixelart
@@ -90,6 +90,8 @@ files:
 - config/alien-male.png
 - config/ape-female.png
 - config/ape-male.png
+- config/colors/eyes.csv
+- config/colors/hair.csv
 - config/demon-female.png
 - config/demon-male.png
 - config/human-female4.png
@@ -111,20 +113,21 @@ files:
 - config/zombie-female.png
 - config/zombie-male.png
 - lib/punkmaker.rb
-- lib/punkmaker/alien.rb
-- lib/punkmaker/ape.rb
 - lib/punkmaker/colors.rb
-- lib/punkmaker/demon.rb
+- lib/punkmaker/eyes.rb
 - lib/punkmaker/hair.rb
-- lib/punkmaker/human.rb
-- lib/punkmaker/mummy.rb
-- lib/punkmaker/orc.rb
-- lib/punkmaker/robot.rb
-- lib/punkmaker/skeleton.rb
 - lib/punkmaker/skintone.rb
-- lib/punkmaker/vampire.rb
+- lib/punkmaker/type/alien.rb
+- lib/punkmaker/type/ape.rb
+- lib/punkmaker/type/demon.rb
+- lib/punkmaker/type/human.rb
+- lib/punkmaker/type/mummy.rb
+- lib/punkmaker/type/orc.rb
+- lib/punkmaker/type/robot.rb
+- lib/punkmaker/type/skeleton.rb
+- lib/punkmaker/type/vampire.rb
+- lib/punkmaker/type/zombie.rb
 - lib/punkmaker/version.rb
-- lib/punkmaker/zombie.rb
 homepage: https://github.com/cryptopunksnotdead/punkart.sandbox
 licenses:
 - Public Domain