pixelart 1.3.1 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9cb1460263f319b98c4d333f6caa42118eb94f583f9cc6cdaa5bfa6bc4316b9
-  data.tar.gz: 2deabe3c3bc35c62d249e0ff5178d23f986d1131c96daf53a8d36fde51cd6de8
+  metadata.gz: 07a749afe60b5174e207574ab916bfd4a41dd844897ec1375947b170cb155fb9
+  data.tar.gz: 4a5f82ec221fb71a3d4db47cb131d86a8f4c778b3eaaae22f42c55492025e4c5
 SHA512:
-  metadata.gz: 57213049f46aac9a612adb3d9e236ce03aa336318705cabaed98f1f87557dc5dc08a73a7f50254852ab0c3c988ca0ed3d5b3ba6666925640ab837692c573be7c
-  data.tar.gz: 9ff7ae16a77eca4b2d4deb65b98747aa053ab97ab15b0f8a40d373f5ecb96dcd2c18d2fdfd18beca0c06a5e9330719dd2df1a3be1efac07c8f008dfa0b4db614
+  metadata.gz: 10845c93bda5c7ab3186e84b4621028a435eda87dca9c5e651f5259dc482c9d3d00a3da72054a262a43baa79e18e3f82cca7960bb15b1076a7ed2c121caf1d17
+  data.tar.gz: 5c77a94549a22310c07f08e380a1029d538e7e2d5eced92b24ce65a64824e2ecfb9374f03184edfb480e1d8fa2ca6cbfc22cf8ba09d30459ca995080a0f9defd

data/Manifest.txt

@@ -6,14 +6,12 @@ lib/pixelart.rb
 lib/pixelart/base.rb
 lib/pixelart/blur.rb
 lib/pixelart/circle.rb
-lib/pixelart/color.rb
 lib/pixelart/composite.rb
+lib/pixelart/convert.rb
 lib/pixelart/generator.rb
-lib/pixelart/gradient.rb
 lib/pixelart/image.rb
 lib/pixelart/led.rb
 lib/pixelart/misc.rb
-lib/pixelart/palette.rb
 lib/pixelart/pixelator.rb
 lib/pixelart/sample.rb
 lib/pixelart/silhouette.rb

data/README.md

@@ -288,3 +288,9 @@ Just install the gem:
 
 The scripts are dedicated to the public domain.
 Use it as you please with no restrictions whatsoever.
+
+
+
+## Questions? Comments?
+
+Post them on the [D.I.Y. Punk (Pixel) Art reddit](https://old.reddit.com/r/DIYPunkArt). Thanks.

data/Rakefile

@@ -18,6 +18,7 @@ Hoe.spec 'pixelart' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
+    ['pixelart-colors'],
     ['chunky_png'],
     ['mini_magick'],
     ['csvreader'],

data/lib/pixelart/base.rb

@@ -1,3 +1,9 @@
+###
+#   base module
+require 'pixelart/colors'
+
+
+
 ###############
 #  3rd party
 require 'chunky_png'
@@ -11,23 +17,9 @@ require 'mini_magick'
 require 'csvreader'
 
 
-## stdlib
-require 'pp'
-require 'time'
-require 'date'
-require 'fileutils'
-
-require 'json'
-require 'yaml'
-
-
-
 
 ## our own code
 require 'pixelart/version'    # note: let version always go first
-require 'pixelart/color'
-require 'pixelart/gradient'
-require 'pixelart/palette'
 require 'pixelart/image'
 require 'pixelart/composite'
 
@@ -71,22 +63,9 @@ require 'pixelart/blur'
 
 
 
-
-
-
-
-##########
-#  add some spelling convenience variants
-PixelArt = Pixelart
-
-module Pixelart
-  Palette256 = Palette8Bit = Palette8bit
-
-  Palette256Image = Palette8BitImage = Palette8bitImage =
-  ImagePalette256 = ImagePalette8Bit = ImagePalette8bit
-
-  CompositeImage = ImageComposite
-end
+###
+# mover helpers / utils
+require 'pixelart/convert'
 
 
 

data/lib/pixelart/convert.rb

@@ -0,0 +1,54 @@
+module Pixelart
+
+class Image
+
+
+## helper to convert (all) image in directory
+##    chech: move to ImageUtils.convert  or such - why? why not?
+##
+##  what about the name e.g. rename to convert_dir or
+##                                    batch_convert such - why? why not?
+def self.convert( dir, from: 'jpg',
+                       to: 'png',
+                       outdir: nil,
+                       overwrite: true )
+
+    outdir = dir   if outdir.nil?
+
+    files = Dir.glob( "#{dir}/*.#{from}" )
+    puts "==> found #{files.size} image(s) to convert from #{from} to #{to} (overwrite mode set to: #{overwrite})"
+
+    files.each_with_index do |file,i|
+      dirname   = File.dirname( file )
+      extname   = File.extname( file )
+      basename  = File.basename( file, extname )
+
+      ## skip convert if target / dest file already exists
+      next  if overwrite == false && File.exist?( "#{outdir}/#{basename}.#{to}" )
+
+      ##  note: make sure outdir exists (magic will not create it??)
+      FileUtils.mkdir_p( outdir )  unless Dir.exist?( outdir )
+
+      cmd = "magick convert #{dirname}/#{basename}.#{from} #{outdir}/#{basename}.#{to}"
+
+      puts "   [#{i+1}/#{files.size}] - #{cmd}"
+      ## todo/fix:   check return value!!! magick comand not available (in path) and so on!!!
+      system( cmd )
+
+      if from == 'gif'
+        ## assume multi-images for gif
+        ##   save  image-0.png  to  image.png
+        path0 = "#{outdir}/#{basename}-0.#{to}"
+        path  = "#{outdir}/#{basename}.#{to}"
+
+        puts "   saving #{path0} to #{path}..."
+
+        blob = File.open( path0, 'rb' ) { |f| f.read }
+        File.open( path, 'wb' ) { |f| f.write( blob ) }
+      end
+    end
+end
+
+
+end   # class Image
+end   # class Pixelart

data/lib/pixelart/generator.rb

@@ -170,24 +170,27 @@ module Pixelart
 
 
 
+ def generate_image( *values, background: nil, before: nil )
+   ## note: generate_image NO longer supports
+   ##             - generate by integer number (indexes), sorry
 
- def generate_image( *values, background: nil )
-
-    ids = if values[0].is_a?( Integer )  ## assume integer number (indexes)
-              values
-          else ## assume strings (names)
-              to_recs( *values ).map { |rec| rec.id }
-          end
-
+    recs = to_recs( *values )
 
+    ## note: first construct/generate image on transparent background
+    ##          add background if present as LAST step
     img = Image.new( @width, @height )
 
-    if background    ## for now assume background is (simply) color
-       img.compose!( Image.new( @width, @height, background ) )
+    recs.each do |rec|
+      ## note: before call(back) MUST change image INPLACE!!!!
+      before.call( img, rec )   if before
+      img.compose!( @sheet[ rec.id ] )
     end
 
-    ids.each do |id|
-      img.compose!( @sheet[ id ] )
+    if background    ## for now assume background is (simply) color
+      img2 = Image.new( @width, @height )
+      img2.compose!( Image.new( @width, @height, background ) )
+      img2.compose!( img )
+      img = img2
     end
 
     img

data/lib/pixelart/version.rb

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

data/lib/pixelart.rb

@@ -9,4 +9,14 @@ require 'pixelart/base'   # aka "strict(er)" version
 include Pixelart
 
 
+##########
+#  add some spelling convenience variants
+
+
+module Pixelart
+  Palette256Image = Palette8BitImage = Palette8bitImage =
+  ImagePalette256 = ImagePalette8Bit = ImagePalette8bit
+
+  CompositeImage = ImageComposite
+end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pixelart
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.4
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-19 00:00:00.000000000 Z
+date: 2022-07-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pixelart-colors
+  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: chunky_png
   requirement: !ruby/object:Gem::Requirement
@@ -104,14 +118,12 @@ files:
 - lib/pixelart/base.rb
 - lib/pixelart/blur.rb
 - lib/pixelart/circle.rb
-- lib/pixelart/color.rb
 - lib/pixelart/composite.rb
+- lib/pixelart/convert.rb
 - lib/pixelart/generator.rb
-- lib/pixelart/gradient.rb
 - lib/pixelart/image.rb
 - lib/pixelart/led.rb
 - lib/pixelart/misc.rb
-- lib/pixelart/palette.rb
 - lib/pixelart/pixelator.rb
 - lib/pixelart/sample.rb
 - lib/pixelart/silhouette.rb

data/lib/pixelart/color.rb

@@ -1,131 +0,0 @@
-module Pixelart
-
-
-class Color
-  TRANSPARENT = 0            # rgba(  0,  0,  0,  0)
-  BLACK       = 0xff         # rgba(  0,  0,  0,255)
-  WHITE       = 0xffffffff   # rgba(255,255,255,255)
-
-
-  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]
-      from_hsl( *color )
-    elsif color.is_a?( String )
-      if color.downcase == 'transparent'   ## special case for builtin colors
-        TRANSPARENT
-      else
-        ## note: return an Integer !!! (not a Color class or such!!! )
-        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
-
-  def self.r( color ) ChunkyPNG::Color.r( color ); end
-  def self.g( color ) ChunkyPNG::Color.g( color ); end
-  def self.b( color ) ChunkyPNG::Color.b( color ); end
-
-  def self.rgb( r, g, b ) ChunkyPNG::Color.rgb( r, g, b); end
-
-
-
-  ## known built-in color names
-  def self.build_names
-    names = {
-      '#00000000' => 'TRANSPARENT',
-      '#000000ff' => 'BLACK',
-      '#ffffffff' => 'WHITE',
-    }
-
-    ## auto-add grayscale 1 to 254
-    (1..254).each do |n|
-      hex = "#" + ('%02x' % n)*3
-      hex << "ff"  ## add alpha channel (255)
-      names[ hex ] = "8-BIT GRAYSCALE ##{n}"
-    end
-
-    names
-  end
-
-  NAMES = build_names
-
-
-
-  def self.format( color )
-    rgb = [r(color),
-           g(color),
-           b(color)]
-
-    # rgb in hex (string format)
-    #   note: do NOT include alpha channel for now - why? why not?
-    hex = "#" + rgb.map{|num| '%02x' % num }.join
-
-    hsl = to_hsl( color )
-    ## get alpha channel (transparency) for hsla
-    alpha = hsl[3]
-
-
-    buf = ''
-    buf << hex
-    buf << " / "
-    buf << "rgb("
-    buf << "%3d " % rgb[0]
-    buf << "%3d " % rgb[1]
-    buf << "%3d)"  % rgb[2]
-    buf << " - "
-    buf << "hsl("
-    buf << "%3d° " % (hsl[0] % 360)
-    buf << "%3d%% " % (hsl[1]*100+0.5).to_i
-    buf << "%3d%%)" % (hsl[2]*100+0.5).to_i
-
-    if alpha != 255
-      buf << " - α(%3d%%)" % (alpha*100/255+0.5).to_i
-    else
-      buf << "          "  ## add empty for 255 (full opacity)
-    end
-
-    ## note: add alpha channel to hex
-    alpha_hex = '%02x' % alpha
-    name = NAMES[ hex+alpha_hex ]
-    buf << " - #{name}"  if name
-
-    buf
-  end
-  class << self
-    alias_method :fmt, :format
-  end
-
-end  # class Color
-end  # module Pixelart
-
-

data/lib/pixelart/gradient.rb

@@ -1,106 +0,0 @@
-
-## inspired / helped by
-##  https://en.wikipedia.org/wiki/List_of_software_palettes#Color_gradient_palettes
-##  https://github.com/mistic100/tinygradient
-##   https://mistic100.github.io/tinygradient/
-##   https://bsouthga.dev/posts/color-gradients-with-python
-
-
-module Pixelart
-
-class Gradient
-
-  def initialize( *stops )
-    ## note:  convert stop colors to rgb triplets e.g.
-    ##         from #ffffff to [255,255,255]
-    ##              #000000 to [0,0,0]  etc.
-    @stops = stops.map do |stop|
-               stop = Color.parse( stop )
-               [Color.r(stop), Color.g(stop), Color.b(stop)]
-             end
-  end
-
-
-  def colors( steps )
-    segments = @stops.size - 1
-
-    ## note: gradient will include start (first)
-    ##   AND stop color (last) - stop color is NOT excluded for now!!
-    if segments == 1
-       start = @stops[0]
-       stop  = @stops[1]
-
-       gradient = linear_gradient( start, stop, steps,
-                                   include_stop: true )
-    else
-      steps_per_segment, mod = steps.divmod( segments )
-      raise ArgumentError, "steps (#{steps}) must be divisible by # of segments (#{segments}); expected mod of 0 but got #{mod}"   if mod != 0
-
-      gradient = []
-      segments.times do |segment|
-        start = @stops[segment]
-        stop  = @stops[segment+1]
-        include_stop =  (segment == segments-1)  ## note: only include stop if last segment!!
-
-        # print "  segment #{segment+1}/#{segments} #{steps_per_segment} color(s) - "
-        # print "  start: #{start.inspect}  "
-        # print  include_stop ? 'include' : 'exclude'
-        # print " stop:  #{stop.inspect}"
-        # print "\n"
-
-        gradient += linear_gradient( start, stop, steps_per_segment,
-                                     include_stop: include_stop )
-      end
-    end
-
-    ## convert to color (Integer)
-    gradient.map do |color|
-      Color.rgb( *color )
-    end
- end
-
-
-
- def interpolate( start, stop, steps, n )
-   ## note: n - expected to start with 1,2,3,etc.
-   color = []
-   3.times do |i|
-     stepize = Float(stop[i] - start[i]) / Float(steps-1)
-     value = stepize * n
-     ## convert back to Integer from Float
-     ##   add 0.5 for rounding up (starting with 0.5) - why? why not?
-     value = (value+0.5).to_i
-     value = start[i] + value
-
-     color << value
-   end
-   color
- end
-
-
- def linear_gradient( start, stop, steps,
-                      include_stop: true )
-
-  gradient = [start]  ## auto-add start color (first color in gradient)
-
-  if include_stop
-    1.upto( steps-2 ).each do |n|  ## sub two (-2), that is, start and stop color
-      gradient << interpolate( start, stop, steps, n )
-    end
-    # note: use original passed in stop color (should match calculated)
-    gradient << stop
-  else
-    1.upto( steps-1 ).each do |n|  ## sub one (-1), that is, start color only
-      ## note: add one (+1) to steps because stop color gets excluded (not included)!!
-      gradient << interpolate( start, stop, steps+1, n )
-    end
-  end
-
-  gradient
-end
-
-
-
-end  # class Gradient
-end  # module Pixelart
-

data/lib/pixelart/palette.rb

@@ -1,72 +0,0 @@
-module Pixelart
-
-
-class Palette8bit     # or use Palette256 alias?
-
-
-  ## auto-add grayscale 0 to 255
-  ##  e.g. rgb(0,0,0)
-  ##       rgb(1,1,1)
-  ##       rgb(2,2,2)
-  ##       ...
-  ##       rgb(255,255,255)
-  GRAYSCALE = (0..255).map { |n| Color.rgb( n, n, n ) }
-
-
-   ## 8x32 gradient color stops
-   ##   see https://en.wikipedia.org/wiki/List_of_software_palettes#Color_gradient_palettes
-
-  SEPIA_STOPS = [
-    ['080400', '262117'],
-    ['272218', '453E2F'],
-    ['463F30', '645C48'],
-    ['655D48', '837A60'],
-
-    ['847A60', 'A29778'],
-    ['A39878', 'C1B590'],
-    ['C2B691', 'E0D2A8'],
-    ['E1D3A9', 'FEEFBF'],
-  ]
-
-  BLUE_STOPS = [
-    ['000000', '001F3E'],
-    ['002040', '003F7E'],
-    ['004080', '005FBD'],
-    ['0060BF', '007FFD'],
-
-    ['0080FF', '009FFF'],
-    ['00A0FF', '00BFFF'],
-    ['00C0FF', '00DFFF'],
-    ['00E0FF', '00FEFF'],
-  ]
-
-  FALSE_STOPS = [
-    ['FF00FF', '6400FF'],
-    ['5F00FF', '003CFF'],
-    ['0041FF', '00DCFF'],
-    ['00E1FF', '00FF82'],
-
-    ['00FF7D', '1EFF00'],
-    ['23FF00', 'BEFF00'],
-    ['C3FF00', 'FFA000'],
-    ['FF9B00', 'FF0000'],
-  ]
-
-
-  def self.build_palette( gradients )
-    colors_per_gradient, mod = 256.divmod( gradients.size )
-    raise ArgumentError, "8bit palette - 256 must be divisible by # of gradients (#{gradients.size}; expected mod of 0 but got #{mod}"   if mod != 0
-
-    colors = []
-    gradients.each do |stops|
-      colors += Gradient.new( *stops ).colors( colors_per_gradient )
-    end
-    colors
-  end
-
-  SEPIA     = build_palette( SEPIA_STOPS )
-  BLUE      = build_palette( BLUE_STOPS )
-  FALSE     = build_palette( FALSE_STOPS )
-end  # class Palette8bit
-end # module Pixelart
-