rubysketch 0.5.7 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9465d904b4ad4eed514cb114281c1f19b49e692750456714152033cbabd3bea
-  data.tar.gz: aff3bf85d73c1dc26fc200647a77c0dc2c0133630450f33bb0e98c62b5ac6f5e
+  metadata.gz: 5385034a66ab2a3bba10f16e08dc828f6f8dd4d3dc9f8425a4d009e46945e9e7
+  data.tar.gz: 60027fb7618e84373d0943d5a091548e5d503e6234f61344d57de8a2d9805714
 SHA512:
-  metadata.gz: 68579b3732c2a114b8d421b61a92cbe611d412ed84bc3f1bb7cb3d81ff2cd28ecbbd35aa2469cad156fb7510cafcf624d79630a4422f4ba85ce98fd47a06b8c4
-  data.tar.gz: a8227ef0c4a0e7c9653f0825c3b8dfb74036058b2550cc1e5075f85d85579c1450e69f93d5bfd543e66f883b2798eca98af04b2f2747da7e54bdafeb5b99e60e
+  metadata.gz: 36c596d721b9d2965fcb32f7cd1b28e1d76120a71283c11f11be37b983988ac31cfb350f46c9b7441efecb66260c39762cbe6ef4b3a8292b5c89445f7b20154b
+  data.tar.gz: eaa2be7d0033d6f7c37d4252cd45acfbdc6d6567139f5e87627bdc9260e80d827b52ffddde6650fac30241e289b6cb328f21a21f62d5a147af04d74a19280334

data/ChangeLog.md

@@ -1,6 +1,19 @@
 # rubysketch ChangeLog
 
 
+## [v0.5.9] - 2023-05-19
+
+- Add Sprite#clickCount()
+- Add Sprite#from_screen() and to_screen()
+- Sprite#update returns nil
+- Sprite#center includes z
+
+
+## [v0.5.8] - 2023-05-18
+
+- Dispatch pointer events only to the topmost sprite
+
+
 ## [v0.5.7] - 2023-05-13
 
 - Update dependencies

data/VERSION

@@ -1 +1 @@
-0.5.7
+0.5.9

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

@@ -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,6 +115,25 @@ 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=
 
@@ -123,7 +142,7 @@ module RubySketch
     # @return [Vector] center position
     #
     def center()
-      Vector.new(x + w / 2, y + h / 2)
+      Vector.new(x + w / 2, y + h / 2, z)
     end
 
     # Sets the center position of the sprite.
@@ -138,7 +157,7 @@ module RubySketch
     #
     def center=(arg)
       x, y = *(arg.is_a?(Vector) ? arg.getInternal__.to_a : arg)
-      self.pos = [x - w / 2, y - h / 2]
+      self.pos = [x - w / 2, y - h / 2, z]
       self.center
     end
 
@@ -473,6 +492,26 @@ module RubySketch
     alias rest  restitution
     alias rest= restitution=
 
+    # Converts a vector from the screen coordinate
+    #
+    # @param [Vector] vec screen coordinate vector
+    #
+    # @return [Vector] sprite coordinate vector
+    #
+    def from_screen(vec)
+      @view__.from_parent(vec.getInternal__).toVector
+    end
+
+    # Converts a vector to the screen coordinate
+    #
+    # @param [Vector] vec sprite coordinate vector
+    #
+    # @return [Vector] screen coordinate vector
+    #
+    def to_screen(vec)
+      @view__.to_parent(vec.getInternal__).toVector
+    end
+
     # Returns the x-position of the mouse in the sprite coordinates.
     #
     # @return [Numeric] x position
@@ -513,6 +552,14 @@ module RubySketch
       @view__.mouseButton
     end
 
+    # Returns the mouse button click count on the sprite.
+    #
+    # @return [Numeric] click count
+    #
+    def clickCount()
+      @view__.clickCount
+    end
+
     # Returns the touch objects touched on the sprite.
     #
     # @return [Array<Touch>] touches
@@ -532,6 +579,7 @@ module RubySketch
     #
     def update(&block)
       @view__.update = block
+      nil
     end
 
     # Defines draw block.
@@ -737,29 +785,34 @@ module RubySketch
       ((@pointersPressed + @pointersReleased) & [LEFT, RIGHT, CENTER]).last
     end
 
+    def clickCount()
+      clicked? ? 1 : 0
+    end
+
     def on_update(e)
       @update&.call
     end
 
     def on_pointer_down(e)
       updatePointerStates e, true
-      @pointerDownStartPos = @pointerPos.dup
-      (@touchStarted || @mousePressed)&.call
+      @pointerDownStartPos = to_screen @pointerPos
+      (@touchStarted || @mousePressed)&.call if e.view_index == 0
     end
 
     def on_pointer_up(e)
       updatePointerStates e, false
-      (@touchEnded || @mouseReleased)&.call
-      if startPos = @pointerDownStartPos
-        @mouseClicked&.call if (@pointerPos - startPos).length < 3
-        @pointerDownStartPos = nil
+      if e.view_index == 0
+        (@touchEnded || @mouseReleased)&.call
+        @mouseClicked&.call if clicked?
       end
+      @pointerDownStartPos = nil
       @pointersReleased.clear
     end
 
     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)
@@ -799,6 +852,13 @@ module RubySketch
       end
     end
 
+    def clicked?()
+      return false unless @pointerPos && @pointerDownStartPos
+      [to_screen(@pointerPos), @pointerDownStartPos]
+        .map {|pos| Rays::Point.new pos.x, pos.y, 0}
+        .then {|pos, startPos| (pos - startPos).length < 3}
+    end
+
   end# SpriteView
 
 

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.36'
-  s.add_runtime_dependency 'reflexion',  '~> 0.1.38'
-  s.add_runtime_dependency 'processing', '~> 0.5.8'
+  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.10'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.9
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-12 00:00:00.000000000 Z
+date: 2023-05-19 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.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: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.38
+        version: 0.1.39
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.38
+        version: 0.1.39
 - !ruby/object:Gem::Dependency
   name: processing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 0.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 0.5.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement