rubysketch 0.3.21 → 0.5.1

data/lib/rubysketch/sprite.rb

@@ -0,0 +1,101 @@
+module RubySketch
+
+
+  class Sprite
+
+    extend Forwardable
+
+    def initialize(x = 0, y = 0, w = nil, h = nil, image: nil, offset: nil, dynamic: false)
+      w ||= image&.width  || 0
+      h ||= image&.height || 0
+      raise 'invalid size' unless w >= 0 && h >= 0
+
+      @image__, @offset__ = image, offset
+      @view__ = View.new self, x: x, y: y, w: w, h: h, back: :white, dynamic: dynamic
+    end
+
+    def_delegators :@view__,
+      :x, :x=,
+      :y, :y=,
+      :w,     :h,
+      :width, :height,
+      :dynamic?,    :dynamic=,
+      :density,     :density=,
+      :friction,    :friction=,
+      :restitution, :restitution=
+
+    def update(&block)
+      @view__.update = block
+    end
+
+    def contact(&block)
+      @view__.contact = block
+    end
+
+    def position()
+      @view__.position.toVector
+    end
+
+    def position=(vector)
+      @view__.position = vector.getInternal__
+    end
+
+    def size()
+      @view__.size.toVector
+    end
+
+    def image()
+      @image__
+    end
+
+    def offset()
+      @offset__
+    end
+
+    def velocity()
+      @view__.velocity.toVector
+    end
+
+    def velocity=(vector)
+      @view__.velocity = vector.getInternal__
+    end
+
+    alias pos   position
+    alias pos=  position=
+    alias vel   velocity
+    alias vel=  velocity=
+    alias dens  density
+    alias dens= density=
+    alias fric  friction
+    alias fric= friction
+    alias rest  restitution
+    alias rest= restitution=
+
+    # @private
+    def getInternal__()
+      @view__
+    end
+
+    class View < Reflex::View
+      attr_accessor :update, :contact
+      attr_reader :sprite
+
+      def initialize(sprite, *a, **k, &b)
+        @sprite = sprite
+        super(*a, **k, &b)
+      end
+
+      def on_update(e)
+        @update.call if @update
+      end
+
+      def on_contact(e)
+        v = e.view
+        @contact.call v.sprite, e.action if @contact && v.is_a?(View)
+      end
+    end
+
+  end# Sprite
+
+
+end# RubySketch

data/lib/rubysketch.rb

@@ -1,12 +1,30 @@
-require 'set'
-require 'digest/sha1'
-require 'pathname'
-require 'tmpdir'
-require 'open-uri'
-
-require 'reflex'
-require 'rubysketch/module'
-require 'rubysketch/app'
-require 'rubysketch/window'
-require 'rubysketch/processing'
-require 'rubysketch/glsl'
+require 'rubysketch/all'
+
+
+module RubySketch
+  WINDOW  = Processing::Window.new {start}
+  CONTEXT = RubySketch::Context.new WINDOW
+
+  refine Object do
+    (CONTEXT.methods - Object.instance_methods).each do |method|
+      define_method method do |*args, **kwargs, &block|
+        CONTEXT.__send__ method, *args, **kwargs, &block
+      end
+    end
+  end
+end# RubySketch
+
+
+begin
+  w, c = RubySketch::WINDOW, RubySketch::CONTEXT
+
+  c.class.constants.each do |const|
+    self.class.const_set const, c.class.const_get(const)
+  end
+
+  w.__send__ :begin_draw
+  at_exit do
+    w.__send__ :end_draw
+    Processing::App.new {w.show}.start if c.hasDrawBlock__ && !$!
+  end
+end

data/rubysketch.gemspec

@@ -4,7 +4,7 @@
 File.expand_path('lib', __dir__)
   .tap {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
-require 'rubysketch/module'
+require 'rubysketch/extension'
 
 
 Gem::Specification.new do |s|
@@ -12,24 +12,31 @@ Gem::Specification.new do |s|
     patterns.map {|pat| Dir.glob(pat).to_a}.flatten
   end
 
-  mod   = RubySketch::Module
-  name  = mod.name.downcase
+  ext   = RubySketch::Extension
+  name  = ext.name.downcase
   rdocs = glob.call *%w[README]
 
   s.name        = name
-  s.summary     = 'Processing like Creative Coding Framework.'
-  s.description = 'Creative Coding Framework have API compatible to Processing API or p5.js.'
-  s.version     = mod.version
+  s.summary     = 'A game engine based on the Processing API.'
+  s.description = 'A game engine based on the Processing API.'
+  s.version     = ext.version
 
   s.authors  = %w[xordog]
   s.email    = 'xordog@gmail.com'
   s.homepage = "https://github.com/xord/rubysketch"
 
   s.platform              = Gem::Platform::RUBY
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 2.7.0'
 
-  s.add_runtime_dependency 'reflexion', '~> 0.1.28'
+  s.add_runtime_dependency 'xot',        '~> 0.1.32'
+  s.add_runtime_dependency 'rucy',       '~> 0.1.32'
+  s.add_runtime_dependency 'beeps',      '~> 0.1.32'
+  s.add_runtime_dependency 'rays',       '~> 0.1.32'
+  s.add_runtime_dependency 'reflexion',  '~> 0.1.32'
+  s.add_runtime_dependency 'processing', '~> 0.5.1'
 
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'test-unit'
   s.add_development_dependency 'yard'
 
   s.files            = `git ls-files`.split $/

data/src/{RubySketch.h → RubyProcessing.h}

@@ -8,8 +8,4 @@
 
 	+ (void) start: (NSString*) path;
 
-	+ (void) setActiveReflexViewController: (id) reflexViewController;
-
-	+ (void) resetActiveReflexViewController;
-
 @end

data/src/RubyProcessing.mm

@@ -0,0 +1,25 @@
+// -*- mode: objc -*-
+#import <CRuby.h>
+#import "RubyProcessing.h"
+#import "RubySketch.h"
+
+
+@implementation RubySketch
+
+	+ (void) setup
+	{
+		static BOOL done = NO;
+		if (done) return;
+		done = YES;
+
+		[RubyProcessing setup];
+		[CRuby addLibrary:@"RubySketch" bundle:[NSBundle bundleForClass:RubySketch.class]];
+	}
+
+	+ (void) start: (NSString*) path
+	{
+		[CRuby evaluate:@"raise 'already started' unless require 'rubysketch'\n"];
+		[RubyProcessing start: path];
+	}
+
+@end

data/test/helper.rb

@@ -1,19 +1,12 @@
 # -*- coding: utf-8 -*-
 
 
-%w[../xot ../rucy ../rays ../reflex .]
-  .map  {|s| File.expand_path "../../#{s}/lib", __FILE__}
+%w[../xot ../rucy ../rays ../reflex ../processing .]
+  .map  {|s| File.expand_path "../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'test/unit'
 require 'xot/test'
-require 'rubysketch'
+require 'rubysketch/all'
 
 include Xot::Test
-
-
-def assert_equal_vector(v1, v2, delta = 0.000001)
-  assert_in_delta v1.x, v2.x, delta
-  assert_in_delta v1.y, v2.y, delta
-  assert_in_delta v1.z, v2.z, delta
-end

data/test/test_sprite.rb

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helper'
+
+
+class TestSprite < Test::Unit::TestCase
+
+  def sprite(*args, **kwargs)
+    RubySketch::Sprite.new(*args, **kwargs)
+  end
+
+  def vec(*args, **kwargs)
+    Processing::Vector.new(*args, **kwargs)
+  end
+
+  def test_initialize()
+    assert_equal 0,         sprite.x
+    assert_equal 0,         sprite.y
+    assert_equal vec(0, 0), sprite.pos
+  end
+
+end# TestSprite

metadata

@@ -1,29 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.3.21
+  version: 0.5.1
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-04 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: xot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.32
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.32
+- !ruby/object:Gem::Dependency
+  name: rucy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.32
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.32
+- !ruby/object:Gem::Dependency
+  name: beeps
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.32
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.32
+- !ruby/object:Gem::Dependency
+  name: rays
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.32
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.32
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.28
+        version: 0.1.32
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.32
+- !ruby/object:Gem::Dependency
+  name: processing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.28
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -38,14 +136,16 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Creative Coding Framework have API compatible to Processing API or p5.js.
+description: A game engine based on the Processing API.
 email: xordog@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/release.yml"
+- ".github/workflows/release-gem.yml"
+- ".github/workflows/tag.yml"
 - ".github/workflows/test.yml"
+- ".github/workflows/utils.rb"
 - ".gitignore"
 - ".yardopts"
 - ChangeLog.md
@@ -55,28 +155,19 @@ files:
 - Rakefile
 - RubySketch.podspec
 - VERSION
-- examples/breakout.rb
-- examples/camera.rb
-- examples/clock.rb
-- examples/delay_camera.rb
-- examples/glsl.rb
 - examples/hello.rb
-- examples/image.rb
-- examples/shapes.rb
-- lib/rubysketch-glsl.rb
-- lib/rubysketch-processing.rb
 - lib/rubysketch.rb
-- lib/rubysketch/app.rb
-- lib/rubysketch/glsl.rb
-- lib/rubysketch/module.rb
-- lib/rubysketch/processing.rb
-- lib/rubysketch/window.rb
+- lib/rubysketch/all.rb
+- lib/rubysketch/context.rb
+- lib/rubysketch/extension.rb
+- lib/rubysketch/graphics_context.rb
+- lib/rubysketch/helper.rb
+- lib/rubysketch/sprite.rb
 - rubysketch.gemspec
-- src/RubySketch.h
-- src/RubySketch.mm
+- src/RubyProcessing.h
+- src/RubyProcessing.mm
 - test/helper.rb
-- test/processing/test_utility.rb
-- test/processing/test_vector.rb
+- test/test_sprite.rb
 homepage: https://github.com/xord/rubysketch
 licenses: []
 metadata: {}
@@ -88,18 +179,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
-summary: Processing like Creative Coding Framework.
+summary: A game engine based on the Processing API.
 test_files:
 - test/helper.rb
-- test/processing/test_utility.rb
-- test/processing/test_vector.rb
+- test/test_sprite.rb

data/examples/breakout.rb

@@ -1,212 +0,0 @@
-%w[xot rays reflex rubysketch]
-  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
-  .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
-
-require 'rubysketch-processing'
-
-
-PADDING = 50
-BRICK_COUNT = 10
-
-$objs = []
-$bar = nil
-$gameover = false
-
-setup do
-  addWalls
-  addBricks
-
-  colorMode HSB, 360, 100, 100
-  ellipseMode CORNER
-  background 0
-  noStroke
-  fill 0, 0, 100
-end
-
-draw do
-  background 0
-  $objs.each do |o|
-    o.update
-    o.draw
-  end
-  drawTexts
-end
-
-mousePressed do
-  start unless started?
-end
-
-mouseDragged do
-  $bar.pos.x = mouseX - $bar.w / 2 if $bar
-end
-
-def start()
-  $bar = Bar.new
-  $objs += [$bar, Ball.new($bar)]
-end
-
-def started?()
-  $bar
-end
-
-def gameover?()
-  started? &&
-    $objs.count {|o| o.kind_of? Ball} == 0
-end
-
-def cleared?()
-  started? && !gameover? &&
-    $objs.count {|o| o.kind_of? Brick} == 0
-end
-
-def addWalls()
-  left = Obj.new 0, 0, 10, height
-  top = Obj.new 0, 0, width, 10
-  right = Obj.new width - 10, 0, 10, height
-  bottom = Bottom.new 0, height - 10, width, 10
-  $objs += [top, bottom, left, right]
-end
-
-def addBricks()
-  brickW = (width - PADDING * 2) / BRICK_COUNT
-  5.times do |y|
-    BRICK_COUNT.times do |x|
-      xx = PADDING + brickW * x
-      yy = PADDING + 30 * y
-      $objs.push Brick.new(xx, yy, brickW - 5, 20, y * 60)
-    end
-  end
-end
-
-def drawTexts()
-  push do
-    textAlign CENTER, CENTER
-
-    if !started?
-      fill 50, 100, 100
-      textSize 50
-      text "BREAKOUT", 0, 0, width, height
-      textSize 20
-      translate 0, 100
-      text "Tap to start!", 0, 0, width, height
-    elsif cleared?
-      fill 100, 80, 100
-      textSize 50
-      text "CLEAR!", 0, 0, width, height
-    elsif gameover?
-      fill 0, 20, 100
-      textSize 50
-      text "GAMEOVER", 0, 0, width, height
-    end
-  end
-end
-
-class Obj
-  attr_reader :pos, :w, :h, :vel
-
-  def initialize(x, y, w, h, vx = 0, vy = 0)
-    @pos = createVector x, y
-    @w, @h = w, h
-    @vel = createVector vx, vy
-  end
-
-  def update()
-    @pos.add @vel
-  end
-
-  def draw()
-    rect @pos.x, @pos.y, @w, @h
-  end
-
-  def bounds()
-    x, y = @pos.x, @pos.y
-    return x, y, x + @w, y + @h
-  end
-
-  def center()
-    createVector @pos.x + @w / 2, @pos.y + @h / 2
-  end
-end
-
-class Ball < Obj
-  def initialize(bar)
-    super bar.pos.x, bar.pos.y - bar.h, 20, 20
-    self.vel = createVector random(-1, 1), -1
-  end
-
-  def vel=(v)
-    @vel = v.dup.normalize.mult 8
-  end
-
-  def update()
-    b = bounds.dup
-    super
-    checkHit b
-  end
-
-  def checkHit(prevBounds)
-    x1, y1, x2, y2 = prevBounds
-    hitH = hitV = false
-    hits = []
-    $objs.each do |o|
-      next if o == self
-      next unless intersect? o
-      hits.push o
-      ox1, oy1, ox2, oy2 = o.bounds
-      hitH ||= !overlap?(x1, x2, ox1, ox2)
-      hitV ||= !overlap?(y1, y2, oy1, oy2)
-    end
-    vel.x *= -1 if hitH
-    vel.y *= -1 if hitV
-
-    hits.each {|o| hit o}
-  end
-
-  def intersect?(o)
-    x1, y1, x2, y2 = bounds
-    ox1, oy1, ox2, oy2 = o.bounds
-    overlap?(x1, x2, ox1, ox2) && overlap?(y1, y2, oy1, oy2)
-  end
-
-  def overlap?(a1, a2, b1, b2)
-    a1 <= b2 && b1 <= a2
-  end
-
-  def hit(o)
-    case o
-    when Bar then self.vel = center.sub o.center
-    when Brick then $objs.delete o
-    when Bottom then $objs.delete self unless cleared?
-    end
-  end
-end
-
-class Bar < Obj
-  def initialize()
-    w = 100
-    super (width - w) / 2, height - 50, w, 20
-  end
-end
-
-class Brick < Obj
-  def initialize(x, y, w, h, hue)
-    super x, y, w, h
-    @hue = hue
-  end
-
-  def draw()
-    push do
-      fill @hue, 50, 100
-      super
-    end
-  end
-end
-
-class Bottom < Obj
-  def draw()
-    push do
-      fill 0, 0, 50
-      super
-    end
-  end
-end