rubysketch 0.5.30 → 0.5.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbbb972756576a0aa6c5dfc70ba1682776dd0f95c1bc0d0ec20a06dce0e1bd01
-  data.tar.gz: 7ce985bbaee1c81f3b20dea0392cd2b5459af3e520eb8552840306d32ba03adb
+  metadata.gz: 96ae60d6cddfaf8e77134a40cd35024a252278bc9b87755eb235ad6ef96151b5
+  data.tar.gz: c3bb6f454cfb2d5f6c9f872571842a82affe84e08bde8d7b68e4a95b46dd65a9
 SHA512:
-  metadata.gz: f0f53b5fb3464b8cc6e0f9ff3b3c4d76d465816a5c6414b99a3d5724ca9c20411c37091f8a2b9ed850e05b863c8ef958ed7dceaf8257189dbdb1df125033d7fa
-  data.tar.gz: 1e9696d6e23b5333f4c784abd7847fd2ebb00e4dd210945c4f92b251eed80f7485cc1694fd1d09003c9a7cfe9e8ff1a95275cca6cb928d53814c65cdeb184781
+  metadata.gz: 38bbd11f37d0541d94ad2e06c468116e0f215561c6e53798a6adb1b5a1bba7a5b634b39415387f354f3e6907d4cb4685417a86c865d9e20f3fe1c2161ad353dd
+  data.tar.gz: 6f7664cd66b93f54897c0904a41b64ec0c79060c4d661a3b8f6858298c64ef0cbb6e7f4e8c9fe115ee50f7cbb00e02b75bee0949396e5514dd3b44d43146b9e8

data/ChangeLog.md

@@ -1,6 +1,17 @@
 # rubysketch ChangeLog
 
 
+## [v0.5.32] - 2023-10-29
+
+- Add Shape class
+- Add Circle shape class and Sprite can take 'shape' parameter
+
+
+## [v0.5.31] - 2023-10-25
+
+- Add toon.rb
+
+
 ## [v0.5.30] - 2023-08-24
 
 - Fix failed test

data/VERSION

@@ -1 +1 @@
-0.5.30
+0.5.32

data/examples/physics.rb

@@ -17,7 +17,8 @@ draw do
 end
 
 mousePressed do
-  sp             = createSprite mouseX, mouseY, 20, 20
+  shape          = Circle.new 0, 0, 20
+  sp             = createSprite mouseX + rand, mouseY + rand, shape: shape
   sp.dynamic     = true
   sp.restitution = 0.5
   sprites << sp

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/all.rb

@@ -5,6 +5,7 @@ require 'rubysketch/extension'
 require 'rubysketch/helper'
 
 require 'rubysketch/sprite'
+require 'rubysketch/shape'
 require 'rubysketch/sound'
 require 'rubysketch/easings'
 require 'rubysketch/context'

data/lib/rubysketch/context.rb

@@ -4,6 +4,7 @@ module RubySketch
   class Context < Processing::Context
 
     Sprite = RubySketch::Sprite
+    Circle = RubySketch::Circle
     Sound  = RubySketch::Sound
 
     # @private
@@ -141,31 +142,49 @@ module RubySketch
 
     # Creates a new sprite and add it to physics engine.
     #
+    # @overload createSprite(x, y, w, h)
+    #  pos(x, y), size: [w, h]
+    #  @param [Numeric] x x of the sprite position
+    #  @param [Numeric] y y of the sprite position
+    #  @param [Numeric] w width of the sprite
+    #  @param [Numeric] h height of the sprite
+    #
     # @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 [Numeric] x   x of the sprite position
+    #  @param [Numeric] y   y of the 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
+    # @overload createSprite(x, y, image: img, offset: off)
+    #  pos: [x, y], size: [image.width, image.height], offset: [offset.x, offset.x]
+    #  @param [Numeric] x   x of the sprite position
+    #  @param [Numeric] y   y of the sprite position
+    #  @param [Image]   img sprite image
+    #  @param [Vector]  off offset of the sprite image
+    #
+    # @overload createSprite(x, y, image: img, shape: shp)
+    #  pos: [x, y], size: [image.width, image.height]
+    #  @param [Numeric] x   x of the sprite position
+    #  @param [Numeric] y   y of the sprite position
     #  @param [Image]   img sprite image
-    #  @param [Vector]  off offset of sprite image
+    #
+    # @overload createSprite(x, y, image: img, offset: off, shape: shp)
+    #  pos: [x, y], size: [image.width, image.height], offset: [offset.x, offset.x]
+    #  @param [Numeric] x   x of the sprite position
+    #  @param [Numeric] y   y of the sprite position
+    #  @param [Image]   img sprite image
+    #  @param [Vector]  off offset of the sprite image
+    #  @param [Shape]   shp shape of the sprite for physics calculations
+    #
+    # @overload createSprite(x, y, shape: shp)
+    #  pos: [x, y], size: [shape.width, shape.height]
+    #  @param [Numeric] x   x of the sprite position
+    #  @param [Numeric] y   y of the sprite position
+    #  @param [Shape]   shp shape of the sprite for physics calculations
     #
     def createSprite(*args, **kwargs)
       addSprite Sprite.new(*args, **kwargs, context: self)
@@ -210,16 +229,16 @@ module RubySketch
             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}
+            draw.call {sp.draw__ self, 0, 0, f.w, f.h}
           end
         elsif degrees == 0
-          drawSprite__ sp, f.x, f.y, f.w, f.h
+          sp.draw__ self, 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
+            sp.draw__ self, 0, 0, f.w, f.h
           end
         end
       end
@@ -228,18 +247,6 @@ module RubySketch
 
     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
-
     # Loads sound file.
     #
     # @param [String] path path for sound file

data/lib/rubysketch/shape.rb

@@ -0,0 +1,123 @@
+module RubySketch
+
+
+  # Shape class for physics calculations.
+  #
+  class Shape
+
+    include Xot::Inspectable
+
+    # @private
+    def initialize(shape)
+      @shape = shape or raise ArgumentError
+      @shape.instance_variable_set :@owner__, self
+    end
+
+    # Returns the width of the shape.
+    #
+    # @return [Numeric] width
+    #
+    def width()
+      @shape.width
+    end
+
+    # Returns the height of the shape.
+    #
+    # @return [Numeric] height
+    #
+    def height()
+      @shape.height
+    end
+
+    alias w width
+    alias h height
+
+    # Set this shape as a sensor object.
+    # Sensor object receives contact events, but no collisions.
+    #
+    # @return [Boolean] sensor or not
+    #
+    def sensor=(state)
+      @shape.sensor = state
+    end
+
+    # Returns weather the shape is a sensor or not.
+    #
+    # @return [Boolean] sensor or not
+    #
+    def sensor?()
+      @shape.sensor?
+    end
+
+    # Defines contact block.
+    #
+    # @example Score increases when the shape touches a coin
+    #  shape.contact do |o|
+    #    score += 1 if o.coin?
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def contact(&block)
+      @shape.contact_begin do |other|
+        block.call other.instance_variable_get :@owner__ if block
+      end
+      nil
+    end
+
+    # Defines contact_end block.
+    #
+    # @example Call jumping() when the shape leaves the ground sprite
+    #  shape.contact_end do |o|
+    #    jumping if o == groundSprite
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def contact_end(&block)
+      @shape.contact_end do |other|
+        block.call other.instance_variable_get :@owner__ if block
+      end
+      nil
+    end
+
+    # @private
+    def getInternal__()
+      @shape
+    end
+
+    # @private
+    def draw__(context, x, y, width, height)
+      raise NotImplementedError
+    end
+
+  end# Shape
+
+
+  # Circle shape object.
+  #
+  class Circle < Shape
+
+    # Initialize circle object.
+    #
+    # @param [Numeric] x    x of the circle shape position
+    # @param [Numeric] y    y of the circle shape position
+    # @param [Numeric] size width and height of the circle shape
+    #
+    def initialize(x, y, size)
+      super Reflex::EllipseShape.new(frame: [x, y, size, size])
+    end
+
+    # @private
+    def draw__(c, x, y, w, h)
+      f = @shape.frame
+      c.pushStyle do
+        c.ellipseMode CORNER
+        c.ellipse x + f.x, y + f.y, f.w, f.h
+      end
+    end
+
+  end# Circle
+
+
+end# RubySketch

data/lib/rubysketch/sprite.rb

@@ -9,6 +9,13 @@ module RubySketch
 
     # Initialize sprite object.
     #
+    # @overload new(x, y, w, h)
+    #  pos(x, y), size: [w, h]
+    #  @param [Numeric] x x of the sprite position
+    #  @param [Numeric] y y of the sprite position
+    #  @param [Numeric] w width of the sprite
+    #  @param [Numeric] h height of the sprite
+    #
     # @overload new(image: img)
     #  pos: [0, 0], size: [image.width, image.height]
     #  @param [Image] img sprite image
@@ -19,36 +26,49 @@ module RubySketch
     #  @param [Numeric] y   y of the sprite position
     #  @param [Image]   img sprite image
     #
-    # @overload new(x, y, w, h)
-    #  pos(x, y), size: [w, h]
-    #  @param [Numeric] x x of the sprite position
-    #  @param [Numeric] y y of the sprite position
-    #  @param [Numeric] w width of the sprite
-    #  @param [Numeric] h height of the sprite
+    # @overload new(x, y, image: img, offset: off)
+    #  pos: [x, y], size: [image.width, image.height], offset: [offset.x, offset.x]
+    #  @param [Numeric] x   x of the sprite position
+    #  @param [Numeric] y   y of the sprite position
+    #  @param [Image]   img sprite image
+    #  @param [Vector]  off offset of the sprite image
+    #
+    # @overload new(x, y, image: img, shape: shp)
+    #  pos: [x, y], size: [image.width, image.height]
+    #  @param [Numeric] x   x of the sprite position
+    #  @param [Numeric] y   y of the sprite position
+    #  @param [Image]   img sprite image
     #
-    # @overload new(x, y, w, h, image: img, offset: off)
-    #  pos: [x, y], size: [w, h], offset: [offset.x, offset.x]
+    # @overload new(x, y, image: img, offset: off, shape: shp)
+    #  pos: [x, y], size: [image.width, image.height], offset: [offset.x, offset.x]
     #  @param [Numeric] x   x of the sprite position
     #  @param [Numeric] y   y of the sprite position
-    #  @param [Numeric] w   width of the sprite
-    #  @param [Numeric] h   height of the sprite
     #  @param [Image]   img sprite image
     #  @param [Vector]  off offset of the sprite image
+    #  @param [Shape]   shp shape of the sprite for physics calculations
+    #
+    # @overload new(x, y, shape: shp)
+    #  pos: [x, y], size: [shape.width, shape.height]
+    #  @param [Numeric] x   x of the sprite position
+    #  @param [Numeric] y   y of the sprite position
+    #  @param [Shape]   shp shape of the sprite for physics calculations
     #
     def initialize(
-      x = 0, y = 0, w = nil, h = nil, image: nil, offset: nil,
+      x = 0, y = 0, w = nil, h = nil, image: nil, offset: nil, shape: nil,
       physics: true, context: nil)
 
-      w ||= (image&.width  || 0)
-      h ||= (image&.height || 0)
+      w ||= (image&.width  || shape&.width  || 0)
+      h ||= (image&.height || shape&.height || 0)
       raise 'invalid size'  unless w >= 0 && h >= 0
       raise 'invalid image' if image && !image.getInternal__.is_a?(Rays::Image)
+      raise 'invalid shape' if shape && !shape.getInternal__.is_a?(Reflex::Shape)
 
       @context__ = context || Context.context__
+      @shape__   = shape
       @view__    = SpriteView.new(
         self, x: x, y: y, w: w, h: h,
-        physics: physics, density: 1, friction: 0, restitution: 0,
-        back: :white)
+        shape: @shape__, physics: physics, back: :white)
+      @view__.set density: 1, friction: 0, restitution: 0
 
       self.image  = image  if image
       self.offset = offset if offset
@@ -878,6 +898,20 @@ module RubySketch
       @view__
     end
 
+    # @private
+    def draw__(c, x, y, w, h)
+      img, off = @image__, @offset__
+      if img && off
+        c.copy img, off.x, off.y, w, h, x, y, w, h
+      elsif img
+        c.image img, x, y
+      elsif @shape__
+        @shape__.draw__ c, x, y, w, h
+      else
+        c.rect x, y, w, h
+      end
+    end
+
   end# Sprite
 
 
@@ -891,7 +925,7 @@ module RubySketch
 
     attr_reader :sprite, :touches
 
-    def initialize(sprite, *args, physics:, **kwargs, &block)
+    def initialize(sprite, *args, shape:, physics:, **kwargs, &block)
       @sprite = sprite
       super(*args, **kwargs, &block)
 
@@ -902,6 +936,7 @@ module RubySketch
       @pointersReleased = []
       @touches          = []
 
+      self.shape  = shape.getInternal__ if shape
       self.static = true if physics
     end
 

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.45'
+  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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.5.30
+  version: 0.5.32
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-23 00:00:00.000000000 Z
+date: 2023-10-28 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.45
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.43
+        version: 0.1.45
 - !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,12 +158,14 @@ files:
 - examples/hello.rb
 - examples/physics.rb
 - examples/sprite.rb
+- examples/toon.rb
 - lib/rubysketch.rb
 - lib/rubysketch/all.rb
 - lib/rubysketch/context.rb
 - lib/rubysketch/easings.rb
 - lib/rubysketch/extension.rb
 - lib/rubysketch/helper.rb
+- lib/rubysketch/shape.rb
 - lib/rubysketch/sound.rb
 - lib/rubysketch/sprite.rb
 - pod.rake