rubysketch 0.3.20 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d0836f855d3ae54ed3cdeaec0d4d479da386cb0a09684fce54d5b2b17cc4c72
-  data.tar.gz: 72af8263d9531136860ce15145b59011c838743f64659362bd66e4ae6c717d1c
+  metadata.gz: acfaff485263c8e6557c8610df2a4643e53d1046e55cf813c79b648492e84d52
+  data.tar.gz: d7beb5170988d554771d50d5a726b1f51c961cded8a3cf3370dc55ccc91059fb
 SHA512:
-  metadata.gz: 5dc6de1cba1571960c9cd9a621b568ee7257b11c537ac74a827cdf3d95fadbb33a0c25258177b0fec299e766c7f78c0e82a308319a38fdd004fe340a7be4ebe4
-  data.tar.gz: 9cac5e78ddb2a9c7bf4e5e53c294321155bc4276cefed59ba115e44e1370fe9ca15c2ebd404615bceb72305f022a329be915d1d197df587770fe42376df87f88
+  metadata.gz: 95ce0e61b8db2f0046bfd43070dd9d10f24b48f7838b267509b98e9a4b6930aa8958c065ae7af253c3877c754a5187ce970b80722421c32e6fbb9de4d1ebc05a
+  data.tar.gz: a810edf5f210a8a505fc3830697a46a76a743860a90118d1de38e99192d0cf43639dd5410409baf040c4b6feb0275a90d2cb330230b7457890d8555b9f257d5e

data/.github/workflows/release.yml

@@ -12,10 +12,10 @@ jobs:
       - name: checkout
         uses: actions/checkout@v2
 
-      - name: ruby 2.7
+      - name: ruby 3.0
         uses: actions/setup-ruby@v1
         with:
-          ruby-version: 2.7.x
+          ruby-version: 3.0.x
 
       - name: install gems
         run: |

data/ChangeLog.md

@@ -1,6 +1,16 @@
 # RubySketch ChangeLog
 
 
+## [0.3.21] - 2022-x-x
+
+- add rubysketch-glsl.rb
+- add blend(), createImage(), setTitle(), tint() and noTint()
+- add save() that saves screen image to file
+- circle() function is affected by ellipseMode()
+- point() draws by line(x, y, x, y)
+- change initial values for strokeCap and strokeJoin to ROUND and MITER
+
+
 ## [0.3.20] - 2022-07-24
 
 - add mouseClicked()

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'yard'
-gem 'reflexion'
+gemspec

data/Rakefile

@@ -22,7 +22,7 @@ test_ruby_extension
 generate_documents
 build_ruby_gem
 
-task :default => :test
+task :default
 
 
 namespace :version do

data/VERSION

@@ -1 +1 @@
-0.3.20
+0.3.21

data/examples/glsl.rb

@@ -2,16 +2,13 @@
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
-require 'rubysketch'
+require 'rubysketch-glsl'
 
-
-RubySketch::GLSL.start <<END
-  varying vec4 v_TexCoord;
+RubySketch::GLSL.run <<END
   uniform vec2 resolution;
   uniform float time;
-  void main ()
-  {
-    vec2 pos = v_TexCoord.xy / resolution;
-    gl_FragColor = vec4(pos, float(mod(time, 1.0)), 1);
+  void main() {
+    vec2 pos = gl_FragCoord.xy / resolution;
+    gl_FragColor = vec4(pos * abs(sin(time)), 0, 1);
   }
 END

data/lib/rubysketch/glsl.rb

@@ -1,29 +1,36 @@
 module RubySketch
 
 
-  # @private
-  class GLSL
+  # OpenGL Shader Language
+  #
+  module GLSL
 
-    def initialize(glsl)
-      @shader = Reflex::Shader.new glsl
-    end
 
     # @private
-    def on_start__(window)
-      start = Time.now.to_f
-
-      window.draw = proc do |e, painter|
-        painter.paint do |p|
-          c = window.canvas
-          w = c.width
-          h = c.height
-          t = Time.now.to_f - start
-          p.shader @shader, resolution: [w, h], time: t if @shader
+    class Context
+
+      # @private
+      def initialize(window, shader_source)
+        shader = Rays::Shader.new shader_source
+        start  = now__
+        window.draw = proc do |e|
+          i, p = window.canvas_image, window.canvas_painter
+          w, h = i.width, i.height
+          p.shader shader, resolution: [w, h], time: now__ - start
           p.fill 1
           p.rect 0, 0, w, h
         end
       end
-    end
+
+      private
+
+      # @private
+      def now__()
+        Time.now.to_f
+      end
+
+    end# Context
+
 
   end# GLSL
 

data/lib/rubysketch/processing.rb

@@ -624,9 +624,34 @@ module RubySketch
       # @return [nil] nil
       #
       def copy(img = nil, sx, sy, sw, sh, dx, dy, dw, dh)
+        blend img, sx, sy, sw, sh, dx, dy, dw, dh, :normal
+      end
+
+      # Blends image.
+      #
+      # @overload blend(sx, sy, sw, sh, dx, dy, dw, dh, mode)
+      # @overload blend(img, sx, sy, sw, sh, dx, dy, dw, dh, mode)
+      #
+      # @param img  [Image]   image for blend source
+      # @param sx   [Numrtic] x position of source region
+      # @param sy   [Numrtic] y position of source region
+      # @param sw   [Numrtic] width of source region
+      # @param sh   [Numrtic] height of source region
+      # @param dx   [Numrtic] x position of destination region
+      # @param dy   [Numrtic] y position of destination region
+      # @param dw   [Numrtic] width of destination region
+      # @param dh   [Numrtic] height of destination region
+      # @param mode [BLEND, ADD, SUBTRACT, LIGHTEST, DARKEST, EXCLUSION, MULTIPLY, SCREEN, REPLACE] blend mode
+      #
+      # @return [nil] nil
+      #
+      def blend(img = nil, sx, sy, sw, sh, dx, dy, dw, dh, mode)
         img ||= self
         @image.paint do |painter|
+          current = painter.blend_mode
+          painter.blend_mode = mode
           painter.image img.getInternal__, sx, sy, sw, sh, dx, dy, dw, dh
+          painter.blend_mode = current
         end
       end
 
@@ -850,13 +875,17 @@ module RubySketch
       #
       TAU        = PI * 2
 
-      # RGB mode for colorMode().
+      # RGBA format for createImage().
+      #
+      RGBA = :rgba
+
+      # RGB format for createImage, or RGB mode for colorMode().
       #
-      RGB = :rgb
+      RGB  = :rgb
 
       # HSB mode for colorMode().
       #
-      HSB = :hsb
+      HSB  = :hsb
 
       # Radian mode for angleMode().
       #
@@ -1007,6 +1036,7 @@ module RubySketch
         @rectMode__    = nil
         @ellipseMode__ = nil
         @imageMode__   = nil
+        @tint__        = nil
         @textAlignH__  = nil
         @textAlignV__  = nil
         @matrixStack__ = []
@@ -1021,11 +1051,14 @@ module RubySketch
         ellipseMode CENTER
         imageMode   CORNER
         blendMode   BLEND
+        strokeCap   ROUND
+        strokeJoin  MITER
         textAlign   LEFT
 
         fill 255
         stroke 0
         strokeWeight 1
+        noTint
       end
 
       # @private
@@ -1186,6 +1219,17 @@ module RubySketch
         end
       end
 
+      # Sets blend mode. Default is BLEND.
+      #
+      # @param mode [BLEND, ADD, SUBTRACT, LIGHTEST, DARKEST, EXCLUSION, MULTIPLY, SCREEN, REPLACE]
+      #
+      # @return [nil] nil
+      #
+      def blendMode(mode)
+        @painter__.blend_mode = mode
+        nil
+      end
+
       # Sets fill color.
       #
       # @overload fill(rgb)
@@ -1283,6 +1327,37 @@ module RubySketch
         nil
       end
 
+      # Sets fill color for drawing images.
+      #
+      # @overload tint(rgb)
+      # @overload tint(rgb, alpha)
+      # @overload tint(gray)
+      # @overload tint(gray, alpha)
+      # @overload tint(r, g, b)
+      # @overload tint(r, g, b, alpha)
+      #
+      # @param rgb   [String]  color code like '#00AAFF'
+      # @param gray  [Integer]  gray value (0..255)
+      # @param r     [Integer]   red value (0..255)
+      # @param g     [Integer] green value (0..255)
+      # @param b     [Integer]  blue value (0..255)
+      # @param alpha [Integer] alpha value (0..255)
+      #
+      # @return [nil] nil
+      #
+      def tint(*args)
+        @tint__ = args
+        nil
+      end
+
+      # Resets tint color.
+      #
+      # @return [nil] nil
+      #
+      def noTint()
+        @tint__ = nil
+      end
+
       # Limits the drawable rectangle.
       #
       # The parameters a, b, c, and d are determined by rectMode().
@@ -1309,17 +1384,6 @@ module RubySketch
         nil
       end
 
-      # Sets blend mode. Default is BLEND.
-      #
-      # @param mode [BLEND, ADD, SUBTRACT, LIGHTEST, DARKEST, EXCLUSION, MULTIPLY, SCREEN, REPLACE]
-      #
-      # @return [nil] nil
-      #
-      def blendMode(mode)
-        @painter__.blend_mode = mode
-        nil
-      end
-
       # Sets font.
       #
       # @overload textFont(font)
@@ -1402,7 +1466,7 @@ module RubySketch
         if rgba[3] == 1
           @painter__.background(*rgba)
         else
-          @painter__.push fill: rgba, stroke: nil do |_|
+          @painter__.push fill: rgba, stroke: :none do |_|
             @painter__.rect 0, 0, width, height
           end
         end
@@ -1418,9 +1482,7 @@ module RubySketch
       #
       def point(x, y)
         assertDrawing__
-        w = @painter__.stroke_width
-        w = 1 if w == 0
-        @painter__.ellipse x - (w / 2.0), y - (w / 2.0), w, w
+        @painter__.line x, y, x, y
         nil
       end
 
@@ -1498,9 +1560,7 @@ module RubySketch
       # @return [nil] nil
       #
       def circle(x, y, extent)
-        assertDrawing__
-        @painter__.ellipse x, y, extent, extent
-        nil
+        ellipse x, y, extent, extent
       end
 
       # Draws an arc.
@@ -1667,9 +1727,12 @@ module RubySketch
       #
       def image(img, a, b, c = nil, d = nil)
         assertDrawing__
-        i = img.getInternal__
+        i          = img.getInternal__
         x, y, w, h = toXYWH__ @imageMode__, a, b, c || i.width, d || i.height
-        @painter__.image i, x, y, w, h
+        tint       = @tint__ ? toRGBA__(*@tint__) : 1
+        @painter__.push fill: tint, stroke: :none do |_|
+          @painter__.image i, x, y, w, h
+        end
         nil
       end
 
@@ -1691,9 +1754,43 @@ module RubySketch
       # @return [nil] nil
       #
       def copy(img = nil, sx, sy, sw, sh, dx, dy, dw, dh)
+        blend img, sx, sy, sw, sh, dx, dy, dw, dh, BLEND
+      end
+
+      # Blends image.
+      #
+      # @overload blend(sx, sy, sw, sh, dx, dy, dw, dh, mode)
+      # @overload blend(img, sx, sy, sw, sh, dx, dy, dw, dh, mode)
+      #
+      # @param img  [Image]   image for blend source
+      # @param sx   [Numrtic] x position of source region
+      # @param sy   [Numrtic] y position of source region
+      # @param sw   [Numrtic] width of source region
+      # @param sh   [Numrtic] height of source region
+      # @param dx   [Numrtic] x position of destination region
+      # @param dy   [Numrtic] y position of destination region
+      # @param dw   [Numrtic] width of destination region
+      # @param dh   [Numrtic] height of destination region
+      # @param mode [BLEND, ADD, SUBTRACT, LIGHTEST, DARKEST, EXCLUSION, MULTIPLY, SCREEN, REPLACE] blend mode
+      #
+      # @return [nil] nil
+      #
+      def blend(img = nil, sx, sy, sw, sh, dx, dy, dw, dh, mode)
         assertDrawing__
-        src = img&.getInternal__ || @window__.canvas_image
+        src     = img&.getInternal__ || @window__.canvas_image
+        current = @painter__.blend_mode
+
+        @painter__.blend_mode = mode
         @painter__.image src, sx, sy, sw, sh, dx, dy, dw, dh
+        @painter__.blend_mode = current
+      end
+
+      # Saves screen image to file.
+      #
+      # @param filename [String] file name to save image
+      #
+      def save(filename)
+        @window__.canvas_image.save filename
       end
 
       # Applies translation matrix to current transformation matrix.
@@ -2185,6 +2282,17 @@ module RubySketch
         nil
       end
 
+      # Changes title of window.
+      #
+      # @param title [String] new title
+      #
+      # @return [nil] nil
+      #
+      def setTitle(title)
+        @window__.title = title
+        nil
+      end
+
       # Changes and returns canvas pixel density.
       #
       # @param density [Numeric] new pixel density
@@ -2716,6 +2824,23 @@ module RubySketch
         Vector.new(*args, context: self)
       end
 
+      # Creates a new image.
+      #
+      # @overload createImage(w, h)
+      # @overload createImage(w, h, format)
+      #
+      # @param w      [Numeric]   width of new image
+      # @param h      [Numeric]   height of new image
+      # @param format [RGB, RGBA] image format
+      #
+      # @return [Image] new image
+      #
+      def createImage(w, h, format = RGBA)
+        colorspace = {RGB => Rays::RGB, RGBA => Rays::RGBA}[format]
+        raise ArgumentError, "Unknown image format" unless colorspace
+        Image.new Rays::Image.new(w, h, colorspace).paint {background 0, 0}
+      end
+
       # Creates a camera object as a video input device.
       #
       # @return [Capture] camera object

data/lib/rubysketch-glsl.rb

@@ -0,0 +1,11 @@
+require 'rubysketch'
+
+
+def (RubySketch::GLSL).run(
+    shader_source,
+    title: 'RubySketch',
+    width: 500, height: 500)
+  w = RubySketch::Window.new(title: title, w: width, h: height) {start}
+  RubySketch::GLSL::Context.new w, shader_source
+  at_exit {RubySketch::App.new {w.show}.start unless $!}
+end

data/rubysketch.gemspec

@@ -28,7 +28,9 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.6.0'
 
-  s.add_runtime_dependency 'reflexion', '~> 0.1.26'
+  s.add_runtime_dependency 'reflexion', '~> 0.1.28'
+
+  s.add_development_dependency 'yard'
 
   s.files            = `git ls-files`.split $/
   s.test_files       = s.files.grep %r{^(test|spec|features)/}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.3.20
+  version: 0.3.21
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-23 00:00:00.000000000 Z
+date: 2022-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reflexion
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.26
+        version: 0.1.28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.26
+        version: 0.1.28
+- !ruby/object:Gem::Dependency
+  name: yard
+  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'
 description: Creative Coding Framework have API compatible to Processing API or p5.js.
 email: xordog@gmail.com
 executables: []
@@ -49,6 +63,7 @@ files:
 - examples/hello.rb
 - examples/image.rb
 - examples/shapes.rb
+- lib/rubysketch-glsl.rb
 - lib/rubysketch-processing.rb
 - lib/rubysketch.rb
 - lib/rubysketch/app.rb
@@ -80,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Processing like Creative Coding Framework.