Merge branch 'auto-return-shader-hooks' into flat-strands

Author: davepagurek

src/strands/strands_api.js

@@ -437,7 +437,7 @@ export function createShaderHooksFunctions(strandsContext, fn, shader) {
   for (const hookType of hookTypes) {
     const hook = function(hookUserCallback) {
       const args = setupHook();
-      hook._result = hookUserCallback(...args);
+      hook._result = hookUserCallback(...args) ?? hook._result;
       finishHook();
     }
 

test/unit/visual/cases/webgl.js

@@ -1021,6 +1021,111 @@ visualSuite('WebGL', function() {
       p5.circle(p5.noise(0), p5.noise(0), 20);
       screenshot();
     });
+
+    visualSuite('auto-return for shader hooks', () => {
+      visualTest('auto-returns input struct when return is omitted', (p5, screenshot) => {
+        p5.createCanvas(50, 50, p5.WEBGL);
+        const shader = p5.baseMaterialShader().modify(() => {
+          p5.getWorldInputs((inputs) => {
+            inputs.position.x += 10;
+            // No explicit return - should auto-return inputs
+          });
+        }, { p5 });
+        p5.background(255);
+        p5.noStroke();
+        p5.shader(shader);
+        p5.sphere(20);
+        screenshot();
+      });
+
+      visualTest('explicit return still works', (p5, screenshot) => {
+        p5.createCanvas(50, 50, p5.WEBGL);
+        const shader = p5.baseMaterialShader().modify(() => {
+          p5.getWorldInputs((inputs) => {
+            inputs.position.x += 10;
+            return inputs; // Explicit return should still work
+          });
+        }, { p5 });
+        p5.background(255);
+        p5.noStroke();
+        p5.shader(shader);
+        p5.sphere(20);
+        screenshot();
+      });
+
+      visualTest('auto-return works with getObjectInputs', (p5, screenshot) => {
+        p5.createCanvas(50, 50, p5.WEBGL);
+        const shader = p5.baseMaterialShader().modify(() => {
+          p5.getObjectInputs((inputs) => {
+            inputs.position.x += 0.25;
+            // No explicit return
+          });
+        }, { p5 });
+        p5.background(255);
+        p5.lights();
+        p5.fill('red');
+        p5.noStroke();
+        p5.rotateY(p5.PI / 2);
+        p5.camera(-800, 0, 0, 0, 0, 0);
+        p5.shader(shader);
+        p5.sphere(20);
+        screenshot();
+      });
+
+      visualTest('auto-return works with getCameraInputs', (p5, screenshot) => {
+        p5.createCanvas(50, 50, p5.WEBGL);
+        const shader = p5.baseMaterialShader().modify(() => {
+          p5.getCameraInputs((inputs) => {
+            inputs.position.x += 10;
+            // No explicit return
+          });
+        }, { p5 });
+        p5.background(255);
+        p5.lights();
+        p5.fill('red');
+        p5.noStroke();
+        p5.rotateY(p5.PI / 2);
+        p5.camera(-800, 0, 0, 0, 0, 0);
+        p5.shader(shader);
+        p5.sphere(20);
+        screenshot();
+      });
+
+      visualTest('auto-return preserves multiple property modifications', (p5, screenshot) => {
+        p5.createCanvas(50, 50, p5.WEBGL);
+        const shader = p5.baseMaterialShader().modify(() => {
+          p5.getWorldInputs((inputs) => {
+            inputs.position.x += 5;
+            inputs.position.y += 5;
+            inputs.normal.x += 0.5;
+            inputs.normal = p5.normalize(inputs.normal);
+            // No explicit return - all modifications should be preserved
+          });
+        }, { p5 });
+        p5.background(255);
+        p5.lights();
+        p5.fill('red');
+        p5.noStroke();
+        p5.shader(shader);
+        p5.sphere(20);
+        screenshot();
+      });
+
+      visualTest('auto-return works with getPixelInputs', (p5, screenshot) => {
+        p5.createCanvas(50, 50, p5.WEBGL);
+        const shader = p5.baseMaterialShader().modify(() => {
+          p5.getPixelInputs((inputs) => {
+            inputs.color = p5.vec4(1.0, 0.0, 0.0, 1.0); // Red
+            // No explicit return
+          });
+        }, { p5 });
+        p5.background(255);
+        p5.noStroke();
+        p5.shader(shader);
+        p5.circle(0, 0, 40);
+        screenshot();
+      });
+    });
   });
 
   visualSuite('background()', function () {

test/unit/visual/screenshots/WebGL/p5.strands/auto-return for shader hooks/auto-return preserves multiple property modifications/000.png

@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}

test/unit/visual/screenshots/WebGL/p5.strands/auto-return for shader hooks/auto-return preserves multiple property modifications/metadata.json

@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}

test/unit/visual/screenshots/WebGL/p5.strands/auto-return for shader hooks/auto-return works with getCameraInputs/000.png

@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}

test/unit/visual/screenshots/WebGL/p5.strands/auto-return for shader hooks/auto-return works with getCameraInputs/metadata.json

@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}