feat(glsl): autodetect type over multiple snippets

Author: MrTelanie

src/glsl/index.js

@@ -465,8 +465,9 @@ ${e.message}`);
   }
 }
 
-export function joinGLSL(args, { glsl: glslOn = true, js: jsOn = false } = {}) {
-  const { asts, js, originals, keys } = args.reduce((mem, { [ORIGINALS]: originals, ast }) => {
+export function joinGLSL(args, { glsl: glslOn = true, js: jsOn = false, ast: astOn = false } = {}) {
+  const options = { ...TREE_SETTINGS, scope: {} };
+  const { asts, js, originals, keys } = args.reduce((mem, { [ORIGINALS]: originals }) => {
     if (jsOn) {
       originals.forEach((original) => {
         mem.js = sim(original, { BuiltIn }, mem.keys);
@@ -476,8 +477,14 @@ export function joinGLSL(args, { glsl: glslOn = true, js: jsOn = false } = {}) {
         });
       });
     }
+    if (glslOn || astOn) {
+      originals.forEach((fun) => {
+        const str = fun.toString();
+        const ast = parse(str, options);
+        mem.asts.push(ast);
+      });
+    }
     mem.originals.push(...originals);
-    mem.asts.push(ast);
     return mem;
   }, { asts: [], js: undefined, keys: {}, originals: [] });
 

test/glsl/index.js

@@ -384,29 +384,54 @@ float bar = baz();
     assert.equal(glsl.trim(), expected.trim());
   });
 
-//   it('works with joining chunks auto detection', () => {
-//     const one = buildGLSL(() => {
-//       let foo = uniform(vec2);
-//     });
-//
-//     const two = buildGLSL(() => {
-//       let bar = vec2(() => {
-//         let res = foo;
-//         return res;
-//       });
-//     });
-//
-//     const { glsl } = joinGLSL([one, two]);
-//
-//     const expected = `
-// uniform vec2 foo;
-// vec2 bar() {
-// \tvec2 res = foo;
-// \treturn res;
-// }
-//     `;
-//
-//
-//     assert.equal(glsl.trim(), expected.trim());
-//   });
+  it('works with joining chunks auto detection', () => {
+    const one = buildGLSL(() => {
+      let foo = uniform(vec2);
+    });
+
+    const two = buildGLSL(() => {
+      let bar = vec2(() => {
+        let res = foo;
+        return res;
+      });
+    });
+
+    const { glsl } = joinGLSL([one, two]);
+
+    const expected = `
+uniform vec2 foo;
+vec2 bar() {
+\tvec2 res = foo;
+\treturn res;
+}
+    `;
+
+
+    assert.equal(glsl.trim(), expected.trim());
+  });
+
+  it('works when joining already joined properties', () => {
+    const one = buildGLSL(() => {
+      const foo = vec2(1.0);
+    });
+
+    const two = buildGLSL(() => {
+      const bar = vec2(1.0);
+    });
+
+    const three = buildGLSL(() => {
+      let baz = input(vec2(1.0));
+    });
+
+    const joined = joinGLSL([one, two]);
+    const { glsl } = joinGLSL([joined, three]);
+
+    const expected = `
+const vec2 foo = vec2(1.0);
+const vec2 bar = vec2(1.0);
+in vec2 baz = vec2(1.0);
+    `;
+
+    assert.equal(glsl.trim(), expected.trim());
+  });
 });

test/glsl/sim.js

@@ -15,6 +15,7 @@ describe('glsl tests', () => {
       this.x = x;
       this.y = y;
     }
+
     valueOf() {
       return 5;
     }
@@ -26,6 +27,7 @@ describe('glsl tests', () => {
       this.y = y;
       this.z = z;
     }
+
     valueOf() {
       return 5;
     }
@@ -38,13 +40,16 @@ describe('glsl tests', () => {
       this.z = z;
       this.w = w;
     }
+
     valueOf() {
       return 5;
     }
   }
 
   const jsOptions = {
-    Vec2, Vec3, Vec4,
+    Vec2,
+    Vec3,
+    Vec4,
     calc: calcSim
   };
   buildGLSL(() => { return {}; }, { glsl: false, js: jsOptions });
@@ -578,20 +583,20 @@ vec4 bar(vec2 x) {
       let foo = output(vec2(0.0));
       let getFoo = vec2(() => {
         return foo;
-      })
+      });
       let main = () => {
         foo = vec2(1.0);
-      }
+      };
       return { getFoo, main };
     };
     const shader2 = ({ output, vec2 }) => {
       let bar = output(vec2(0.0));
       let getBar = vec2(() => {
         return bar;
-      })
+      });
       let main = () => {
         bar = vec2(3.0);
-      }
+      };
       return { getBar, main };
     };
     const one = buildGLSL(shader1, { glsl: false });