rubysketch 0.5.19 → 0.5.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ccfda24e6b2342ff8e946b61bcdfa18fc751e6d55a4fd08f3b31ff9c35088b0
-  data.tar.gz: 748ac2d377d700c504b3149f51829c099ca56c7dce65b9bd61d905eabb0935b4
+  metadata.gz: 465b63fb2c047489e7df0a629141c3413acf79d07411309326639ca39d751da0
+  data.tar.gz: 9a2adaafb57a38b765b5afe482868b0da0f4c62f7dc98963b865c202246c0637
 SHA512:
-  metadata.gz: c9849d91ec8fa229958d3ce120415705be94faef3833d7eeda6c2c7168870570eb8e646905828dab81cef2113628c672b26c9482b8fc42a80636f0e7daa9845a
-  data.tar.gz: b46818c44fa441f5d1bce35d8aa5d09111ce6a6888e01f7cb54502bb23a69bc7bae41f3d2853cb7989b675684a205054563bd102069b618b199d1766d1ca69fd
+  metadata.gz: edd124cb7e330e5193dbd0cb19e669d67913b2910a59d236000e624bf3371bec247bcee5a87f5225bdd822e3801d39df9d3094aed17fe17ec1b9d14629c0fdba
+  data.tar.gz: 347152e6d8c121166677cabbf9f28f611f4da284a1251c06e977bb977f59e87db29e9af5649274699b6820d334b25784ef2614e303cdd896c637ef379e905510

data/ChangeLog.md

@@ -1,6 +1,17 @@
 # rubysketch ChangeLog
 
 
+## [v0.5.21] - 2023-07-10
+
+- Sprite#contact block receives only contact begin event
+- from_screen() -> fromScreen(), to_screen() -> toScreen()
+
+
+## [v0.5.20] - 2023-07-09
+
+- fix that calling mousePressed() without block removes mousePressed block
+
+
 ## [v0.5.19] - 2023-06-27
 
 - add loadSound() and RubySketch::Sound class

data/VERSION

@@ -1 +1 @@
-0.5.19
+0.5.21

data/lib/rubysketch/sprite.rb

@@ -619,7 +619,7 @@ module RubySketch
     #
     # @return [Vector] sprite coordinate vector
     #
-    def from_screen(vec)
+    def fromScreen(vec)
       @view__.from_parent(vec.getInternal__).toVector
     end
 
@@ -629,7 +629,7 @@ module RubySketch
     #
     # @return [Vector] screen coordinate vector
     #
-    def to_screen(vec)
+    def toScreen(vec)
       @view__.to_parent(vec.getInternal__).toVector
     end
 
@@ -699,7 +699,7 @@ module RubySketch
     # @return [nil] nil
     #
     def update(&block)
-      @view__.update = block
+      @view__.update = block if block
       nil
     end
 
@@ -715,7 +715,7 @@ module RubySketch
     # @return [nil] nil
     #
     def draw(&block)
-      @drawBlock__ = block
+      @drawBlock__ = block if block
       nil
     end
 
@@ -729,7 +729,7 @@ module RubySketch
     # @return [Boolean] is any mouse button pressed or not
     #
     def mousePressed(&block)
-      @view__.mousePressed = block
+      @view__.mousePressed = block if block
       @view__.mousePressed?
     end
 
@@ -743,7 +743,7 @@ module RubySketch
     # @return [nil] nil
     #
     def mouseReleased(&block)
-      @view__.mouseReleased = block
+      @view__.mouseReleased = block if block
       nil
     end
 
@@ -757,7 +757,7 @@ module RubySketch
     # @return [nil] nil
     #
     def mouseMoved(&block)
-      @view__.mouseMoved = block
+      @view__.mouseMoved = block if block
       nil
     end
 
@@ -771,7 +771,7 @@ module RubySketch
     # @return [nil] nil
     #
     def mouseDragged(&block)
-      @view__.mouseDragged = block
+      @view__.mouseDragged = block if block
       nil
     end
 
@@ -785,7 +785,7 @@ module RubySketch
     # @return [nil] nil
     #
     def mouseClicked(&block)
-      @view__.mouseClicked = block
+      @view__.mouseClicked = block if block
       nil
     end
 
@@ -799,7 +799,7 @@ module RubySketch
     # @return [nil] nil
     #
     def touchStarted(&block)
-      @view__.touchStarted = block
+      @view__.touchStarted = block if block
       nil
     end
 
@@ -813,7 +813,7 @@ module RubySketch
     # @return [nil] nil
     #
     def touchEnded(&block)
-      @view__.touchEnded = block
+      @view__.touchEnded = block if block
       nil
     end
 
@@ -827,7 +827,7 @@ module RubySketch
     # @return [nil] nil
     #
     def touchMoved(&block)
-      @view__.touchMoved = block
+      @view__.touchMoved = block if block
       nil
     end
 
@@ -841,7 +841,7 @@ module RubySketch
     # @return [nil] nil
     #
     def contact(&block)
-      @view__.contact = block
+      @view__.contact = block if block
     end
 
     # Defines contact? block.
@@ -854,7 +854,7 @@ module RubySketch
     # @return [nil] nil
     #
     def contact?(&block)
-      @view__.will_contact = block
+      @view__.will_contact = block if block
     end
 
     # @private
@@ -907,7 +907,7 @@ module RubySketch
     end
 
     def mouseButton()
-      ((@pointersPressed + @pointersReleased) & [LEFT, RIGHT, CENTER]).last
+      ((@pointersPressed + @pointersReleased) & MOUSE_BUTTONS).last
     end
 
     def clickCount()
@@ -955,7 +955,7 @@ module RubySketch
       on_pointer_up e
     end
 
-    def on_contact(e)
+    def on_contact_begin(e)
       v = e.view
       @contact.call v.sprite, e.action if @contact && v.respond_to?(:sprite)
     end
@@ -973,12 +973,14 @@ module RubySketch
       mouse_middle: Processing::GraphicsContext::CENTER
     }
 
+    MOUSE_BUTTONS = MOUSE_BUTTON_MAP.values
+
     def updatePointerStates(event)
       pointer = event.find {|p| p.id == @pointer&.id} || event.first
       if !mousePressed? || pointer.id == @pointer&.id
         @pointerPrev, @pointer = @pointer, pointer.dup
       end
-      @touches = event.map {|p| Touch.new(p.id, *p.pos.to_a)}
+      @touches = event.map {|p| Processing::Touch.new(p.id, *p.pos.to_a)}
     end
 
     def updatePointersPressedAndReleased(event, pressed)

data/rubysketch.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rucy',       '~> 0.1.39'
   s.add_runtime_dependency 'beeps',      '~> 0.1.41'
   s.add_runtime_dependency 'rays',       '~> 0.1.43'
-  s.add_runtime_dependency 'reflexion',  '~> 0.1.47'
-  s.add_runtime_dependency 'processing', '~> 0.5.20'
+  s.add_runtime_dependency 'reflexion',  '~> 0.1.48'
+  s.add_runtime_dependency 'processing', '~> 0.5.22'
 
   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.19
+  version: 0.5.21
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-26 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.47
+        version: 0.1.48
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.47
+        version: 0.1.48
 - !ruby/object:Gem::Dependency
   name: processing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.20
+        version: 0.5.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.20
+        version: 0.5.22
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement