processing 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcfefec0dd503e3934cfd162cf4c2ed6e351b0ca16e5a8f262831ae339677741
-  data.tar.gz: aa8fa395d100d4c4b5124d239213f6608a87e556beefb80dd4d50cf8d64a8ce0
+  metadata.gz: '09125754200830d8b1e3cc8fce0f31194bbe0c319ffd0410be43a3860ef5747e'
+  data.tar.gz: 5cf8e0e1c1c0b1fc46d88c6043ad3a44e32819dd7a9ace3066489c101529b40e
 SHA512:
-  metadata.gz: 94852e2aff0eaece5b719cb1ca7ffb9651cd7de5012ae9992f909213746aee5cdca33a37e0f88e0d65bef1a2d79fa8a0bbbad2ed4d1439373175eb4167f7286a
-  data.tar.gz: a59a540d86331c45502c71bdc259e86591c836c92d857bb11dfe65244412f9697c664517aeceaba3f28fcbdc19917909c38832e21813e638b8c8a5580b28c1be
+  metadata.gz: 60829858cded743eb30a1bd7076953048f824a159d6fd98d8c8e08ec49f80802e0ca2554f04a0766ad6a4067db75f4938a1aae1d7c51b55bb0ad4e2e7cd7c622
+  data.tar.gz: aa3f8da5dd0168cca1aef67462dc11930f5a1dec95b52dab31e720df114f40ead20ff5062a898baca80eb87f76e6a13731d8dd22ff932e86c44cf28426ddacd8

data/ChangeLog.md

@@ -1,6 +1,14 @@
 # processing ChangeLog
 
 
+## [v0.5.6] - 2023-05-08
+
+- Add inspect() to classes
+- Alias draw methods
+- colorMode(), angleMode(), and blendMode() returns current mode value
+- fix that mouseButton returns 0 on mouseReleased
+
+
 ## [v0.5.5] - 2023-04-30
 
 - Update documents

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/lib/processing/all.rb

@@ -3,6 +3,7 @@ require 'digest/sha1'
 require 'pathname'
 require 'tmpdir'
 require 'open-uri'
+require 'xot/inspectable'
 require 'reflex'
 
 require 'processing/extension'

data/lib/processing/capture.rb

@@ -5,6 +5,8 @@ module Processing
   #
   class Capture
 
+    include Xot::Inspectable
+
     # Returns a list of available camera device names
     #
     # @return [Array] device name list

data/lib/processing/context.rb

@@ -5,6 +5,7 @@ module Processing
   #
   class Context
 
+    include Xot::Inspectable
     include GraphicsContext
 
     Capture    = Processing::Capture
@@ -35,17 +36,18 @@ module Processing
         @window__.canvas_image,
         @window__.canvas_painter.paint {background 0.8})
 
-      @loop__            = true
-      @redraw__          = false
-      @frameCount__      = 0
-      @key__             = nil
-      @keyCode__         = nil
-      @keysPressed__     = Set.new
-      @pointerPos__      =
-      @pointerPrevPos__  = Rays::Point.new 0
-      @pointersPressed__ = []
-      @touches__         = []
-      @motionGravity__   = createVector 0, 0
+      @loop__             = true
+      @redraw__           = false
+      @frameCount__       = 0
+      @key__              = nil
+      @keyCode__          = nil
+      @keysPressed__      = Set.new
+      @pointerPos__       =
+      @pointerPrevPos__   = Rays::Point.new 0
+      @pointersPressed__  = []
+      @pointersReleased__ = []
+      @touches__          = []
+      @motionGravity__    = createVector 0, 0
 
       @window__.before_draw   = proc {beginDraw__}
       @window__.after_draw    = proc {endDraw__}
@@ -95,11 +97,13 @@ module Processing
         @pointerPos__ = event.pos.dup
         @touches__    = event.pointers.map {|p| Touch.new(p.id, *p.pos.to_a)}
         if pressed != nil
-          array = @pointersPressed__
           event.types
             .tap {|types| types.delete :mouse}
             .map {|type| mouseButtonMap[type] || type}
-            .each {|type| pressed ? array.push(type) : array.delete(type)}
+            .each do |type|
+              (pressed ? @pointersPressed__ : @pointersReleased__).push type
+              @pointersPressed__.delete type unless pressed
+            end
         end
       }
 
@@ -127,6 +131,7 @@ module Processing
           @mouseClickedBlock__&.call if (@pointerPos__ - startPos).length < 3
           @pointerDownStartPos__ = nil
         end
+        @pointersReleased__.clear
       end
 
       @window__.pointer_move = proc do |e|
@@ -440,7 +445,7 @@ module Processing
     # @return [Numeric] LEFT, RIGHT, CENTER or 0
     #
     def mouseButton()
-      (@pointersPressed__ & [LEFT, RIGHT, CENTER]).last || 0
+      ((@pointersPressed__ + @pointersReleased__) & [LEFT, RIGHT, CENTER]).last
     end
 
     # Returns array of touches

data/lib/processing/font.rb

@@ -28,6 +28,14 @@ module Processing
       TextBounds.new x, y, x + f.width(str), y + f.height
     end
 
+    # Returns a string containing a human-readable representation of object.
+    #
+    # @return [String] inspected text
+    #
+    def inspect()
+      "#<Processing::Font: name:'#{@font.name}' size:#{@font.size}>"
+    end
+
   end# Font
 
 
@@ -56,6 +64,14 @@ module Processing
       @x, @y, @w, @h = x, y, w, h
     end
 
+    # Returns a string containing a human-readable representation of object.
+    #
+    # @return [String] inspected text
+    #
+    def inspect()
+      "#<Processing::TextBounds: x:#{x} y:#{y} w:#{w} h:#{h}>"
+    end
+
   end# TextBounds
 
 

data/lib/processing/graphics.rb

@@ -5,6 +5,7 @@ module Processing
   #
   class Graphics
 
+    include Xot::Inspectable
     include GraphicsContext
 
     # Initialize graphics object.

data/lib/processing/graphics_context.rb

@@ -198,12 +198,15 @@ module Processing
     # @private
     def init__(image, painter)
       @drawing__     = false
+      @colorMode__   = nil
       @hsbColor__    = false
       @colorMaxes__  = [1.0] * 4
+      @angleMode__   = nil
       @angleScale__  = 1.0
       @rectMode__    = nil
       @ellipseMode__ = nil
       @imageMode__   = nil
+      @blendMode__   = nil
       @textAlignH__  = nil
       @textAlignV__  = nil
       @tint__        = nil
@@ -271,19 +274,22 @@ module Processing
     # @param max3 [Numeric]  max value for blue or brightness
     # @param maxA [Numeric]  max value for alpha
     #
-    # @return [nil] nil
+    # @return [RGB, HSB] current mode
     #
-    def colorMode(mode, *maxes)
-      mode = mode.downcase.to_sym
-      raise ArgumentError, "invalid color mode: #{mode}" unless [RGB, HSB].include?(mode)
-      raise ArgumentError unless [0, 1, 3, 4].include?(maxes.size)
+    def colorMode(mode = nil, *maxes)
+      if mode != nil
+        mode = mode.downcase.to_sym
+        raise ArgumentError, "invalid color mode: #{mode}" unless [RGB, HSB].include?(mode)
+        raise ArgumentError unless [0, 1, 3, 4].include?(maxes.size)
 
-      @hsbColor__ = mode == HSB
-      case maxes.size
-      when 1    then @colorMaxes__                 = [maxes.first.to_f] * 4
-      when 3, 4 then @colorMaxes__[0...maxes.size] = maxes.map &:to_f
+        @colorMode__ = mode
+        @hsbColor__  = mode == HSB
+        case maxes.size
+        when 1    then @colorMaxes__                 = [maxes.first.to_f] * 4
+        when 3, 4 then @colorMaxes__[0...maxes.size] = maxes.map &:to_f
+        end
       end
-      nil
+      @colorMode__
     end
 
     # @private
@@ -319,15 +325,19 @@ module Processing
     #
     # @param mode [RADIANS, DEGREES] RADIANS or DEGREES
     #
-    # @return [nil] nil
+    # @return [RADIANS, DEGREES] current mode
     #
-    def angleMode(mode)
-      @angleScale__ = case mode.downcase.to_sym
-        when RADIANS then RAD2DEG__
-        when DEGREES then 1.0
-        else raise ArgumentError, "invalid angle mode: #{mode}"
-        end
-      nil
+    def angleMode(mode = nil)
+      if mode != nil
+        @angleMode__  = mode
+        @angleScale__ =
+          case mode.downcase.to_sym
+          when RADIANS then RAD2DEG__
+          when DEGREES then 1.0
+          else raise ArgumentError, "invalid angle mode: #{mode}"
+          end
+      end
+      @angleMode__
     end
 
     # @private
@@ -335,6 +345,24 @@ module Processing
       angle * @angleScale__
     end
 
+    # @private
+    def fromRadians__(radians)
+      case @angleMode__
+      when RADIANS then radians
+      when DEGREES then radians * RAD2DEG__
+      else raise "invalid angle mode: #{mode}"
+      end
+    end
+
+    # @private
+    def fromDegrees__(degrees)
+      case @angleMode__
+      when RADIANS then degrees * DEG2RAD__
+      when DEGREES then degrees
+      else raise "invalid angle mode: #{mode}"
+      end
+    end
+
     # Sets rect mode. Default is CORNER.
     #
     # CORNER  -> rect(left, top, width, height)
@@ -396,9 +424,12 @@ module Processing
     #
     # @return [nil] nil
     #
-    def blendMode(mode)
-      @painter__.blend_mode = mode
-      nil
+    def blendMode(mode = nil)
+      if mode != nil
+        @blendMode__          = mode
+        @painter__.blend_mode = mode
+      end
+      @blendMode__
     end
 
     # Sets fill color.
@@ -691,6 +722,8 @@ module Processing
       nil
     end
 
+    alias drawPoint point
+
     # Draws a line.
     #
     # @param x1 [Numeric] horizontal position of first point
@@ -706,6 +739,8 @@ module Processing
       nil
     end
 
+    alias drawLine line
+
     # Draws a rectangle.
     #
     # The parameters a, b, c, and d are determined by rectMode().
@@ -738,6 +773,8 @@ module Processing
       nil
     end
 
+    alias drawRect rect
+
     # Draws an ellipse.
     #
     # The parameters a, b, c, and d are determined by ellipseMode().
@@ -756,6 +793,8 @@ module Processing
       nil
     end
 
+    alias drawEllipse ellipse
+
     # Draws a circle.
     #
     # @param x      [Numeric] horizontal position of the shape
@@ -768,6 +807,8 @@ module Processing
       ellipse x, y, extent, extent
     end
 
+    alias drawCircle circle
+
     # Draws an arc.
     #
     # The parameters a, b, c, and d are determined by ellipseMode().
@@ -790,6 +831,8 @@ module Processing
       nil
     end
 
+    alias drawArc arc
+
     # Draws a square.
     #
     # @param x      [Numeric] horizontal position of the shape
@@ -802,6 +845,8 @@ module Processing
       rect x, y, extent, extent
     end
 
+    alias drawSquare square
+
     # Draws a triangle.
     #
     # @param x1 [Numeric] horizontal position of first point
@@ -819,6 +864,8 @@ module Processing
       nil
     end
 
+    alias drawTriangle triangle
+
     # Draws a quad.
     #
     # @param x1 [Numeric] horizontal position of first point
@@ -838,6 +885,8 @@ module Processing
       nil
     end
 
+    alias drawQuad quad
+
     # Draws a Catmull-Rom spline curve.
     #
     # @param cx1 [Numeric] horizontal position of beginning control point
@@ -857,6 +906,8 @@ module Processing
       nil
     end
 
+    alias drawCurve curve
+
     # Draws a Bezier spline curve.
     #
     # @param x1  [Numeric] horizontal position of first point
@@ -876,6 +927,8 @@ module Processing
       nil
     end
 
+    alias drawBezier bezier
+
     # Draws a text.
     #
     # The parameters a, b, c, and d are determined by rectMode().
@@ -915,6 +968,8 @@ module Processing
       nil
     end
 
+    alias drawText text
+
     # Draws an image.
     #
     # The parameters a, b, c, and d are determined by imageMode().
@@ -938,6 +993,8 @@ module Processing
       nil
     end
 
+    alias drawImage image
+
     # Copies image.
     #
     # @overload copy(sx, sy, sw, sh, dx, dy, dw, dh)

data/lib/processing/image.rb

@@ -5,6 +5,8 @@ module Processing
   #
   class Image
 
+    include Xot::Inspectable
+
     # @private
     def initialize(image)
       @image = image

data/lib/processing/shader.rb

@@ -5,6 +5,8 @@ module Processing
   #
   class Shader
 
+    include Xot::Inspectable
+
     # Initialize shader object.
     #
     # @param vertSrc [String] vertex shader source

data/lib/processing/touch.rb

@@ -26,6 +26,14 @@ module Processing
       @id, @x, @y = id, x, y
     end
 
+    # Returns a string containing a human-readable representation of object.
+    #
+    # @return [String] inspected text
+    #
+    def inspect()
+      "#<Processing::Touch: id:#{id} x:#{x} y:#{y}>"
+    end
+
   end# Touch
 
 

data/lib/processing/vector.rb

@@ -535,9 +535,12 @@ module Processing
       v
     end
 
-    # @private
+    # Returns a string containing a human-readable representation of object.
+    #
+    # @return [String] inspected text
+    #
     def inspect()
-      "<##{self.class.name} #{x}, #{y}, #{z}>"
+      "#<#{self.class.name}: #{x}, #{y}, #{z}>"
     end
 
     # @private

data/lib/processing/window.rb

@@ -4,6 +4,8 @@ module Processing
   # @private
   class Window < Reflex::Window
 
+    include Xot::Inspectable
+
     attr_accessor :setup, :update, :draw, :resize,
       :key_down, :key_up,
       :pointer_down, :pointer_up, :pointer_move, :pointer_drag,

data/processing.gemspec

@@ -28,10 +28,10 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.7.0'
 
-  s.add_runtime_dependency 'xot',       '~> 0.1.34'
-  s.add_runtime_dependency 'rucy',      '~> 0.1.34'
-  s.add_runtime_dependency 'rays',      '~> 0.1.34'
-  s.add_runtime_dependency 'reflexion', '~> 0.1.35'
+  s.add_runtime_dependency 'xot',       '~> 0.1.35'
+  s.add_runtime_dependency 'rucy',      '~> 0.1.35'
+  s.add_runtime_dependency 'rays',      '~> 0.1.35'
+  s.add_runtime_dependency 'reflexion', '~> 0.1.36'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/test/helper.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[../xot ../rucy ../rays ../reflex .]
   .map  {|s| File.expand_path "../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/test/test_capture.rb

@@ -0,0 +1,16 @@
+require_relative 'helper'
+
+
+class TestCapture < Test::Unit::TestCase
+
+  P = Processing
+
+  def capture(*args, **kwargs)
+    P::Capture.new(*args, **kwargs)
+  end
+
+  def test_inspect()
+    assert_match %r|#<Processing::Capture:0x\w{16}>|, capture.inspect
+  end
+
+end# TestCapture

data/test/test_font.rb

@@ -0,0 +1,16 @@
+require_relative 'helper'
+
+
+class TestFont < Test::Unit::TestCase
+
+  P = Processing
+
+  def font()
+    P::Font.new Rays::Font.new(nil, 10)
+  end
+
+  def test_inspect()
+    assert_match %r|#<Processing::Font: name:'[\w\s]+' size:[\d\.]+>|, font.inspect
+  end
+
+end# TestFont

data/test/test_graphics.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 
@@ -18,4 +15,8 @@ class TestGraphics < Test::Unit::TestCase
     assert_raise {g.beginDraw}
   end
 
+  def test_inspect()
+    assert_match %r|#<Processing::Graphics:0x\w{16}>|, graphics.inspect
+  end
+
 end# TestGraphics

data/test/test_graphics_context.rb

@@ -0,0 +1,43 @@
+require_relative 'helper'
+
+
+class TestGraphicsContext < Test::Unit::TestCase
+
+  P = Processing
+  G = P::Graphics
+
+  def graphics(w = 10, h = 10)
+    G.new w, h
+  end
+
+  def test_colorMode()
+    g = graphics
+    assert_equal G::RGB, g.colorMode
+
+    g.colorMode G::HSB, 1
+    assert_equal G::HSB, g.colorMode
+
+    assert_raise {g.colorMode LEFT}
+  end
+
+  def test_angleMode()
+    g = graphics
+    assert_equal G::RADIANS, g.angleMode
+
+    g.angleMode G::DEGREES
+    assert_equal G::DEGREES, g.angleMode
+
+    assert_raise {g.angleMode LEFT}
+  end
+
+  def test_blendMode()
+    g = graphics
+    assert_equal G::BLEND, g.blendMode
+
+    g.blendMode G::ADD
+    assert_equal G::ADD, g.blendMode
+
+    assert_raise {g.blendMode LEFT}
+  end
+
+end# TestGraphics

data/test/test_image.rb

@@ -0,0 +1,16 @@
+require_relative 'helper'
+
+
+class TestImage < Test::Unit::TestCase
+
+  P = Processing
+
+  def image(w = 10, h = 10)
+    P::Image.new(Rays::Image.new w, h)
+  end
+
+  def test_inspect()
+    assert_match %r|#<Processing::Image:0x\w{16}>|, image.inspect
+  end
+
+end# TestImage

data/test/test_shader.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 
@@ -44,4 +41,8 @@ class TestShader < Test::Unit::TestCase
     end
   end
 
+  def test_inspect()
+    assert_match %r|#<Processing::Shader:0x\w{16}>|, shader.inspect
+  end
+
 end# TestShader

data/test/test_text_bounds.rb

@@ -0,0 +1,16 @@
+require_relative 'helper'
+
+
+class TestTextBounds < Test::Unit::TestCase
+
+  P = Processing
+
+  def bounds(*args)
+    P::TextBounds.new(*args)
+  end
+
+  def test_inspect()
+    assert_equal "#<Processing::TextBounds: x:1 y:2 w:3 h:4>", bounds(1, 2, 3, 4).inspect
+  end
+
+end# TestTextBounds

data/test/test_touch.rb

@@ -0,0 +1,16 @@
+require_relative 'helper'
+
+
+class TestTouch < Test::Unit::TestCase
+
+  P = Processing
+
+  def touch(id, x, y)
+    P::Touch.new id, x, y
+  end
+
+  def test_inspect()
+    assert_equal "#<Processing::Touch: id:1 x:2 y:3>", touch(1, 2, 3).inspect
+  end
+
+end# TestTouch

data/test/test_utility.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 

data/test/test_vector.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 
@@ -395,4 +392,8 @@ class TestVector < Test::Unit::TestCase
     assert_in_delta 1, v2.mag, 0.000001
   end
 
+  def test_inspect()
+    assert_equal '#<Processing::Vector: 1.0, 2.0, 3.0>', vec(1, 2, 3).inspect
+  end
+
 end# TestVector

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: processing
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-30 00:00:00.000000000 Z
+date: 2023-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.34
+        version: 0.1.35
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.34
+        version: 0.1.35
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.34
+        version: 0.1.35
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.34
+        version: 0.1.35
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.34
+        version: 0.1.35
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.34
+        version: 0.1.35
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.35
+        version: 0.1.36
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.35
+        version: 0.1.36
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -149,8 +149,14 @@ files:
 - lib/processing/window.rb
 - processing.gemspec
 - test/helper.rb
+- test/test_capture.rb
+- test/test_font.rb
 - test/test_graphics.rb
+- test/test_graphics_context.rb
+- test/test_image.rb
 - test/test_shader.rb
+- test/test_text_bounds.rb
+- test/test_touch.rb
 - test/test_utility.rb
 - test/test_vector.rb
 homepage: https://github.com/xord/processing
@@ -177,7 +183,13 @@ specification_version: 4
 summary: Processing compatible Creative Coding Framework.
 test_files:
 - test/helper.rb
+- test/test_capture.rb
+- test/test_font.rb
 - test/test_graphics.rb
+- test/test_graphics_context.rb
+- test/test_image.rb
 - test/test_shader.rb
+- test/test_text_bounds.rb
+- test/test_touch.rb
 - test/test_utility.rb
 - test/test_vector.rb