rubysketch 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccbb3ec25a88b53bba2570b98bce4e809f6e4cbe68ffe9d3ecd0632934d75e2c
-  data.tar.gz: 47bc1c14d77513954b4bae6a5611b802c99836ad2474d2232d35ef92def908a1
+  metadata.gz: 82a93ef9dac4ae855bfa85f9a076ed05c807875db70be9c5e72419137499434e
+  data.tar.gz: 2f432e94c80ad231f50ca11df96ecd6a13c389551f75c426e161701e25d85a23
 SHA512:
-  metadata.gz: 2ad5c3d346dfd79446ad795e00c7b148baeb1bdee3600d6b628d1ba6f5c366273aa71986016500649ed36944022e418d1a5f012ccd4d808b6546e6fbed1eb9e2
-  data.tar.gz: 3c657e0ef7fdefc37d370246d881b0d976805d74c1ee22b99b7470fb502aacf5de1d7bba0991f7b1534e3d8a43114da7b05cf6336bebb43bd9d90d57b8328d69
+  metadata.gz: cdf7238a4d07fe88b5d1fe3d68ea6f62d9536b142afda5dad1f4c15538bae2047d4e188bbc88e0777d641650ad9c5f5864720345ad5ec950e2ff18e83f552db9
+  data.tar.gz: 310a71a0b3388876bd0c0910a09bb9aa12e5686e5885ec8e4b2a32cb4af629ed18a010731a77b4a8ea1a9a4be41de504098767d0d133e3344554d5078508ad29

data/.github/workflows/release-gem.yml

@@ -24,7 +24,7 @@ jobs:
         run: gem install yard
 
       - name: test
-        run: rake test
+        run: rake quiet test
 
       - name: create gem
         id: gem

data/.github/workflows/utils.rb

@@ -20,8 +20,9 @@ def setup_dependencies(build: true, only: nil)
 
   exts.each do |ext|
     gem   = RENAMES[ext.to_sym].then {|s| s || ext}
-    clone = "git clone --depth 1 https://github.com/xord/#{ext}.git ../#{ext}"
     ver   = gemspec[/add_runtime_dependency.*['"]#{gem}['"].*['"]\s*~>\s*([\d\.]+)\s*['"]/, 1]
+    opts  = '-c advice.detachedHead=false --depth 1'
+    clone = "git clone #{opts} https://github.com/xord/#{ext}.git ../#{ext}"
 
     # 'rake subtree:push' pushes all subrepos, so cloning by new tag
     # often fails before tagging each new tag

data/ChangeLog.md

@@ -1,6 +1,23 @@
 # rubysketch ChangeLog
 
 
+## [v0.5.4] - 2023-04-30
+
+- Add Sprite#image=() and Sprite#offset=()
+- gravity() takes vector by pixel
+- Add documents for Sprite class and test it
+
+
+## [v0.5.3] - 2023-04-22
+
+- Depends on Beeps
+- Update RubySketch.podspec to include beeps, rays, reflex, and processing libs
+- Add RubySketch.h and RubySketch.mm
+- Add Sound class and loadSound()
+- Add vx, vy accessors and will_contact? callback to Sprite class
+- Add RubySketch::Window andd calls Beeps.process_streams!
+
+
 ## [v0.5.2] - 2023-03-02
 
 - depend to processing-0.5.2 gem

data/RubySketch.podspec

@@ -14,16 +14,118 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = "10.10"
   s.ios.deployment_target = "10.0"
 
-  incdirs = %W[
-    #{s.name}/src
-    CRuby/CRuby/include
-    Reflexion/reflex/include
-    RubyProcessing/src
-  ].map {|s| "${PODS_ROOT}/#{s}"}
-
-  s.preserve_paths = "src"
-  s.source_files   = "src/*.mm"
-  s.xcconfig       = {"HEADER_SEARCH_PATHS" => incdirs.join(' ')}
-
-  s.resource_bundles = {'RubySketch' => %w[lib VERSION]}
+  root = "${PODS_ROOT}/#{s.name}"
+  exts = File.read(File.expand_path 'Rakefile', __dir__)
+    .lines(chomp: true)
+    .map {|line| line[%r|require\s*['"](\w+)/extension['"]|, 1]}
+    .compact - [s.name.downcase]
+
+  incdirs = exts.map {|x| "#{root}/#{x}/include"}.concat %W[
+    #{root}/src
+    #{root}/beeps/vendor/stk/include
+    #{root}/beeps/vendor/AudioFile
+    #{root}/beeps/vendor/r8brain-free-src
+    #{root}/beeps/vendor/signalsmith-stretch
+    #{root}/rays/vendor/glm
+    #{root}/rays/vendor/clipper/cpp
+    #{root}/rays/vendor/poly2tri/poly2tri
+    #{root}/rays/vendor/splines-lib
+    #{root}/reflex/vendor/box2d/include
+    #{root}/reflex/vendor/box2d/src
+    ${PODS_ROOT}/CRuby/CRuby/include
+  ]
+
+  s.prepare_command    = 'rake -f pod.rake setup'
+  s.preserve_paths     = exts + %w[src]
+  s.requires_arc       = false
+  s.osx.compiler_flags = "-DOSX"
+  s.ios.compiler_flags = "-DIOS"
+  s.library            = %w[c++]
+  s.xcconfig           = {
+    "CLANG_CXX_LANGUAGE_STANDARD" => 'c++20',
+    "HEADER_SEARCH_PATHS"         => incdirs.join(' ')
+  }
+
+  #s.dependency = 'CRuby', git: 'https://github.com/xord/cruby'
+
+  s.source_files     = "src/*.mm"
+  s.resource_bundles =
+    exts.each_with_object({'RubySketch' => %w[lib VERSION]}) do |ext, hash|
+      hash[ext.capitalize] = %W[#{ext}/lib VERSION]
+    end
+
+  s.subspec "Xot" do |spec|
+    spec.source_files = "xot/src/*.cpp"
+  end
+
+  s.subspec "Rucy" do |spec|
+    spec.source_files = "rucy/src/*.cpp"
+
+    spec.subspec "Ext" do |ext|
+      ext.source_files = "rucy/ext/rucy/*.cpp"
+    end
+  end
+
+  s.subspec "Beeps" do |spec|
+    spec    .source_files = "beeps/src/*.cpp"
+    spec.osx.source_files = "beeps/src/osx/*.{cpp,mm}"
+    spec.ios.source_files = "beeps/src/osx/*.{cpp,mm}"
+    spec.frameworks       = %w[OpenAL AVFoundation]
+
+    spec.subspec "STK" do |sub|
+      sub.source_files  = "beeps/vendor/stk/src/*.cpp"
+      sub.exclude_files = %w[Tcp Udp Socket Thread Mutex InetWv Rt].map {|s|
+        "beeps/vendor/stk/src/#{s}*.cpp"
+      }
+    end
+
+    spec.subspec "R8BrainFreeSrc" do |sub|
+      sub.source_files  = "beeps/vendor/r8brain-free-src/*.cpp"
+      sub.exclude_files = %w[example pffft_double/].map {|s|
+        "beeps/vendor/r8brain-free-src/#{s}*.cpp"
+      }
+    end
+
+    spec.subspec "Ext" do |ext|
+      ext.source_files = "beeps/ext/beeps/*.cpp"
+    end
+  end
+
+  s.subspec "Rays" do |spec|
+    spec    .source_files = "rays/src/*.cpp"
+    spec.osx.source_files = "rays/src/osx/*.{cpp,mm}"
+    spec.ios.source_files = "rays/src/ios/*.{cpp,mm}"
+    spec.ios.frameworks   = %w[GLKit MobileCoreServices AVFoundation]# ImageIO
+
+    spec.subspec "Clipper" do |sub|
+      sub.source_files = "rays/vendor/clipper/cpp/*.cpp"
+    end
+
+    spec.subspec "Poly2Tri" do |sub|
+      sub.source_files = "rays/vendor/poly2tri/poly2tri/**/*.cc"
+    end
+
+    spec.subspec "SplineLib" do |sub|
+      sub.source_files = "rays/vendor/splines-lib/Splines.cpp"
+    end
+
+    spec.subspec "Ext" do |ext|
+      ext.source_files = "rays/ext/rays/*.cpp"
+    end
+  end
+
+  s.subspec "Reflex" do |spec|
+    spec    .source_files = "reflex/src/*.cpp"
+    spec.osx.source_files = "reflex/src/osx/*.{cpp,mm}"
+    spec.ios.source_files = "reflex/src/ios/*.{cpp,mm}"
+    spec.ios.frameworks   = %w[CoreMotion]
+
+    spec.subspec "Box2D" do |sub|
+      sub.source_files = "reflex/vendor/box2d/src/**/*.cpp"
+    end
+
+    spec.subspec "Ext" do |ext|
+      ext.source_files = "reflex/ext/reflex/*.cpp"
+    end
+  end
 end

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.4

data/examples/hello.rb

@@ -1,4 +1,4 @@
-%w[xot rays reflex processing rubysketch]
+%w[xot rucy beeps rays reflex processing rubysketch]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 

data/lib/rubysketch/all.rb

@@ -1,9 +1,19 @@
-require 'forwardable'
+require 'beeps'
 require 'processing/all'
 
 require 'rubysketch/extension'
+require 'rubysketch/window'
 require 'rubysketch/helper'
 
 require 'rubysketch/sprite'
+require 'rubysketch/sound'
 require 'rubysketch/graphics_context'
 require 'rubysketch/context'
+
+
+module RubySketch
+
+  Vector = Processing::Vector
+  Image  = Processing::Image
+
+end# RubySketch

data/lib/rubysketch/context.rb

@@ -5,43 +5,103 @@ module RubySketch
 
     include GraphicsContext
 
+    Sound  = RubySketch::Sound
+    Sprite = RubySketch::Sprite
+
+    # @private
     def initialize(window)
       super
-      @sprites__ = window.add SpritesView.new
+      @layer__ = window.add_overlay SpriteLayer.new
     end
 
+    # Creates a new sprite and add it to physics engine.
+    #
+    # @overload createSprite(image: img)
+    #  pos: [0, 0], size: [image.width, image.height]
+    #  @param [Image] img sprite image
+    #
+    # @overload createSprite(x, y, image: img)
+    #  pos: [x, y], size: [image.width, image.height]
+    #  @param [Numeric] x   x of sprite position
+    #  @param [Numeric] y   y of sprite position
+    #  @param [Image]   img sprite image
+    #
+    # @overload createSprite(x, y, w, h)
+    #  pos(x, y), size: [w, h]
+    #  @param [Numeric] x x of sprite position
+    #  @param [Numeric] y y of sprite position
+    #  @param [Numeric] w width of sprite
+    #  @param [Numeric] h height of sprite
+    #
+    # @overload createSprite(x, y, w, h, image: img, offset: off)
+    #  pos: [x, y], size: [w, h], offset: [offset.x, offset.x]
+    #  @param [Numeric] x   x of sprite position
+    #  @param [Numeric] y   y of sprite position
+    #  @param [Numeric] w   width of sprite
+    #  @param [Numeric] h   height of sprite
+    #  @param [Image]   img sprite image
+    #  @param [Vector]  off offset of sprite image
+    #
     def createSprite(*args, **kwargs)
       addSprite Sprite.new(*args, **kwargs)
     end
 
+    # Adds the sprite to the physics engine.
+    #
+    # @param [Sprite] sprite sprite object
+    #
     def addSprite(sprite)
-      @sprites__.add sprite.getInternal__ if sprite
+      @layer__.add sprite.getInternal__ if sprite
       sprite
     end
 
+    # Removes the sprite from the physics engine.
+    #
+    # @param [Sprite] sprite sprite object
+    #
     def removeSprite(sprite)
-      @sprites__.remove sprite.getInternal__ if sprite
+      @layer__.remove sprite.getInternal__ if sprite
       sprite
     end
 
+    # @private
+    def loadSound(path)
+      Sound.load path
+    end
+
+    # Sets gravity for the physics engine.
+    #
+    # @overload gravity(vec)
+    #  @param [Vector] vec gracity vector
+    #
+    # @overload gravity(ary)
+    #  @param [Array<Numeric>] ary gravityX, gravityY
+    #
+    # @overload gravity(x, y)
+    #  @param [Numeric] x x of gravity vector
+    #  @param [Numeric] y y of gracity vector
+    #
     def gravity(*args)
       x, y =
-        case args
-        when Processing::Vector then args.array
+        case arg = args.first
+        when Vector then arg.array
+        when Array  then arg
         else args
         end
-      @sprites__.then do |v|
-        v.gravity x * v.meter, y * v.meter
-      end
+      @layer__.gravity x, y
     end
 
-    class SpritesView < Reflex::View
-      def on_draw(e)
-        e.block
-      end
+  end# Context
+
+
+  # @private
+  class SpriteLayer < Reflex::View
+
+    def on_draw(e)
+      e.block
     end
 
-  end# Context
+  end# SpriteLayer
 
 
 end# RubySketch

data/lib/rubysketch/extension.rb

@@ -1,6 +1,7 @@
 module RubySketch
 
 
+  # @private
   module Extension
 
     module_function

data/lib/rubysketch/graphics_context.rb

@@ -3,34 +3,27 @@ module RubySketch
 
   module GraphicsContext
 
+    # Draws one or more sprites.
+    #
+    # @param [Array<Sprite>] sprites
+    #
     def sprite(*sprites)
       sprites.flatten! if sprites.first&.is_a? Array
       sprites.each do |sp|
         v = sp.getInternal__
-        f, angle, img, offset = v.frame, v.angle, sp.image, sp.offset
+        f, angle = v.frame, v.angle
         if angle == 0
-          drawSprite__ f.x, f.y, f.w, f.h, img, offset
+          sp.on_draw__ f.x, f.y, f.w, f.h
         else
           pushMatrix do
             translate f.x, f.y
             rotate radians(angle)
-            drawSprite__ 0, 0, f.w, f.h, img, offset
+            sp.on_draw__ 0, 0, f.w, f.h
           end
         end
       end
     end
 
-    def drawSprite__(x, y, w, h, img, offset)
-      if img && offset
-        ox, oy = offset
-        copy img, ox, oy, w, h, x, y, w, h
-      elsif img
-        image img, x, y
-      else
-        rect x, y, w, h
-      end
-    end
-
   end# GraphicsContext
 
 

data/lib/rubysketch/helper.rb

@@ -1,3 +1,4 @@
+# @private
 class Rays::Point
   def toVector()
     Processing::Vector.new x, y, z

data/lib/rubysketch/sound.rb

@@ -0,0 +1,86 @@
+module RubySketch
+
+
+  # @private
+  class Sound
+
+    # @private
+    def initialize(sound)
+      @sound = sound
+    end
+
+    # Play sound.
+    #
+    def play()
+      old = @player
+      @player = @sound.play
+      old&.stop
+      true
+    end
+
+    # Pause sound.
+    #
+    def pause()
+      return false unless @player
+      @player.pause
+      true
+    end
+
+    # Stop sound.
+    #
+    def stop()
+      return false unless @player
+      @player.stop
+      @player = nil
+      true
+    end
+
+    # Returns whether the sound is playing or not.
+    #
+    # @return [Boolean] playing or not
+    #
+    def playing?()
+      @player ? @player.playing? : false
+    end
+
+    # Returns whether the sound is paused or not.
+    #
+    # @return [Boolean] paused or not
+    #
+    def paused?()
+      @player ? @player.paused? : false
+    end
+
+    # Returns whether the sound is stopped or not.
+    #
+    # @return [Boolean] stopped or not
+    #
+    def stopped?()
+      @player ? @player.stopped? : true
+    end
+
+    # Save the sound data to a file.
+    #
+    # @param [String] path file path
+    #
+    # @return [Sound] self
+    #
+    def save(path)
+      @sound.save path
+    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
+
+  end# Sound
+
+
+end# RubySketch