pixelart 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68fa84133edc2cb7f9742514af4ef188e1e358b3ae408f6ffd282c4c815e1ae5
-  data.tar.gz: 2048f7c4e4a29cf6aff876b273c25a58bb3c2ef1c9836756847c13e59f381d18
+  metadata.gz: 71ac76ef187b8148a547f8dd7b76f2216bdd034f2ba67f7974b6e1a98abe3992
+  data.tar.gz: 6b44348938795087874a80fec20a6e1f87633ff282f62804605b42cbb232e46d
 SHA512:
-  metadata.gz: 188f2845bf2f64102829f1840eaf56ded7ba7f2f2f931e07aa951d3b29e2e82b7570cd1564a40e8afb54ecd8f040874a9e1e589a5284025836dd81adf73549d3
-  data.tar.gz: c12fa48855d076acd7516fa02d97a5da56467ce8ce78e7dc41e305681be1e1251fdb82ce638d6921726d5d6455e2849a75806730f314b93efe2146a70eb89d7c
+  metadata.gz: d94abebcda0b1d87bdc0bcdc0f6072d7ae88efed8b26a0733f4fcdccb9b8063068b9a55f24bf08ebe34705e30298ebaf5d1f619045e37fe5be3b2412a8019932
+  data.tar.gz: 63be655c80cf3703499aae7984a901888ca2ae3fe362ea66f5324e7abd98a0b207f5a150da9f2f1c6b7b2c29d52b71e44d252b6323eb8050160bac8c52e542f0

data/Manifest.txt

@@ -3,4 +3,5 @@ Manifest.txt
 README.md
 Rakefile
 lib/pixelart.rb
+lib/pixelart/image.rb
 lib/pixelart/version.rb

data/README.md

@@ -71,8 +71,8 @@ img3x.save( './i/mooncat_white-3x.png' )
 
 Voila!
 
-![](https://github.com/cryptocopycats/mooncats/raw/master/pixelarti/mooncat_white.png)
-![](https://github.com/cryptocopycats/mooncats/raw/master/pixelarti/mooncat_white-3x.png)
+![](https://github.com/cryptocopycats/mooncats/raw/master/pixelart/i/mooncat_white.png)
+![](https://github.com/cryptocopycats/mooncats/raw/master/pixelart/i/mooncat_white-3x.png)
 
 
 
@@ -100,8 +100,8 @@ img3x.save( './i/mooncat_black-3x.png' )
 
 Voila! Black is the new White!
 
-![](https://github.com/cryptocopycats/mooncats/raw/master/pixelarti/mooncat_black.png)
-![](https://github.com/cryptocopycats/mooncats/raw/master/pixelarti/mooncat_black-3x.png)
+![](https://github.com/cryptocopycats/mooncats/raw/master/pixelart/i/mooncat_black.png)
+![](https://github.com/cryptocopycats/mooncats/raw/master/pixelart/i/mooncat_black-3x.png)
 
 
 
@@ -227,8 +227,8 @@ img5x.save( './i/vader5x.png' )
 
 Voila!
 
-![](https://github.com/cryptocopycats/mooncats/raw/master/pixelarti/vader.png)
-![](https://github.com/cryptocopycats/mooncats/raw/master/pixelarti/vader5x.png)
+![](https://github.com/cryptocopycats/mooncats/raw/master/pixelart/i/vader.png)
+![](https://github.com/cryptocopycats/mooncats/raw/master/pixelart/i/vader5x.png)
 
 
 

data/lib/pixelart.rb

@@ -10,166 +10,10 @@ require 'fileutils'
 
 ## our own code
 require 'pixelart/version'    # note: let version always go first
+require 'pixelart/image'
 
 
 
-module Pixelart
-class Image
-
-
-
-def self.read( path )   ## convenience helper
-  img_inner = ChunkyPNG::Image.from_file( path )
-  img = new( img_inner.width, img_inner.height, img_inner )
-  img
-end
-
-
-def self.parse( pixels, colors: )
-  colors = parse_colors( colors )
-  pixels = parse_pixels( pixels )
-
-  width  = pixels.reduce(1) {|width,row| row.size > width ? row.size : width }
-  height = pixels.size
-
-  img = new( width, height )
-
-  pixels.each_with_index do |row,y|
-    row.each_with_index do |color,x|
-      pixel = colors[color]
-      img[x,y] = pixel
-    end # each row
-  end # each data
-
-  img
-end
-
-
-
-def initialize( width, height, initial=ChunkyPNG::Color::TRANSPARENT )
-
-  if initial.is_a?( ChunkyPNG::Image )
-    @img = initial
-  else
-    ## todo/check - initial - use parse_color here too e.g. allow "#fff" too etc.
-    @img = ChunkyPNG::Image.new( width, height, initial )
-  end
-end
-
-
-
-def zoom( zoom=2 )
-  ## create a new zoom factor x image (2x, 3x, etc.)
-
-  img = Image.new( @img.width*zoom,
-                   @img.height*zoom )
-
-  @img.height.times do |y|
-    @img.width.times do |x|
-      pixel = @img[x,y]
-      zoom.times do |n|
-        zoom.times do |m|
-          img[n+zoom*x,m+zoom*y] = pixel
-        end
-      end
-    end # each x
-  end # each y
-
-  img
-end
-alias_method :scale, :zoom
-
-
-
-
-#####
-# (image) delegates
-##   todo/check: add some more??
-def save( path, constraints = {} )
-  # step 1: make sure outdir exits
-  outdir = File.dirname( path )
-  FileUtils.mkdir_p( outdir )  unless Dir.exist?( outdir )
-
-  # step 2: save
-  @img.save( path, constraints )
-end
-alias_method :write, :save
-
-
-def compose!( other, x=0, y=0 )
-  @img.compose!( other.image, x, y )    ## note: "unwrap" inner image ref
-end
-alias_method :paste!, :compose!
-
-
-def width()        @img.width; end
-def height()       @img.height; end
-
-def []( x, y )          @img[x,y]; end
-def []=( x, y, value )  @img[x,y]=value; end
-
-## return image ref - use a different name - why? why not?
-def image()        @img; end
-
-
-
-
-######
-# helpers
-def self.parse_pixels( pixels )
-  data = []
-  pixels.each_line do |line|
-    line = line.strip
-    if line.empty?
-      puts "!! WARN: skipping empty line in pixel art source"
-      next
-    end
-
-    ## note: allow multiple spaces or tabs to separate pixel codes
-    ##  e.g.   o o o o o o o o o o o o dg lg w w lg w lg lg dg dg w w  lg dg o o o o o o o o o o o
-    ##    or
-    data << line.split( /[ \t]+/)
- end
- data
-end
-
-
-def self.parse_colors( colors )
-  if colors.is_a?( Array )   ## convenience shortcut
-    ## note: always auto-add color 0 as pre-defined transparent - why? why not?
-    h = { '0' => ChunkyPNG::Color::TRANSPARENT }
-    colors.each_with_index do |color, i|
-       h[ (i+1).to_s ] = parse_color( color )
-    end
-    h
-  else  ## assume hash table with color map
-    ## convert into ChunkyPNG::Color
-    colors.map do |key,color|
-      ## always convert key to string why? why not?  use symbol?
-      [ key.to_s, parse_color( color ) ]
-    end.to_h
-  end
-end
-
-def self.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)
-    if color.downcase == 'transparent'   ## special case for builtin colors
-      ChunkyPNG::Color::TRANSPARENT
-    else
-      ## note: return an Integer !!! (not a Color class or such!!! )
-      ChunkyPNG::Color.from_hex( color )
-    end
-  else
-    raise ArgumentError, "unknown color format; cannot parse - expected rgb hex string e.g. d3d3d3"
-  end
-end
-
-
-end # class Image
-end  # module Pixelart
-
 
 
 ### add some convenience shortcuts

data/lib/pixelart/image.rb

@@ -0,0 +1,225 @@
+module Pixelart
+
+
+
+
+class Color
+  def self.parse( color )
+    if color.is_a?( Integer )  ## e.g. assumes ChunkyPNG::Color.rgb() or such
+      color ## pass through as is 1:1
+    elsif color.is_a?( Array )  ## assume array of hsl(a) e. g. [180, 0.86, 0.88]
+      ChunkyPNG::Color.from_hsl( *color )
+    elsif color.is_a?( String )
+      if color.downcase == 'transparent'   ## special case for builtin colors
+        ChunkyPNG::Color::TRANSPARENT
+      else
+        ## note: return an Integer !!! (not a Color class or such!!! )
+        ChunkyPNG::Color.from_hex( color )
+      end
+    else
+      raise ArgumentError, "unknown color format; cannot parse - expected rgb hex string e.g. d3d3d3"
+    end
+  end
+
+  def self.from_hex( hex )
+    ## Creates a color by converting it from a string in hex notation.
+    ##
+    ## It supports colors with (#rrggbbaa) or without (#rrggbb)
+    ##  alpha channel as well as the 3-digit short format (#rgb)
+    ## for those without. Color strings may include
+    ## the prefix "0x" or "#"".
+    ChunkyPNG::Color.from_hex( hex )
+  end
+
+  def self.from_hsl( hue, saturation, lightness, alpha=255)
+    ChunkyPNG::Color.from_hsl( hue,
+                               saturation,
+                               lightness,
+                               alpha )
+  end
+
+
+  def self.to_hex( color, include_alpha: true )
+    ChunkyPNG::Color.to_hex( color, include_alpha )
+  end
+
+  def self.to_hsl( color, include_alpha: true )
+    # Returns an array with the separate HSL components of a color.
+    ChunkyPNG::Color.to_hsl( color, include_alpha )
+  end
+end  # class Color
+
+
+
+
+class Image
+
+def self.read( path )   ## convenience helper
+  img_inner = ChunkyPNG::Image.from_file( path )
+  img = new( img_inner.width, img_inner.height, img_inner )
+  img
+end
+
+
+def self.parse( pixels, colors: )
+  colors = parse_colors( colors )
+  pixels = parse_pixels( pixels )
+
+  width  = pixels.reduce(1) {|width,row| row.size > width ? row.size : width }
+  height = pixels.size
+
+  img = new( width, height )
+
+  pixels.each_with_index do |row,y|
+    row.each_with_index do |color,x|
+      pixel = colors[color]
+      img[x,y] = pixel
+    end # each row
+  end # each data
+
+  img
+end
+
+
+
+def initialize( width, height, initial=ChunkyPNG::Color::TRANSPARENT )
+
+  if initial.is_a?( ChunkyPNG::Image )
+    @img = initial
+  else
+    ## todo/check - initial - use parse_color here too e.g. allow "#fff" too etc.
+    @img = ChunkyPNG::Image.new( width, height, initial )
+  end
+end
+
+
+
+def zoom( zoom=2 )
+  ## create a new zoom factor x image (2x, 3x, etc.)
+
+  img = Image.new( @img.width*zoom,
+                   @img.height*zoom )
+
+  @img.height.times do |y|
+    @img.width.times do |x|
+      pixel = @img[x,y]
+      zoom.times do |n|
+        zoom.times do |m|
+          img[n+zoom*x,m+zoom*y] = pixel
+        end
+      end
+    end # each x
+  end # each y
+
+  img
+end
+alias_method :scale, :zoom
+
+
+
+
+def parse_color_map( color_map )
+  color_map.map do |k,v|
+    [Color.parse(k),  Color.parse(v)]
+  end.to_h
+end
+
+## add replace_colors alias too? - why? why not?
+def change_colors( color_map )
+  img = @img.dup  ## note: make a deep copy!!!
+  color_map = parse_color_map( color_map )
+  ## pp color_map
+
+  img.width.times do |x|
+    img.height.times do |y|
+      color = img[x,y]
+      new_color = color_map[color]
+      img[x,y] = new_color  if new_color
+    end
+  end
+
+  ## wrap into Pixelart::Image - lets you use zoom() and such
+  Image.new( img.width, img.height, img )
+end
+alias_method :recolor, :change_colors
+
+
+
+
+
+#####
+# (image) delegates
+##   todo/check: add some more??
+def save( path, constraints = {} )
+  # step 1: make sure outdir exits
+  outdir = File.dirname( path )
+  FileUtils.mkdir_p( outdir )  unless Dir.exist?( outdir )
+
+  # step 2: save
+  @img.save( path, constraints )
+end
+alias_method :write, :save
+
+
+def compose!( other, x=0, y=0 )
+  @img.compose!( other.image, x, y )    ## note: "unwrap" inner image ref
+end
+alias_method :paste!, :compose!
+
+
+def width()        @img.width; end
+def height()       @img.height; end
+
+def []( x, y )          @img[x,y]; end
+def []=( x, y, value )  @img[x,y]=value; end
+
+def pixels()       @img.pixels; end
+
+## return image ref - use a different name - why? why not?
+def image()        @img; end
+
+
+
+
+######
+# helpers
+def self.parse_pixels( pixels )
+  data = []
+  pixels.each_line do |line|
+    line = line.strip
+    if line.empty?
+      puts "!! WARN: skipping empty line in pixel art source"
+      next
+    end
+
+    ## note: allow multiple spaces or tabs to separate pixel codes
+    ##  e.g.   o o o o o o o o o o o o dg lg w w lg w lg lg dg dg w w  lg dg o o o o o o o o o o o
+    ##    or
+    data << line.split( /[ \t]+/)
+ end
+ data
+end
+
+
+def self.parse_colors( colors )
+  if colors.is_a?( Array )   ## convenience shortcut
+    ## note: always auto-add color 0 as pre-defined transparent - why? why not?
+    h = { '0' => ChunkyPNG::Color::TRANSPARENT }
+    colors.each_with_index do |color, i|
+       h[ (i+1).to_s ] = Color.parse( color )
+    end
+    h
+  else  ## assume hash table with color map
+    ## convert into ChunkyPNG::Color
+    colors.map do |key,color|
+      ## always convert key to string why? why not?  use symbol?
+      [ key.to_s, Color.parse( color ) ]
+    end.to_h
+  end
+end
+
+
+
+end # class Image
+end  # module Pixelart
+

data/lib/pixelart/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelart
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -73,6 +73,7 @@ files:
 - README.md
 - Rakefile
 - lib/pixelart.rb
+- lib/pixelart/image.rb
 - lib/pixelart/version.rb
 homepage: https://github.com/cryptocopycats/mooncats
 licenses: