punkmaker 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '090cd7aef96630d9965d356c07f5ee4ee2f10646e004ce04d33b818e6f14fe9d'
-  data.tar.gz: 18845296d5fb06f19ade59f9b9b247bd6e8034ee1a3b9771e4144eb08e98e282
+  metadata.gz: 44a12cf90683dcbdc1289eb5272daa165010d4e86bd0c31c9eca9d9f6cbfef42
+  data.tar.gz: 83ea621299ee91bd119ac9583cfc7df5b75ff0efe2e02b5e50e6225f9ba721a3
 SHA512:
-  metadata.gz: 9fae8313d6eb3617e4a24815dfa2ace0edd8a06ff878583425bb9611e0adea29a033ab7c143639fbfffc4c82a064b56e4e92255ca03184297870806b5e8b0794
-  data.tar.gz: 47ac27f962d02de05919e42b1289e4acb06723548ac66c32277f1fd0a718b62e1fd72e1accac07eeb74c49c0e6bbf9f3fb0ddd76f0b8be94093b2a762a97f4fd
+  metadata.gz: 5e94379084c7172fc7be35986e4f9033287ef42a99bd9aac91c7e2c50087b928051463c6c2e1c615e4b620c72f225158f16b642cad895343b65a1adf75bfbd3d
+  data.tar.gz: 93fe49aeb67af85fd2fea30d79db2deced0931e38f05ae8d7bbc2b916ab72f02af3568a90989dad8d0ce2246b21308209ecdd969597772c9e2943dabf5034696

data/CHANGELOG.md

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

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.parse( 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 )
 
@@ -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,18 +6,21 @@ 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 )

data/lib/punkmaker/demon.rb

@@ -6,17 +6,21 @@ 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 )

data/lib/punkmaker/human.rb

@@ -8,45 +8,72 @@ 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.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 )
+    
+    if color    ## change skin tone (& eyebrows)?
+      color_map = derive_color_map( color )  
+      punk = punk.change_colors( color_map )
+    end
+
+    if eye_color    ## change eye color?
+       eye_color = Color.parse( eye_color )    if eye_color.is_a?( String )
+       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 =    color ? derive_shine( color ) : 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.parse( 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 )
 
@@ -59,28 +86,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,29 +7,34 @@ 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.parse( 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 )

data/lib/punkmaker/orc.rb

@@ -6,17 +6,20 @@ 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 )

data/lib/punkmaker/robot.rb

@@ -6,17 +6,20 @@ 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 )

data/lib/punkmaker/skeleton.rb

@@ -5,17 +5,20 @@ 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 )

data/lib/punkmaker/vampire.rb

@@ -6,17 +6,20 @@ 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 )

data/lib/punkmaker/version.rb

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

data/lib/punkmaker/zombie.rb

@@ -6,18 +6,58 @@ module Zombie    ## make it a class - why? why not?
   BASE_M = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/zombie-male.png" )
   BASE_F = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/zombie-female.png" )
         
-  def self.make( color,
+  def self.make( color=nil,
+                  shine: true,
                    gender: 'm'  )
-      color_map = derive_color_map( color )
-  
-      punk = nil
+    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
+
+    if shine
+      shine_color =    color ? derive_shine( color ) : 0x9bbc88ff
       if gender == 'm'
-          punk = BASE_M.change_colors( color_map )
-      else
-          punk = BASE_F.change_colors( color_map )
+        punk[9,7] = shine_color
+        punk[8,8] = shine_color
+      else 
+        punk[9,9] = shine_color
       end
-      punk
+     end   
+
+    punk
+  end
+
+
+  def self.derive_shine( color )
+## was before - reuse - 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.parse( 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
+
   
   def self.derive_color_map( color )
     color = Color.parse( color )  if color.is_a?( String )
@@ -40,17 +80,10 @@ module Zombie    ## make it a class - why? why not?
     [0.0,s-0.05].max,
     [0.0,l-0.12].max)
 
-  ## 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_map = {
       '#7da269' =>  base,
       '#5e7253' => darker,
-      '#9bbc88' => lighter
   }
 
   color_map

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: punkmaker
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-31 00:00:00.000000000 Z
+date: 2023-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pixelart