rubysketch 0.3.10 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 756b461427f81652025d1b032458a21e02a0405cbe876f93f42868a2a0d63091
-  data.tar.gz: 484f88ebc98855c074c7b2b8a1d11c0384d9acc9267775c9f72b68cd730c3967
+  metadata.gz: 75d494d2c77928d0cac0bd8d6c29f28004098baed821870169a5829673eedb54
+  data.tar.gz: 29f153c1caa566e87efc6b3158ff8e17367ef57c78ed981a4e4f5a5a0a410ee1
 SHA512:
-  metadata.gz: bbfb538eaf51488a522b98f41e6c193d40aabf960421118cfd63d76072bada647ba3dbb993e23bf52d025701b348c2736a893308a9dc220e4347e7caa91bafff
-  data.tar.gz: 79871d6ed4f4c2fa0799ccfdeb62062a963c9dce05b7b17feafa5b23dba937d69cb3839efb986ed51f9f334c370accf82aebe0417305a9c186ea3f9b05a04415
+  metadata.gz: 7076a1988f49df4df59499eeeee4871eee1b1f228fb7f61be118bfd0f8cbe2fd7b77d5ffddb76a2972bb11931a8f07de91b413afedc54896870f41689d03743f
+  data.tar.gz: e26017b018da1cf2866ea84479c8b6fa3d246956bf4a2ffd307cf3c34e891fe5b7284017cb32dfed54d8313576742240ef6e9cb282b3f6a3f2876387ce64df76

data/ChangeLog.md

@@ -1,6 +1,31 @@
 # RubySketch ChangeLog
 
 
+## [0.3.15] - 2020-12-12
+
+- delete temporary directory on launch
+
+
+## [0.3.14] - 2020-12-12
+
+- fix loadImage() fails when Encoding.default_internal is not nil
+
+
+## [0.3.13] - 2020-12-12
+
+- size(), createCanvas(): default pixelDensity is same as current value
+
+
+## [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

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/VERSION

@@ -1 +1 @@
-0.3.10
+0.3.15

data/examples/image.rb

@@ -5,7 +5,7 @@
 require 'rubysketch-processing'
 
 
-icon = loadImage 'https://xord.org/rubysketch/rubysketch.png'
+icon = loadImage 'https://xord.org/rubysketch/images/rubysketch128.png'
 
 draw do
   background 0, 10

data/lib/rubysketch/processing.rb

@@ -913,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
@@ -929,6 +926,8 @@ module RubySketch
         @matrixStack__ = []
         @styleStack__  = []
 
+        updateCanvas__ image, painter
+
         colorMode   RGB, 255
         angleMode   RADIANS
         rectMode    CORNER
@@ -940,6 +939,10 @@ module RubySketch
         stroke 0
       end
 
+      def updateCanvas__ (image, painter)
+        @image__, @painter__ = image, painter
+      end
+
       # @private
       def beginDraw__ ()
         @matrixStack__.clear
@@ -1712,8 +1715,8 @@ 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.
@@ -1761,15 +1764,16 @@ module RubySketch
       def initialize (window)
         @@context__ = self
 
+        tmpdir__.tap {|dir| FileUtils.rm_r dir.to_s if dir.directory?}
+
         @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__      = []
 
@@ -1777,8 +1781,7 @@ module RubySketch
         @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__
@@ -1797,9 +1800,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|
@@ -1837,61 +1842,130 @@ module RubySketch
         nil
       end
 
-      def key (&block)
+      # @private
+      private def key__ (&block)
         @window__.key = block
         nil
       end
 
+      # Define mousePressed block.
+      #
       def mousePressed (&block)
         @mousePressedBlock__ = block if block
         @mousePressed__
       end
 
+      # Define mouseReleased block.
+      #
       def mouseReleased (&block)
         @mouseReleasedBlock__ = block if block
         nil
       end
 
+      # Define mouseMoved block.
+      #
       def mouseMoved (&block)
         @mouseMovedBlock__ = block if block
         nil
       end
 
+      # Define mouseDragged block.
+      #
       def mouseDragged (&block)
         @mouseDraggedBlock__ = block if block
         nil
       end
 
+      # Define touchStarted block.
+      #
       def touchStarted (&block)
         @touchStartedBlock__ = block if block
         nil
       end
 
+      # Define touchEnded block.
+      #
       def touchEnded (&block)
         @touchEndedBlock__ = block if block
         nil
       end
 
+      # Define touchMoved block.
+      #
       def touchMoved (&block)
         @touchMovedBlock__ = block if block
         nil
       end
 
+      # Changes canvas size.
+      #
+      # @param width        [Integer] new width
+      # @param height       [Integer] new height
+      # @param pixelDensity [Numeric] new pixel density
+      #
+      # @return [nil] nil
+      #
+      def size (width, height, pixelDensity: self.pixelDensity)
+        resizeCanvas__ :size, width, height, pixelDensity
+        nil
+      end
+
+      # Changes canvas size.
+      #
+      # @param width        [Integer] new width
+      # @param height       [Integer] new height
+      # @param pixelDensity [Numeric] new pixel density
+      #
+      # @return [nil] nil
+      #
+      def createCanvas (width, height, pixelDensity: self.pixelDensity)
+        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
+
+      # Returns window width.
+      #
+      # @return [Numeric] window width
+      #
       def windowWidth ()
         @window__.width
       end
 
+      # Returns window height.
+      #
+      # @return [Numeric] window height
+      #
       def windowHeight ()
         @window__.height
       end
@@ -1912,20 +1986,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
@@ -1933,7 +1999,7 @@ module RubySketch
       # @return [Numeric] vertical position of mouse
       #
       def mouseY ()
-        @mousePos__.y
+        @mousePos__[1]
       end
 
       # Returns mouse x position in previous frame
@@ -1941,7 +2007,7 @@ module RubySketch
       # @return [Numeric] horizontal position of mouse
       #
       def pmouseX ()
-        @mousePrevPos__.x
+        @mousePrevPos__[0]
       end
 
       # Returns mouse y position in previous frame
@@ -1949,7 +2015,7 @@ module RubySketch
       # @return [Numeric] vertical position of mouse
       #
       def pmouseY ()
-        @mousePrevPos__.y
+        @mousePrevPos__[1]
       end
 
       # Returns array of touches
@@ -2389,14 +2455,16 @@ module RubySketch
         ext ||= File.extname uri
         raise "unsupported image type -- #{ext}" unless ext =~ /^\.?(png)$/i
 
-        tmpdir = Pathname(Dir.tmpdir) + Digest::SHA1.hexdigest(self.class.name)
+        tmpdir = tmpdir__
         path   = tmpdir + Digest::SHA1.hexdigest(uri)
         path   = path.sub_ext ext
 
         unless path.file?
           URI.open uri do |input|
+            input.set_encoding nil# disable default_internal
             tmpdir.mkdir unless tmpdir.directory?
             path.open('w') do |output|
+              output.set_encoding Encoding::ASCII_8BIT
               while buf = input.read(2 ** 16)
                 output.write buf
               end
@@ -2406,6 +2474,11 @@ module RubySketch
         path.to_s
       end
 
+      # @private
+      private def tmpdir__ ()
+        Pathname(Dir.tmpdir) + Digest::SHA1.hexdigest(self.class.name)
+      end
+
     end# Context
 
 

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,47 @@ 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
+        cs          = old_canvas&.color_space || Rays::RGBA
+        pd          =  pixel_density ||
+          old_painter&.pixel_density ||
+          painter     .pixel_density
 
-      if old_canvas
-        @canvas_painter.paint {image old_canvas}
-        copy_painter_attributes old_painter, @canvas_painter
+        @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 +120,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.15
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2020-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reflexion