rubysketch 0.5.3 → 0.5.5

data/lib/rubysketch/window.rb

@@ -1,6 +1,7 @@
 module RubySketch
 
 
+  # @private
   class Window < Processing::Window
 
     def on_update(e)

data/pod.rake

@@ -19,15 +19,17 @@ task :setup
 
 repos.each do |repo, ver|
   rakefile = "#{repo}/Rakefile"
-  opts     = {
-    depth:  1,
-    branch: (ENV['RUBYSKETCH_BRANCH'] || "v#{ver}")
-  }.map {|k, v| "--#{k} #{v}"}.join ' '
+  opts     = [
+    '-c advice.detachedHead=false',
+    '--no-single-branch',
+    '--depth 1',
+    "--branch #{ENV['RUBYSKETCH_BRANCH'] || ('v' + ver)}"
+  ]
 
   task :setup => rakefile
 
   file rakefile do
-    sh %( git clone #{opts} #{github}/#{repo} )
+    sh %( git clone #{opts.join ' '} #{github}/#{repo} )
     sh %( cd #{repo} && VENDOR_NOCOMPILE=1 rake vendor erb )
   end
 end

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.33'
-  s.add_runtime_dependency 'rucy',       '~> 0.1.33'
-  s.add_runtime_dependency 'beeps',      '~> 0.1.33'
-  s.add_runtime_dependency 'rays',       '~> 0.1.33'
-  s.add_runtime_dependency 'reflexion',  '~> 0.1.33'
-  s.add_runtime_dependency 'processing', '~> 0.5.3'
+  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.35'
+  s.add_runtime_dependency 'reflexion',  '~> 0.1.36'
+  s.add_runtime_dependency 'processing', '~> 0.5.6'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/test/helper.rb

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

data/test/test_sprite.rb

@@ -1,23 +1,238 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 
 class TestSprite < Test::Unit::TestCase
 
+  RS = RubySketch
+
   def sprite(*args, **kwargs)
-    RubySketch::Sprite.new(*args, **kwargs)
+    RS::Sprite.new(*args, **kwargs)
   end
 
   def vec(*args, **kwargs)
-    Processing::Vector.new(*args, **kwargs)
+    RS::Vector.new(*args, **kwargs)
+  end
+
+  def image(w, h)
+    RS::Image.new Rays::Image.new(w, h)
   end
 
   def test_initialize()
-    assert_equal 0,         sprite.x
-    assert_equal 0,         sprite.y
-    assert_equal vec(0, 0), sprite.pos
+    assert_equal vec(0, 0), sprite            .pos
+    assert_equal vec(1, 2), sprite(1, 2)      .pos
+    assert_equal vec(1, 2), sprite(1, 2, 3, 4).pos
+
+    assert_equal vec(0, 0), sprite                                .size
+    assert_equal vec(3, 4), sprite(1, 2, 3, 4)                    .size
+    assert_equal vec(5, 6), sprite(            image: image(5, 6)).size
+    assert_equal vec(5, 6), sprite(1, 2,       image: image(5, 6)).size
+    assert_equal vec(3, 4), sprite(1, 2, 3, 4, image: image(5, 6)).size
+
+    assert_equal nil,    sprite                    .image
+    assert_equal [1, 2], sprite(image: image(1, 2)).image.size
+
+    assert_equal nil,       sprite.offset
+    assert_equal vec(1, 2), sprite(offset:    [1, 2]).offset
+    assert_equal vec(1, 2), sprite(offset: vec(1, 2)).offset
+
+    assert_raise {sprite 0, 0, -1, 0}
+    assert_raise {sprite 0, 0, 0, -1}
+  end
+
+  def test_position()
+    s = sprite
+    assert_equal vec(0, 0), s.pos
+
+    s.pos = vec(1, 2)
+    assert_equal vec(1, 2), s.pos
+
+    s.pos = [3, 4]
+    assert_equal vec(3, 4), s.pos
+  end
+
+  def test_xy()
+    s = sprite
+    assert_equal     0,     s.x
+    assert_equal vec(0, 0), s.pos
+
+    s.x = 1
+    assert_equal     1,     s.x
+    assert_equal vec(1, 0), s.pos
+
+    s.y = 2
+    assert_equal        2,  s.y
+    assert_equal vec(1, 2), s.pos
+  end
+
+  def test_size()
+    assert_equal vec(0, 0), sprite                    .size
+    assert_equal vec(1, 0), sprite(0, 0, 1)           .size
+    assert_equal vec(1, 2), sprite(0, 0, 1, 2)        .size
+    assert_equal vec(3, 4), sprite(image: image(3, 4)).size
+  end
+
+  def test_wh()
+    assert_equal 1, sprite(0, 0, 1, 2).width
+    assert_equal 2, sprite(0, 0, 1, 2).height
+  end
+
+  def test_angle()
+    s = sprite
+    assert_equal 0,             s.angle
+
+    s.angle = Math::PI
+    assert_in_epsilon Math::PI, s.angle
+  end
+
+  def test_pivot()
+    s = sprite
+    assert_each_in_epsilon [0, 0],     s.pivot
+
+    s.pivot =              [0.1, 0.2]
+    assert_each_in_epsilon [0.1, 0.2], s.pivot
+  end
+
+  def test_velocity()
+    s = sprite
+    assert_equal vec(0, 0), s.vel
+
+    s.vel = vec(1, 2)
+    assert_equal vec(1, 2), s.vel
+
+    s.vel = [3, 4]
+    assert_equal vec(3, 4), s.vel
+  end
+
+  def test_vxvy()
+    s = sprite
+    assert_equal     0,     s.vx
+    assert_equal vec(0, 0), s.vel
+
+    s.vx = 1
+    assert_equal     1,     s.vx
+    assert_equal vec(1, 0), s.vel
+
+    s.vy = 2
+    assert_equal        2,  s.vy
+    assert_equal vec(1, 2), s.vel
+  end
+
+  def test_image()
+    s = sprite
+    assert_equal nil,    s.image
+
+    s.image = image(1, 2)
+    assert_equal [1, 2], s.image.size
+
+    s.image = image(3, 4)
+    assert_equal [3, 4], s.image.size
+
+    s.image = nil
+    assert_equal nil,    s.image
+  end
+
+  def test_offset()
+    s = sprite
+    assert_equal nil,       s.offset
+
+    s.offset =      [1, 2]
+    assert_equal vec(1, 2), s.offset
+
+    s.offset =   vec(3, 4)
+    assert_equal vec(3, 4), s.offset
+
+    s.offset =      [5]
+    assert_equal vec(5, 0), s.offset
+
+    s.offset =      []
+    assert_equal vec(0, 0), s.offset
+
+    s.offset =   nil
+    assert_equal nil,       s.offset
+
+    assert_raise(ArgumentError) {s.offset = 1}
+  end
+
+  def test_oxoy()
+    s = sprite
+    assert_equal    [0, 0], [s.ox, s.oy]
+    assert_equal    nil,    s.offset
+
+    s.ox = 1
+    assert_equal    [1, 0], [s.ox, s.oy]
+    assert_equal vec(1, 0), s.offset
+
+    s = sprite
+
+    s.oy = 2
+    assert_equal    [0, 2], [s.ox, s.oy]
+    assert_equal vec(0, 2), s.offset
+
+    s.offset = nil
+    assert_equal    [0, 0], [s.ox, s.oy]
+    assert_equal    nil,    s.offset
+  end
+
+  def test_dynamic?()
+    s = sprite
+    assert_equal false, s.dynamic?
+
+    s.dynamic = true
+    assert_equal true,  s.dynamic?
+
+    s.dynamic = false
+    assert_equal false, s.dynamic?
+  end
+
+  def test_density()
+    s = sprite
+    assert_equal 1, s.dens
+
+    s.dens = 2
+    assert_equal 2, s.dens
+  end
+
+  def test_friction()
+    s = sprite
+    assert_equal 0, s.fric
+
+    s.fric = 1
+    assert_equal 1, s.fric
+  end
+
+  def test_restitution()
+    s = sprite
+    assert_equal 0, s.rest
+
+    s.rest = 1
+    assert_equal 1, s.rest
+  end
+
+  def test_blocks()
+    s = sprite
+    v = s.instance_variable_get :@view__
+    assert_nil v.update
+    assert_nil v.contact
+    assert_nil v.will_contact
+
+    s.update {}
+    assert_not_nil v.update
+    assert_nil     v.contact
+    assert_nil     v.will_contact
+
+    s.contact {}
+    assert_not_nil v.update
+    assert_not_nil v.contact
+    assert_nil     v.will_contact
+
+    s.contact? {}
+    assert_not_nil v.update
+    assert_not_nil v.contact
+    assert_not_nil v.will_contact
+  end
+
+  def test_inspect()
+    assert_match %r|#<RubySketch::Sprite:0x\w{16}>|, sprite.inspect
   end
 
 end# TestSprite

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2023-05-08 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.33
+        version: 0.1.35
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.35
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.35
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.35
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.36
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.36
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.35
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.35
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.36
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.36
 - !ruby/object:Gem::Dependency
   name: processing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -156,13 +156,13 @@ files:
 - RubySketch.podspec
 - VERSION
 - examples/hello.rb
+- examples/physics.rb
+- examples/sprite.rb
 - lib/rubysketch.rb
 - lib/rubysketch/all.rb
 - lib/rubysketch/context.rb
 - lib/rubysketch/extension.rb
-- lib/rubysketch/graphics_context.rb
 - lib/rubysketch/helper.rb
-- lib/rubysketch/sound.rb
 - lib/rubysketch/sprite.rb
 - lib/rubysketch/window.rb
 - pod.rake
@@ -170,7 +170,6 @@ 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,5 +195,4 @@ 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

data/lib/rubysketch/graphics_context.rb

@@ -1,37 +0,0 @@
-module RubySketch
-
-
-  module GraphicsContext
-
-    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
-        if angle == 0
-          drawSprite__ f.x, f.y, f.w, f.h, img, offset
-        else
-          pushMatrix do
-            translate f.x, f.y
-            rotate radians(angle)
-            drawSprite__ 0, 0, f.w, f.h, img, offset
-          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
-
-
-end# RubySketch

data/lib/rubysketch/sound.rb

@@ -1,55 +0,0 @@
-module RubySketch
-
-
-  class Sound
-
-    # @private
-    def initialize(sound)
-      @sound = sound
-    end
-
-    def play()
-      old = @player
-      @player = @sound.play
-      old&.stop
-      true
-    end
-
-    def pause()
-      return false unless @player
-      @player.pause
-      true
-    end
-
-    def stop()
-      return false unless @player
-      @player.stop
-      @player = nil
-      true
-    end
-
-    def playing?()
-      @player ? @player.playing? : false
-    end
-
-    def paused?()
-      !playing? && !stopped?
-    end
-
-    def stopped?()
-      @player ? @player.stopped? : true
-    end
-
-    def save(path)
-      @sound.save path
-    end
-
-    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

data/test/test_sound.rb

@@ -1,90 +0,0 @@
-# -*- 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()
-    s = sound
-    assert_equal [false, false, true],  [s.playing?, s.paused?, s.stopped?]
-    s.play
-    assert_equal [true,  false, false], [s.playing?, s.paused?, s.stopped?]
-  end
-
-  def test_pause()
-    s = sound
-    s.play
-    assert_equal [true,  false, false], [s.playing?, s.paused?, s.stopped?]
-    s.pause
-    assert_equal [false, true,  false], [s.playing?, s.paused?, s.stopped?]
-  end
-
-  def test_stop()
-    s = sound
-    s.play
-    assert_equal [true,  false, false], [s.playing?, s.paused?, s.stopped?]
-    s.stop
-    assert_equal [false, false, true],  [s.playing?, s.paused?, s.stopped?]
-  end
-
-  def test_play_end_then_stop()
-    s = sound
-    s.play
-    assert_equal [true,  false, false], [s.playing?, s.paused?, s.stopped?]
-    sleep 0.2
-    assert_equal [false, false, true],  [s.playing?, s.paused?, s.stopped?]
-  end
-
-  def test_play_after_pause()
-    s = sound
-    s.play
-    s.pause
-    assert_equal [false, true,  false], [s.playing?, s.paused?, s.stopped?]
-    s.play
-    assert_equal [true,  false, false], [s.playing?, s.paused?, s.stopped?]
-  end
-
-  def test_stop_after_pause()
-    s = sound
-    s.play
-    s.pause
-    assert_equal [false, true,  false], [s.playing?, s.paused?, s.stopped?]
-    s.stop
-    assert_equal [false, false, true],  [s.playing?, s.paused?, s.stopped?]
-  end
-
-  def test_save()
-    s = sound
-
-    File.delete PATH
-    assert_false File.exist? PATH
-
-    s.save PATH
-    assert_true  File.exist? PATH
-  end
-
-  def test_load()
-    assert_nothing_raised {sound.play}
-  end
-
-end# TestSound