punkmaker 0.3.0 → 0.3.2

data/lib/punkmaker/alien.rb

@@ -8,19 +8,60 @@ module Alien   ## make it a class - why? why not?
   BASE_F = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/alien-female.png" )
   
   
-  def self.make( color,
+  def self.make( color=nil,
+                 shine: true,
                  gender: 'm'  )
-    color_map = derive_color_map( color )
 
-    punk = nil
-    if gender == 'm'
-        punk = BASE_M.change_colors( color_map )
-    else
-        punk = BASE_F.change_colors( color_map )
+    base =   gender == 'm' ? BASE_M : BASE_F
+
+    ## note: make a copy of base 
+    punk = Image.new( base.width, base.height )  
+    punk.compose!( base )
+    
+    if color    ## change skin tone (& eyebrows)?
+      color_map = derive_color_map( color )  
+      punk = punk.change_colors( color_map )
     end
+
+   
+    if shine
+     shine_color =    color ? derive_shine( color ) : 0xf1ffffff
+     if gender == 'm'
+       punk[9,7] = shine_color
+       punk[8,8] = shine_color
+     else 
+       punk[9,9] = shine_color
+     end
+    end   
     punk
   end
 
+
+  def self.derive_shine( color )
+## was before - reuse old formula- why? why not?
+## todo/check - check "formula" used in skintones script for humans!!!
+## lighter = Color.from_hsl(
+##   (h+1)%360,   # todo/check: make lighter by -1 on hue? or +1????
+##   [1.0,s+0.10].min,
+##   [1.0,l+0.25].min)
+
+    color = Color.from_hex( color )  if color.is_a?( String )
+  
+    hsv  = Color.to_hsv( color )
+    # pp hsv
+
+    h, s, v = hsv
+    h = h % 360   # make always positive (might be -50 or such)
+    ## pp [h,s,v]
+
+    ## add extra saturation if v(alue) / brightness is max 1.0 - why? why not?
+    sdiff = v >= 0.99 ? 0.35 : 0.25
+
+    lighter =  Color.from_hsv( h, [0.0, s-sdiff].max, [v+0.1,1.0].min )  
+    lighter
+  end
+
+
   
 def self.derive_color_map( color )
 
@@ -28,7 +69,7 @@ def self.derive_color_map( color )
 # 125 pixels #c8fbfb / rgb(200 251 251) - hsl(180°  86%  88%)   - base (use as base)
 #  6 pixels #9be0e0 / rgb(155 224 224) - hsl(180°  53%  74%)   - darker
 #  2 pixels #75bdbd / rgb(117 189 189) - hsl(180°  35%  60%)  - darkest
-color = Color.parse( color )  if color.is_a?( String )
+color = Color.from_hex( color )  if color.is_a?( String )
 base = color
 
 hsl  = Color.to_hsl( color )
@@ -38,12 +79,6 @@ h, s, l = hsl
 h = h % 360   # make always positive (might be -50 or such)
 pp [h,s,l]
 
-## todo/check - check "formula" used in skintones script for humans!!!
-lighter = Color.from_hsl(
-   (h+1)%360,   # todo/check: make lighter by -1 on hue? or +1????
-   [1.0,s+0.10].min,
-   [1.0,l+0.25].min)
-
 
 darker = Color.from_hsl(
   h,
@@ -58,7 +93,6 @@ darkest = Color.from_hsl(
 
 color_map = {
     '#c8fbfb' =>  base,
-    '#f1ffff' => lighter,
     '#9be0e0' => darker,
     '#75bdbd' => darkest,
 }

data/lib/punkmaker/ape.rb

@@ -6,21 +6,24 @@ module Ape    ## make it a class - why? why not?
   BASE_M = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/ape-male.png" )
   BASE_F = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/ape-female.png" )
         
-  def self.make( color,
+  def self.make( color=nil,
                    gender: 'm'  )
-      color_map = derive_color_map( color )
-  
-      punk = nil
-      if gender == 'm'
-          punk = BASE_M.change_colors( color_map )
-      else
-          punk = BASE_F.change_colors( color_map )
-      end
-      punk
-  end
+     base =   gender == 'm' ? BASE_M : BASE_F
+
+    ## note: make a copy of base 
+    punk = Image.new( base.width, base.height )  
+    punk.compose!( base )
+    
+    if color    
+      color_map = derive_color_map( color )  
+      punk = punk.change_colors( color_map )
+    end
+
+    punk
+ 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 )
    
     darkest = color
 

data/lib/punkmaker/colors.rb

@@ -0,0 +1,60 @@
+
+class ColorBundle
+
+def self.read( *paths )
+    recs = []
+    paths.each do |path|
+        recs += read_csv( path )
+    end
+    new( recs )
+end    
+
+def self.normalize_key( str )
+    ## remove all non-alphanum chars (a-z,0-9)
+    str.downcase.gsub(/[^a-z0-9]/, '').strip
+end
+def normalize_key( str )  self.class.normalize_key( str ); end
+ 
+
+def initialize( recs )
+    @recs = recs
+    @colors_by_key = _build_colors_by_key( @recs )
+end
+
+def records() @recs; end
+
+def find_by( name: )
+   key = normalize_key( name )  ## normalize q(uery) string/symbol
+   @colors_by_key[ key ]
+end
+
+def _find( name )  find_by( name: name ); end
+alias_method :[], :_find
+
+
+######
+##  helpers
+def _build_colors_by_key( recs )
+   h = {}
+   recs.each_with_index do |rec|
+
+     color = Color.from_hex( rec['color'] )
+     names = (rec['names'] || '').split( '|' )
+     
+     names.each do |name|
+       key = normalize_key( name )
+
+       if h[ key ]
+         puts "!!! ERROR - color name is not unique:"
+         pp rec
+         puts "duplicate:"
+         pp h[key]
+         exit 1
+       end
+       h[ key ] = color
+     end
+  end
+   h
+end
+
+end  # class ColorBundle

data/lib/punkmaker/demon.rb

@@ -6,21 +6,25 @@ module Demon    ## make it a class - why? why not?
   BASE_M = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/demon-male.png" )
   BASE_F = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/demon-female.png" )
         
-  def self.make( color,
+  def self.make( color=nil,
                    gender: 'm'  )
-      color_map = derive_color_map( color )
-  
-      punk = nil
-      if gender == 'm'
-          punk = BASE_M.change_colors( color_map )
-      else
-          punk = BASE_F.change_colors( color_map )
-      end
-      punk
+       base =   gender == 'm' ? BASE_M : BASE_F
+
+    ## note: make a copy of base 
+    punk = Image.new( base.width, base.height )  
+    punk.compose!( base )
+    
+    if color   
+      color_map = derive_color_map( color )  
+      punk = punk.change_colors( color_map )
+    end
+
+    punk
+                
   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 )
 
 # 134 pixels #850008 / rgb(133   0   8) - hsl(356° 100%  26%)  - base
 #   2 pixels #630006 / rgb( 99   0   6) - hsl(356° 100%  19%)  - darker

data/lib/punkmaker/human.rb

@@ -8,47 +8,95 @@ module Human   ## make it a class - why? why not?
   BASE_F = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/human-female4.png" )
 
 
-  def self.make( color,
+
+  def self.parse_skintone( color )   ##  lookup skintone by name or rgb(a) hex string or integer "true color"
+    if color.is_a?( String ) 
+       Skintone[ color ] || Color.from_hex( color )  
+    else ## assume color is integer - assert - why? why not?
+       color
+    end
+  end
+
+  def self.parse_eye_color( color )
+    if color.is_a?( String )
+       Color.from_hex( color )
+    else
+       color
+    end
+  end
+
+
+
+  def self.make( color=nil,
+                 shine: true,
                  eye_color: nil,
                  gender: 'm'  )
-    color_map = derive_color_map( color )
-
-    eye_color = Color.parse( eye_color )    if eye_color && eye_color.is_a?( String )
-
-    punk = nil
-    if gender == 'm'
-      punk = BASE_M.change_colors( color_map )
-      punk[10,12] = Color::WHITE     # left eye dark-ish pixel to white
-      punk[15,12] = Color::WHITE     # right eye ---
-      if eye_color
-        punk[9,12]  = eye_color
-        punk[14,12] = eye_color
-      end
-    else  ## assume 'f'
-      ## for female - change lips to all black (like in male for now) - why? why not?
-      color_map[ '#711010' ] = '#000000'
-      punk = BASE_F.change_colors( color_map )
-      punk[10,13] = Color::WHITE     # left eye dark-ish pixel to white
-      punk[15,13] = Color::WHITE     # right eye ---
-      if eye_color
-        punk[9,13] = eye_color
-        punk[14,13] = eye_color
-      end
+
+    base =   gender == 'm' ? BASE_M : BASE_F
+
+    ## note: make a copy of base 
+    punk = Image.new( base.width, base.height )  
+    punk.compose!( base )
+
+    
+    skintone = color ? parse_skintone( color ) : nil 
+    if skintone    ## change skin tone (& eyebrows)?
+      color_map = derive_color_map( skintone )  
+      punk = punk.change_colors( color_map )
+    end
+
+    if eye_color    ## change eye color?
+       eye_color = parse_eye_color( eye_color ) 
+       if gender == 'm'
+         punk[9,12]  = eye_color
+         punk[14,12] = eye_color
+       else
+         punk[9,13] = eye_color
+         punk[14,13] = eye_color
+       end
+    end
+
+    if shine     ## add shine?
+       # note: default shine color is white
+       shine_color =   skintone ? derive_shine( skintone ) : 0xffffffff
+       if gender == 'm'
+         punk[9,7] = shine_color
+         punk[8,8] = shine_color
+       else 
+         punk[9,9] = shine_color
+      end   
     end
 
     punk
   end
 
 
+  def self.derive_shine( color )
+    color = Color.from_hex( color )  if color.is_a?( String )
+  
+    hsv  = Color.to_hsv( color )
+    # pp hsv
+
+    h, s, v = hsv
+    h = h % 360   # make always positive (might be -50 or such)
+    ## pp [h,s,v]
+
+    ## add extra saturation if v(alue) / brightness is max 1.0 - why? why not?
+    sdiff = v >= 0.99 ? 0.25 : 0.15
+
+    lighter =  Color.from_hsv( h, [0.0, s-sdiff].max, [v+0.1,1.0].min )  
+    lighter
+  end
+ 
+
   ##
   ## todo/check:
   ##  add a derive_colors or dervice_skintones  method - why? why not?
   ##    - change to name skintone_palette - why? why not?
   ## def self.derive_skintone_colors( color  or base )  ???
 
-
   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 )
 
       base = color
 
@@ -59,28 +107,16 @@ module Human   ## make it a class - why? why not?
       h = h % 360   # make always positive (might be -50 or such)
       pp [h,s,l]
 
-      darker   = Color.from_hsl(
-        h,
-        [0.0, s-0.05].max,
-        [0.14, l-0.1].max)
-
       ## sub one degree on hue on color wheel (plus +10% on lightness??)
-      darkest = Color.from_hsl(
-                     (h-1) % 360,
+      ## darker
+      eyebrows = Color.from_hsl(
+                     h,
                      s,
                      [0.05, l-0.1].max)
 
-
-      lighter = Color.from_hsl(
-                      (h+1) % 360,
-                      s,
-                      [1.0, l+0.1].min)
-
       color_map = {
          '#ead9d9'  =>   base,
-         '#ffffff'  =>   lighter,
-         '#a58d8d'  =>   darkest,
-         '#c9b2b2'  =>   darker
+         '#a58d8d'  =>   eyebrows,
       }
       color_map
   end

data/lib/punkmaker/mummy.rb

@@ -7,32 +7,37 @@ module Punk
     BASE_F = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/mummy-female.png" )
 
 
-    def self.make( color,
+    def self.make( color=nil,
                    eye_color: nil,
                    gender: 'm'  )
-      color_map = derive_color_map( color )
+     base =   gender == 'm' ? BASE_M : BASE_F
+
+    ## note: make a copy of base 
+    punk = Image.new( base.width, base.height )  
+    punk.compose!( base )
+    
+    if color    
+      color_map = derive_color_map( color )  
+      punk = punk.change_colors( color_map )
+    end
 
-      eye_color = Color.parse( eye_color )    if eye_color && eye_color.is_a?( String )
+    if eye_color
+      eye_color = Color.from_hex( eye_color )    if eye_color.is_a?( String )
 
-      punk = nil
       if gender == 'm'
-        punk = BASE_M.change_colors( color_map )
-        if eye_color
           punk[9,12]  = eye_color
           punk[14,12] = eye_color
-        end
       else ## assume 'f'
-        punk = BASE_F.change_colors( color_map )
-        if eye_color
           punk[10,13] = eye_color   ## note: eye pos +1 pix!!
           punk[14,13] = eye_color
-        end
       end
-      punk
     end
+    punk
+  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 )
 
 # 385 pixels #000000 / rgb(  0   0   0) - hsl(  0°   0%   0%) - hsv(  0°   0%   0%) - α(  0%) - TRANSPARENT
 # 52 pixels #000000 / rgb(  0   0   0) - hsl(  0°   0%   0%) - hsv(  0°   0%   0%)           - BLACK

data/lib/punkmaker/orc.rb

@@ -6,21 +6,24 @@ module Orc    ## make it a class - why? why not?
   BASE_M = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/orc-male.png" )
   BASE_F = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/orc-female.png" )
         
-  def self.make( color,
+  def self.make( color=nil,
                    gender: 'm'  )
-      color_map = derive_color_map( color )
-  
-      punk = nil
-      if gender == 'm'
-          punk = BASE_M.change_colors( color_map )
-      else
-          punk = BASE_F.change_colors( color_map )
-      end
-      punk
+     base =   gender == 'm' ? BASE_M : BASE_F
+
+    ## note: make a copy of base 
+    punk = Image.new( base.width, base.height )  
+    punk.compose!( base )
+    
+    if color    
+      color_map = derive_color_map( color )  
+      punk = punk.change_colors( color_map )
+    end
+
+    punk
   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 )
 
 # 380 pixels #000000 / rgb(  0   0   0) - hsl(  0°   0%   0%) - hsv(  0°   0%   0%) - α(  0%) - TRANSPARENT
 # 63 pixels #000000 / rgb(  0   0   0) - hsl(  0°   0%   0%) - hsv(  0°   0%   0%)           - BLACK

data/lib/punkmaker/robot.rb

@@ -6,21 +6,24 @@ module Robot    ## make it a class - why? why not?
   BASE_M = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/robot-male.png" )
   BASE_F = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/robot-female.png" )
         
-  def self.make( color,
+  def self.make( color=nil,
                    gender: 'm'  )
-      color_map = derive_color_map( color )
-  
-      punk = nil
-      if gender == 'm'
-          punk = BASE_M.change_colors( color_map )
-      else
-          punk = BASE_F.change_colors( color_map )
-      end
-      punk
+     base =   gender == 'm' ? BASE_M : BASE_F
+
+    ## note: make a copy of base 
+    punk = Image.new( base.width, base.height )  
+    punk.compose!( base )
+    
+    if color    
+      color_map = derive_color_map( color )  
+      punk = punk.change_colors( color_map )
+    end
+
+    punk
   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 )
 
 # 384 pixels #000000 / rgb(  0   0   0) - hsl(  0°   0%   0%) - hsv(  0°   0%   0%) - α(  0%) - TRANSPARENT
 # 74 pixels #000000 / rgb(  0   0   0) - hsl(  0°   0%   0%) - hsv(  0°   0%   0%)           - BLACK

data/lib/punkmaker/skeleton.rb

@@ -5,21 +5,24 @@ module Skeleton    ## make it a class - why? why not?
   BASE_M = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/skeleton-male.png" )
   BASE_F = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/skeleton-female.png" )
         
-  def self.make( color,
+  def self.make( color=nil,
                    gender: 'm'  )
-      color_map = derive_color_map( color )
-  
-      punk = nil
-      if gender == 'm'
-          punk = BASE_M.change_colors( color_map )
-      else
-          punk = BASE_F.change_colors( color_map )
-      end
-      punk
+    base =   gender == 'm' ? BASE_M : BASE_F
+
+    ## note: make a copy of base 
+    punk = Image.new( base.width, base.height )  
+    punk.compose!( base )
+    
+    if color    
+      color_map = derive_color_map( color )  
+      punk = punk.change_colors( color_map )
+    end
+
+    punk
   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 )
   
 # 122 pixels #e0e0e0 / rgb(224 224 224) - hsl(  0°   0%  88%)           - 8-BIT GRAYSCALE #224
 

data/lib/punkmaker/skintone.rb

@@ -0,0 +1,16 @@
+
+module Punk
+module Skintone
+
+def self.bundle
+  @bundle ||= 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 )   bundle.find_by( name: name ); end
+end   # module Skintone
+end   # module Punk
+        

data/lib/punkmaker/vampire.rb

@@ -6,21 +6,24 @@ module Vampire    ## make it a class - why? why not?
   BASE_M = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/vampire-male.png" )
   BASE_F = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/vampire-female.png" )
         
-  def self.make( color,
+  def self.make( color=nil,
                    gender: 'm'  )
-      color_map = derive_color_map( color )
-  
-      punk = nil
-      if gender == 'm'
-          punk = BASE_M.change_colors( color_map )
-      else
-          punk = BASE_F.change_colors( color_map )
-      end
-      punk
+    base =   gender == 'm' ? BASE_M : BASE_F
+
+    ## note: make a copy of base 
+    punk = Image.new( base.width, base.height )  
+    punk.compose!( base )
+    
+    if color    
+      color_map = derive_color_map( color )  
+      punk = punk.change_colors( color_map )
+    end
+
+    punk
   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 )
 
 # 366 pixels #000000 / rgb(  0   0   0) - hsl(  0°   0%   0%) - hsv(  0°   0%   0%) - α(  0%) - TRANSPARENT
 # 67 pixels #000000 / rgb(  0   0   0) - hsl(  0°   0%   0%) - hsv(  0°   0%   0%)           - BLACK

data/lib/punkmaker/version.rb

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