pixelart 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb520f7fc94b0b7d62336829d92929bbeb27600f0042ab3f68d81b6e5b26d2b3
-  data.tar.gz: ed4756f69b5f5d5ca696a1105aa348b5b86ab33653ff7c34d1b24f4dc75e244f
+  metadata.gz: ba25604fe4925484c00f133e26e2d3d67aec4b23af8daa2cc3306235a2c704a6
+  data.tar.gz: 570abba81b211dc9aa1df3939b15e9e6845676884c01197c25d9cb23d3b4ba0f
 SHA512:
-  metadata.gz: caa3d9eeb12a4a59e4f6ec3191e432ae11d7cf44465e0b6722c69bda985af6caeea3a4390f773d4d535a38096f483c3d9467b03f63ed6547a168f79361db1991
-  data.tar.gz: d7f6d039eddc337b62ca22b338712a26423781b2a57703429469d376c02af0fef6aadd9182f4fb2cb755dc83f27c6bcbb97519ee528c01169ba8070534c7c377
+  metadata.gz: 1af47c73f13001e103d1ad0a4965d8125763935c2b962d50769f48cba1728ea351645bfb381721425c776b20ccd484acde470a41044b055552bb929e18a8e98d
+  data.tar.gz: e60473974839ade310e105c148f98b7a1e5232f6e0491df1108cb0f50028d8ff1b02af8e9c2ba61ede00c6396b4d5bf8833dd3c757692190f101ecdc6e6072f8

data/Manifest.txt

@@ -15,4 +15,5 @@ lib/pixelart/palette.rb
 lib/pixelart/pixelator.rb
 lib/pixelart/sketch.rb
 lib/pixelart/spots.rb
+lib/pixelart/vector.rb
 lib/pixelart/version.rb

data/lib/pixelart/base.rb

@@ -28,6 +28,7 @@ require 'pixelart/palette'
 require 'pixelart/image'
 require 'pixelart/composite'
 
+
 require 'pixelart/pixelator'
 
 require 'pixelart/misc'   ## misc helpers
@@ -47,6 +48,9 @@ module Pixelart
   MAGICK_OUTPUT = './tmp/magick_output.png'
 end
 
+require 'pixelart/vector'   ## vector graphics helpers
+
+
 require 'pixelart/spots'
 require 'pixelart/blur'
 

data/lib/pixelart/image.rb

@@ -101,6 +101,14 @@ def mirror
 end
 alias_method :flip_vertically, :mirror
 
+def flip
+  img = @img.flip
+  Image.new( img.width, img.height, img )
+end
+alias_method :flip_horizontally, :flip
+
+
+
 
 ## add replace_colors alias too? - why? why not?
 def change_colors( color_map )

data/lib/pixelart/spots.rb

@@ -3,41 +3,67 @@ module Pixelart
 class Image
 
 
-def spots( spot=10,
-              spacing: 0,
-              center: nil,
-              radius: nil,
-              background: nil,
-              lightness: nil,
-              odd: false )
+def spots_hidef( spot=10,
+                   spacing: 0,
+                   center: nil,
+                   radius: nil,
+                   background: nil,
+                   lightness: nil,
+                   odd: false )
+
+  width  = @img.width*spot+(@img.width-1)*spacing
+  height = @img.height*spot+(@img.height-1)*spacing
 
-  width  = @img.width
-  height = @img.height
   ## puts "  #{width}x#{height}"
 
+  ## settings in a hash for "pretty printing" in comments
+  settings = { spot: spot
+             }
+
+  settings[ :spacing ] = spacing  if spacing
+  settings[ :center ]  = center  if center
+  settings[ :radius ] = radius  if radius
+  settings[ :background ] = background  if background
+  settings[ :lightness ] = lightness  if lightness
+  settings[ :odd ] = odd   if odd
+
+
+  v = Vector.new( width, height, header: <<TXT )
+generated by pixelart/v#{VERSION} on #{Time.now.utc}
+
+spots_hidef with settings:
+    #{settings.to_json}
+TXT
+
+
   min_center, max_center = center ? center : [0,0]
   min_radius, max_radius = radius ? radius : [0,0]
 
-  background_color = background ? Color.parse( background ) : 0
+  ## note: allow passing in array of colors (will get randomally picked)
+  background_colors = if background
+                        ## check for array; otherwise assume single color passed in
+                        background_ary = background.is_a?( Array) ? background : [background]
+                        background_ary.map { |background| Color.parse( background ) }
+                      else
+                        [0]   # transparent (default - no background)
+                      end
 
-  min_lightness, max_lightness = lightness ? lightness : [0.0,0.0]
 
-  ## note: magick command line might get way too long, thus,
-  ##   save commands to a script
-  script = String.new('')
-  script << "#{MAGICK_INPUT} \\\n"
+  min_lightness, max_lightness = lightness ? lightness : [0.0,0.0]
 
 
-    width.times do |x|
-      height.times do |y|
+   @img.width.times do |x|
+      @img.height.times do |y|
          color = @img[ x, y ]
 
-         if color == 0  ## transparent
-           if background   ## change transparent to background
-              color = background_color
-           else
-             next ## skip transparent
-           end
+         if color == 0   ## transparent
+           next if background.nil?
+
+           color = if background_colors.size == 1
+                     background_colors[0]
+                   else  ## pick random background color
+                     background_colors[ rand( background_colors.size ) ]
+                   end
          end
 
 
@@ -65,7 +91,6 @@ def spots( spot=10,
          # e.g.    0 becomes #00000000
          #        and so on
          color_hex = Color.to_hex( color, include_alpha: true )
-         script << "-fill '#{color_hex}' "
 
          cx_offset,
          cy_offset = if center  ## randomize (offset off center +/-)
@@ -79,48 +104,40 @@ def spots( spot=10,
          cx = x*spot + x*spacing + cx_offset
          cy = y*spot + y*spacing + cx_offset
 
-         px_offset = if radius ## randomize (radius +/-)
+         r = if radius ## randomize (radius +/-)
                        min_radius + rand( max_radius-min_radius )
                      else
                        spot/2
                      end
-         px = cx + px_offset
-         py = cy
 
+         cx += spot/2   if odd && (y % 2 == 1)  ## add odd offset
 
-         if odd && (y % 2 == 1)  ## add odd offset
-            cx += spot/2
-            px += spot/2
-         end
 
-         ## circle
-         ##  give the center and any point on the perimeter (boundary)
-         script << "-draw 'circle #{cx},#{cy},#{px},#{py}' \\\n"
+         v.circle( cx: cx, cy: cy, r: r, fill: color_hex)
       end
     end
+  v
+end  ## method spots_hidef
+alias_method :spots_hd, :spots_hidef
 
-    script << "-write #{MAGICK_OUTPUT}\n"
-
-
-    ## use an empty image (canvas) with transparent background
-    ##   as magick input image
-   canvas = Image.new( width*spot+(width-1)*spacing,
-                       height*spot+(height-1)*spacing )
-   canvas.save( MAGICK_INPUT )
-
-   ## note: save magick input first (see above) before save script
-   ##        will (auto-)create missing directories in path (if missing)
-
-   File.open( MAGICK_SCRIPT, 'w:utf-8' ) do |f|
-     f.write( script )
-   end
 
+def spots( spot=10,
+              spacing: 0,
+              center: nil,
+              radius: nil,
+              background: nil,
+              lightness: nil,
+              odd: false )
 
-  MiniMagick::Tool::Magick.new do |magick|
-    magick.script( MAGICK_SCRIPT )
-  end
+  v = spots_hidef( spot,
+        spacing: spacing,
+        center: center,
+        radius: radius,
+        background: background,
+        lightness: lightness,
+        odd: odd )
 
-  Image.read( MAGICK_OUTPUT )
+  v.to_image
 end
 
 

data/lib/pixelart/vector.rb

@@ -0,0 +1,108 @@
+module Pixelart
+
+
+class Vector   # holds a vector graphics image (in source)
+
+  class Shape; end
+  class Circle < Shape
+    def initialize( cx, cy, r, fill: )
+      @cx   = cx
+      @cy   = cy
+      @r    = r
+      @fill = fill
+    end
+
+    def to_svg
+      %Q{<circle cx="#{@cx}" cy="#{@cy}" r="#{@r}" fill="#{@fill}" />}
+    end
+
+    def to_magick
+      ## circle
+      ##  give the center and any point on the perimeter (boundary)
+      px = @cx+@r
+      py = @cy
+      "-fill '#{@fill}' -draw 'circle #{@cx},#{@cy},#{px},#{py}'"
+    end
+  end # class Circle
+
+
+
+  def initialize( width, height, header: nil )
+     @width  = width
+     @height = height
+
+     @header = header
+     @shapes = []
+  end
+
+  def circle( cx:, cy:, r:, fill: )
+     @shapes << Circle.new( cx, cy, r, fill: fill )
+  end
+
+
+
+  def to_image
+     ## use an empty image (canvas) with transparent background
+     ##   as magick input image
+     canvas = Image.new( @width, @height )
+     canvas.save( MAGICK_INPUT )
+
+     ## note: magick command line might get way too long, thus,
+     ##   save commands to a script
+     ## note: save magick input first (see above) before save script
+     ##        will (auto-)create missing directories in path (if missing)
+
+    File.open( MAGICK_SCRIPT, 'w:utf-8' ) do |f|
+      f.write( "#{MAGICK_INPUT} \\\n" )
+      @shapes.each do |shape|
+        f.write( "#{shape.to_magick} \\\n" )
+      end
+      f.write( "-write #{MAGICK_OUTPUT}\n" )
+    end
+
+    MiniMagick::Tool::Magick.new do |magick|
+      magick.script( MAGICK_SCRIPT )
+    end
+
+    Image.read( MAGICK_OUTPUT )
+  end
+
+
+  def to_svg
+    buf = String.new('')
+
+    if @header
+      buf << "<!--\n"
+      ## auto-indent lines by five (5) spaces for now
+      @header.each_line do |line|
+        buf << "     #{line}"
+      end
+      buf << "\n-->\n\n"
+    end
+
+    buf << %Q{<svg version="1.1" width="#{@width}" height="#{@height}" xmlns="http://www.w3.org/2000/svg">\n}
+    @shapes.each do |shape|
+       buf << "  #{shape.to_svg}\n"
+    end
+    buf << "</svg>"
+    buf
+  end
+
+
+  def save( path, format: nil )
+    if format && format.downcase == 'png'  ## support png with image magick
+      img = to_image
+      img.save( path )
+    else
+     # make sure outdir exits
+     outdir = File.dirname( path )
+     FileUtils.mkdir_p( outdir )  unless Dir.exist?( outdir )
+     File.open( path, 'w:utf-8' ) do |f|
+        f.write( to_svg )
+      end
+    end
+  end
+  alias_method :write, :save
+
+end # class Vector
+end # module Pixelart

data/lib/pixelart/version.rb

@@ -3,7 +3,7 @@ module Pixelart
 
   MAJOR = 1
   MINOR = 1
-  PATCH = 0
+  PATCH = 1
   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: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -99,6 +99,7 @@ files:
 - lib/pixelart/pixelator.rb
 - lib/pixelart/sketch.rb
 - lib/pixelart/spots.rb
+- lib/pixelart/vector.rb
 - lib/pixelart/version.rb
 homepage: https://github.com/rubycoco/pixel
 licenses: