rubysketch 0.3.7 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41b3a75aeb6c8bdc443d2d87e44c60361a527e4d6b8b3918e8b1eaa2503f92e4
-  data.tar.gz: 7f373d0f3fdb31d38bb76d8e8ed88ce2f3cedca0c696d8a5f571ded1e78fb15d
+  metadata.gz: fb34f91483c8d24fb65c537455d808c3f0f9ac337eed9199440623ba564ef710
+  data.tar.gz: 2c7dd117d90a04210d256dd36185f599ca7527abbaad4dd48757cb83b49edfe8
 SHA512:
-  metadata.gz: ffcba1a2e5ae98525c4c1512230d249995071e6be9183918b6f62ed5293d9ac8f530d38aa5f544d2d4fc431ca17f38c7746955df313e9609e0ee528551045a51
-  data.tar.gz: cb49daa453cdf6dd9027a59c508363a63fed2e210b0acbcfa311e66334b107a88471e5b8b59dac7f77b5aa04423aaa2d0cd2b2fa0c4b1221b76997a93ce89e79
+  metadata.gz: 50ef4e1473605388da623a0e252061c4cd611969d9665bd5cf2212ed9a7930dd313915f2fb27879939a9ef0bea4e1d84bcc70349c6757a931dbfcd7fb30fa240
+  data.tar.gz: 818c2ffc497f2f4f044832e702799ba005f826f03dcf626e8862dd1127b7061f6d1e4653dfe0ffcf07e3fc7a7b7579655387452a77f421a289de2660b2344a48

data/ChangeLog.md

@@ -1,6 +1,34 @@
 # RubySketch ChangeLog
 
 
+## [0.3.12] - 2020-12-10
+
+- size() and createCanvas() take 'pixelDensity' parameter and default value is 1
+
+
+## [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

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.7
+0.3.12

data/examples/camera.rb

@@ -5,7 +5,7 @@
 require 'rubysketch-processing'
 
 
-cam = Capture.new
+cam = Capture.new 300, 300
 cam.start
 
 draw do

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

@@ -737,22 +737,41 @@ module RubySketch
       # @return [Array] device name list
       #
       def self.list ()
-        ['default']
+        Rays::Camera.device_names
       end
 
       # Initialize camera object.
       #
-      def initialize ()
-        @camera = Rays::Camera.new
+      # @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 [Capture] self
+      # @return [nil] nil
       #
       def start ()
         raise "Failed to start capture" unless @camera.start
-        self
+        nil
       end
 
       # Stop capturing.
@@ -778,6 +797,22 @@ module RubySketch
         @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__
@@ -878,10 +913,7 @@ module RubySketch
       #
       SQUARE = :square
 
-      def setup__ (painter)
-        @painter__             = painter
-        @painter__.miter_limit = 10
-
+      def init__ (image, painter)
         @drawing__     = false
         @hsbColor__    = false
         @colorMaxes__  = [1.0] * 4
@@ -894,6 +926,8 @@ module RubySketch
         @matrixStack__ = []
         @styleStack__  = []
 
+        updateCanvas__ image, painter
+
         colorMode   RGB, 255
         angleMode   RADIANS
         rectMode    CORNER
@@ -905,13 +939,19 @@ 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
       end
 
-      def endDraw ()
+      # @private
+      def endDraw__ ()
         @drawing__ = false
       end
 
@@ -1332,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
@@ -1675,23 +1715,27 @@ module RubySketch
       # 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
 
       # Start drawing.
       #
-      def beginDraw ()
+      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
 
@@ -1708,8 +1752,10 @@ module RubySketch
       Capture  = Processing::Capture
       Graphics = Processing::Graphics
 
+      # @private
       @@context__ = nil
 
+      # @private
       def self.context__ ()
         @@context__
       end
@@ -1719,23 +1765,21 @@ module RubySketch
         @@context__ = self
 
         @window__ = window
-        @image__  = @window__.canvas
-        setup__ @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__
@@ -1754,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|
@@ -1834,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, pixelDensity: 1)
+        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, pixelDensity: 1)
+        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 ()
@@ -1869,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
@@ -1890,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
@@ -1898,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
@@ -1906,7 +1988,7 @@ module RubySketch
       # @return [Numeric] vertical position of mouse
       #
       def pmouseY ()
-        @mousePrevPos__.y
+        @mousePrevPos__[1]
       end
 
       # Returns array of touches

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.12
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reflexion
@@ -43,6 +43,7 @@ files:
 - examples/breakout.rb
 - examples/camera.rb
 - examples/clock.rb
+- examples/delay_camera.rb
 - examples/glsl.rb
 - examples/hello.rb
 - examples/image.rb