rubysketch 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90fb6bf8a945c62f9ac122dc4df7515aa2ebf271cb100836c76cb8cc1d4f7c50
-  data.tar.gz: 53e61d592dbc5090d98e3c6bb015d406f018683767997c3f2f4d53462a9f27b4
+  metadata.gz: e9914f7b869e2dfeb80a8ba58a8c6678c0a995a974124b2b88974e477af3fdd8
+  data.tar.gz: 2b7d45e918f60be716bc9edc8f5bfbb7ceb800954965af32163431e681709250
 SHA512:
-  metadata.gz: deb1f851efbcfd3feff20a7495ad55c9ef3a2d1e9ee416d6b87de89069197cc397a64303c69929f212cb0dda658f739a6ca1f1e83bea3050afa219b889509a9d
-  data.tar.gz: ba13f0ce8a03a0b86f1ad20078e0b473d2e6058a446a3059c21f8c9e5ccabcaa72f065bcbfee13bb7b105960f0e658b1ee3e609c44c1429f1d4a9851ce122eab
+  metadata.gz: 5f1192007cfb3a80c6335dd8a881358a9fa2b9dac8b6a0931836f295f2658ac0d4723b9a9d51800e6923ccfcc625f6fd92fd9444732339a338773681d6921299
+  data.tar.gz: afefa27c322e08e0be3c1c6099b3ef3a3c86d0fadfc3140e4ec4c26c4686573d1a733ce0791f94241a4e73a67cda5998029fcfd4ebc6e7f3a1de6c8994ecdb0e

data/ChangeLog.md

@@ -1,6 +1,11 @@
 # RubySketch ChangeLog
 
 
+## [0.3.4] - 2020-08-02
+
+- delete Utility module
+
+
 ## [0.3.3] - 2020-08-01
 
 - add Vector class

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/rubysketch/processing.rb

@@ -6,6 +6,13 @@ module RubySketch
   module Processing
 
 
+    # @private
+    DEG2RAD__ = Math::PI / 180.0
+
+    # @private
+    RAD2DEG__ = 180.0 / Math::PI
+
+
     # Vector class.
     #
     class Vector
@@ -27,14 +34,14 @@ module RubySketch
       # @param v [Vector]  vector object to copy
       # @param a [Array]   array like [x, y, z]
       #
-      def initialize (x = 0, y = 0, z = 0, context: context)
+      def initialize (x = 0, y = 0, z = 0, context: nil)
         @point = case x
           when Rays::Point then x.dup
           when Vector      then x.getInternal__.dup
           when Array       then Rays::Point.new x[0] || 0, x[1] || 0, x[2] || 0
           else                  Rays::Point.new x    || 0, y    || 0, z    || 0
           end
-        @context = context
+        @context = context || Context.context__
       end
 
       # Initializer for dup or clone
@@ -464,7 +471,7 @@ module RubySketch
       # @return [Vector] rotated this object
       #
       def rotate (angle)
-        angle = @context ? @context.toAngle__(angle) : angle * Utility::RAD2DEG__
+        angle = @context ? @context.toAngle__(angle) : angle * RAD2DEG__
         @point.rotate! angle
         self
       end
@@ -915,7 +922,7 @@ module RubySketch
       #
       def angleMode (mode)
         @angleScale__ = case mode.upcase.to_sym
-          when RADIANS then Utility::RAD2DEG__
+          when RADIANS then RAD2DEG__
           when DEGREES then 1.0
           else raise ArgumentError, "invalid angle mode: #{mode}"
           end
@@ -1617,13 +1624,248 @@ module RubySketch
     end# Graphics
 
 
-    module Utility
+    # Processing context
+    #
+    module Context
+
+      include GraphicsContext, Math
+
+      @@context__ = nil
+
+      def self.context__ ()
+        @@context__
+      end
 
       # @private
-      DEG2RAD__ = Math::PI / 180.0
+      def setup__ (window)
+        @@context__ = self
+
+        @window__ = window
+        @image__  = @window__.canvas
+        super @window__.canvas_painter.paint {background 0.8}
+
+        @loop__         = true
+        @redraw__       = false
+        @frameCount__   = 0
+        @mousePos__     =
+        @mousePrevPos__ = Rays::Point.new 0
+        @mousePressed__ = false
+        @touches__      = []
+
+        @window__.before_draw = proc {beginDraw}
+        @window__.after_draw  = proc {endDraw}
+
+        drawFrame = -> {
+          @image__   = @window__.canvas
+          @painter__ = @window__.canvas_painter
+          begin
+            push
+            @drawBlock__.call if @drawBlock__
+          ensure
+            pop
+            @frameCount__ += 1
+          end
+        }
+
+        @window__.draw = proc do |e|
+          if @loop__ || @redraw__
+            @redraw__ = false
+            drawFrame.call
+          end
+          @mousePrevPos__ = @mousePos__
+        end
+
+        updatePointerStates = -> event, pressed = nil {
+          @mousePos__     = event.pos
+          @mousePressed__ = pressed if pressed != nil
+          @touches__      = event.positions.map {|pos| Touch.new pos.x, pos.y}
+        }
+
+        @window__.pointer_down = proc do |e|
+          updatePointerStates.call e, true
+          (@touchStartedBlock__ || @mousePressedBlock__)&.call
+        end
+
+        @window__.pointer_up = proc do |e|
+          updatePointerStates.call e, false
+          (@touchEndedBlock__ || @mouseReleasedBlock__)&.call
+        end
+
+        @window__.pointer_move = proc do |e|
+          updatePointerStates.call e
+          (@touchMovedBlock__ || @mouseMovedBlock__)&.call
+        end
+
+        @window__.pointer_drag = proc do |e|
+          updatePointerStates.call e
+          (@touchMovedBlock__ || @mouseDraggedBlock__)&.call
+        end
+      end
+
+      # Define setup block.
+      #
+      def setup (&block)
+        @window__.setup = block
+        nil
+      end
+
+      # Define draw block.
+      #
+      def draw (&block)
+        @drawBlock__ = block if block
+        nil
+      end
+
+      def key (&block)
+        @window__.key = block
+        nil
+      end
+
+      def mousePressed (&block)
+        @mousePressedBlock__ = block if block
+        @mousePressed__
+      end
+
+      def mouseReleased (&block)
+        @mouseReleasedBlock__ = block if block
+        nil
+      end
+
+      def mouseMoved (&block)
+        @mouseMovedBlock__ = block if block
+        nil
+      end
+
+      def mouseDragged (&block)
+        @mouseDraggedBlock__ = block if block
+        nil
+      end
+
+      def touchStarted (&block)
+        @touchStartedBlock__ = block if block
+        nil
+      end
+
+      def touchEnded (&block)
+        @touchEndedBlock__ = block if block
+        nil
+      end
+
+      def touchMoved (&block)
+        @touchMovedBlock__ = block if block
+        nil
+      end
 
       # @private
-      RAD2DEG__ = 180.0 / Math::PI
+      private def size__ (width, height)
+        raise 'size() must be called on startup or setup block' if @started__
+
+        @painter__.__send__ :end_paint
+        @window__.__send__ :reset_canvas, width, height
+        @painter__.__send__ :begin_paint
+
+        @auto_resize__ = false
+      end
+
+      def windowWidth ()
+        @window__.width
+      end
+
+      def windowHeight ()
+        @window__.height
+      end
+
+      # Returns number of frames since program started.
+      #
+      # @return [Integer] total number of frames
+      #
+      def frameCount ()
+        @frameCount__
+      end
+
+      # Returns number of frames per second.
+      #
+      # @return [Float] frames per second
+      #
+      def frameRate ()
+        @window__.event.fps
+      end
+
+      # Returns pixel density
+      #
+      # @return [Numeric] pixel density
+      #
+      def displayDensity ()
+        @painter__.pixel_density
+      end
+
+      # Returns mouse x position
+      #
+      # @return [Numeric] horizontal position of mouse
+      #
+      def mouseX ()
+        @mousePos__.x
+      end
+
+      # Returns mouse y position
+      #
+      # @return [Numeric] vertical position of mouse
+      #
+      def mouseY ()
+        @mousePos__.y
+      end
+
+      # Returns mouse x position in previous frame
+      #
+      # @return [Numeric] horizontal position of mouse
+      #
+      def pmouseX ()
+        @mousePrevPos__.x
+      end
+
+      # Returns mouse y position in previous frame
+      #
+      # @return [Numeric] vertical position of mouse
+      #
+      def pmouseY ()
+        @mousePrevPos__.y
+      end
+
+      # Returns array of touches
+      #
+      # @return [Array] Touch objects
+      #
+      def touches ()
+        @touches__
+      end
+
+      # Enables calling draw block on every frame.
+      #
+      # @return [nil] nil
+      #
+      def loop ()
+        @loop__ = true
+      end
+
+      # Disables calling draw block on every frame.
+      #
+      # @return [nil] nil
+      #
+      def noLoop ()
+        @loop__ = false
+      end
+
+      # Calls draw block to redraw frame.
+      #
+      # @return [nil] nil
+      #
+      def redraw ()
+        @redraw__ = true
+      end
+
+      #
+      # Utility functions
+      #
 
       # Converts degree to radian.
       #
@@ -1854,6 +2096,33 @@ module RubySketch
         Rays.perlin(x, y, z) / 2.0 + 0.5
       end
 
+      # Creates a new vector.
+      #
+      # @overload createVector()
+      # @overload createVector(x, y)
+      # @overload createVector(x, y, z)
+      #
+      # @param x [Numeric] x of new vector
+      # @param y [Numeric] y of new vector
+      # @param z [Numeric] z of new vector
+      #
+      # @return [Vector] new vector
+      #
+      def createVector (*args)
+        Vector.new *args
+      end
+
+      # Creates a new off-screen graphics context object.
+      #
+      # @param width  [Numeric] width of graphics image
+      # @param height [Numeric] height of graphics image
+      #
+      # @return [Graphics] graphics object
+      #
+      def createGraphics (width, height)
+        Graphics.new width, height
+      end
+
       # Loads image.
       #
       # @param filename  [String] file name to load image
@@ -1888,244 +2157,6 @@ module RubySketch
         path.to_s
       end
 
-      def createGraphics (width, height)
-        Graphics.new width, height
-      end
-
-    end# Utility
-
-
-    # Processing context
-    #
-    module Context
-
-      include GraphicsContext, Utility, Math
-
-      # @private
-      def setup__ (window)
-        @window__ = window
-        @image__  = @window__.canvas
-        super @window__.canvas_painter.paint {background 0.8}
-
-        @loop__         = true
-        @redraw__       = false
-        @frameCount__   = 0
-        @mousePos__     =
-        @mousePrevPos__ = Rays::Point.new 0
-        @mousePressed__ = false
-        @touches__      = []
-
-        @window__.before_draw = proc {beginDraw}
-        @window__.after_draw  = proc {endDraw}
-
-        drawFrame = -> {
-          @image__   = @window__.canvas
-          @painter__ = @window__.canvas_painter
-          begin
-            push
-            @drawBlock__.call if @drawBlock__
-          ensure
-            pop
-            @frameCount__ += 1
-          end
-        }
-
-        @window__.draw = proc do |e|
-          if @loop__ || @redraw__
-            @redraw__ = false
-            drawFrame.call
-          end
-          @mousePrevPos__ = @mousePos__
-        end
-
-        updatePointerStates = -> event, pressed = nil {
-          @mousePos__     = event.pos
-          @mousePressed__ = pressed if pressed != nil
-          @touches__      = event.positions.map {|pos| Touch.new pos.x, pos.y}
-        }
-
-        @window__.pointer_down = proc do |e|
-          updatePointerStates.call e, true
-          (@touchStartedBlock__ || @mousePressedBlock__)&.call
-        end
-
-        @window__.pointer_up = proc do |e|
-          updatePointerStates.call e, false
-          (@touchEndedBlock__ || @mouseReleasedBlock__)&.call
-        end
-
-        @window__.pointer_move = proc do |e|
-          updatePointerStates.call e
-          (@touchMovedBlock__ || @mouseMovedBlock__)&.call
-        end
-
-        @window__.pointer_drag = proc do |e|
-          updatePointerStates.call e
-          (@touchMovedBlock__ || @mouseDraggedBlock__)&.call
-        end
-      end
-
-      # Define setup block.
-      #
-      def setup (&block)
-        @window__.setup = block
-        nil
-      end
-
-      # Define draw block.
-      #
-      def draw (&block)
-        @drawBlock__ = block if block
-        nil
-      end
-
-      def key (&block)
-        @window__.key = block
-        nil
-      end
-
-      def mousePressed (&block)
-        @mousePressedBlock__ = block if block
-        @mousePressed__
-      end
-
-      def mouseReleased (&block)
-        @mouseReleasedBlock__ = block if block
-        nil
-      end
-
-      def mouseMoved (&block)
-        @mouseMovedBlock__ = block if block
-        nil
-      end
-
-      def mouseDragged (&block)
-        @mouseDraggedBlock__ = block if block
-        nil
-      end
-
-      def touchStarted (&block)
-        @touchStartedBlock__ = block if block
-        nil
-      end
-
-      def touchEnded (&block)
-        @touchEndedBlock__ = block if block
-        nil
-      end
-
-      def touchMoved (&block)
-        @touchMovedBlock__ = block if block
-        nil
-      end
-
-      # @private
-      private def size__ (width, height)
-        raise 'size() must be called on startup or setup block' if @started__
-
-        @painter__.__send__ :end_paint
-        @window__.__send__ :reset_canvas, width, height
-        @painter__.__send__ :begin_paint
-
-        @auto_resize__ = false
-      end
-
-      def windowWidth ()
-        @window__.width
-      end
-
-      def windowHeight ()
-        @window__.height
-      end
-
-      # Returns number of frames since program started.
-      #
-      # @return [Integer] total number of frames
-      #
-      def frameCount ()
-        @frameCount__
-      end
-
-      # Returns number of frames per second.
-      #
-      # @return [Float] frames per second
-      #
-      def frameRate ()
-        @window__.event.fps
-      end
-
-      # Returns pixel density
-      #
-      # @return [Numeric] pixel density
-      #
-      def displayDensity ()
-        @painter__.pixel_density
-      end
-
-      # Returns mouse x position
-      #
-      # @return [Numeric] horizontal position of mouse
-      #
-      def mouseX ()
-        @mousePos__.x
-      end
-
-      # Returns mouse y position
-      #
-      # @return [Numeric] vertical position of mouse
-      #
-      def mouseY ()
-        @mousePos__.y
-      end
-
-      # Returns mouse x position in previous frame
-      #
-      # @return [Numeric] horizontal position of mouse
-      #
-      def pmouseX ()
-        @mousePrevPos__.x
-      end
-
-      # Returns mouse y position in previous frame
-      #
-      # @return [Numeric] vertical position of mouse
-      #
-      def pmouseY ()
-        @mousePrevPos__.y
-      end
-
-      # Returns array of touches
-      #
-      # @return [Array] Touch objects
-      #
-      def touches ()
-        @touches__
-      end
-
-      # Enables calling draw block on every frame.
-      #
-      # @return [nil] nil
-      #
-      def loop ()
-        @loop__ = true
-      end
-
-      # Disables calling draw block on every frame.
-      #
-      # @return [nil] nil
-      #
-      def noLoop ()
-        @loop__ = false
-      end
-
-      # Calls draw block to redraw frame.
-      #
-      # @return [nil] nil
-      #
-      def redraw ()
-        @redraw__ = true
-      end
-
     end# Context
 
 

data/test/helper.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+
+%w[../xot ../rucy ../rays ../reflex .]
+  .map  {|s| File.expand_path "../../#{s}/lib", __FILE__}
+  .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
+
+require 'test/unit'
+require 'xot/test'
+require 'rubysketch'
+
+include Xot::Test
+
+
+unless $RAYS_NOAUTOINIT
+  #def Rays.fin! () end
+end
+
+
+def assert_equal_vector (v1, v2, delta = 0.000001)
+  assert_in_delta v1.x, v2.x, delta
+  assert_in_delta v1.y, v2.y, delta
+  assert_in_delta v1.z, v2.z, delta
+end

data/test/processing/test_vector.rb

@@ -6,7 +6,9 @@ require_relative '../helper'
 
 class TestProcessingVector < Test::Unit::TestCase
 
-  V = RubySketch::Processing::Vector
+  P = RubySketch::Processing
+
+  V = P::Vector
 
   M = Math
 
@@ -21,76 +23,76 @@ class TestProcessingVector < Test::Unit::TestCase
   end
 
   def test_initialize ()
-    assert_equal vec(0, 0, 0), vec()
-    assert_equal vec(1, 0, 0), vec(1)
-    assert_equal vec(1, 2, 0), vec(1, 2)
-    assert_equal vec(1, 2, 3), vec(1, 2, 3)
+    assert_equal_vector vec(0, 0, 0), vec()
+    assert_equal_vector vec(1, 0, 0), vec(1)
+    assert_equal_vector vec(1, 2, 0), vec(1, 2)
+    assert_equal_vector vec(1, 2, 3), vec(1, 2, 3)
 
-    assert_equal vec(0, 0, 0), vec([])
-    assert_equal vec(1, 0, 0), vec([1])
-    assert_equal vec(1, 2, 0), vec([1, 2])
-    assert_equal vec(1, 2, 3), vec([1, 2, 3])
+    assert_equal_vector vec(0, 0, 0), vec([])
+    assert_equal_vector vec(1, 0, 0), vec([1])
+    assert_equal_vector vec(1, 2, 0), vec([1, 2])
+    assert_equal_vector vec(1, 2, 3), vec([1, 2, 3])
 
-    assert_equal vec(1, 2, 3), vec(vec 1, 2, 3)
-    assert_equal vec(1, 2, 3), vec(point 1, 2, 3)
+    assert_equal_vector vec(1, 2, 3), vec(vec 1, 2, 3)
+    assert_equal_vector vec(1, 2, 3), vec(point 1, 2, 3)
   end
 
   def test_set ()
     v0 = vec 9, 9, 9
 
-    v = v0.dup; v.set;         assert_equal vec(0, 0, 0), v
-    v = v0.dup; v.set 1;       assert_equal vec(1, 0, 0), v
-    v = v0.dup; v.set 1, 2;    assert_equal vec(1, 2, 0), v
-    v = v0.dup; v.set 1, 2, 3; assert_equal vec(1, 2, 3), v
+    v = v0.dup; v.set;         assert_equal_vector vec(0, 0, 0), v
+    v = v0.dup; v.set 1;       assert_equal_vector vec(1, 0, 0), v
+    v = v0.dup; v.set 1, 2;    assert_equal_vector vec(1, 2, 0), v
+    v = v0.dup; v.set 1, 2, 3; assert_equal_vector vec(1, 2, 3), v
 
-    v = v0.dup; v.set [];        assert_equal vec(0, 0, 0), v
-    v = v0.dup; v.set [1];       assert_equal vec(1, 0, 0), v
-    v = v0.dup; v.set [1, 2];    assert_equal vec(1, 2, 0), v
-    v = v0.dup; v.set [1, 2, 3]; assert_equal vec(1, 2, 3), v
+    v = v0.dup; v.set [];        assert_equal_vector vec(0, 0, 0), v
+    v = v0.dup; v.set [1];       assert_equal_vector vec(1, 0, 0), v
+    v = v0.dup; v.set [1, 2];    assert_equal_vector vec(1, 2, 0), v
+    v = v0.dup; v.set [1, 2, 3]; assert_equal_vector vec(1, 2, 3), v
 
-    v = v0.dup; v.set   vec(1, 2, 3); assert_equal vec(1, 2, 3), v
-    v = v0.dup; v.set point(1, 2, 3); assert_equal vec(1, 2, 3), v
+    v = v0.dup; v.set   vec(1, 2, 3); assert_equal_vector vec(1, 2, 3), v
+    v = v0.dup; v.set point(1, 2, 3); assert_equal_vector vec(1, 2, 3), v
   end
 
   def test_dup ()
     v1 = vec 1, 2, 3
-    assert_equal vec(1, 2, 3), v1
+    assert_equal_vector vec(1, 2, 3), v1
 
     v2 = v1.dup
-    assert_equal vec(1, 2, 3), v1
-    assert_equal vec(1, 2, 3), v2
+    assert_equal_vector vec(1, 2, 3), v1
+    assert_equal_vector vec(1, 2, 3), v2
 
     v1.set 7, 8, 9
-    assert_equal vec(7, 8, 9), v1
-    assert_equal vec(1, 2, 3), v2
+    assert_equal_vector vec(7, 8, 9), v1
+    assert_equal_vector vec(1, 2, 3), v2
   end
 
   def test_copy ()
     v1 = vec 1, 2, 3
-    assert_equal vec(1, 2, 3), v1
+    assert_equal_vector vec(1, 2, 3), v1
 
     v2 = v1.copy
-    assert_equal vec(1, 2, 3), v1
-    assert_equal vec(1, 2, 3), v2
+    assert_equal_vector vec(1, 2, 3), v1
+    assert_equal_vector vec(1, 2, 3), v2
 
     v1.set 7, 8, 9
-    assert_equal vec(7, 8, 9), v1
-    assert_equal vec(1, 2, 3), v2
+    assert_equal_vector vec(7, 8, 9), v1
+    assert_equal_vector vec(1, 2, 3), v2
   end
 
   def test_xyz ()
     v = vec 1, 2, 3
-    assert_equal vec(1, 2, 3), v
-    assert_equal [1, 2, 3], [v.x, v.y, v.z]
+    assert_equal_vector vec(1, 2, 3), v
+    assert_equal           [1, 2, 3], [v.x, v.y, v.z]
 
     v.x = 7
-    assert_equal vec(7, 2, 3), v
+    assert_equal_vector vec(7, 2, 3), v
 
     v.y = 8
-    assert_equal vec(7, 8, 3), v
+    assert_equal_vector vec(7, 8, 3), v
 
     v.z = 9
-    assert_equal vec(7, 8, 9), v
+    assert_equal_vector vec(7, 8, 9), v
   end
 
   def test_array ()
@@ -100,135 +102,135 @@ class TestProcessingVector < Test::Unit::TestCase
   def test_add ()
     v = vec 1, 2, 3
     v.add 4, 5, 6
-    assert_equal vec(5, 7, 9), v
+    assert_equal_vector vec(5, 7, 9), v
 
-    assert_equal vec(1, 2, 3), vec(1, 2, 3).add()
-    assert_equal vec(5, 2, 3), vec(1, 2, 3).add(4)
-    assert_equal vec(5, 7, 3), vec(1, 2, 3).add(4, 5)
-    assert_equal vec(5, 7, 9), vec(1, 2, 3).add(4, 5, 6)
+    assert_equal_vector vec(1, 2, 3), vec(1, 2, 3).add()
+    assert_equal_vector vec(5, 2, 3), vec(1, 2, 3).add(4)
+    assert_equal_vector vec(5, 7, 3), vec(1, 2, 3).add(4, 5)
+    assert_equal_vector vec(5, 7, 9), vec(1, 2, 3).add(4, 5, 6)
 
-    assert_equal vec(1, 2, 3), vec(1, 2, 3).add([])
-    assert_equal vec(5, 2, 3), vec(1, 2, 3).add([4])
-    assert_equal vec(5, 7, 3), vec(1, 2, 3).add([4, 5])
-    assert_equal vec(5, 7, 9), vec(1, 2, 3).add([4, 5, 6])
+    assert_equal_vector vec(1, 2, 3), vec(1, 2, 3).add([])
+    assert_equal_vector vec(5, 2, 3), vec(1, 2, 3).add([4])
+    assert_equal_vector vec(5, 7, 3), vec(1, 2, 3).add([4, 5])
+    assert_equal_vector vec(5, 7, 9), vec(1, 2, 3).add([4, 5, 6])
 
-    assert_equal vec(5, 7, 9), vec(1, 2, 3).add(  vec(4, 5, 6))
-    assert_equal vec(5, 7, 9), vec(1, 2, 3).add(point(4, 5, 6))
+    assert_equal_vector vec(5, 7, 9), vec(1, 2, 3).add(  vec(4, 5, 6))
+    assert_equal_vector vec(5, 7, 9), vec(1, 2, 3).add(point(4, 5, 6))
   end
 
   def test_sub ()
     v = vec 9, 8, 7
     v.sub 1, 2, 3
-    assert_equal vec(8, 6, 4), v
+    assert_equal_vector vec(8, 6, 4), v
 
-    assert_equal vec(9, 8, 7), vec(9, 8, 7).sub()
-    assert_equal vec(8, 8, 7), vec(9, 8, 7).sub(1)
-    assert_equal vec(8, 6, 7), vec(9, 8, 7).sub(1, 2)
-    assert_equal vec(8, 6, 4), vec(9, 8, 7).sub(1, 2, 3)
+    assert_equal_vector vec(9, 8, 7), vec(9, 8, 7).sub()
+    assert_equal_vector vec(8, 8, 7), vec(9, 8, 7).sub(1)
+    assert_equal_vector vec(8, 6, 7), vec(9, 8, 7).sub(1, 2)
+    assert_equal_vector vec(8, 6, 4), vec(9, 8, 7).sub(1, 2, 3)
 
-    assert_equal vec(9, 8, 7), vec(9, 8, 7).sub([])
-    assert_equal vec(8, 8, 7), vec(9, 8, 7).sub([1])
-    assert_equal vec(8, 6, 7), vec(9, 8, 7).sub([1, 2])
-    assert_equal vec(8, 6, 4), vec(9, 8, 7).sub([1, 2, 3])
+    assert_equal_vector vec(9, 8, 7), vec(9, 8, 7).sub([])
+    assert_equal_vector vec(8, 8, 7), vec(9, 8, 7).sub([1])
+    assert_equal_vector vec(8, 6, 7), vec(9, 8, 7).sub([1, 2])
+    assert_equal_vector vec(8, 6, 4), vec(9, 8, 7).sub([1, 2, 3])
 
-    assert_equal vec(8, 6, 4), vec(9, 8, 7).sub(  vec(1, 2, 3))
-    assert_equal vec(8, 6, 4), vec(9, 8, 7).sub(point(1, 2, 3))
+    assert_equal_vector vec(8, 6, 4), vec(9, 8, 7).sub(  vec(1, 2, 3))
+    assert_equal_vector vec(8, 6, 4), vec(9, 8, 7).sub(point(1, 2, 3))
   end
 
   def test_mult ()
     v = vec 1, 2, 3
     v.mult 2
-    assert_equal vec(2, 4, 6), v
+    assert_equal_vector vec(2, 4, 6), v
   end
 
   def test_div ()
     v = vec 2, 4, 6
     v.div 2
-    assert_equal vec(1, 2, 3), v
+    assert_equal_vector vec(1, 2, 3), v
   end
 
   def test_op_add ()
     v1 = vec 1, 2, 3
     v2 = vec 4, 5, 6
-    assert_equal vec(5, 7, 9), v1 + v2
-    assert_equal vec(1, 2, 3), v1
-    assert_equal vec(4, 5, 6), v2
+    assert_equal_vector vec(5, 7, 9), v1 + v2
+    assert_equal_vector vec(1, 2, 3), v1
+    assert_equal_vector vec(4, 5, 6), v2
 
-    assert_equal vec(5, 2, 3), vec(1, 2, 3) + 4
+    assert_equal_vector vec(5, 2, 3), vec(1, 2, 3) + 4
 
-    assert_equal vec(1, 2, 3), vec(1, 2, 3) + []
-    assert_equal vec(5, 2, 3), vec(1, 2, 3) + [4]
-    assert_equal vec(5, 7, 3), vec(1, 2, 3) + [4, 5]
-    assert_equal vec(5, 7, 9), vec(1, 2, 3) + [4, 5, 6]
+    assert_equal_vector vec(1, 2, 3), vec(1, 2, 3) + []
+    assert_equal_vector vec(5, 2, 3), vec(1, 2, 3) + [4]
+    assert_equal_vector vec(5, 7, 3), vec(1, 2, 3) + [4, 5]
+    assert_equal_vector vec(5, 7, 9), vec(1, 2, 3) + [4, 5, 6]
 
-    assert_equal vec(5, 7, 9), vec(1, 2, 3) +   vec(4, 5, 6)
-    assert_equal vec(5, 7, 9), vec(1, 2, 3) + point(4, 5, 6)
+    assert_equal_vector vec(5, 7, 9), vec(1, 2, 3) +   vec(4, 5, 6)
+    assert_equal_vector vec(5, 7, 9), vec(1, 2, 3) + point(4, 5, 6)
   end
 
   def test_op_sub ()
     v1 = vec 9, 8, 7
     v2 = vec 1, 2, 3
-    assert_equal vec(8, 6, 4), v1 - v2
-    assert_equal vec(9, 8, 7), v1
-    assert_equal vec(1, 2, 3), v2
+    assert_equal_vector vec(8, 6, 4), v1 - v2
+    assert_equal_vector vec(9, 8, 7), v1
+    assert_equal_vector vec(1, 2, 3), v2
 
-    assert_equal vec(8, 8, 7), vec(9, 8, 7) - 1
+    assert_equal_vector vec(8, 8, 7), vec(9, 8, 7) - 1
 
-    assert_equal vec(9, 8, 7), vec(9, 8, 7) - []
-    assert_equal vec(8, 8, 7), vec(9, 8, 7) - [1]
-    assert_equal vec(8, 6, 7), vec(9, 8, 7) - [1, 2]
-    assert_equal vec(8, 6, 4), vec(9, 8, 7) - [1, 2, 3]
+    assert_equal_vector vec(9, 8, 7), vec(9, 8, 7) - []
+    assert_equal_vector vec(8, 8, 7), vec(9, 8, 7) - [1]
+    assert_equal_vector vec(8, 6, 7), vec(9, 8, 7) - [1, 2]
+    assert_equal_vector vec(8, 6, 4), vec(9, 8, 7) - [1, 2, 3]
 
-    assert_equal vec(8, 6, 4), vec(9, 8, 7) -   vec(1, 2, 3)
-    assert_equal vec(8, 6, 4), vec(9, 8, 7) - point(1, 2, 3)
+    assert_equal_vector vec(8, 6, 4), vec(9, 8, 7) -   vec(1, 2, 3)
+    assert_equal_vector vec(8, 6, 4), vec(9, 8, 7) - point(1, 2, 3)
   end
 
   def test_op_mult ()
     v = vec 1, 2, 3
-    assert_equal vec(2, 4, 6), v * 2
-    assert_equal vec(1, 2, 3), v
+    assert_equal_vector vec(2, 4, 6), v * 2
+    assert_equal_vector vec(1, 2, 3), v
   end
 
   def test_op_div ()
     v = vec 2, 4, 6
-    assert_equal vec(1, 2, 3), v / 2
-    assert_equal vec(2, 4, 6), v
+    assert_equal_vector vec(1, 2, 3), v / 2
+    assert_equal_vector vec(2, 4, 6), v
   end
 
   def test_fun_add ()
     v1     = vec 1, 2, 3
     v2     = vec 4, 5, 6
     result = vec
-    assert_equal vec(5, 7, 9), V.add(v1, v2, result)
-    assert_equal vec(1, 2, 3), v1
-    assert_equal vec(4, 5, 6), v2
-    assert_equal vec(5, 7, 9), result
+    assert_equal_vector vec(5, 7, 9), V.add(v1, v2, result)
+    assert_equal_vector vec(1, 2, 3), v1
+    assert_equal_vector vec(4, 5, 6), v2
+    assert_equal_vector vec(5, 7, 9), result
   end
 
   def test_fun_sub ()
     v1     = vec 9, 8, 7
     v2     = vec 1, 2, 3
     result = vec
-    assert_equal vec(8, 6, 4), V.sub(v1, v2, result)
-    assert_equal vec(9, 8, 7), v1
-    assert_equal vec(1, 2, 3), v2
-    assert_equal vec(8, 6, 4), result
+    assert_equal_vector vec(8, 6, 4), V.sub(v1, v2, result)
+    assert_equal_vector vec(9, 8, 7), v1
+    assert_equal_vector vec(1, 2, 3), v2
+    assert_equal_vector vec(8, 6, 4), result
   end
 
   def test_fun_mult ()
     v1     = vec 1, 2, 3
     result = vec
-    assert_equal vec(2, 4, 6), V.mult(v1, 2, result)
-    assert_equal vec(1, 2, 3), v1
-    assert_equal vec(2, 4, 6), result
+    assert_equal_vector vec(2, 4, 6), V.mult(v1, 2, result)
+    assert_equal_vector vec(1, 2, 3), v1
+    assert_equal_vector vec(2, 4, 6), result
   end
 
   def test_fun_div ()
     v1     = vec 2, 4, 6
     result = vec
-    assert_equal vec(1, 2, 3), V.div(v1, 2, result)
-    assert_equal vec(2, 4, 6), v1
-    assert_equal vec(1, 2, 3), result
+    assert_equal_vector vec(1, 2, 3), V.div(v1, 2, result)
+    assert_equal_vector vec(2, 4, 6), v1
+    assert_equal_vector vec(1, 2, 3), result
   end
 
   def test_mag ()
@@ -243,27 +245,27 @@ class TestProcessingVector < Test::Unit::TestCase
 
   def test_setMag ()
     v = vec 3, 4, 0
-    assert_equal vec(6, 8, 0), v.setMag(10)
-    assert_equal vec(6, 8, 0), v
+    assert_equal_vector vec(6, 8, 0), v.setMag(10)
+    assert_equal_vector vec(6, 8, 0), v
 
     v      = vec 3, 4, 0
     result = vec
-    assert_equal vec(6, 8, 0), v.setMag(result, 10)
-    assert_equal vec(3, 4, 0), v
-    assert_equal vec(6, 8, 0), result
+    assert_equal_vector vec(6, 8, 0), v.setMag(result, 10)
+    assert_equal_vector vec(3, 4, 0), v
+    assert_equal_vector vec(6, 8, 0), result
   end
 
   def test_normalize ()
     v      = vec 1, 2, 3
     normal = v / v.mag
-    assert_equal normal, v.normalize
-    assert_equal normal, v
+    assert_equal_vector normal, v.normalize
+    assert_equal_vector normal, v
 
     v      = vec 1, 2, 3
     result = vec
-    assert_equal normal,       v.normalize(result)
-    assert_equal vec(1, 2, 3), v
-    assert_equal normal,       result
+    assert_equal_vector normal,       v.normalize(result)
+    assert_equal_vector vec(1, 2, 3), v
+    assert_equal_vector normal,       result
   end
 
   def test_limit ()
@@ -282,12 +284,12 @@ class TestProcessingVector < Test::Unit::TestCase
     v2 = vec 4, 5, 6
 
     assert_in_delta M.sqrt((4-1)**2 + (5-2)**2 + (6-3)**2), v1.dist(v2), 0.000001
-    assert_equal vec(1, 2, 3), v1
-    assert_equal vec(4, 5, 6), v2
+    assert_equal_vector vec(1, 2, 3), v1
+    assert_equal_vector vec(4, 5, 6), v2
 
     assert_in_delta M.sqrt((4-1)**2 + (5-2)**2 + (6-3)**2), V.dist(v1, v2), 0.000001
-    assert_equal vec(1, 2, 3), v1
-    assert_equal vec(4, 5, 6), v2
+    assert_equal_vector vec(1, 2, 3), v1
+    assert_equal_vector vec(4, 5, 6), v2
   end
 
   def test_dot ()
@@ -295,55 +297,55 @@ class TestProcessingVector < Test::Unit::TestCase
     v2 = vec 4, 5, 6
 
     assert_equal 1*4 + 2*5 + 3*6, v1.dot(4, 5, 6)
-    assert_equal vec(1, 2, 3), v1
+    assert_equal_vector vec(1, 2, 3), v1
 
     assert_equal 1*4 + 2*5 + 3*6, v1.dot(v2)
-    assert_equal vec(1, 2, 3), v1
-    assert_equal vec(4, 5, 6), v2
+    assert_equal_vector vec(1, 2, 3), v1
+    assert_equal_vector vec(4, 5, 6), v2
 
     assert_equal 1*4 + 2*5 + 3*6, V.dot(v1, v2)
-    assert_equal vec(1, 2, 3), v1
-    assert_equal vec(4, 5, 6), v2
+    assert_equal_vector vec(1, 2, 3), v1
+    assert_equal_vector vec(4, 5, 6), v2
   end
 
   def test_cross ()
     v1 = vec 1, 0, 0
     v2 = vec 0, 1, 0
 
-    assert_equal vec(0, 0, 1), v1.cross(0, 1, 0)
-    assert_equal vec(1, 0, 0), v1
+    assert_equal_vector vec(0, 0, 1), v1.cross(0, 1, 0)
+    assert_equal_vector vec(1, 0, 0), v1
 
     result = vec 1, 2, 3
-    assert_equal vec(0, 0, 1), v1.cross(v2, result)
-    assert_equal vec(1, 0, 0), v1
-    assert_equal vec(0, 1, 0), v2
-    assert_equal vec(0, 0, 1), result
+    assert_equal_vector vec(0, 0, 1), v1.cross(v2, result)
+    assert_equal_vector vec(1, 0, 0), v1
+    assert_equal_vector vec(0, 1, 0), v2
+    assert_equal_vector vec(0, 0, 1), result
 
     result = vec 1, 2, 3
-    assert_equal vec(0, 0, 1), V.cross(v1, v2, result)
-    assert_equal vec(1, 0, 0), v1
-    assert_equal vec(0, 1, 0), v2
-    assert_equal vec(0, 0, 1), result
+    assert_equal_vector vec(0, 0, 1), V.cross(v1, v2, result)
+    assert_equal_vector vec(1, 0, 0), v1
+    assert_equal_vector vec(0, 1, 0), v2
+    assert_equal_vector vec(0, 0, 1), result
   end
 
   def test_rotate ()
     angle   = PI * 2 * 0.1
-    context = Object.new.tap {|o| def o.toAngle__ (angle); angle; end}
+    context = Object.new.tap {|o| def o.toAngle__ (a); a * 2 * P::RAD2DEG__; end}
 
     v = vec 1, 0, 0
-    assert_equal vec(M.cos(angle), M.sin(angle), 0), v.rotate(angle)
-    assert_equal vec(M.cos(angle), M.sin(angle), 0), v
+    assert_equal_vector vec(M.cos(angle), M.sin(angle), 0), v.rotate(angle)
+    assert_equal_vector vec(M.cos(angle), M.sin(angle), 0), v
 
     v = vec 1, 0, 0, context: context
-    assert_equal vec(M.cos(angle), M.sin(angle), 0), v.rotate(36)
+    assert_equal_vector vec(M.cos(angle * 2), M.sin(angle * 2), 0), v.rotate(angle)
   end
 
   def test_fromAngle ()
     angle  = PI * 2 * 0.1
     result = vec
-    assert_equal vec(M.cos(angle), M.sin(angle), 0), V.fromAngle(angle)
-    assert_equal vec(M.cos(angle), M.sin(angle), 0), V.fromAngle(angle, result)
-    assert_equal vec(M.cos(angle), M.sin(angle), 0), result
+    assert_equal_vector vec(M.cos(angle), M.sin(angle), 0), V.fromAngle(angle)
+    assert_equal_vector vec(M.cos(angle), M.sin(angle), 0), V.fromAngle(angle, result)
+    assert_equal_vector vec(M.cos(angle), M.sin(angle), 0), result
   end
 
   def test_heading ()
@@ -359,9 +361,9 @@ class TestProcessingVector < Test::Unit::TestCase
   end
 
   def test_lerp ()
-    assert_equal vec(0.5, 0.5, 0.5), vec(0, 0, 0).lerp(vec(1, 1, 1),    0.5)
-    assert_equal vec(0.5, 0.5, 0.5), vec(0, 0, 0).lerp(    1, 1, 1,     0.5)
-    assert_equal vec(0.5, 0.5, 0.5), V.lerp(vec(0, 0, 0), vec(1, 1, 1), 0.5)
+    assert_equal_vector vec(0.5, 0.5, 0.5), vec(0, 0, 0).lerp(vec(1, 1, 1),    0.5)
+    assert_equal_vector vec(0.5, 0.5, 0.5), vec(0, 0, 0).lerp(    1, 1, 1,     0.5)
+    assert_equal_vector vec(0.5, 0.5, 0.5), V.lerp(vec(0, 0, 0), vec(1, 1, 1), 0.5)
   end
 
   def test_random2D ()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - xordog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-01 00:00:00.000000000 Z
+date: 2020-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -120,6 +120,7 @@ files:
 - lib/rubysketch/processing.rb
 - lib/rubysketch/window.rb
 - rubysketch.gemspec
+- test/helper.rb
 - test/processing/test_vector.rb
 homepage: https://github.com/xord/rubysketch
 licenses: []
@@ -144,4 +145,5 @@ signing_key:
 specification_version: 4
 summary: Processing like Creative Coding Framework.
 test_files:
+- test/helper.rb
 - test/processing/test_vector.rb