rubysketch 0.5.31 → 0.5.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee4bec833e545d64ac7822c59d7b52e92a507ac23d909fd6143f15dace1ed8c4
-  data.tar.gz: 8151adda147364200efe13a96b2fce82b00c01fa25cb84c69f4de6ba5d9a6a4d
+  metadata.gz: 96ae60d6cddfaf8e77134a40cd35024a252278bc9b87755eb235ad6ef96151b5
+  data.tar.gz: c3bb6f454cfb2d5f6c9f872571842a82affe84e08bde8d7b68e4a95b46dd65a9
 SHA512:
-  metadata.gz: d85c90842181d311cee151604fc1c38edc6d5b2d1caba4d3c9f206f512d98b5f93ced450f8ec6aaa760781bdfc61c8d92644cdc2f2b4811c63b7f81f70091ca2
-  data.tar.gz: 94978e5eadf6fbd607c4762adec4049df1930123be74c5cee46dfb582c0ec76f907f8a3e214cc162d779a9b96bc12a4904cd054f60ecae921db3abdb57a5ff0c
+  metadata.gz: 38bbd11f37d0541d94ad2e06c468116e0f215561c6e53798a6adb1b5a1bba7a5b634b39415387f354f3e6907d4cb4685417a86c865d9e20f3fe1c2161ad353dd
+  data.tar.gz: 6f7664cd66b93f54897c0904a41b64ec0c79060c4d661a3b8f6858298c64ef0cbb6e7f4e8c9fe115ee50f7cbb00e02b75bee0949396e5514dd3b44d43146b9e8

data/ChangeLog.md

@@ -1,6 +1,12 @@
 # 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

data/VERSION

@@ -1 +1 @@
-0.5.31
+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/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

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'xot',        '~> 0.1.39'
   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 'rays',       '~> 0.1.45'
   s.add_runtime_dependency 'reflexion',  '~> 0.1.52'
   s.add_runtime_dependency 'processing', '~> 0.5.28'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.5.31
+  version: 0.5.32
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-24 00:00:00.000000000 Z
+date: 2023-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.44
+        version: 0.1.45
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.44
+        version: 0.1.45
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +165,7 @@ files:
 - 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