rubysketch 0.5.18 → 0.5.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a57b4fcc0eb7699cf1bc5207145f4621d4f1b807d390d8fbe9f06f3cc9eba78
-  data.tar.gz: 384dfcb3495eeadf390f5f74c86c99cef32b91a0926cedfa1848225e1aa8a98b
+  metadata.gz: de696798b30cb2b3545e2b2c44aeda9ca5df2658e7026392f20ba9cf9bf85570
+  data.tar.gz: a7a93a821db3bb44dac6c656d23ae246f696b09ce4d2b2c2eacd797d44664659
 SHA512:
-  metadata.gz: 82ea2f25e3299991344f514aa3495a4b68b32d3097bcff0e1913dddae19756521c55edcf892ba7eda5b9acf05e25530e379359f78332d566b2b824fea41270f1
-  data.tar.gz: 453434d0c6d9f80a138b40654441b8b7cf133e1bf6a3c19b241e06fd1710836a28ecf9816edd0bad8910b7870dd88098ed83244892649c84f00a39725916424c
+  metadata.gz: 4c4f5662bd7ad50e429dc5de1e91de19fe73be52de3f48addefa6b67007218f9dd9bad033603cf89a2bf08b092d8b424116abc0cb8a1ac4e0d6a9428b7eaa124
+  data.tar.gz: 4b2e98ed91f9eff96170fcd79f1bfac8323c341e7c10ffa65f060be7d04645f8bf41502608dc2d7914f5a5a968f6ec4a9959db5af57cd2217d862468e1ad01b2

data/ChangeLog.md

@@ -1,6 +1,16 @@
 # rubysketch ChangeLog
 
 
+## [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
+
+
 ## [v0.5.18] - 2023-06-22
 
 - Update dependencies

data/VERSION

@@ -1 +1 @@
-0.5.18
+0.5.20

data/lib/rubysketch/all.rb

@@ -6,6 +6,7 @@ require 'rubysketch/window'
 require 'rubysketch/helper'
 
 require 'rubysketch/sprite'
+require 'rubysketch/sound'
 require 'rubysketch/context'
 
 

data/lib/rubysketch/context.rb

@@ -4,6 +4,7 @@ module RubySketch
   class Context < Processing::Context
 
     Sprite = RubySketch::Sprite
+    Sound  = RubySketch::Sound
 
     # @private
     def initialize(window)
@@ -112,6 +113,16 @@ module RubySketch
       end
     end
 
+    # Loads sound file.
+    #
+    # @param [String] path path for sound file
+    #
+    # @return [Sound] sound object
+    #
+    def loadSound(path)
+      Sound.load path
+    end
+
     # Sets gravity for the physics engine.
     #
     # @overload gravity(vec)

data/lib/rubysketch/sound.rb

@@ -0,0 +1,57 @@
+module RubySketch
+
+
+  # Sound object.
+  #
+  class Sound
+
+    # @private
+    def initialize(sound)
+      @sound   = sound
+      @players = []
+    end
+
+    # Play sound.
+    #
+    # @param [Numeric] gain volume for playing sound
+    #
+    # @return [nil] nil
+    #
+    def play(gain: 1.0)
+      clean_stopped_players
+      @players.push @sound.play(gain: gain)
+      nil
+    end
+
+    # Stop playing sounds.
+    #
+    # @return [nil] nil
+    #
+    def stop()
+      @players.each &:stop
+      @players.clear
+      nil
+    end
+
+    # Load a sound file.
+    #
+    # @param [String] path file path
+    #
+    # @return [Sound] sound object
+    #
+    def self.load(path)
+      f = Beeps::FileIn.new path
+      self.new Beeps::Sound.new(f, f.seconds, nchannels: f.nchannels)
+    end
+
+    private
+
+    # @private
+    def clean_stopped_players()
+      @players.delete_if {|p| not p.playing?}
+    end
+
+  end# Sound
+
+
+end# RubySketch

data/lib/rubysketch/sprite.rb

@@ -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
@@ -978,7 +978,7 @@ module RubySketch
       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

@@ -27,10 +27,10 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'xot',        '~> 0.1.39'
   s.add_runtime_dependency 'rucy',       '~> 0.1.39'
-  s.add_runtime_dependency 'beeps',      '~> 0.1.40'
+  s.add_runtime_dependency 'beeps',      '~> 0.1.41'
   s.add_runtime_dependency 'rays',       '~> 0.1.43'
-  s.add_runtime_dependency 'reflexion',  '~> 0.1.46'
-  s.add_runtime_dependency 'processing', '~> 0.5.19'
+  s.add_runtime_dependency 'reflexion',  '~> 0.1.47'
+  s.add_runtime_dependency 'processing', '~> 0.5.21'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/test/test_sound.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helper'
+
+
+class TestSound < Test::Unit::TestCase
+
+  RS = RubySketch
+  B  = Beeps
+
+  PATH = 'test.wav'
+
+  def sound()
+    RS::Sound.load PATH
+  end
+
+  def setup()
+    B::Sound.new(B::Oscillator.new >> B::Gain.new(gain: 0), 0.1).save PATH
+  end
+
+  def teardown()
+    B::SoundPlayer.stop_all
+    File.delete PATH if File.exist?(PATH)
+  end
+
+  def test_play_stop()
+    s = sound
+    assert_nothing_raised {s.play}
+    assert_nothing_raised {s.stop}
+  end
+
+end# TestSound

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.5.18
+  version: 0.5.20
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2023-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.40
+        version: 0.1.41
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.40
+        version: 0.1.41
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.46
+        version: 0.1.47
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.46
+        version: 0.1.47
 - !ruby/object:Gem::Dependency
   name: processing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.19
+        version: 0.5.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.19
+        version: 0.5.21
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -163,6 +163,7 @@ files:
 - lib/rubysketch/context.rb
 - lib/rubysketch/extension.rb
 - lib/rubysketch/helper.rb
+- lib/rubysketch/sound.rb
 - lib/rubysketch/sprite.rb
 - lib/rubysketch/window.rb
 - pod.rake
@@ -170,6 +171,7 @@ files:
 - src/RubySketch.h
 - src/RubySketch.mm
 - test/helper.rb
+- test/test_sound.rb
 - test/test_sprite.rb
 homepage: https://github.com/xord/rubysketch
 licenses:
@@ -196,4 +198,5 @@ specification_version: 4
 summary: A game engine based on the Processing API.
 test_files:
 - test/helper.rb
+- test/test_sound.rb
 - test/test_sprite.rb