rubysketch 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aae68b50056538ec9f1de57091af05176af8b629331d40e16b640de83d4a610
-  data.tar.gz: 8929fd46a62eeb5457f386a72b255d3a6267fc1380bb29aabe9b093a722ecb34
+  metadata.gz: 11852910038d162e39601eb01056ee3b4161c4ac0576ac93aef87e25eed557ee
+  data.tar.gz: 6d978cf96d2e8d32df00477e77f03c645840bb70985f74e5d254ff5f47f5cd4c
 SHA512:
-  metadata.gz: fe6b88ffc3d9ee14f6b9206df4b554d498cd6a4b5b13a21baf8a6b0cfcebec4888322d12f6cee09829cc7a1038ad9ad2854945d5bb4e8706337bbfa310c113ab
-  data.tar.gz: 56dac7438fb09ed3d8164e390e44dc785be289e6c4a4e5c3b9550fd5363c87f0a5a05f94806b6f68e691019e9297e2be6710435c5b0cafa35b2527ca1d7d1124
+  metadata.gz: '0593125c1c609a1f1c38eb45631f558fcb525db85792335524a37718d306c770d12f12012d3ddf5752080318070eb139d8ece676fb436f5a10abd88af02b2c8b'
+  data.tar.gz: 2d78202eb29f9541886efc54ec44142caf1cbd192ff58e51a26af5d3a0b8cb242c80be05171013f215b698a01cd70b9878fb10a2364abb4259402c48f6ea8475

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,29 @@
 # rubysketch ChangeLog
 
 
+## [v0.5.5] - 2023-05-08
+
+- Add Sprite#draw()
+- Add Sprite#angle accessor
+- Add Sprite#pivot accessor
+- Add Sprite#ox and Sprite#oy
+- Add mousePressed, mouseReleased, mouseMoved, mouseDragged, mouseClicked, touchStarted, touchEnded, and touchMoved to Sprite class
+- Add inspect() to classes
+- Alias draw methods
+- Sprite has density 1 by default
+- Sprite is static by deault
+- Add sprite.rb and physics.rb as an example
+- Delete Sound class
+- Remove wall collision by default
+
+
+## [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

data/RubySketch.podspec

@@ -23,11 +23,15 @@ Pod::Spec.new do |s|
   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/Box2D
+    #{root}/reflex/vendor/box2d/include
+    #{root}/reflex/vendor/box2d/src
     ${PODS_ROOT}/CRuby/CRuby/include
   ]
 
@@ -63,16 +67,25 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "Beeps" do |spec|
-    spec.source_files = "beeps/src/*.cpp"
-    spec.frameworks   = %w[OpenAL]
+    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|
+      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
@@ -108,7 +121,7 @@ Pod::Spec.new do |s|
     spec.ios.frameworks   = %w[CoreMotion]
 
     spec.subspec "Box2D" do |sub|
-      sub.source_files = "reflex/vendor/Box2D/Box2D/Box2D/**/*.cpp"
+      sub.source_files = "reflex/vendor/box2d/src/**/*.cpp"
     end
 
     spec.subspec "Ext" do |ext|

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.5

data/examples/physics.rb

@@ -0,0 +1,24 @@
+%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)}
+
+require 'rubysketch'
+using RubySketch
+
+noStroke
+gravity 0, 1000
+
+sprites = []
+ground  = createSprite 0, height - 10, width, 10
+
+draw do
+  background 100
+  sprite *sprites, ground
+end
+
+mousePressed do
+  sp             = createSprite mouseX, mouseY, 20, 20
+  sp.dynamic     = true
+  sp.restitution = 0.5
+  sprites << sp
+end

data/examples/sprite.rb

@@ -0,0 +1,47 @@
+%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)}
+
+require 'rubysketch'
+using RubySketch
+
+sp = createSprite 100, 100, 50, 50
+sp.angle += Math::PI * 0.2
+
+red = 0
+
+sp.update do
+  red = (red + 1) % 255
+end
+
+sp.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]
+end
+
+sp.mouseReleased do
+  p [:released, sp.mouseX, sp.mouseY, sp.mouseButton]
+end
+
+sp.mouseMoved do
+  p [:moved, sp.mouseX, sp.mouseY, sp.pmouseX, sp.pmouseY]
+end
+
+sp.mouseDragged do
+  p [:dragged, sp.mouseX, sp.mouseY, sp.pmouseX, sp.pmouseY]
+end
+
+sp.mouseClicked do
+  p [:clicked, sp.mouseX, sp.mouseY, sp.mouseButton]
+end
+
+draw do
+  background 0
+  sprite sp
+end

data/lib/rubysketch/all.rb

@@ -1,4 +1,3 @@
-require 'forwardable'
 require 'beeps'
 require 'processing/all'
 
@@ -7,6 +6,12 @@ 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

@@ -3,49 +3,152 @@ module RubySketch
 
   class Context < Processing::Context
 
-    include GraphicsContext
+    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)
+      addSprite Sprite.new(*args, **kwargs, context: self)
     end
 
+    # Adds the sprite to the physics engine.
+    #
+    # @param [Sprite] sprite sprite object
+    #
+    # @return [Sprite] added sprite
+    #
     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
+    #
+    # @return [Sprite] removed sprite
+    #
     def removeSprite(sprite)
-      @sprites__.remove sprite.getInternal__ if sprite
+      @layer__.remove sprite.getInternal__ if sprite
       sprite
     end
 
-    def loadSound(path)
-      Sound.load path
+    # Draws one or more sprites.
+    #
+    # @param [Array<Sprite>] sprites
+    #
+    # @return [nil] nil
+    #
+    def sprite(*sprites)
+      sprites.flatten! if sprites.first&.is_a? Array
+      sprites.each do |sp|
+        view, draw = sp.getInternal__, sp.instance_variable_get(:@drawBlock__)
+        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
+            rotate fromDegrees__ degrees
+            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
+            rotate fromDegrees__ degrees
+            translate      -pivot.x * f.w,      -pivot.y * f.h
+            drawSprite__ sp, 0, 0, f.w, f.h
+          end
+        end
+      end
+      nil
+    end
+
+    alias drawSprite sprite
+
+    # @private
+    def drawSprite__(sp, x, y, w, h)
+      img, off = sp.image, sp.offset
+      if img && off
+        copy img, off.x, off.y, w, h, x, y, w, h
+      elsif img
+        image img, x, y
+      else
+        rect x, y, w, h
+      end
     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 initialize(*a, **k, &b)
+      super
+      remove wall
     end
 
-  end# Context
+    def on_draw(e)
+      e.block
+    end
+
+  end# SpriteLayer
 
 
 end# RubySketch

data/lib/rubysketch/extension.rb

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

data/lib/rubysketch/helper.rb

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