rubysketch 0.5.5 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11852910038d162e39601eb01056ee3b4161c4ac0576ac93aef87e25eed557ee
-  data.tar.gz: 6d978cf96d2e8d32df00477e77f03c645840bb70985f74e5d254ff5f47f5cd4c
+  metadata.gz: 739c6814b5036acf34bf85ff187adb2c2c4781663cb88a2ac261ccde7016a7ac
+  data.tar.gz: a51e5ab02cb6353bbe56f9a697bcd7d56cd6ca8d7fa6bf83028258f236f30ed2
 SHA512:
-  metadata.gz: '0593125c1c609a1f1c38eb45631f558fcb525db85792335524a37718d306c770d12f12012d3ddf5752080318070eb139d8ece676fb436f5a10abd88af02b2c8b'
-  data.tar.gz: 2d78202eb29f9541886efc54ec44142caf1cbd192ff58e51a26af5d3a0b8cb242c80be05171013f215b698a01cd70b9878fb10a2364abb4259402c48f6ea8475
+  metadata.gz: 01ab6b71222edc9fda13fbce1812f69fb14534f2019ad76c6f6a511bb579d3bedc34f0d13a8aaa3da9c068365a06cef5de7cce38206fb76c61abb6cf96e3b26d
+  data.tar.gz: 4442846bd3b378ca0b06cd70aadfef0fdfe3fce2df69ba223b1f5e06602d5eb086c936743c646da90d11fad9e2962fc2099f2fd864bb0481d188e873553c424f

data/ChangeLog.md

@@ -1,6 +1,22 @@
 # rubysketch ChangeLog
 
 
+## [v0.5.8] - 2023-05-18
+
+- Dispatch pointer events only to the topmost sprite
+
+
+## [v0.5.7] - 2023-05-13
+
+- Update dependencies
+
+
+## [v0.5.6] - 2023-05-11
+
+- Add Sprite#center accessor
+- Add Sprite#size=, Sprite#width=, and Sprite#height=
+
+
 ## [v0.5.5] - 2023-05-08
 
 - Add Sprite#draw()

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.8

data/examples/sprite.rb

@@ -5,43 +5,80 @@
 require 'rubysketch'
 using RubySketch
 
-sp = createSprite 100, 100, 50, 50
-sp.angle += Math::PI * 0.2
+red = green = 0
 
-red = 0
+sprites = (0..10).map do |n|
+  createSprite(100 + 50 * n, 100 + 50 * n, 100, 100).tap do |sp|
+    name = "sp#{n}"
+    sp.instance_variable_set :@n, n
+    sp.mousePressed do
+      p [name, :pressed, sp.mouseX, sp.mouseY, sp.mouseButton]
+    end
 
-sp.update do
-  red = (red + 1) % 255
+    sp.mouseReleased do
+      p [name, :released, sp.mouseX, sp.mouseY, sp.mouseButton]
+    end
+
+    sp.mouseMoved do
+      p [name, :moved, sp.mouseX, sp.mouseY, sp.pmouseX, sp.pmouseY]
+    end
+
+    sp.mouseDragged do
+      p [name, :dragged, sp.mouseX, sp.mouseY, sp.pmouseX, sp.pmouseY]
+    end
+
+    sp.mouseClicked do
+      p [name, :clicked, sp.mouseX, sp.mouseY, sp.mouseButton]
+      sp.z += 10
+    end
+  end
 end
 
-sp.draw do |&draw|
+sprites[1].angle += Math::PI * 0.2
+sprites[1].z      = 10
+
+sprites[1].update {red   = (red + 1)   % 255}
+sprites[2].update {green = (green + 1) % 255}
+
+sprites[1].draw do |&draw|
   fill red, 200, 200
   draw.call
   fill 0
   text :hello, 10, 20
 end
 
-sp.mousePressed do
-  p [:pressed, sp.mouseX, sp.mouseY, sp.mouseButton]
+sprites[2].draw do |&draw|
+  fill 200, green, 200
+  draw.call
+  fill 0
+  text :world, 10, 20
 end
 
-sp.mouseReleased do
-  p [:released, sp.mouseX, sp.mouseY, sp.mouseButton]
+draw do
+  background 0
+  text sprites.map {|sp| sp.z}, 100, 50
+  sprite sprites.sort {|a, b|
+    an, bn = [a, b].map {|o| o.instance_variable_get :@n}
+    a.z != b.z ? a.z <=> b.z : an <=> bn
+  }
 end
 
-sp.mouseMoved do
-  p [:moved, sp.mouseX, sp.mouseY, sp.pmouseX, sp.pmouseY]
+mousePressed do
+  p [:pressed, mouseX, mouseY, mouseButton]
 end
 
-sp.mouseDragged do
-  p [:dragged, sp.mouseX, sp.mouseY, sp.pmouseX, sp.pmouseY]
+mouseReleased do
+  p [:released, mouseX, mouseY, mouseButton]
 end
 
-sp.mouseClicked do
-  p [:clicked, sp.mouseX, sp.mouseY, sp.mouseButton]
+mouseMoved do
+  p [:moved, mouseX, mouseY, pmouseX, pmouseY]
 end
 
-draw do
-  background 0
-  sprite sp
+mouseDragged do
+  p [:dragged, mouseX, mouseY, pmouseX, pmouseY]
+end
+
+mouseClicked do
+  p [:clicked, mouseX, mouseY, mouseButton]
 end

data/lib/rubysketch/context.rb

@@ -78,18 +78,18 @@ module RubySketch
         f, degrees, pivot = view.frame, view.angle, view.pivot
         if draw
           push do
-            translate f.x + pivot.x * f.w, f.y + pivot.y * f.h
+            translate f.x + pivot.x  * f.w, f.y + pivot.y  * f.h
             rotate fromDegrees__ degrees
-            translate      -pivot.x * f.w,      -pivot.y * f.h
+            translate     (-pivot.x) * f.w,     (-pivot.y) * f.h
             draw.call {drawSprite__ sp, 0, 0, f.w, f.h}
           end
         elsif degrees == 0
           drawSprite__ sp, f.x, f.y, f.w, f.h
         else
           pushMatrix do
-            translate f.x + pivot.x * f.w, f.y + pivot.y * f.h
+            translate f.x + pivot.x  * f.w, f.y + pivot.y  * f.h
             rotate fromDegrees__ degrees
-            translate      -pivot.x * f.w,      -pivot.y * f.h
+            translate     (-pivot.x) * f.w,     (-pivot.y) * f.h
             drawSprite__ sp, 0, 0, f.w, f.h
           end
         end
@@ -145,7 +145,7 @@ module RubySketch
     end
 
     def on_draw(e)
-      e.block
+      e.block false
     end
 
   end# SpriteLayer

data/lib/rubysketch/sprite.rb

@@ -115,9 +115,52 @@ module RubySketch
       n
     end
 
+    # Returns the z-coordinate position of the sprite.
+    #
+    # @return [Numeric] sprite position z
+    #
+    def z()
+      @view__.z
+    end
+
+    # Set the z-coordinate position of the sprite.
+    #
+    # @param [Numeric] n sprite position z
+    #
+    # @return [Numeric] sprite position z
+    #
+    def z=(n)
+      @view__.z = n
+      n
+    end
+
     alias pos  position
     alias pos= position=
 
+    # Returns the center position of the sprite.
+    #
+    # @return [Vector] center position
+    #
+    def center()
+      Vector.new(x + w / 2, y + h / 2)
+    end
+
+    # Sets the center position of the sprite.
+    #
+    # @overload center=(vec)
+    #  @param [Vector] vec center position
+    #
+    # @overload center=(ary)
+    #  @param [Array<Numeric>] ary an array of centerX and centerY
+    #
+    # @return [Vector] center position
+    #
+    def center=(arg)
+      x, y = *(arg.is_a?(Vector) ? arg.getInternal__.to_a : arg)
+      self.pos = [x - w / 2, y - h / 2]
+      self.center
+    end
+
     # Returns the size of the sprite.
     #
     # @return [Vector] size
@@ -126,6 +169,15 @@ module RubySketch
       @view__.size.toVector
     end
 
+    # Returns the size of the sprite.
+    #
+    # @return [Vector] size
+    #
+    def size=(arg)
+      @view__.size = arg.is_a?(Vector) ? arg.getInternal__ : arg
+      arg
+    end
+
     # Returns the width of the sprite.
     #
     # @return [Numeric] width
@@ -134,6 +186,16 @@ module RubySketch
       @view__.width
     end
 
+    # Sets the width of the sprite.
+    #
+    # @param [Numeric] w width
+    #
+    # @return [Numeric] width
+    #
+    def width=(w)
+      @view__.width = w
+    end
+
     # Returns the height of the sprite.
     #
     # @return [Numeric] height
@@ -142,8 +204,20 @@ module RubySketch
       @view__.height
     end
 
-    alias w width
-    alias h height
+    # Sets the height of the sprite.
+    #
+    # @param [Numeric] h height
+    #
+    # @return [Numeric] height
+    #
+    def height=(h)
+      @view__.height = h
+    end
+
+    alias w  width
+    alias w= width=
+    alias h  height
+    alias h= height=
 
     # Returns the rotation angle of sprite.
     #
@@ -689,14 +763,14 @@ module RubySketch
     def on_pointer_down(e)
       updatePointerStates e, true
       @pointerDownStartPos = @pointerPos.dup
-      (@touchStarted || @mousePressed)&.call
+      (@touchStarted || @mousePressed)&.call if e.view_index == 0
     end
 
     def on_pointer_up(e)
       updatePointerStates e, false
-      (@touchEnded || @mouseReleased)&.call
+      (@touchEnded || @mouseReleased)&.call if e.view_index == 0
       if startPos = @pointerDownStartPos
-        @mouseClicked&.call if (@pointerPos - startPos).length < 3
+        @mouseClicked&.call if e.view_index == 0 && (@pointerPos - startPos).length < 3
         @pointerDownStartPos = nil
       end
       @pointersReleased.clear
@@ -704,7 +778,8 @@ module RubySketch
 
     def on_pointer_move(e)
       updatePointerStates e
-      (@touchMoved || (e.drag? ? @mouseDragged : @mouseMoved))&.call
+      mouseMoved = e.drag? ? @mouseDragged : @mouseMoved
+      (@touchMoved || mouseMoved)&.call if e.view_index == 0
     end
 
     def on_pointer_cancel(e)

data/rubysketch.gemspec

@@ -28,12 +28,12 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.7.0'
 
-  s.add_runtime_dependency 'xot',        '~> 0.1.35'
-  s.add_runtime_dependency 'rucy',       '~> 0.1.35'
-  s.add_runtime_dependency 'beeps',      '~> 0.1.36'
-  s.add_runtime_dependency 'rays',       '~> 0.1.35'
-  s.add_runtime_dependency 'reflexion',  '~> 0.1.36'
-  s.add_runtime_dependency 'processing', '~> 0.5.6'
+  s.add_runtime_dependency 'xot',        '~> 0.1.36'
+  s.add_runtime_dependency 'rucy',       '~> 0.1.36'
+  s.add_runtime_dependency 'beeps',      '~> 0.1.37'
+  s.add_runtime_dependency 'rays',       '~> 0.1.37'
+  s.add_runtime_dependency 'reflexion',  '~> 0.1.39'
+  s.add_runtime_dependency 'processing', '~> 0.5.9'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/test/test_sprite.rb

@@ -64,16 +64,49 @@ class TestSprite < Test::Unit::TestCase
     assert_equal vec(1, 2), s.pos
   end
 
+  def test_center()
+    s = sprite 0, 0, 10, 20
+    assert_equal vec( 5, 10),   s.center
+
+    s.center =   vec 100, 200
+    assert_equal vec( 95, 190), s.pos
+
+    s.center =      [300, 400]
+    assert_equal vec(295, 390), s.pos
+  end
+
   def test_size()
     assert_equal vec(0, 0), sprite                    .size
     assert_equal vec(1, 0), sprite(0, 0, 1)           .size
     assert_equal vec(1, 2), sprite(0, 0, 1, 2)        .size
     assert_equal vec(3, 4), sprite(image: image(3, 4)).size
+
+    s      = sprite
+    s.size =     vec 10, 20
+    assert_equal vec(10, 20), s.size
+
+    s.size =        [30, 40]
+    assert_equal vec(30, 40), s.size
   end
 
   def test_wh()
     assert_equal 1, sprite(0, 0, 1, 2).width
+    assert_equal 1, sprite(0, 0, 1, 2).w
     assert_equal 2, sprite(0, 0, 1, 2).height
+    assert_equal 2, sprite(0, 0, 1, 2).h
+
+    s        = sprite
+    s.width  =       10
+    assert_equal vec(10, 0),  s.size
+
+    s.w      =       20
+    assert_equal vec(20, 0),  s.size
+
+    s.height =           30
+    assert_equal vec(20, 30), s.size
+
+    s.h      =           40
+    assert_equal vec(20, 40), s.size
   end
 
   def test_angle()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.8
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-08 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,84 +16,84 @@ dependencies:
     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: rucy
   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: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.36
+        version: 0.1.37
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.36
+        version: 0.1.37
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.35
+        version: 0.1.37
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.35
+        version: 0.1.37
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.36
+        version: 0.1.39
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.36
+        version: 0.1.39
 - !ruby/object:Gem::Dependency
   name: processing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.5.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.5.9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement