add suggested changes

Author: hxrshxz

src/strands/strands_api.js

@@ -116,28 +116,28 @@ export function initGlobalStrandsAPI(p5, fn, strandsContext) {
 
   // Add GLSL noise. TODO: Replace this with a backend-agnostic implementation
   const originalNoise = fn.noise;
-  fn.noise = function (...args) {
+  const originalNoiseDetail = fn.noiseDetail;
+
+  strandsContext._noiseOctaves = null;
+  strandsContext._noiseAmpFalloff = null;
+
+  fn.noiseDetail = function (lod, falloff) {
     if (!strandsContext.active) {
-      return originalNoise.apply(this, args); // fallback to regular p5.js noise
+      return originalNoiseDetail.apply(this, arguments);
     }
 
-    const hasNoiseUniforms = strandsContext.uniforms.some(u => u.name === 'uNoiseOctaves');
-    if (!hasNoiseUniforms) {
-      strandsContext.uniforms.push({
-        name: 'uNoiseOctaves',
-        typeInfo: DataType.int1,
-        defaultValue: () => p5._getNoiseOctaves()
-      });
-      strandsContext.uniforms.push({
-        name: 'uNoiseAmpFalloff',
-        typeInfo: DataType.float1,
-        defaultValue: () => p5._getNoiseAmpFalloff()
-      });
+    strandsContext._noiseOctaves = lod;
+    strandsContext._noiseAmpFalloff = falloff;
+  };
+
+  fn.noise = function (...args) {
+    if (!strandsContext.active) {
+      return originalNoise.apply(this, args);
     }
 
     strandsContext.vertexDeclarations.add(noiseGLSL);
     strandsContext.fragmentDeclarations.add(noiseGLSL);
-    // Handle noise(x, y) as noise(vec2)
+
     let nodeArgs;
     if (args.length === 3) {
       nodeArgs = [fn.vec3(args[0], args[1], args[2])];
@@ -147,10 +147,20 @@ export function initGlobalStrandsAPI(p5, fn, strandsContext) {
       nodeArgs = args;
     }
 
+    const octaves = strandsContext._noiseOctaves !== null
+      ? strandsContext._noiseOctaves
+      : p5._getNoiseOctaves();
+    const falloff = strandsContext._noiseAmpFalloff !== null
+      ? strandsContext._noiseAmpFalloff
+      : p5._getNoiseAmpFalloff();
+
+    nodeArgs.push(octaves);
+    nodeArgs.push(falloff);
+
     const { id, dimension } = build.functionCallNode(strandsContext, 'noise', nodeArgs, {
       overloads: [{
-        params: [DataType.float3],
-        returnType: DataType.float1,
+        params: [DataType.float3, DataType.int1, DataType.float1],
+        returnType: DataType.float1
       }]
     });
     return createStrandsNode(id, dimension, strandsContext);

src/webgl/shaders/functions/noise3DGLSL.glsl

@@ -93,16 +93,16 @@ float baseNoise(vec3 v)
         dot(p2,x2), dot(p3,x3) ) );
 }
 
-float noise(vec3 st) {
+float noise(vec3 st, int octaves, float ampFalloff) {
   float result = 0.0;
   float amplitude = 1.0;
   float frequency = 1.0;
 
   for (int i = 0; i < 8; i++) {
-    if (i >= uNoiseOctaves) break;
+    if (i >= octaves) break;
     result += amplitude * baseNoise(st * frequency);
     frequency *= 2.0;
-    amplitude *= uNoiseAmpFalloff;
+    amplitude *= ampFalloff;
   }
 
   return result;