fractal 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce6ccc1d562e8399fdbd9b5867851075197b1b31
-  data.tar.gz: 708e78c8f8d02810d0376b2185618a55333e974f
+  metadata.gz: c48c0abbbd61e352458fe008cc8644bc663e6cab
+  data.tar.gz: 4d6a44628b4fca35212178956b1e0ff309e6e71d
 SHA512:
-  metadata.gz: 48cd8349fe3c1602ee3fd3740765e7dcacecb548116b8347b3ff83cbb0fb719f8a819cfe93837760b1fbd92aa4205849a11a6633f5eae6fc03e6a7b3fae1af42
-  data.tar.gz: 490f199d0ce4326813e4e17c1d82ba638adc56db49a99e2ceff1362fd2428deacef47788ec61e08dbe026a01bac0acc597a36e5847628ba1d0ea2c6ce39a7dc1
+  metadata.gz: 00b3e6e4a738d218de472066fc6d2329018de4b6ee21eebadfc29d3877ce8d2cc7a76b6f96f4552546a9d617d0827e7027baf3c42f748151d4c5be4b61b4e313
+  data.tar.gz: 065da56ed5d1c6a368eb51e2357241138093d431f8d3f9cf0bd4ae7ca0e224e52d73d4eb17bc59b632d8011edf6e6ede4f9b1a119506700ae079d1d9a63faf70

data/bin/fractal

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'fractal'
 args = Hash[ARGV.join(' ').scan(/--?([^=\s]+)(?:=(\S+))?/)]
-if args.key?('h') || args.key?('help')
+if args.key?('help')
   help = <<EOF
 
 `fractal` command-line arguments:
@@ -38,7 +38,7 @@ ARGV.each do |arg|
 end
 
 if fractalType.empty?
-  puts "Please provide a fractal type."
+  puts "Error: Please provide a fractal type."
   exit 1
 end
 
@@ -51,6 +51,20 @@ if width <= 0 || height <= 0
   width = height = 300
 end
 
+ca = cb = nil
+if args.key? 'complex'
+  complex = args['complex']
+  ca, cb = complex.split(/(?=[+\-])/)
+  ca = ca.to_f
+  cb.delete! "i"
+  cb = cb.to_f
+end
+
+if fractalType == 'julia' && (ca.nil? || cb.nil?)
+  puts "Error: fractal type: '#{fractalType}' requires complex coordinate,\n in form of '±c₁±c₂i', for example: -0.416+0.8i"
+  exit 1
+end
+
 png = ChunkyPNG::Image.new width, height
 fractal = (
   case fractalType
@@ -60,7 +74,6 @@ fractal = (
     Fractals::Mandelbrot.new png
   end
 )
-fractal.colorType = 'mono'
 # TODO: Use colorMode option for multichromatic images.
 fractal.colorType = args['color'] if args.key? 'color' # --color=mono
 fractal.colorType = args['mode'] if args.key? 'mode' # --mode=mono

data/lib/fractal.rb

@@ -45,15 +45,22 @@ module Fractals
             end
             snap += 1
           end
-          # TODO: Use colorType as option non-monochromatic images
-          #       (allow colourful fractals), currently only greyscale
-          shade = drag(snap, 0, definition, 0, 1)
-          shade = drag(Math.sqrt(shade), 0, 1, 0, 255)
-
-          colours = [shade.round.to_i] * 3
-          hex = String.new
-          colours.each { |component| hex << component.to_s(16) }
-          @image[x, y] = ChunkyPNG::Color.from_hex hex
+
+          case @colorType
+          when 'multichromatic', 'multi', 'rainbow'
+            brightness = 1
+            brightness = 0 if snap == definition
+            hue = drag(snap, 0, definition, 0, 1)
+            hue = drag(Math.sqrt(hue), 0, 1, 0, 360)
+
+            @image[x, y] = ChunkyPNG::Color.from_hsv hue, 1, brightness
+          else
+            shade = drag(snap, 0, definition, 0, 1)
+            shade = drag(Math.sqrt(shade), 0, 1, 0, 255)
+            r, g, b = [shade.round.to_i] * 3
+
+            @image[x, y] = ChunkyPNG::Color.rgb r, g, b
+          end
         end
       end
       return @image

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fractal
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Demonstrandum