processing 0.5.14 → 0.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 311dd968164719386205299dcfeaf129213ab0837975e995f09568fb9180e0e3
-  data.tar.gz: 0b566cc36e09ba7e87624144ad5293f699f3662f1b114d24fd5738ed137a079b
+  metadata.gz: b6025b178164394ad3493995863e8077280dbf2745abd4c2a84223fcbfb6aa65
+  data.tar.gz: 41a9a7b7410d0a6aa5bc34e611e17432722a85a15179eb746511aa75f46eaa97
 SHA512:
-  metadata.gz: c4c627e0c5f44104b12dcb83b0e08257d416115797923af02ee156d8c6c72f309bc55fe19cce5db73de41582546550e31e42d0e543bd9a368107cfb7a3870ec4
-  data.tar.gz: 7c452bb4ad0144326991dddfd12f4e2ff60b5db8095b649630d27a9620b2070eb1b3a63424f03b13d26c45bc2c9a346670b3bd814604fce8f10d67a5612a9e54
+  metadata.gz: cbdf458466e765affb174fce19573fab4d4cfe76e106aaef421fc4e66f95e7b02a6c2d5bc11662756a313f0cabbadfb705f75306b0f7627c32386a17da365030
+  data.tar.gz: 11a736963e87ab5b91c087dce0fcd863c29f5912a6bbfd20d643345f0ead8f268e7a0784f3ceeb7bf903a0d06d500c350e82f9fc34c25d61f23d0cdf2b828554

data/ChangeLog.md

@@ -1,6 +1,20 @@
 # processing ChangeLog
 
 
+## [v0.5.16] - 2023-06-02
+
+- Fix failed tests and add tests
+
+
+## [v0.5.15] - 2023-06-02
+
+- Set initial canvas size to same as the window size
+- Use WIDTH and HEIGHT env vars for initial canvas size
+- Shader class can take shadertoy frament shader source
+- createGraphics() can take pixelDensity parameter
+- Pass self to the block call of beginDraw(), and ensure endDraw
+
+
 ## [v0.5.14] - 2023-05-29
 
 - Add windowMove() and windowResize()

data/VERSION

@@ -1 +1 @@
-0.5.14
+0.5.16

data/lib/processing/graphics.rb

@@ -10,8 +10,8 @@ module Processing
 
     # Initialize graphics object.
     #
-    def initialize(width, height)
-      image = Rays::Image.new width, height
+    def initialize(width, height, pixelDensity = 1)
+      image = Rays::Image.new width, height, Rays::RGBA, pixelDensity
       init__ image, image.painter
     end
 
@@ -22,8 +22,11 @@ module Processing
       @painter__.__send__ :begin_paint
       push
       if block
-        block.call
-        endDraw
+        begin
+          block.call self
+        ensure
+          endDraw
+        end
       end
     end
 

data/lib/processing/graphics_context.rb

@@ -1648,13 +1648,14 @@ module Processing
 
     # Creates a new off-screen graphics context object.
     #
-    # @param width  [Numeric] width of graphics image
-    # @param height [Numeric] height of graphics image
+    # @param width        [Numeric] width of graphics image
+    # @param height       [Numeric] height of graphics image
+    # @param pixelDensity [Numeric] pixel density of graphics image
     #
     # @return [Graphics] graphics object
     #
-    def createGraphics(width, height)
-      Graphics.new width, height
+    def createGraphics(width, height, pixelDensity = 1)
+      Graphics.new width, height, pixelDensity
     end
 
     # Creates a shader object.

data/lib/processing/shader.rb

@@ -13,7 +13,7 @@ module Processing
     # @param fragSrc [String] fragment shader source
     #
     def initialize(vertSrc, fragSrc)
-      @shader = Rays::Shader.new fragSrc, vertSrc, ENV__
+      @shader = Rays::Shader.new modifyFragSource(fragSrc), vertSrc, ENV__
     end
 
     # Sets uniform variables.
@@ -83,74 +83,117 @@ module Processing
       when Shader
         arg
       when :threshold
-        self.new(nil, <<~END).tap {|sh| sh.set :threshold, (args.shift || 0.5)}
-          uniform float threshold;
-          uniform sampler2D texMap;
-          varying vec4 vertTexCoord;
-          varying vec4 vertColor;
-          void main() {
-            vec4 col     = texture2D(texMap, vertTexCoord.xy) * vertColor;
-            float gray   = col.r * 0.3 + col.g * 0.59 + col.b * 0.11;
-            gl_FragColor = vec4(vec3(gray > threshold ? 1.0 : 0.0), 1.0);
-          }
-        END
+        self.new(nil, THRESHOLD_SOURCE).tap {|sh| sh.set :threshold, (args.shift || 0.5)}
       when :gray
-        self.new nil, <<~END
-          uniform sampler2D texMap;
-          varying vec4 vertTexCoord;
-          varying vec4 vertColor;
-          void main() {
-            vec4 col     = texture2D(texMap, vertTexCoord.xy);
-            float gray   = col.r * 0.3 + col.g * 0.59 + col.b * 0.11;
-            gl_FragColor = vec4(vec3(gray), 1.0) * vertColor;
-          }
-        END
+        self.new nil, GRAY_SOURCE
       when :invert
-        self.new nil, <<~END
-          uniform sampler2D texMap;
-          varying vec4 vertTexCoord;
-          varying vec4 vertColor;
-          void main() {
-            vec4 col     = texture2D(texMap, vertTexCoord.xy);
-            gl_FragColor = vec4(vec3(1.0 - col.rgb), 1.0) * vertColor;
-          }
-        END
+        self.new nil, INVERT_SOURCE
       when :blur
-        self.new(nil, <<~END).tap {|sh| sh.set :radius, (args.shift || 1).to_f}
-          #define PI 3.1415926538
-          uniform float radius;
-          uniform sampler2D texMap;
-          uniform vec3 texMin;
-          uniform vec3 texMax;
-          uniform vec3 texOffset;
+        self.new(nil, BLUR_SOURCE).tap {|sh| sh.set :radius, (args.shift || 1).to_f}
+      else
+        nil
+      end
+    end
+
+    private
+
+    THRESHOLD_SOURCE = <<~END
+      uniform float threshold;
+      uniform sampler2D texMap;
+      varying vec4 vertTexCoord;
+      varying vec4 vertColor;
+      void main() {
+        vec4 col     = texture2D(texMap, vertTexCoord.xy) * vertColor;
+        float gray   = col.r * 0.3 + col.g * 0.59 + col.b * 0.11;
+        gl_FragColor = vec4(vec3(gray > threshold ? 1.0 : 0.0), 1.0);
+      }
+    END
+
+    GRAY_SOURCE = <<~END
+      uniform sampler2D texMap;
+      varying vec4 vertTexCoord;
+      varying vec4 vertColor;
+      void main() {
+        vec4 col     = texture2D(texMap, vertTexCoord.xy);
+        float gray   = col.r * 0.3 + col.g * 0.59 + col.b * 0.11;
+        gl_FragColor = vec4(vec3(gray), 1.0) * vertColor;
+      }
+    END
+
+    INVERT_SOURCE = <<~END
+      uniform sampler2D texMap;
+      varying vec4 vertTexCoord;
+      varying vec4 vertColor;
+      void main() {
+        vec4 col     = texture2D(texMap, vertTexCoord.xy);
+        gl_FragColor = vec4(vec3(1.0 - col.rgb), 1.0) * vertColor;
+      }
+    END
+
+    BLUR_SOURCE = <<~END
+      #define PI 3.1415926538
+      uniform float radius;
+      uniform sampler2D texMap;
+      uniform vec3 texMin;
+      uniform vec3 texMax;
+      uniform vec3 texOffset;
+      varying vec4 vertTexCoord;
+      varying vec4 vertColor;
+      float gaussian(vec2 pos, float sigma) {
+        float s2 = sigma * sigma;
+        return 1.0 / (2.0 * PI * s2) * exp(-(dot(pos, pos) / (2.0 * s2)));
+      }
+      void main() {
+        float sigma        = radius * 0.5;
+        vec3 color         = vec3(0.0);
+        float total_weight = 0.0;
+        for (float y = -radius; y < radius; y += 1.0)
+        for (float x = -radius; x < radius; x += 1.0) {
+          vec2 offset   = vec2(x, y);
+          float weight  = gaussian(offset, sigma);
+          vec2 texcoord = vertTexCoord.xy + offset * texOffset.xy;
+          if (
+            texcoord.x < texMin.x || texMax.x < texcoord.x ||
+            texcoord.y < texMin.y || texMax.y < texcoord.y
+          ) continue;
+          color += texture2D(texMap, texcoord).rgb * weight;
+          total_weight += weight;
+        }
+        gl_FragColor = vec4(color / total_weight, 1.0) * vertColor;
+      }
+    END
+
+    def modifyFragSource(source)
+      return nil unless source
+      if hasShadertoyMainImage?(source) && source !~ /void\s+main\s*\(/
+        source += <<~END
           varying vec4 vertTexCoord;
-          varying vec4 vertColor;
-          float gaussian(vec2 pos, float sigma) {
-            float s2 = sigma * sigma;
-            return 1.0 / (2.0 * PI * s2) * exp(-(dot(pos, pos) / (2.0 * s2)));
-          }
           void main() {
-            float sigma        = radius * 0.5;
-            vec3 color         = vec3(0.0);
-            float total_weight = 0.0;
-            for (float y = -radius; y < radius; y += 1.0)
-            for (float x = -radius; x < radius; x += 1.0) {
-              vec2 offset   = vec2(x, y);
-              float weight  = gaussian(offset, sigma);
-              vec2 texcoord = vertTexCoord.xy + offset * texOffset.xy;
-              if (
-                texcoord.x < texMin.x || texMax.x < texcoord.x ||
-                texcoord.y < texMin.y || texMax.y < texcoord.y
-              ) continue;
-              color += texture2D(texMap, texcoord).rgb * weight;
-              total_weight += weight;
-            }
-            gl_FragColor = vec4(color / total_weight, 1.0) * vertColor;
+            mainImage(gl_FragColor, vertTexCoord.xy);
           }
         END
-      else
-        nil
       end
+      {
+        iTime:       :float,
+        iResolution: :vec2,
+        iMouse:      :vec2
+      }.each do |uniformName, type|
+        if needsUniformDeclaration type, uniformName, source
+          source = <<~END + source
+            uniform #{type} #{uniformName};
+          END
+        end
+      end
+      source
+    end
+
+    def hasShadertoyMainImage?(source)
+      source =~ /void\s+mainImage\s*\(\s*out\s+vec4\s+\w+\s*,\s*in\s+vec2\s+\w+\s*\)/
+    end
+
+    def needsUniformDeclaration(type, uniformName, source)
+      source.include?(uniformName.to_s) &&
+        source !~ /uniform\s+#{type}\s+#{uniformName}/
     end
 
   end# Shader

data/lib/processing/window.rb

@@ -20,7 +20,7 @@ module Processing
       @events       = []
       @error        = nil
       @auto_resize  = true
-      @canvas       = Canvas.new self
+      @canvas       = Canvas.new self, width, height
       @canvas_view  =              add   CanvasView.new name: :canvas
       @overlay_view = @canvas_view.add Reflex::View.new name: :overlay
 
@@ -204,11 +204,11 @@ module Processing
 
     attr_reader :image, :painter
 
-    def initialize(window)
+    def initialize(window, width, height)
       @image   = nil
       @painter = window.painter
 
-      resize 1, 1
+      resize width, height
       painter.miter_limit = 10
     end
 

data/lib/processing.rb

@@ -2,7 +2,9 @@ require 'processing/all'
 
 
 module Processing
-  WINDOW  = Processing::Window.new {start}
+  w = (ENV['WIDTH']  || 500).to_i
+  h = (ENV['HEIGHT'] || 500).to_i
+  WINDOW  = Processing::Window.new(w, h) {start}
   CONTEXT = Processing::Context.new WINDOW
 
   refine Object do

data/processing.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'xot',       '~> 0.1.38'
   s.add_runtime_dependency 'rucy',      '~> 0.1.38'
   s.add_runtime_dependency 'rays',      '~> 0.1.39'
-  s.add_runtime_dependency 'reflexion', '~> 0.1.41'
+  s.add_runtime_dependency 'reflexion', '~> 0.1.42'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/test/test_shader.rb

@@ -41,6 +41,20 @@ class TestShader < Test::Unit::TestCase
     end
   end
 
+  def test_shadertoy_shader()
+    assert_equal <<~EXPECTED, shader(nil, <<~ACTUAL).instance_variable_get(:@shader).fragment_shader_source
+      void mainImage(out vec4 fragColor, in vec2 fragCoord) {
+      }
+      varying vec4 vertTexCoord;
+      void main() {
+        mainImage(gl_FragColor, vertTexCoord.xy);
+      }
+    EXPECTED
+      void mainImage(out vec4 fragColor, in vec2 fragCoord) {
+      }
+    ACTUAL
+  end
+
   def test_inspect()
     assert_match %r|#<Processing::Shader:0x\w{16}>|, shader.inspect
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: processing
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.16
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-29 00:00:00.000000000 Z
+date: 2023-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.41
+        version: 0.1.42
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.41
+        version: 0.1.42
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement