barbershop 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04dfa931a2cf7ed29b4b6660d8e201a902fcdebe5927f700737a12bc2a8a6906
-  data.tar.gz: aa55a1e1e2e240a1e6bc500929fbeb9ce77b93d2a6b89e4cc5e765ae1ad55390
+  metadata.gz: 4e4c7cf0e3654ce629ee2e53ac955fcdc1e413a53364552841f8ff7ca4cda6ed
+  data.tar.gz: a00b8c25d80ae8713e84571c5a53277ded4958c5bccb4957ad190dd2c409cdd4
 SHA512:
-  metadata.gz: aad854331a700ff8f93922bfbe0cee1fd14bf361dadcef52c48d071dec011fd192c25d86266d7e465169ca95b0163851a141df0b6e69fa104f3e844f1d33fed4
-  data.tar.gz: 3c8fb11e9510285b458603fac4e3ce2ae61606147d099b79b07f02cfceef9dd62e1d99ebf0882cc83be1628eeaacc876c76c23d7bc6a283df42b44fa4be99c86
+  metadata.gz: d3740540399b33cdc2ec4304c05b092667d919bc3ddad6a6802239b4fa48a45dbc89ecf269c56f413d7c398971b2239584d74f93d5cc0e314d193d0713598e30
+  data.tar.gz: 288116a4f8571f7374d8bd39617722db2b46b147a02229d753e0f246de9b3f8179b00ccb0e1057cf0e8d73eb094b2e02ba4ffa7e216cdc6708089058efff60bc

data/CHANGELOG.md

@@ -1,3 +1,4 @@
+### 0.1.0
 ### 0.0.1 / 2023-08-26
 
 * Everything is new. First release

data/Rakefile

@@ -26,8 +26,7 @@ Hoe.spec 'barbershop' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['pixelart'],
-    ['spritesheet'],
+    ['punkmaker'],
   ]
 
   self.licenses = ['Public Domain']

data/lib/barbershop/version.rb

@@ -2,8 +2,8 @@ module Pixelart
   module Module
 module Barbershop
   MAJOR = 0
-  MINOR = 0
-  PATCH = 1
+  MINOR = 1
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/barbershop.rb

@@ -1,5 +1,4 @@
-require 'pixelart'
-require 'spritesheet'
+require 'punkmaker'
 
 
 # our code
@@ -9,105 +8,21 @@ require_relative 'barbershop/version'  # let version go first
 
 module Barbershop
   module Hair
-   def self.sheet
-      @sheet ||= Pixelart::Spritesheet.read( 
-                     "#{Pixelart::Module::Barbershop.root}/config/spritesheet-hair.png",
-                     "#{Pixelart::Module::Barbershop.root}/config/spritesheet-hair.csv",
-                                    width: 24,
-                                    height: 24 )
-   end
-   def self.find_by( name: )  sheet.find_by( name: name ); end
-
-   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.maker
+      @maker ||= Punk::Hair::Maker.read( "#{Pixelart::Module::Barbershop.root}/config/spritesheet-hair.png",
+                                         "#{Pixelart::Module::Barbershop.root}/config/spritesheet-hair.csv",
+                                         width: 24, height: 24,
+                                         colors: Punk::Hair.colors )
     end
-
-    def self.colorize( hair, color: )     
-            h,s,v = Color.to_hsv( color, include_alpha: false )
-            h = h % 360    ## make sure h(ue) is always positive!!!
-            puts "    #{[h,s,v].inspect}"
-        
-              # lighter  - #2a2aff / rgb( 42  42 255) - hsl(240° 100%  58%) - hsv(240°  84% 100%)
-              #   - used in hair( frumpy, f/pigtails3, f/straight3, f/wild4, f/wild5 )
-        
-              # lightest -  #5454ff / rgb( 84  84 255) - hsl(240° 100%  66%) - hsv(240°  67% 100%)
-              #  - used in hair(mohawk thin)
-        
-              # darker   - #0000dd / rgb(  0   0 221) - hsl(240° 100%  43%) - hsv(240° 100%  87%)
-              #  - used in hair(mohawk)
-        
-              ## todo/fix: make lighter/darker formula more "robust"/ better!!!
-            if color == 0x000000ff   # black
-              # hsv(  0°   0%   0%)
-              lighter =  Color.from_hsv( h, 0.0, 0.16 )
-              lightest = Color.from_hsv( h, 0.0, 0.33 )
-              darker   = Color.from_hsv( h, 0.0, 0.0 )  ## darker than black not possible ;-)
-            elsif color == 0xe0e0e0ff   # silver
-             #  hsv(  0°   0%  88%)
-              lighter =  Color.from_hsv( h, 0.0, 1.0 )  # white
-              lightest = Color.from_hsv( h, 0.0, 1.0 )  # white
-              darker   = Color.from_hsv( h, 0.0, [0.0, v-0.13].max )
-            elsif color == 0xffffffff   # white
-             #  hsv(  0°   0% 100%)
-               lighter =  Color.from_hsv( h, 0.0, [0.0, v-0.11].max )  # note: make darker
-               lightest = Color.from_hsv( h, 0.0, 1.0 )
-               darker   = Color.from_hsv( h, 0.0, [0.0, v-0.16].max )   
-            else
-              lighter =  Color.from_hsv( h, [0.0, s-0.16].max, v )
-              lightest = Color.from_hsv( h, [0.0, s-0.33].max, v )
-              darker   = Color.from_hsv( h, s, [0.0, v-0.13].max )
-            end
-        
-            hair.change_colors( {
-                     '0000ffff' => color,
-                     '2a2affff' => lighter,
-                     '5454ffff' => lightest, 
-                     '0000ddff' => darker,
-                  })
-    end # method self.colorize
-        
+    def self.sheet() maker.sheet; end
+    def self.colors() maker.colors; end
            
-   def self.make( style, color: 'black' )
-       ## pass-through  shavedhead (no colors - alpha only) - why? why not?
-       hair = sheet.find_by( name: style )
-       if hair.nil?
-         puts "!! ERROR - unknow hair style >#{style}<; sorry"
-         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
-
-       colorize( hair, color: rgba )
-   end
-
+    def self.make( style, color: 'black' )
+       maker.make( style, color: color )
+    end
 
+    ## "low-level" convenience helper/wrapper/forwarder
+    def self.colorize( hair, color: )  Punk::Hair.colorize( hair, color: color ); end
   end # module Hair
 end # module Barbershop
 

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: barbershop
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-26 00:00:00.000000000 Z
+date: 2023-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pixelart
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: spritesheet
+  name: punkmaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="