rubysketch 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1bb07d704867d0e00deedee6f3cc5dfb1b14b371b921d2e6cb1ada2109b2ee7
-  data.tar.gz: 5b2120035af8b39d30871491d00fc386d3d04ca92e6f9c004773621056a7e8e0
+  metadata.gz: 31a6c8685fd803f34636e81ee5098dfda6c2d82ab500952662e5b77c30601c09
+  data.tar.gz: e4f22f4dbf9d01a0cc4f5f084648698ae42c0a1eddf582c0848849b194ac5933
 SHA512:
-  metadata.gz: ea61784f451fbe2b302c08b6ee3927b92836ee0379c9df0412a4e79e743e4ec7a1309dd12f78618b410232ce96a383042a5f8e706567ea9745579f83b3feba06
-  data.tar.gz: 3b91cde4bfc763ebe5a132930f71209dc8cce3f214361c4aa782a24c3c855ad8ea751580c6adaca8523cfecba4d06c3a7db7e2961d943755de6ce8c2dc4bee4d
+  metadata.gz: 5df3c266fb39715d6c83cda24268e48f27e922292398cda0f3c84412089fe88bc0a08a6373cd4b97faf342b64a79b3c7d7343794081522c7ae4894e8d7cefdc9
+  data.tar.gz: 2c182badae8ae8f471647a2fc8289e7151730985de955b54d29f51c04ed8ee242ea89c274303e2f9d5b4d6189186b7ea635bc464d3ece7af5329124729f5c999

data/.yardopts

@@ -0,0 +1 @@
+--no-private

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/rubysketch/processing.rb

@@ -5,9 +5,10 @@ module RubySketch
   #
   class Processing1
 
+    include Math
+
     extend Starter
 
-    PI         = Math::PI
     HALF_PI    = PI / 2
     QUARTER_PI = PI / 4
     TWO_PI     = PI * 2
@@ -54,7 +55,7 @@ module RubySketch
     # @private
     def on_start__ (window)
       @window__  = window
-      @painter__ = window.canvas.painter
+      @painter__ = window.canvas_painter
 
       setupDrawBlock__
       setupMousePressedBlock__
@@ -63,22 +64,153 @@ module RubySketch
       setupMouseDraggedBlock__
     end
 
+    # Returns the absolute number of the value.
+    #
+    # @param value [Numeric] number
+    #
+    # @return [Numeric] absolute number
+    #
     def abs (value)
       value.abs
     end
 
+    # Returns the closest integer number greater than or equal to the value.
+    #
+    # @param value [Numeric] number
+    #
+    # @return [Numeric] rounded up number
+    #
     def ceil (value)
       value.ceil
     end
 
+    # Returns the closest integer number less than or equal to the value.
+    #
+    # @param value [Numeric] number
+    #
+    # @return [Numeric] rounded down number
+    #
     def floor (value)
       value.floor
     end
 
+    # Returns the closest integer number.
+    #
+    # @param value [Numeric] number
+    #
+    # @return [Numeric] rounded number
+    #
     def round (value)
       value.round
     end
 
+    # Returns value raised to the power of exponent.
+    #
+    # @param value    [Numeric] base number
+    # @param exponent [Numeric] exponent number
+    #
+    # @return [Numeric] value ** exponent
+    #
+    def pow (value, exponent)
+      value ** exponent
+    end
+
+    # Returns squared value.
+    #
+    # @param value [Numeric] number
+    #
+    # @return [Numeric] squared value
+    #
+    def sq (value)
+      value * value
+    end
+
+    # Returns the magnitude (or length) of a vector.
+    #
+    # @overload mag(x, y)
+    # @overload mag(x, y, z)
+    #
+    # @param x [Numeric] x of point
+    # @param y [Numeric] y of point
+    # @param z [Numeric] z of point
+    #
+    # @return [Numeric] magnitude
+    #
+    def mag (*args)
+      x, y, z = *args
+      case args.size
+        when 2 then sqrt x * x + y * y
+        when 3 then sqrt x * x + y * y + z * z
+        else raise ArgumentError
+      end
+    end
+
+    # Returns distance between 2 points.
+    #
+    # @overload dist(x1, y1, x2, y2)
+    # @overload dist(x1, y1, z1, x2, y2, z2)
+    #
+    # @param x1 [Numeric] x of first point
+    # @param y1 [Numeric] y of first point
+    # @param z1 [Numeric] z of first point
+    # @param x2 [Numeric] x of second point
+    # @param y2 [Numeric] y of second point
+    # @param z2 [Numeric] z of second point
+    #
+    # @return [Numeric] distance between 2 points
+    #
+    def dist (*args)
+      case args.size
+        when 4
+          x1, y1, x2, y2 = *args
+          xx, yy = x2 - x1, y2 - y1
+          sqrt xx * xx + yy * yy
+        when 3
+          x1, y1, z1, x2, y2, z2 = *args
+          xx, yy, zz = x2 - x1, y2 - y1, z2 - z1
+          sqrt xx * xx + yy * yy + zz * zz
+        else raise ArgumentError
+      end
+    end
+
+    # Normalize the value from range start..stop into 0..1.
+    #
+    # @param value [Numeric] number to be normalized
+    # @param start [Numeric] lower bound of the range
+    # @param stop  [Numeric] upper bound of the range
+    #
+    # @return [Numeric] normalized value between 0..1
+    #
+    def norm (value, start, stop)
+      (value.to_f - start.to_f) / (stop.to_f - start.to_f)
+    end
+
+    # Returns the interpolated number between range start..stop.
+    #
+    # @param start  [Numeric] lower bound of the range
+    # @param stop   [Numeric] upper bound of the range
+    # @param amount [Numeric] amount to interpolate
+    #
+    # @return [Numeric] interporated number
+    #
+    def lerp (start, stop, amount)
+      start + (stop - start) * amount
+    end
+
+    # Maps a number from range start1..stop1 to range start2..stop2.
+    #
+    # @param value  [Numeric] number to be mapped
+    # @param start1 [Numeric] lower bound of the range1
+    # @param stop1  [Numeric] upper bound of the range1
+    # @param start2 [Numeric] lower bound of the range2
+    # @param stop2  [Numeric] upper bound of the range2
+    #
+    # @return [Numeric] mapped number
+    #
+    def map (value, start1, stop1, start2, stop2)
+      lerp start2, stop2, norm(value, start1, stop1)
+    end
+
     # Returns minimum value.
     #
     # @overload min(a, b)
@@ -113,6 +245,14 @@ module RubySketch
       args.flatten.max
     end
 
+    # Constrains the number between min..max.
+    #
+    # @param value [Numeric] number to be constrained
+    # @param min   [Numeric] lower bound of the range
+    # @param max   [Numeric] upper bound of the range
+    #
+    # @return [Numeric] constrained number
+    #
     def constrain (value, min, max)
       value < min ? min : (value > max ? max : value)
     end
@@ -146,7 +286,7 @@ module RubySketch
     def setupDrawBlock__ ()
       @window__.draw = proc do |e, painter|
         @painter__ = painter
-        @painter__.paint {|_| @drawBlock__.call e} if @drawBlock__
+        @drawBlock__.call e if @drawBlock__
         @frameCount__ += 1
         updateMousePrevPos__
       end
@@ -227,7 +367,8 @@ module RubySketch
       @mousePrevY__ = @mouseY__
     end
 
-    def size (width, height)
+    # @private
+    def size__ (width, height)
       raise 'size() must be called on startup or setup block' if @started__
 
       @painter__.send :end_paint
@@ -339,12 +480,12 @@ module RubySketch
 
     # @private
     def to_rgba__ (*args)
-      _0, _1, _2, _3 = args
-      return parse_color__(_0, _1 || alphaMax__) if _0.kind_of?(String)
+      a, b, c, d = args
+      return parse_color__(a, b || alphaMax__) if a.kind_of?(String)
 
       rgba  = case args.size
-        when 1, 2 then [_0, _0, _0, _1 || alphaMax__]
-        when 3, 4 then [_0, _1, _2, _3 || alphaMax__]
+        when 1, 2 then [a, a, a, b || alphaMax__]
+        when 3, 4 then [a, b, c, d || alphaMax__]
         else raise ArgumentError
       end
       rgba  = rgba.map.with_index {|value, i| value / @colorMaxes__[i]}
@@ -357,7 +498,7 @@ module RubySketch
       result = str.match /^\s*##{'([0-9a-f]{2})' * 3}\s*$/i
       raise ArgumentError, "Invalid color code: '#{str}'" unless result
 
-      rgb = result[1..3].map.with_index {|hex, i| hex.to_i(16) / @colorMaxes__[i]}
+      rgb = result[1..3].map.with_index {|hex, i| hex.to_i(16) / 255.0}
       return *rgb, (alpha / alphaMax__)
     end
 

data/lib/rubysketch/starter.rb

@@ -4,10 +4,11 @@ module RubySketch
   extend module Functions
 
     def start (context, start_at_exit: false, &block)
-      window = Window.new
+      window = Window.new do
+        context.instance_eval &block if block
+      end
 
       context.on_start__ window
-      context.instance_eval &block if block
 
       start = proc do
         Reflex.start {window.show}
@@ -18,6 +19,8 @@ module RubySketch
       else
         start.call
       end
+
+      window
     end
 
     private
@@ -41,7 +44,10 @@ module RubySketch
         end
       end
 
-      start context, start_at_exit: true
+      window = start context, start_at_exit: true
+
+      window.canvas_painter.__send__ :begin_paint
+      at_exit {window.canvas_painter.__send__ :end_paint}
     end
 
     self

data/lib/rubysketch/window.rb

@@ -8,19 +8,24 @@ module RubySketch
 
     attr_accessor :auto_resize
 
-    attr_reader :canvas
+    attr_reader :canvas, :canvas_painter
 
     def initialize (width = 500, height = 500, *args, &block)
-      @canvas      = nil
       @events      = []
       @auto_resize = true
       @error       = nil
 
+      reset_canvas 1, 1
+
       super *args, size: [width, height] do |_|
-        @canvas.painter.paint do |_|
-          block.call if block
-          on_setup
-        end
+        start &block if block
+      end
+    end
+
+    def start (&block)
+      @canvas_painter.paint do |_|
+        block.call if block
+        on_setup
       end
     end
 
@@ -38,8 +43,10 @@ module RubySketch
     end
 
     def on_draw (e)
-      call_block @draw, e, @canvas.painter
-      e.painter.image @canvas if @canvas
+      @canvas_painter.paint do |painter|
+        call_block @draw, e, painter
+      end
+      e.painter.image @canvas
     end
 
     def on_key (e)
@@ -70,11 +77,24 @@ module RubySketch
       return if width * height == 0
       return if width == @canvas&.width && height == @canvas&.height
 
-      old     = @canvas
-      pd      = @canvas&.pixel_density || painter.pixel_density
-      @canvas = Rays::Image.new width, height, Rays::ColorSpace::RGBA, pd
+      old_canvas  = @canvas
+      old_painter = @canvas_painter
+
+      cs              = old_canvas&.color_space || Rays::ColorSpace::RGBA
+      @canvas         = Rays::Image.new width, height, cs, painter.pixel_density
+      @canvas_painter = @canvas.painter
+
+      if old_canvas
+        @canvas_painter.paint {image old_canvas}
+        copy_painter_attributes old_painter, @canvas_painter
+      end
+    end
 
-      @canvas.paint {image old} if old
+    def copy_painter_attributes (from, to)
+      to.fill         = from.fill
+      to.stroke       = from.stroke
+      to.stroke_width = from.stroke_width
+      to.font         = from.font
     end
 
     def call_block (block, event, *args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - xordog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -102,6 +102,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".yardopts"
 - LICENSE
 - README.md
 - Rakefile