fractal 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45b8f6fa7a6f441266b58e9ef31a977d506184ca
-  data.tar.gz: 16d849e8562d36b027ff10e0cf14b4939b5a07c5
+  metadata.gz: 99a86a0f26d2335d74151a20aaabfe6da583299b
+  data.tar.gz: 82cf591b8628ac0f466063c87cbf8cf8a251ff60
 SHA512:
-  metadata.gz: 812a196b7ae1eaef40e896821e21b67f4a514d9535a48d5f7050866bd0c09be2c2a75e7066593c9b629050b0b92ca5248c2cb79951c777efabeeb0910d4b5d30
-  data.tar.gz: 21b4e68b948b0a2471048a3011d501353d21a5a7a20a6d3950c46a941b1a0a3b8abc3474fbbe4770cb40c17c4df09d852ecc6bc79233ce7d87179063566055e1
+  metadata.gz: 79b069848c22308b1bb06f7f4eb80a6b600dd88a50d56fac2b394027e9d2ef950e63868134093b73cb28579614ef61e3ab9096a5e1bdb152d1137da8efbf9530
+  data.tar.gz: 8bc30cd1bd68b7c91849a7d9953a77674048bebf611bb0e6550676a4c7bb9d2857ee88b547bf805f5c61c60b210b6606f274606d825e0498ba5472d0343e9229

data/bin/fractal

@@ -1,8 +1,46 @@
 #!/usr/bin/env ruby
 require 'fractal'
 
-png = ChunkyPNG::Image.new ARGV[0].to_i, ARGV[1].to_i
-fractal = Fractals::Mandelbrot.new png
-fractal.colorMode = 'rgb'
+fractals = ['mandelbrot']
+fractalType = String.new
 
-fractal.draw(ARGV[2].to_i, ARGV[3].to_i).save('mandelbrot-fractal.png')
+ARGV.each do |arg|
+  fractals.each do |option|
+    fractalType = arg.downcase if arg.downcase == option
+  end
+end
+
+if fractalType.empty?
+  puts "Please provide a fractal type."
+  exit 1
+end
+
+width = height = 0
+args = Hash[ARGV.join(' ').scan(/--?([^=\s]+)(?:=(\S+))?/)]
+width  = args['w'].to_i if args.key? 'w' # -w=2000
+height = args['h'].to_i if args.key? 'h' # -h=1500
+
+if width <= 0 || height <= 0
+  puts "Warning, width and/or height not provided.\nSetting to default: 300x300"
+  width = height = 300
+end
+
+png = ChunkyPNG::Image.new width, height
+fractal = (
+  case fractalType
+  when 'mandelbrot'
+    Fractals::Mandelbrot.new png
+  else
+    Fractals::Mandelbrot.new png
+  end
+)
+fractal.colorMode = 'mono'
+# TODO: Use colorMode option for multichromatic images.
+fractal.colorMode = args['color'] if args.key? 'color' # --color=mono
+fractal.colorMode = args['mode'] if args.key? 'mode' # --mode=mono
+
+definition, scale = 255, 2
+definition = args['def'].to_i if args.key? 'def' # --def=100
+scale = args['scale'].to_i if args.key? 'scale'  # --scale=1.5
+
+fractal.draw(definition, scale).save("#{fractalType}-fractal.png")

data/lib/fractal.rb

@@ -11,33 +11,42 @@ module Fractals
   I = Complex 'i'
 
   class Mandelbrot
-    attr_accessor :colorMode
+    attr_accessor :colorType
 
     def initialize image
       @width, @height = image.width, image.height
       @image = image
     end
 
-    def draw definition=100, scale=2
-      scale = scale.to_f
+    def calculate a, b, c_arr
+      ca, cb = c_arr
+      left = a * a - b * b
+      right = 2 * a * b
+      a = left  + ca
+      b = right + cb
+
+      return [a, b]
+    end
+
+    def draw definition=255, scale=2
+      scaleWidth  = scale.to_f
+      scaleHeight = scale.to_f * (@height.to_f / @width.to_f)
       definition = definition.to_f
       (0..@width - 1).each do |x|
         (0..@height - 1).each do |y|
-          a = ca = drag(x, 0, @width,  -scale, scale)
-          b = cb = drag(y, 0, @height, -scale, scale)
+          a = ca = drag(x, 0, @width,  -scaleWidth, scaleWidth)
+          b = cb = drag(y, 0, @height, -scaleHeight, scaleHeight)
 
           snap = 0
           while snap < definition
-            left  = a * a - b * b
-            right = 2 * a * b
-            a = left  + ca
-            b = right + cb
-
+            a, b = calculate(a, b, [ca, cb])
             if a * a + b * b > 16
               break
             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)
 

metadata

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