rubysketch 0.3.6 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a40d65c055cc2baacd0a7489ec511a0db37b8e534f58fc02d5c095f78ecca66
-  data.tar.gz: 9c8634c610e0df8201655809b82bc8e7dbc2adab8cad405e2033ecc321c09137
+  metadata.gz: f9d6862ce564503738c10d66ea1b76000d57ffa7100a0e47bf0b96c8083e02dd
+  data.tar.gz: 44825a802755cd03c1efa129ec0a0349872f330795433839f2232ef2b9b83a24
 SHA512:
-  metadata.gz: 04d5e9096e7cef9ea5d6c16e3397d5965bc8da07f699fc3b241e91ad982c755fe7b4faf4296b6ce74612da690cc7d7cfd507612387f43276b0e2ab0d05566ddf
-  data.tar.gz: 224f32277392e5b84c84b6ef13a437813859f960e47dce696f97dd547273d0d86a3e62685a171a7055981989fd99679e60b843e12b839bc2b501c4e9fbb7e622
+  metadata.gz: ed6efaf98ea1b9e816d337ebf82d57516f3f2fb30877d693f2a18c42d24d85eaf981fa804c1f1761ec0bd86ec73e8a5f88fcb50103c5bd5979e46bf58a2c0162
+  data.tar.gz: 5d8d25591fdbc056dc0f793d5a8c93cae50547731e10128c6ec27e9432491f238d5e547f9cc74701beb85903a39114da045cd320cf1903f235afa7975bef42ca

data/ChangeLog.md

@@ -1,6 +1,38 @@
 # RubySketch ChangeLog
 
 
+## [0.3.11] - 2020-12-9
+
+- add size(), createCanvas() and pixelDensity()
+
+
+## [0.3.10] - 2020-12-1
+
+- invert angle parameter value for arc() to fix compatibility to processing API
+
+
+## [0.3.9] - 2020-11-30
+
+- Graphics#beginDraw() can take block to call endDraw automatically
+- Capture#start() always returns nil
+- add delay_camera.rb
+
+
+## [0.3.8] - 2020-11-27
+
+- Capture#initialize() can take requestWidth, requestHeight and cameraName
+- add Capture#width and Capture#height
+
+
+## [0.3.7] - 2020-11-18
+
+- add Capture class
+- add log(), exp(), sqrt() and PI
+- add examples/camera.rb
+- add examples/breakout.rb
+- fix error on calling image()
+
+
 ## [0.3.6] - 2020-08-02
 
 - random() can take array or nothing

data/README.md

@@ -1,3 +1,11 @@
-# RubySketch - Processing like Creative Coding Framework
+# RubySketch - Processing compatible Creative Coding Framework
 
 by xordog@gmail.com
+
+
+# How to release
+
+```
+ $ rake version:bump:patch message="..."
+ $ git push origin --tags
+```

data/Rakefile

@@ -23,3 +23,28 @@ generate_documents
 build_ruby_gem
 
 task :default => :test
+
+
+namespace :version do
+
+  namespace :bump do
+
+    task :major do
+      update_and_tag_version 0
+    end
+
+    task :minor do
+      update_and_tag_version 1
+    end
+
+    task :patch do
+      update_and_tag_version 2
+    end
+
+    task :build do
+      update_and_tag_version 3
+    end
+
+  end# bump
+
+end# version

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.11

data/examples/breakout.rb

@@ -0,0 +1,212 @@
+%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

data/examples/camera.rb

@@ -0,0 +1,14 @@
+%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'
+
+
+cam = Capture.new 300, 300
+cam.start
+
+draw do
+  background 0
+  image cam, 0, 0
+end

data/examples/delay_camera.rb

@@ -0,0 +1,33 @@
+%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'
+
+
+w, h = width, height
+
+cam = Capture.new w, h, Capture.list.last
+cam.start
+
+images = 60.times.map {
+  Graphics.new w, h
+}
+
+draw do
+  if frameCount % 2 == 0
+    images.unshift images.pop
+    images.first.tap do |image|
+      image.beginDraw {
+        image.image cam, 0, 0
+      }
+    end
+  end
+
+  background 0
+  segment_h= h / images.size
+  images.each.with_index do |image, i|
+    y = i * segment_h
+    copy image, 0, y, w, segment_h, 0, y, w, segment_h
+  end
+end

data/lib/rubysketch-processing.rb

@@ -2,10 +2,18 @@ require 'rubysketch'
 
 
 begin
-  include RubySketch::Processing::Context
+  window  = RubySketch::Window.new {start}
+  context = RubySketch::Processing::Context.new window
 
-  window = RubySketch::Window.new {start}
-  setup__ window
+  (context.methods - Object.instance_methods).each do |method|
+    define_method method do |*args, &block|
+      context.__send__ method, *args, &block
+    end
+  end
+
+  context.class.constants.each do |const|
+    self.class.const_set const, context.class.const_get(const)
+  end
 
   window.__send__ :begin_draw
   at_exit do

data/lib/rubysketch/processing.rb

@@ -141,9 +141,9 @@ module RubySketch
       #
       def lerp (*args, amount)
         v      = toVector__ *args
-        self.x = Context.lerp x, v.x, amount
-        self.y = Context.lerp y, v.y, amount
-        self.z = Context.lerp z, v.z, amount
+        self.x = x + (v.x - x) * amount
+        self.y = y + (v.y - y) * amount
+        self.z = z + (v.z - z) * amount
         self
       end
 
@@ -728,27 +728,127 @@ module RubySketch
     end# Touch
 
 
+    # Camera object.
+    #
+    class Capture
+
+      # Returns a list of available camera device names
+      #
+      # @return [Array] device name list
+      #
+      def self.list ()
+        Rays::Camera.device_names
+      end
+
+      # Initialize camera object.
+      #
+      # @overload Capture.new()
+      # @overload Capture.new(cameraName)
+      # @overload Capture.new(requestWidth, requestHeight)
+      # @overload Capture.new(requestWidth, requestHeight, cameraName)
+      #
+      # @param requestWidth  [Integer] captured image width
+      # @param requestHeight [Integer] captured image height
+      # @param cameraName    [String]  camera device name
+      #
+      def initialize (*args)
+        width, height, name =
+          if args.empty?
+            [-1, -1, nil]
+          elsif args[0].kind_of?(String)
+            [-1, -1, args[0]]
+          elsif args[0].kind_of?(Numeric) && args[1].kind_of?(Numeric)
+            [args[0], args[1], args[2]]
+          else
+            raise ArgumentError
+          end
+        @camera = Rays::Camera.new width, height, device_name: name
+      end
+
+      # Start capturing.
+      #
+      # @return [nil] nil
+      #
+      def start ()
+        raise "Failed to start capture" unless @camera.start
+        nil
+      end
+
+      # Stop capturing.
+      #
+      # @return [nil] nil
+      #
+      def stop ()
+        @camera.stop
+        nil
+      end
+
+      # Returns is the next captured image available?
+      #
+      # @return [Boolean] true means object has next frame
+      #
+      def available ()
+        @camera.active?
+      end
+
+      # Reads next frame image
+      #
+      def read ()
+        @camera.image
+      end
+
+      # Returns the width of captured image
+      #
+      # @return [Numeric] the width of captured image
+      #
+      def width ()
+        @camera.image&.width || 0
+      end
+
+      # Returns the height of captured image
+      #
+      # @return [Numeric] the height of captured image
+      #
+      def height ()
+        @camera.image&.height || 0
+      end
+
+      # @private
+      def getInternal__ ()
+        @camera.image || dummyImage__
+      end
+
+      # @private
+      private def dummyImage__ ()
+        @dummy ||= Rays::Image.new 1, 1
+      end
+
+    end# Capture
+
+
     # Drawing context
     #
     module GraphicsContext
 
-      Vector = Processing::Vector
+      # PI
+      #
+      PI         = Math::PI
 
       # PI / 2
       #
-      HALF_PI    = Math::PI / 2
+      HALF_PI    = PI / 2
 
       # PI / 4
       #
-      QUARTER_PI = Math::PI / 4
+      QUARTER_PI = PI / 4
 
       # PI * 2
       #
-      TWO_PI     = Math::PI * 2
+      TWO_PI     = PI * 2
 
       # PI * 2
       #
-      TAU        = Math::PI * 2
+      TAU        = PI * 2
 
       # RGB mode for colorMode().
       #
@@ -813,11 +913,8 @@ module RubySketch
       #
       SQUARE = :square
 
-      def setup__ (painter)
-        @painter__             = painter
-        @painter__.miter_limit = 10
-
-        @drawing       = false
+      def init__ (image, painter)
+        @drawing__     = false
         @hsbColor__    = false
         @colorMaxes__  = [1.0] * 4
         @angleScale__  = 1.0
@@ -829,6 +926,8 @@ module RubySketch
         @matrixStack__ = []
         @styleStack__  = []
 
+        updateCanvas__ image, painter
+
         colorMode   RGB, 255
         angleMode   RADIANS
         rectMode    CORNER
@@ -840,14 +939,20 @@ module RubySketch
         stroke 0
       end
 
-      def beginDraw ()
+      def updateCanvas__ (image, painter)
+        @image__, @painter__ = image, painter
+      end
+
+      # @private
+      def beginDraw__ ()
         @matrixStack__.clear
         @styleStack__.clear
-        @drawing = true
+        @drawing__ = true
       end
 
-      def endDraw ()
-        @drawing = false
+      # @private
+      def endDraw__ ()
+        @drawing__ = false
       end
 
       def width ()
@@ -1267,8 +1372,8 @@ module RubySketch
       def arc (a, b, c, d, start, stop)
         assertDrawing__
         x, y, w, h = toXYWH__ @ellipseMode__, a, b, c, d
-        start      = toAngle__ start
-        stop       = toAngle__ stop
+        start      = toAngle__ -start
+        stop       = toAngle__ -stop
         @painter__.ellipse x, y, w, h, from: start, to: stop
         nil
       end
@@ -1411,8 +1516,9 @@ module RubySketch
       #
       def image (img, a, b, c = nil, d = nil)
         assertDrawing__
-        x, y, w, h = toXYWH__ @imageMode__, a, b, c || img.width, d || img.height
-        @painter__.image img.getInternal__, x, y, w, h
+        i = img.getInternal__
+        x, y, w, h = toXYWH__ @imageMode__, a, b, c || i.width, d || i.height
+        @painter__.image i, x, y, w, h
         nil
       end
 
@@ -1588,13 +1694,13 @@ module RubySketch
       end
 
       # @private
-      private def getInternal__ ()
+      def getInternal__ ()
         @image__
       end
 
       # @private
       private def assertDrawing__ ()
-        raise "call beginDraw() before drawing" unless @drawing
+        raise "call beginDraw() before drawing" unless @drawing__
       end
 
     end# GraphicsContext
@@ -1606,20 +1712,30 @@ module RubySketch
 
       include GraphicsContext
 
+      # Initialize graphics object.
+      #
       def initialize (width, height)
-        @image__ = Rays::Image.new width, height
-        setup__ @image__.painter
+        image = Rays::Image.new width, height
+        init__ image, image.painter
       end
 
-      def beginDraw ()
+      # Start drawing.
+      #
+      def beginDraw (&block)
         @painter__.__send__ :begin_paint
-        super
+        beginDraw__
         push
+        if block
+          block.call
+          endDraw
+        end
       end
 
+      # End drawing.
+      #
       def endDraw ()
         pop
-        super
+        endDraw__
         @painter__.__send__ :end_paint
       end
 
@@ -1628,38 +1744,42 @@ module RubySketch
 
     # Processing context
     #
-    module Context
+    class Context
+
+      include GraphicsContext
 
-      include GraphicsContext, Math
+      Vector   = Processing::Vector
+      Capture  = Processing::Capture
+      Graphics = Processing::Graphics
 
+      # @private
       @@context__ = nil
 
+      # @private
       def self.context__ ()
         @@context__
       end
 
       # @private
-      def setup__ (window)
+      def initialize (window)
         @@context__ = self
 
         @window__ = window
-        @image__  = @window__.canvas
-        super @window__.canvas_painter.paint {background 0.8}
+        init__ @window__.canvas, @window__.canvas_painter.paint {background 0.8}
 
         @loop__         = true
         @redraw__       = false
         @frameCount__   = 0
         @mousePos__     =
-        @mousePrevPos__ = Rays::Point.new 0
+        @mousePrevPos__ = [0, 0]
         @mousePressed__ = false
         @touches__      = []
 
-        @window__.before_draw = proc {beginDraw}
-        @window__.after_draw  = proc {endDraw}
+        @window__.before_draw = proc {beginDraw__}
+        @window__.after_draw  = proc {endDraw__}
 
         drawFrame = -> {
-          @image__   = @window__.canvas
-          @painter__ = @window__.canvas_painter
+          updateCanvas__ @window__.canvas, @window__.canvas_painter
           begin
             push
             @drawBlock__.call if @drawBlock__
@@ -1678,9 +1798,11 @@ module RubySketch
         end
 
         updatePointerStates = -> event, pressed = nil {
-          @mousePos__     = event.pos
+          @mousePos__     = @window__.to_canvas_coord event.pos.x, event.pos.y
           @mousePressed__ = pressed if pressed != nil
-          @touches__      = event.positions.map {|pos| Touch.new pos.x, pos.y}
+          @touches__      = event.positions.map {|pos|
+            Touch.new *@window__.to_canvas_coord(pos.x, pos.y)
+          }
         }
 
         @window__.pointer_down = proc do |e|
@@ -1758,15 +1880,59 @@ module RubySketch
         nil
       end
 
+      # Changes canvas size.
+      #
+      # @param width  [Integer] new width
+      # @param height [Integer] new height
+      #
+      # @return [nil] nil
+      #
+      def size (width, height)
+        resizeCanvas__ :size, width, height, pixelDensity
+        nil
+      end
+
+      # Changes canvas size.
+      #
+      # @param width  [Integer] new width
+      # @param height [Integer] new height
+      #
+      # @return [nil] nil
+      #
+      def createCanvas (width, height)
+        resizeCanvas__ :createCanvas, width, height, pixelDensity
+        nil
+      end
+
+      # Changes and returns canvas pixel density.
+      #
+      # @param density [Numeric] new pixel density
+      #
+      # @return [Numeric] current pixel density
+      #
+      def pixelDensity (density = nil)
+        resizeCanvas__ :pixelDensity, width, height, density if density
+        @painter__.pixel_density
+      end
+
       # @private
-      private def size__ (width, height)
-        raise 'size() must be called on startup or setup block' if @started__
+      def resizeCanvas__ (name, width, height, pixelDensity)
+        raise '#{name}() must be called on startup or setup block' if @started__
 
         @painter__.__send__ :end_paint
-        @window__.__send__ :reset_canvas, width, height
+        @window__.__send__ :resize_canvas, width, height, pixelDensity
+        updateCanvas__ @window__.canvas, @window__.canvas_painter
         @painter__.__send__ :begin_paint
 
-        @auto_resize__ = false
+        @window__.auto_resize = false
+      end
+
+      # Returns pixel density of display.
+      #
+      # @return [Numeric] pixel density
+      #
+      def displayDensity ()
+        @window__.painter.pixel_density
       end
 
       def windowWidth ()
@@ -1793,20 +1959,12 @@ module RubySketch
         @window__.event.fps
       end
 
-      # Returns pixel density
-      #
-      # @return [Numeric] pixel density
-      #
-      def displayDensity ()
-        @painter__.pixel_density
-      end
-
       # Returns mouse x position
       #
       # @return [Numeric] horizontal position of mouse
       #
       def mouseX ()
-        @mousePos__.x
+        @mousePos__[0]
       end
 
       # Returns mouse y position
@@ -1814,7 +1972,7 @@ module RubySketch
       # @return [Numeric] vertical position of mouse
       #
       def mouseY ()
-        @mousePos__.y
+        @mousePos__[1]
       end
 
       # Returns mouse x position in previous frame
@@ -1822,7 +1980,7 @@ module RubySketch
       # @return [Numeric] horizontal position of mouse
       #
       def pmouseX ()
-        @mousePrevPos__.x
+        @mousePrevPos__[0]
       end
 
       # Returns mouse y position in previous frame
@@ -1830,7 +1988,7 @@ module RubySketch
       # @return [Numeric] vertical position of mouse
       #
       def pmouseY ()
-        @mousePrevPos__.y
+        @mousePrevPos__[1]
       end
 
       # Returns array of touches
@@ -1865,7 +2023,9 @@ module RubySketch
         @redraw__ = true
       end
 
-      module_function
+      #
+      # Utilities
+      #
 
       # Returns the absolute number of the value.
       #
@@ -1907,6 +2067,26 @@ module RubySketch
         value.round
       end
 
+      # Returns the natural logarithm (the base-e logarithm) of a number.
+      #
+      # @param value [Numeric] number (> 0.0)
+      #
+      # @return [Numeric] result number
+      #
+      def log (n)
+        Math.log n
+      end
+
+      # Returns Euler's number e raised to the power of value.
+      #
+      # @param value [Numeric] number
+      #
+      # @return [Numeric] result number
+      #
+      def exp (n)
+        Math.exp n
+      end
+
       # Returns value raised to the power of exponent.
       #
       # @param value    [Numeric] base number
@@ -1928,6 +2108,16 @@ module RubySketch
         value * value
       end
 
+      # Returns squared value.
+      #
+      # @param value [Numeric] number
+      #
+      # @return [Numeric] squared value
+      #
+      def sqrt (value)
+        Math.sqrt value
+      end
+
       # Returns the magnitude (or length) of a vector.
       #
       # @overload mag(x, y)
@@ -2202,6 +2392,14 @@ module RubySketch
         Vector.new *args
       end
 
+      # Creates a camera object as a video input device.
+      #
+      # @return [Capture] camera object
+      #
+      def createCapture (*args)
+        Capture.new *args
+      end
+
       # Creates a new off-screen graphics context object.
       #
       # @param width  [Numeric] width of graphics image

data/lib/rubysketch/window.rb

@@ -16,7 +16,8 @@ module RubySketch
       @auto_resize = true
       @error       = nil
 
-      reset_canvas 1, 1
+      painter.miter_limit = 10
+      resize_canvas 1, 1
 
       super *args, size: [width, height], &block
     end
@@ -43,7 +44,9 @@ module RubySketch
 
     def on_draw (e)
       draw_canvas {call_block @draw, e} if @draw
-      e.painter.image @canvas
+
+      x, y, w, h = coord_converter
+      e.painter.image @canvas, x, y, @canvas.width * w, @canvas.height * h
     end
 
     def on_key (e)
@@ -64,27 +67,45 @@ module RubySketch
     end
 
     def on_resize (e)
-      reset_canvas e.width, e.height if @auto_resize
+      resize_canvas e.width, e.height if @auto_resize
       draw_canvas {call_block @resize, e} if @resize
     end
 
+    def to_canvas_coord (x, y)
+      xx, yy, ww, hh = coord_converter
+      return (x - xx) / ww, (y - yy) / hh
+    end
+
     private
 
-    def reset_canvas (width, height)
-      return if width * height == 0
-      return if width == @canvas&.width && height == @canvas&.height
+    def resize_canvas (width, height, pixel_density = nil)
+      return nil if width * height == 0
 
-      old_canvas  = @canvas
-      old_painter = @canvas_painter
+      unless width    == @canvas&.width  &&
+        height        == @canvas&.height &&
+        pixel_density == @canvas_painter&.pixel_density
 
-      cs              = old_canvas&.color_space || Rays::RGBA
-      @canvas         = Rays::Image.new width, height, cs, painter.pixel_density
-      @canvas_painter = @canvas.painter
+        old_canvas  = @canvas
+        old_painter = @canvas_painter
 
-      if old_canvas
-        @canvas_painter.paint {image old_canvas}
-        copy_painter_attributes old_painter, @canvas_painter
+        cs              = old_canvas&.color_space || Rays::RGBA
+        pd              = pixel_density || painter.pixel_density
+        @canvas         = Rays::Image.new width, height, cs, pd
+        @canvas_painter = @canvas.painter
+
+        if old_canvas
+          @canvas_painter.paint {image old_canvas}
+          copy_painter_attributes old_painter, @canvas_painter
+        end
+
+        resize_window width, height
       end
+
+      @canvas_painter
+    end
+
+    def resize_window (width, height)
+      size width, height
     end
 
     def copy_painter_attributes (from, to)
@@ -97,6 +118,21 @@ module RubySketch
       to.font         = from.font
     end
 
+    def coord_converter ()
+      ww, wh =         width.to_f,         height.to_f
+      cw, ch = @canvas.width.to_f, @canvas.height.to_f
+      return [0, 0, 1, 1] if ww == 0 || wh == 0 || cw == 0 || ch == 0
+
+      wratio, cratio = ww / wh, cw / ch
+      if wratio >= cratio
+        scaled_w = wh * cratio
+        return (ww - scaled_w) / 2, 0, scaled_w / cw, wh / ch
+      else
+        scaled_h = ww / cratio
+        return 0, (wh - scaled_h) / 2, ww / cw, scaled_h / ch
+      end
+    end
+
     def draw_canvas (&block)
       begin_draw
       block.call

data/test/helper.rb

@@ -12,11 +12,6 @@ require 'rubysketch'
 include Xot::Test
 
 
-unless $RAYS_NOAUTOINIT
-  #def Rays.fin! () end
-end
-
-
 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

data/test/processing/test_utility.rb

@@ -6,27 +6,31 @@ require_relative '../helper'
 
 class TestProcessingUtility < Test::Unit::TestCase
 
-  C = RubySketch::Processing::Context
+  class Context
+    include RubySketch::Processing::Context
+  end
 
-  def setup ()
-    
+  def context
+    Context.new
   end
 
   def test_random ()
-    assert_equal Float,  C.random(1).class
-    assert_equal Float,  C.random(1.0).class
-    assert_equal Symbol, C.random((:a..:z).to_a).class
+    c = context
+
+    assert_equal Float,  c.random(1).class
+    assert_equal Float,  c.random(1.0).class
+    assert_equal Symbol, c.random((:a..:z).to_a).class
 
-    assert_not_equal C.random, C.random
+    assert_not_equal c.random, c.random
 
     10000.times do
-      n = C.random
+      n = c.random
       assert 0 <= n && n < 1
 
-      n = C.random 1
+      n = c.random 1
       assert 0 <= n && n < 1
 
-      n = C.random 1, 2
+      n = c.random 1, 2
       assert 1.0 <= n && n < 2.0
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.11
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-05 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reflexion
@@ -40,7 +40,10 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- examples/breakout.rb
+- examples/camera.rb
 - examples/clock.rb
+- examples/delay_camera.rb
 - examples/glsl.rb
 - examples/hello.rb
 - examples/image.rb