rubysketch 0.5.28 → 0.5.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a27c613bb9a268367ce581b9b4caa9e89d546f763680ec8b9b408bdadaed0c16
-  data.tar.gz: b0503752020cc76e453922183b34c78d049c2c3b4665438cc024286cadf679c5
+  metadata.gz: ee4bec833e545d64ac7822c59d7b52e92a507ac23d909fd6143f15dace1ed8c4
+  data.tar.gz: 8151adda147364200efe13a96b2fce82b00c01fa25cb84c69f4de6ba5d9a6a4d
 SHA512:
-  metadata.gz: 43c0549b9f6b9381351dad8204a389cf96e80da008d9b0c4a656ad67749a5736a9aff196378905cd42ef012df46e09a49c16f6176882a01cf292cab03056e315
-  data.tar.gz: a66d891ae5a36ba98adb5611f5c5ed7c79f517dcf12a44d2debdcd175dbc2e7e4a8673358ea532712d5a02858f72452139677eb632913f390b6bfbf64ab27c8d
+  metadata.gz: d85c90842181d311cee151604fc1c38edc6d5b2d1caba4d3c9f206f512d98b5f93ced450f8ec6aaa760781bdfc61c8d92644cdc2f2b4811c63b7f81f70091ca2
+  data.tar.gz: 94978e5eadf6fbd607c4762adec4049df1930123be74c5cee46dfb582c0ec76f907f8a3e214cc162d779a9b96bc12a4904cd054f60ecae921db3abdb57a5ff0c

data/ChangeLog.md

@@ -1,6 +1,23 @@
 # rubysketch ChangeLog
 
 
+## [v0.5.31] - 2023-10-25
+
+- Add toon.rb
+
+
+## [v0.5.30] - 2023-08-24
+
+- Fix failed test
+
+
+## [v0.5.29] - 2023-08-23
+
+- Add Sprite#contact_end()
+- Sprite.new() can take 'physics:' keyword parameter
+- Fix that calling clearInterval() inside interval timer block would be ignored
+
+
 ## [v0.5.28] - 2023-07-30
 
 - Update dependencies
@@ -8,7 +25,7 @@
 
 ## [v0.5.27] - 2023-07-30
 
-- add vibrate()
+- Add vibrate()
 
 
 ## [v0.5.26] - 2023-07-26
@@ -46,12 +63,12 @@
 
 ## [v0.5.20] - 2023-07-09
 
-- fix that calling mousePressed() without block removes mousePressed block
+- Fix that calling mousePressed() without block removes mousePressed block
 
 
 ## [v0.5.19] - 2023-06-27
 
-- add loadSound() and RubySketch::Sound class
+- Add loadSound() and RubySketch::Sound class
 
 
 ## [v0.5.18] - 2023-06-22
@@ -93,8 +110,8 @@
 
 ## [v0.5.11] - 2023-05-26
 
-- add left, top, right, and bottom accessors to Sprite class
-- add show(), hide(), and hidden?() to Sprite class
+- Add left, top, right, and bottom accessors to Sprite class
+- Add show(), hide(), and hidden?() to Sprite class
 
 
 ## [v0.5.10] - 2023-05-21
@@ -161,19 +178,19 @@
 
 ## [v0.5.2] - 2023-03-02
 
-- depend to processing-0.5.2 gem
+- Depend to processing-0.5.2 gem
 
 
 ## [v0.5.1] - 2023-03-01
 
-- fix bugs
+- Fix bugs
 
 
 ## [v0.5.0] - 2023-02-09
 
-- add Sprite class
+- Add Sprite class
 
 
 ## [v0.4.0] - 2023-02-08
 
-- first version
+- First version

data/VERSION

@@ -1 +1 @@
-0.5.28
+0.5.31

data/examples/toon.rb

@@ -0,0 +1,181 @@
+%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
+
+
+class Canvas < Sprite
+
+  def initialize(width, height, scale: 1)
+    super 0, 0, width, height
+
+    @width, @height, @scale = width, height, scale
+    @images, @frame         = [], 0
+
+    brushSize 1
+    brushColor 0, 0, 0, 255
+
+    self.draw do
+      drawImage self.image, 0, 0, self.width * self.scale, self.height * self.scale
+    end
+
+    self.mousePressed  {brushStarted self.mouseX / self.scale, self.mouseY / self.scale}
+    self.mouseReleased {brushEnded   self.mouseX / self.scale, self.mouseY / self.scale}
+    self.mouseDragged  {brushMoved   self.mouseX / self.scale, self.mouseY / self.scale}
+  end
+
+  attr_reader :width, :height, :scale
+
+  def image()
+    @images.insert @frame, createImage(width, height) if @frame >= @images.size
+    @images[@frame]
+  end
+
+  def play()
+    setInterval 0.2, id: :play do
+      @frame += 1
+      @frame = 0 if @frame >= @images.size
+    end
+  end
+
+  def stop()
+    clearInterval :play
+  end
+
+  def nextFrame()
+    @frame += 1
+  end
+
+  def prevFrame()
+    @frame -= 1
+    @frame = 0 if @frame < 0
+  end
+
+  def brushSize(size)
+    @brushSize = size
+  end
+
+  def brushColor(r, g, b, a = 255)
+    @brushColor = [r, g, b, a]
+  end
+
+  def drawPoint(x, y)
+    image.beginDraw do |g|
+      g.noFill
+      g.strokeWeight @brushSize
+      g.stroke *@brushColor
+      g.point x, y
+    end
+  end
+
+  def drawLine(x1, y1, x2, y2)
+    image.beginDraw do |g|
+      g.noFill
+      g.strokeWeight @brushSize
+      g.stroke *@brushColor
+      g.line x1, y1, x2, y2
+    end
+  end
+
+  def brushStarted(x, y)
+    drawPoint x, y
+    @prevPoint = [x, y]
+  end
+
+  def brushEnded(x, y)
+    @prevPoint = nil
+  end
+
+  def brushMoved(x, y)
+    return unless @prevPoint
+    drawLine *@prevPoint, x, y
+    @prevPoint = [x, y]
+  end
+
+  private
+
+  def createImage(w, h)
+    createGraphics(w, h).tap do |g|
+      g.beginDraw do
+        g.background 255
+      end
+    end
+  end
+
+end# Canvas
+
+
+class Button < Sprite
+
+  def initialize(label, x = 0, y = 0, w = 100, h = 44, rgb: [200, 200, 200], &block)
+    super x, y, w, h
+
+    draw do
+      round, offset = 12, 8
+      ww, hh        = self.w, self.h - offset
+      yy            = mousePressed ? 6 : 0
+
+      fill *rgb.map {_1 - 32}
+      rect 0, offset, ww, hh, round
+
+      fill *rgb
+      rect 0, yy, ww, hh, round
+
+      textAlign CENTER, CENTER
+      fill 0
+      text label, 0, yy, ww, hh
+    end
+
+    mouseClicked do
+      block.call
+    end
+  end
+
+end# Button
+
+
+class App
+
+  MARGIN = 10
+
+  def initialize()
+    setTitle 'Toon!'
+    size 800, 600
+    noStroke
+
+    @canvas  = Canvas.new 160, 120, scale: 3
+    @buttons = [
+      Button.new('Play',      rgb: [240, 180, 180]) {@canvas.play},
+      Button.new('Stop',      rgb: [240, 180, 180]) {@canvas.stop},
+      Button.new('Next',      rgb: [180, 240, 180]) {@canvas.nextFrame},
+      Button.new('Previous',  rgb: [180, 240, 180]) {@canvas.prevFrame},
+      Button.new('Brush 1px', rgb: [180, 180, 240]) {@canvas.brushSize 1},
+      Button.new('Brush 3px', rgb: [180, 180, 240]) {@canvas.brushSize 3},
+      Button.new('Brush 5px', rgb: [180, 180, 240]) {@canvas.brushSize 5},
+    ]
+    @sprites = [@canvas, *@buttons]
+    @sprites.each {addSprite _1}
+  end
+
+  def draw()
+    background 100
+    sprite *@sprites
+  end
+
+  def resized()
+    @buttons.first.pos = [MARGIN, MARGIN]
+    @buttons.each_cons(2) {_2.pos = [MARGIN, _1.bottom + MARGIN]}
+
+    @canvas.pos    = [@buttons.first.right + MARGIN, MARGIN]
+    @canvas.right  = windowWidth
+    @canvas.bottom = windowHeight
+  end
+
+end# App
+
+
+setup         {$app = App.new}
+draw          {$app.draw}
+windowResized {$app.resized if $app}

data/lib/rubysketch/context.rb

@@ -59,8 +59,8 @@ module RubySketch
       now, nextTime = Time.now.to_f, startTime + seconds
       nextTime      = now if nextTime < now
       setTimeout__ id, nextTime do
-        block.call(*args)
         setInterval__ id, nextTime, seconds, args, &block
+        block.call(*args)
       end
     end
 

data/lib/rubysketch/sprite.rb

@@ -37,7 +37,7 @@ module RubySketch
     #
     def initialize(
       x = 0, y = 0, w = nil, h = nil, image: nil, offset: nil,
-      context: nil)
+      physics: true, context: nil)
 
       w ||= (image&.width  || 0)
       h ||= (image&.height || 0)
@@ -47,7 +47,7 @@ module RubySketch
       @context__ = context || Context.context__
       @view__    = SpriteView.new(
         self, x: x, y: y, w: w, h: h,
-        static: true, density: 1, friction: 0, restitution: 0,
+        physics: physics, density: 1, friction: 0, restitution: 0,
         back: :white)
 
       self.image  = image  if image
@@ -842,6 +842,21 @@ module RubySketch
     #
     def contact(&block)
       @view__.contact = block if block
+      nil
+    end
+
+    # Defines contact_end block.
+    #
+    # @example Call jumping() when the player sprite leaves the ground sprite
+    #  playerSprite.contact_end do |o|
+    #    jumping if o == groundSprite
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def contact_end(&block)
+      @view__.contact_end = block if block
+      nil
     end
 
     # Defines contact? block.
@@ -855,6 +870,7 @@ module RubySketch
     #
     def contact?(&block)
       @view__.will_contact = block if block
+      nil
     end
 
     # @private
@@ -871,13 +887,13 @@ module RubySketch
     attr_accessor :update,
       :mousePressed, :mouseReleased, :mouseMoved, :mouseDragged, :mouseClicked,
       :touchStarted, :touchEnded, :touchMoved,
-      :contact, :will_contact
+      :contact, :contact_end, :will_contact
 
     attr_reader :sprite, :touches
 
-    def initialize(sprite, *a, **k, &b)
+    def initialize(sprite, *args, physics:, **kwargs, &block)
       @sprite = sprite
-      super(*a, **k, &b)
+      super(*args, **kwargs, &block)
 
       @error            = nil
       @pointer          = nil
@@ -885,6 +901,8 @@ module RubySketch
       @pointersPressed  = []
       @pointersReleased = []
       @touches          = []
+
+      self.static = true if physics
     end
 
     def mouseX()
@@ -957,8 +975,15 @@ module RubySketch
     end
 
     def on_contact_begin(e)
+      return unless @contact
+      v = e.view
+      call_block @contact, v.sprite if v.respond_to?(:sprite)
+    end
+
+    def on_contact_end(e)
+      return unless @contact_end
       v = e.view
-      call_block @contact, v.sprite, e.action if v.respond_to?(:sprite)
+      call_block @contact_end, v.sprite if v.respond_to?(:sprite)
     end
 
     def will_contact?(v)
@@ -997,7 +1022,7 @@ module RubySketch
     end
 
     def mouseClicked?()
-      return false unless @pointer && @pointerDownStartPos
+      return false unless parent && @pointer && @pointerDownStartPos
       [to_screen(@pointer.pos), @pointerDownStartPos]
         .map {|pos| Rays::Point.new pos.x, pos.y, 0}
         .then {|pos, startPos| (pos - startPos).length < 3}

data/rubysketch.gemspec

@@ -26,11 +26,11 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 3.0.0'
 
   s.add_runtime_dependency 'xot',        '~> 0.1.39'
-  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.51'
-  s.add_runtime_dependency 'processing', '~> 0.5.27'
+  s.add_runtime_dependency 'rucy',       '~> 0.1.40'
+  s.add_runtime_dependency 'beeps',      '~> 0.1.42'
+  s.add_runtime_dependency 'rays',       '~> 0.1.44'
+  s.add_runtime_dependency 'reflexion',  '~> 0.1.52'
+  s.add_runtime_dependency 'processing', '~> 0.5.28'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/test/test_sprite.rb

@@ -272,21 +272,31 @@ class TestSprite < Test::Unit::TestCase
     v = s.instance_variable_get :@view__
     assert_nil v.update
     assert_nil v.contact
+    assert_nil v.contact_end
     assert_nil v.will_contact
 
     s.update {}
     assert_not_nil v.update
     assert_nil     v.contact
+    assert_nil     v.contact_end
     assert_nil     v.will_contact
 
     s.contact {}
     assert_not_nil v.update
     assert_not_nil v.contact
+    assert_nil     v.contact_end
+    assert_nil     v.will_contact
+
+    s.contact_end {}
+    assert_not_nil v.update
+    assert_not_nil v.contact
+    assert_not_nil v.contact_end
     assert_nil     v.will_contact
 
     s.contact? {}
     assert_not_nil v.update
     assert_not_nil v.contact
+    assert_not_nil v.contact_end
     assert_not_nil v.will_contact
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.5.28
+  version: 0.5.31
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-30 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -30,70 +30,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.39
+        version: 0.1.40
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.39
+        version: 0.1.40
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.41
+        version: 0.1.42
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.41
+        version: 0.1.42
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.43
+        version: 0.1.44
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.43
+        version: 0.1.44
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.51
+        version: 0.1.52
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.51
+        version: 0.1.52
 - !ruby/object:Gem::Dependency
   name: processing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.27
+        version: 0.5.28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.27
+        version: 0.5.28
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +158,7 @@ files:
 - examples/hello.rb
 - examples/physics.rb
 - examples/sprite.rb
+- examples/toon.rb
 - lib/rubysketch.rb
 - lib/rubysketch/all.rb
 - lib/rubysketch/context.rb