mooncats 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2008a93c19babb5a74bb5ebc80ad37dc676fe40b43988131815b3d71ddc78b1a
-  data.tar.gz: c0335955e826d1843c9a8579ac21e65e94800bdd62cd8f7d55e59640ec458870
+  metadata.gz: bf22f607c257a0cef8877f44594782f1c6f704a9c580c01af96a39d49f985209
+  data.tar.gz: f6b10d2506c5b3dc05477ad4d8ba18c24eada0382cbcc29fdbfa0c572a04c892
 SHA512:
-  metadata.gz: 32e5e79b6614917d835c4312113082a75de32ea3e6ba41a11cf50e05d05b3003b0de5f64aaca260816d1fabf87939b3d50fa5ab3cf6665202fa09bbc61e389d9
-  data.tar.gz: 7e2adae8f892f14804ee3510cd60af41d51bfd0b262308a9fdca40bd154836d6d1c7e0e1341f273ed9b1cabbee6417afdb1d78b3b0e6ddda08454af8f88320c4
+  metadata.gz: 4e20d5394cd29624a64d0b7a830fbf7bc0b0890c021a25c077a7c51771600b9d7187220abd2e76c5a94b2f1a50d66fae040727950fca4be859db8a821791082a
+  data.tar.gz: 6028eadc62a9861e3e9c5be6215ec0bb142701cffd15e88d681ce4c30cfc137df4ee102f9b09de0c41f9d1a4715771d631d488a1b49326a8fba96bf211615e08

data/Manifest.txt

@@ -6,6 +6,7 @@ bin/mooncat
 lib/mooncats.rb
 lib/mooncats/composite.rb
 lib/mooncats/dataset.rb
+lib/mooncats/design.rb
 lib/mooncats/designs.rb
 lib/mooncats/image.rb
 lib/mooncats/structs.rb

data/lib/mooncats.rb

@@ -12,6 +12,7 @@ require 'optparse'
 require 'mooncats/version'    # note: let version always go first
 require 'mooncats/designs'
 require 'mooncats/structs'
+require 'mooncats/design'
 require 'mooncats/image'
 require 'mooncats/composite'
 require 'mooncats/dataset'
@@ -93,4 +94,11 @@ module Mooncats
 MoonCats = Mooncats
 
 
+
+
+###
+# note: for convenience auto include Pixelart namespace!!! - why? why not?
+include Pixelart
+
+
 puts Mooncats.banner    # say hello

data/lib/mooncats/composite.rb

@@ -10,7 +10,7 @@ CANVAS_HEIGHT = 24
 def initialize( cols=100, rows=255 )
     @composite = ChunkyPNG::Image.new( cols*CANVAS_WIDTH,
                                        rows*CANVAS_HEIGHT,
-                                       ChunkyPNG::Color::WHITE ) # why? why not? - use TRANSPARENT (is default?)
+                                       ChunkyPNG::Color::TRANSPARENT ) # why? why not? - use TRANSPARENT (is default?)
 
     ## todo/check - find a better name for cols/rows - why? why not?
     @cols = cols

data/lib/mooncats/design.rb

@@ -0,0 +1,92 @@
+
+module Mooncats
+
+
+class Design
+def self.find( num )   ## pass in design index number (0 to 127)
+  ## todo: add cache (memoize) - why? why not?
+  design = parse( DESIGNS[ num ] )
+
+  puts "    design ##{num} (#{design.width}x#{design.height})"
+  ## pp design.data
+  ## puts
+
+  design
+end
+
+
+
+def self.parse( str )
+  ## support original "classic" compact single-line format
+  ##   e.g. 00011111100000000.01113333310000000.13533333331110000....
+  ##  note: this format needs to get rotated by 90 degree!!!
+  if str.start_with?( /[0-5]+\.[0-5]+\.[0-5]+/ )  ## quick (and dirty) heuristic check
+    data = str.split('.')
+
+    ## note: map colors encoded as a string to an array of integers - why? why not?
+    ##  e.g. "00011111133344411"
+    ##          =>
+    ##       [0,0,0,1,1,1,1,1,1,3,3,3,4,4,4,1,1]
+    data = data.map do |row|
+             row.chars.map do |color|
+                color.to_i
+             end
+           end
+    data = data.transpose   ## note: rotate by 90 degree!!!!!
+  else  ## assume "modern" pixelart format
+     ## todo/check: delegate to pixelart parse or such - why? why not?
+
+     data = []
+     str.each_line do |line|
+       line = line.strip
+       next if line.empty?               ## skipping empty line in pixel art source
+       next if line.start_with?( '#' )   ## skipping comment line in pixel art source
+
+       ## note: allow multiple spaces or tabs to separate pixel codes
+       data << line.split( /[ \t]+/)
+     end
+     ## todo/check: change to use strings (instead of nummbers) in the future?
+     ##                 why? why not?  stay "compatible" to pixel art format/machinery?
+     data = data.map do |row|
+       row.map do |color|
+          color.to_i
+       end
+     end
+  end
+  new( data )
+end
+
+
+def initialize( data )
+ @data = data
+end
+
+def width
+  ## todo/check: use/find max - why? why not? lets you you used "unbalanced" / shortcut lines too
+  @data[0].size
+end
+def height() @data.size; end
+
+
+def each_with_index( &blk )
+  @data.each_with_index { |row, y| blk.call( row, y ) }
+end
+def each( &blk )
+  @data.each { |row| blk.call( row ) }
+end
+
+
+
+def to_txt
+  buf = String.new('')
+
+  @data.each do |row|
+    buf << row.join( ' ' )
+    buf << "\n"
+  end
+  buf
+end
+
+
+end # class Design
+end # module Mooncats

data/lib/mooncats/image.rb

@@ -2,33 +2,6 @@
 module Mooncats
 
 
-
-###
-## todo/fix/cleanup - (re)use pixelart color helpers? possible? why? why not?
-
-class Color     ## convenience helper to "abstract" ChunkyPNG usage away in "outside" (not internal) sample code
-  def self.to_hex(color, include_alpha: false)
-    if include_alpha
-      '#%08x' % color
-    else
-      '#%06x' % [color >> 8]
-    end
-  end
-
-  def self.rgb_to_hsl( r, g, b )
-    rgb = ChunkyPNG::Color.rgb( r, g, b )
-    hsl = ChunkyPNG::Color.to_hsl( rgb )
-    hsl
-  end
-
-  def self.from_hsl( h, s, l )
-    ChunkyPNG::Color.from_hsl( h, s, l )
-  end
-end  # class Color
-
-
-
-
 class Image <  Pixelart::Image
 
 
@@ -81,17 +54,17 @@ def initialize( design: 0,
               end
 
     ## note: first color (index 0) is always nil (default/white or transparent)
-    colors = [ nil ] + parse_colors( colors )
+    colors = [ nil ] + colors.map { |color| Pixelart::Color.parse( color ) }
 
     ## puts " colors:"
     ## pp colors
 
   img = ChunkyPNG::Image.new( design.width,
-                               design.height,
-                               ChunkyPNG::Color::TRANSPARENT ) # why? why not?
+                              design.height,
+                              ChunkyPNG::Color::TRANSPARENT ) # why? why not?
 
-    design.each_with_index do |row, x|
-      row.each_with_index do |color, y|
+    design.each_with_index do |row, y|
+      row.each_with_index do |color, x|
         if color > 0
           pixel = colors[ color ]
           img[x,y] = pixel
@@ -151,110 +124,6 @@ def self.derive_palette( r: nil, g: nil, b: nil,
 end
 
 
-######
-# helpers
-def parse_colors( colors )
-  ## convert into ChunkyPNG::Color
-  colors.map { |color| parse_color( color ) }
-end
-
-def parse_color( color )
-  if color.is_a?( Integer )  ## e.g. Assumess ChunkyPNG::Color.rgb() or such
-    color ## pass through as is 1:1
-  elsif color.is_a?(String)
-    ## note: return an Integer !!! (not a Color class or such!!! )
-    ChunkyPNG::Color.from_hex( color )
-  else
-    raise ArgumentError, "unknown color format; cannot parse - expected rgb hex string e.g. d3d3d3"
-  end
-end
-
-
-
-
-
-
-class Bar ## (nested) class inside Image (e.g. Image::Bar)
-  ## make a color bar
-  def initialize( colors:,  zoom: 24 )
-    @bar = ChunkyPNG::Image.new( colors.size*zoom,
-                                 zoom,
-                                 ChunkyPNG::Color::WHITE ) # why? why not?
-
-    colors.each_with_index do |color,i|
-      zoom.times do |x|
-        zoom.times do |y|
-          @bar[x+zoom*i,y] = color
-        end
-      end
-    end
-  end # def initialize
-
-  #####
-  # (image) delegates
-  ##   todo/check: add some more??
-  def save( path, constraints = {} )
-    @bar.save( path, constraints )
-  end
-
-  def width()        @bar.width; end
-  def height()       @bar.height; end
-
-  ## return image ref - use a different name - why? why not?
-  def image()        @bar; end
-end  # (nested) class Bar
 end # class Image
-
-
-
-class Design
-def self.find( num )   ## pass in design index number (0 to 127)
-  ## todo: add cache (memoize) - why? why not?
-  str = DESIGNS[ num ]
-  design = parse( str )
-
-  puts "    design ##{num} (#{design.width}x#{design.height})"
-  ## pp design.data
-  ## puts
-
-  design
-end
-
-
-def self.parse( str )
-  data = str.split('.')
-  new( data )
-end
-
-def initialize( data )
- ## todo: add cache (memoize) - why? why not?
-
- ## note: map colors encoded as a string to an array of integers - why? why not?
- ##  e.g. "00011111133344411"
- ##          =>
- ##       [0,0,0,1,1,1,1,1,1,3,3,3,4,4,4,1,1]
-
- @data = data.map do |row|
-            row.chars.map do |color|
-             color.to_i
-            end
-          end
-end
-
-## note: design data stored mirrored (data.size is the width NOT height)
-def width() @data.size; end
-def height() @data[0].size; end
-
-def data() @data; end
-
-def each_with_index( &blk )
-  ## note: y,x is reversed - keep for now
-  ##  (todo/fix later? and "pivot" raw data on init - why? why not?)
-  @data.each_with_index do |row, x|
-    blk.call( row, x )
-  end
-end
-end # class Design
-
 end # module Mooncats
 

data/lib/mooncats/structs.rb

@@ -11,20 +11,37 @@ POSES = [
   'Stalking',  ## 11
 ]
 
-FACES = [
+
+OLD_FACES = [   ## old names for face (expressions)
   'Smile',              ## 00
   'Frown (Look Down)',  ## 01
   'Frown (Look Up)',    ## 10
   'Flat Whiskers',      ## 11
 ]
 
-FURS = [
+FACES = [  ## face expressions
+  'Smiling',            ## 00
+  'Grumpy',             ## 01
+  'Pouting',            ## 10
+  'Shy',                ## 11
+]
+
+
+OLD_FURS = [    ## old names for fur (patterns)
   'Solid',      ## 00
   'Striped',    ## 01
   'Eyepatch',   ## 10
   'Half/Half',  ## 11
 ]
 
+FURS = [    ##  fur (patterns)
+  'Pure',      ## 00
+  'Tabby',     ## 01
+  'Spotted',   ## 10
+  'Tortie',    ## 11
+]
+
+
 FACINGS = [
   'Left',   # 0
   'Right',  # 1
@@ -50,12 +67,15 @@ class Metadata
     def facing
       @facing ||= FACINGS[ bits[1,1].to_i(2) ]  ## use desgin > 63 instead  - why? why not?
     end
-    def face
+    def face   ## face (expression)
       @face ||= FACES[ bits[2,2].to_i(2) ]
     end
-    def fur
+    alias_method :expression, :face
+
+    def fur    ## fur (pattern)   - add pattern alias - why? why not?
       @fur ||= FURS[ bits[4,2].to_i(2) ]
     end
+
     def pose
       @poses ||= POSES[ bits[6,2].to_i(2) ]   ##  use design % 4 instead - why? why not?
     end
@@ -87,7 +107,10 @@ class Metadata
   def rgb() [r,g,b]; end   ## add rgb shortcut helper - why? why not?
 
   def invert?() k >= 128; end
-  def pattern() k % 64; end   ## treat facing left|right as the same
+  alias_method :pale?, :invert?
+
+
+  def pattern() k % 64; end   ## treat facing left|right as the same - note: conflicts with fur (pattern) - find a better/different name?
 
 
   def hue
@@ -155,6 +178,7 @@ class Metadata
 
   def facing()  design.facing; end
   def face()    design.face; end
+  alias_method :expression, :face
   def fur()     design.fur; end
   def pose()    design.pose; end
 
@@ -170,23 +194,25 @@ class Metadata
   # enable array-like access to - why? why not?
   def []( key )
      case key.to_sym
-     when :id      then id
-     when :genesis then genesis?
-     when :k       then k
-     when :r       then r
-     when :g       then g
-     when :b       then b
-     when :rgb     then rgb
-     when :invert  then invert?
-     when :hue     then hue
-     when :color   then color
-     when :design  then design.to_i
-     when :pattern then pattern
-     when :facing  then facing
-     when :face    then face
-     when :fur     then fur
-     when :pose    then pose
-     when :year    then year    # note: from more via timestamp
+     when :id         then id
+     when :genesis    then genesis?
+     when :k          then k
+     when :r          then r
+     when :g          then g
+     when :b          then b
+     when :rgb        then rgb
+     when :invert,
+          :pale       then invert?
+     when :hue        then hue
+     when :color      then color
+     when :design     then design.to_i
+     when :pattern    then pattern
+     when :facing     then facing
+     when :face,
+          :expression then face
+     when :fur        then fur
+     when :pose       then pose
+     when :year       then year    # note: from more via timestamp
      else
        @more[ key ]
      end

data/lib/mooncats/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mooncats
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-25 00:00:00.000000000 Z
+date: 2021-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pixelart
@@ -92,6 +92,7 @@ files:
 - lib/mooncats.rb
 - lib/mooncats/composite.rb
 - lib/mooncats/dataset.rb
+- lib/mooncats/design.rb
 - lib/mooncats/designs.rb
 - lib/mooncats/image.rb
 - lib/mooncats/structs.rb