fractal 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d6e9e8b59a32d9c1c60cc4491b890caf44e70f70
-  data.tar.gz: 7279d76d297eb703f576063289ea06dc7e8ff92d
+SHA256:
+  metadata.gz: 0c043fdee5986a21bc328754149982e0435ab815933ad075a653332605e8475a
+  data.tar.gz: f76814af1d2f281da912ba797ca7d5db4cbda220f222b2d4caeacf490a4fdcb3
 SHA512:
-  metadata.gz: 3a0aa10ad51c5cf18933c07d0d710dbae8cd21a20bd0b08d74829bef48644797ba315997b83bbf99910a147c2143e3e8f16dd2abe807d7df150f1fdad2511b77
-  data.tar.gz: 9238c025bd4cdeac06d21b1498ddc7677f399f6fc7b7949de04bef0903f93ee6865aa9fd54059d08de53c5e94b854bda506e1ee0c2531b1ff896030662dea47d
+  metadata.gz: fd86626a204a0ad115b9a2120835d643d6995c26e94969e48951ef4e3cccc31876dbcc2c07215f0cf7a1d0ed7ec69918b86ca964056682a6e2025631d599fa2e
+  data.tar.gz: 20e83dca134b2bc920438a5040c4b9328e269eebecdc2cd7660902b532daa8a43ef902d21401e1e31a74362921f8b2bb4f23db44aa79a071805ba7397574a349

data/bin/fractal

@@ -24,6 +24,13 @@ if args.key? 'help'
   -  `--scale=`, (optional), the zoom level of the image,
      a higher value corresponds to a taller imaginary number line
      thus a smaller fractal is seen. e.g. `--scale=2.25`
+  -  `--offset=x,y` (optional), the offset will make you able
+     to position yourself where you like on the plan.
+     (offsetting where the centre is, before (0,0) was
+     the centre of the image, but now your offset is the centre).
+     Make sure you give an x and y value as numerics,
+     (ints and floats work both and don't leave any spaces
+     between the comma).
   -  `--complex=` (*only needed for the Julia set*)
      this sets a complex coordinate for the Julia set,
      in the form of `a±bi` ('a' and 'b' real numbers and
@@ -43,13 +50,13 @@ EOF
   exit 0
 end
 
-allowedFractals = ['mandelbrot', 'julia']
-fractalType = String.new
+allowed_fractals = ['mandelbrot', 'julia']
+fractal_type = String.new
 
 o = String.new
 ARGV.each do |arg|
-  allowedFractals.each do |option|
-    fractalType = arg.downcase if arg.downcase == option
+  allowed_fractals.each do |option|
+    fractal_type = arg.downcase if arg.downcase == option
   end
 
   o = arg if arg[arg.length - 4, 4].downcase == '.png'
@@ -62,7 +69,7 @@ if o.include? '~'
 end
 
 
-if fractalType.empty?
+if fractal_type.empty?
   puts "Error: Please provide a fractal type.\nType `fractal --help` for help."
   exit 1
 end
@@ -85,35 +92,37 @@ if args.key? 'complex'
   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"
+if fractal_type == 'julia' && (ca.nil? || cb.nil?)
+  puts "Error: fractal type: '#{fractal_type}' 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
 
-case fractalType
+case fractal_type
 when 'mandelbrot'
   fractal = Fractals::Mandelbrot.new png
 when 'julia'
   fractal = Fractals::Julia.new png
   fractal.real = ca
-  fractal.complex = cb
+  fractal.imaginary = cb
 else
   fractal = Fractals::Mandelbrot.new png
 end
 
 
-fractal.colorType = args['color'] if args.key? 'color' # --color=mono
-fractal.colorType = args['mode'] if args.key? 'mode' # --mode=mono
+fractal.colouring = args['color'] if args.key? 'color' # --color=mono
+fractal.colouring = args['mode'] if args.key? 'mode' # --mode=mono
 
 definition, scale = 255, 2.0
 definition = args['def'].to_i if args.key? 'def' # --def=100
 scale = args['scale'].to_f if args.key? 'scale'  # --scale=1.5
+offset = [0, 0]
+offset = args['offset'].split(',').map(&:to_f) if args.key? 'offset'
 
 unless o.empty?
-  fractal.draw(definition, scale).save(o)
+  fractal.draw(definition, scale, offset).save(o)
   exit 0
 end
 
-fractal.draw(definition, scale).save("#{fractalType}-fractal.png")
+fractal.draw(definition, scale, offset).save("#{fractal_type}-fractal.png")

data/lib/fractal.rb

@@ -8,10 +8,8 @@ def drag pos, pos_min, pos_max, out_min, out_max
 end # drag(x, x_min_val, x_max_val, mapped_to_min_val, mapped_to_max_val), the same as the popular map(...) function.
 
 module Fractals
-  I = Complex 'i'
-
   class Mandelbrot
-    attr_accessor :colorType
+    attr_accessor :colouring
 
     def initialize image
       @width, @height = image.width, image.height
@@ -28,35 +26,35 @@ module Fractals
       return [a, b]
     end
 
-    def draw definition=255, scale=2.0
+    def draw definition=255, scale=2.0, offset=[0,0]
       scaleWidth  = scale
       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,  -scaleWidth, scaleWidth)
-          b = cb = drag(y, 0, @height, -scaleHeight, scaleHeight)
+          a = ca = drag x, 0, @width,  -scaleWidth  + offset[0], scaleWidth  + offset[0]
+          b = cb = drag y, 0, @height, -scaleHeight - offset[1], scaleHeight - offset[1]
 
           snap = 0
           while snap < definition
-            a, b = calculate(a, b, [ca, cb])
+            a, b = calculate a, b, [ca, cb]
             if a * a + b * b > 16
               break
             end
             snap += 1
           end
 
-          case @colorType
+          case @colouring
           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)
+            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)
+            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
@@ -67,17 +65,20 @@ module Fractals
     end
   end
 
-  class Julia < Mandelbrot # Since the Julia set only has a slightly modified calculation
+  class Julia < Mandelbrot
+    # Since the Julia set only has a slightly modified calculation
     attr_accessor :real
-    attr_accessor :complex
+    attr_accessor :imaginary
 
-    def calculate a, b, c_arr # c_arr is irrelevant as c is now constant, however the draw() still supplies it and I don't want to rewrite draw when it already exists. 
+    def calculate a, b, c_arr
+      # c_arr is irrelevant as c is now constant,
+      # however the #draw() still supplies it and
+      # I don't want to rewrite draw when it already exists. 
       left = a * a - b * b
       right = 2 * a * b
-      a = left  + @real    # z^2 + c
-      b = right + @complex # but here the c is constant, composed of a real and imaginary part in form of a±bi where a and b have been separated and labeled here as real and complex
+      a = left  + @real      # z^2 + c
+      b = right + @imaginary
       return [a, b]
     end
   end
-  # module space
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fractal
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Demonstrandum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -30,7 +30,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.8
-description: Creates PNG images of fractals.
+description: Creates PNG images of complex plane fractals.
 email: knutsen@jetspace.co
 executables:
 - fractal
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Draws fractal PNG images.