Make texelSize uniform instead of varying, remove max_varyings check

colejd · Feb 3, 2021 · 689f106 · 689f106
1 parent 208f28c
commit 689f106
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/src/rd-renderer.js b/src/rd-renderer.js
@@ -125,9 +125,6 @@ export class ReactionDiffusionRenderer {
         if (this.renderer.capabilities.maxVertexTextures === 0) {
             throw new Error("System does not support vertex shader textures!");
         }
-        if (this.renderer.capabilities.maxVaryings < 5) {
-            throw new Error("System does not support the number of varying vectors (>= 5) needed to function!");
-        }
 
         // Detect color_buffer_float support
         // if (this.renderer.capabilities.isWebGL2 && !this.renderer.extensions.get("EXT_color_buffer_float")) {
@@ -240,12 +237,17 @@ export class ReactionDiffusionRenderer {
             this.computeRenderTargets.push(newTarget);
         }
 
-        this.displayMaterialUniforms.resolution.value = new THREE.Vector2(width * this.internalResolutionMultiplier, height * this.internalResolutionMultiplier);
+        // Determine actual resolution
+        let realResolution = new THREE.Vector2(width * this.internalResolutionMultiplier, height * this.internalResolutionMultiplier);
+        // Determine texel size (size of a pixel when resolution is normalized between 0 and 1)
+        let texelSize = new THREE.Vector2(1.0 / realResolution.width, 1.0 / realResolution.height);
+
+        this.displayMaterialUniforms.resolution.value = realResolution;
         console.log(`Display texture sized to (${this.displayMaterialUniforms.resolution.value.x}, ${this.displayMaterialUniforms.resolution.value.y})`);
 
-        this.computeUniforms.resolution.value = new THREE.Vector2(width * this.internalResolutionMultiplier, height * this.internalResolutionMultiplier);
+        this.computeUniforms.resolution.value = realResolution;
+        this.computeUniforms.texelSize.value = texelSize;
         //console.log(`Compute texture sized to (${this.computeUniforms.resolution.value.x}, ${this.computeUniforms.resolution.value.y})`);
-
     }
 
     CreateMaterials() {
@@ -279,6 +281,10 @@ export class ReactionDiffusionRenderer {
                 type: "v2",
                 value: new THREE.Vector2()
             },
+            texelSize: {
+                type: "v2",
+                value: new THREE.Vector2()
+            },
             time: {
                 type: "f",
                 value: 1.0
@@ -473,12 +479,13 @@ export class ReactionDiffusionRenderer {
         for (var i = 0; i < width; i++) {
             for (var j = 0; j < height; j++) {
 
-                let nx = i / width - 0.5;
-                let ny = j / height - 0.5;
+                let nx = i / width;
+                let ny = j / height;
 
                 let r = simplex.noise2D(frequency * nx, frequency * ny) + 1 / 2; // Normalize from [-1, 1] to [0, 1]
                 r = Math.pow(r, 20); // Makes peaks more dramatic. See https://www.redblobgames.com/maps/terrain-from-noise/
-                r = Math.min(r, 1); // Cap value at 1.0
+                if (r > 1.0) r = 1; // Cap value at 1.0
+                if (r < 0.5) r = 0; // High pass at 0.5
 
                 pixels[px + 1] = r;
 

diff --git a/src/resources/shaders/compute-frag.glsl b/src/resources/shaders/compute-frag.glsl
@@ -9,10 +9,11 @@
 //
 
 varying vec2 v_uv;
-varying vec2 texelSize;
 
-uniform sampler2D sourceTexture;
 uniform vec2 resolution;
+uniform vec2 texelSize;
+
+uniform sampler2D sourceTexture;
 uniform float time;
 
 uniform float feed; // Growth rate for B
@@ -56,7 +57,6 @@ float when_ge(float x, float y) {
 vec4 convolve5(vec4 centerPixel, vec3[3] kernel) {
     vec4 result = vec4(0.0, 0.0, 0.0, 1.0);
 
-    // Orthogonal texels
     result += texture2D( sourceTexture, v_uv + vec2( 0.0, texelSize.y ) ) * kernel[0][1];
     result += texture2D( sourceTexture, v_uv + vec2( 0.0, -texelSize.y ) ) * kernel[2][1];
     result += texture2D( sourceTexture, v_uv + vec2( texelSize.x, 0.0 ) ) * kernel[1][0];

diff --git a/src/resources/shaders/compute-vert.glsl b/src/resources/shaders/compute-vert.glsl
@@ -1,6 +1,6 @@
 varying vec2 v_uv;
-varying vec2 texelSize;
 
+uniform vec2 texelSize;
 uniform vec2 resolution;
 
 // Provided by Three.js:
@@ -9,11 +9,6 @@ uniform vec2 resolution;
 // uniform mat4 modelViewMatrix;
 
 void main() {
-    texelSize = 1.0 / resolution.xy;
-    texelSize *= 1.0; //Default 1.0. Change the multiplier for fun times
-
     v_uv = uv;
-
     gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
-
 }