@shaderfrog/core 3.0.0 → 3.0.1

package/engine.d.ts

@@ -77,7 +77,9 @@ export declare const extendNodesContext: (context: EngineContext, nodesContext:
     };
 };
 export type EngineImporter = {
-    convertAst(ast: Program, type?: ShaderStage): void;
+    convertAst(ast: Program, options?: Record<string, unknown> & {
+        type?: ShaderStage;
+    }): void;
     nodeInputMap: Partial<Record<EngineNodeType, Record<string, string | null>>>;
     edgeMap: {
         [oldInput: string]: string;

package/engine.js

@@ -71,8 +71,8 @@ export var convertNode = function (node, converter) {
             define: function () { return true; },
         },
     });
-    var ast = parser.parse(preprocessed);
-    converter.convertAst(ast, node.stage);
+    var ast = parser.parse(preprocessed, { stage: node.stage });
+    converter.convertAst(ast, { type: node.stage });
     var source = generate(ast);
     return __assign(__assign({}, node), { source: source });
 };

package/graph/context.d.ts

@@ -1,4 +1,4 @@
-import { type GlslSyntaxError } from '@shaderfrog/glsl-parser';
+import { GlslSyntaxError } from '@shaderfrog/glsl-parser';
 import { AstNode, FunctionNode, Program } from '@shaderfrog/glsl-parser/ast';
 import { Engine, EngineContext } from '../engine';
 import { NodeInput } from './base-node';

package/graph/parsers.js

@@ -88,7 +88,7 @@ export var coreParsers = (_a = {},
                             version: function () { return true; },
                         },
                     });
-                ast = parser.parse(preprocessed);
+                ast = parser.parse(preprocessed, { stage: node.stage });
                 if (node.config.version === 2 && node.stage) {
                     from2To3(ast, node.stage);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shaderfrog/core",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Shaderfrog core",
   "type": "module",
   "files": [
@@ -34,7 +34,7 @@
     "@babel/core": "^7.21.8",
     "@babel/preset-env": "^7.21.5",
     "@babel/preset-typescript": "^7.21.5",
-    "@shaderfrog/glsl-parser": "^5.3.2",
+    "@shaderfrog/glsl-parser": "^6.0.0-beta.7",
     "@swc/core": "^1.6.7",
     "@types/lodash.groupby": "^4.6.7",
     "@types/three": "^0.169.0",
@@ -48,7 +48,7 @@
     "lodash.groupby": "^4.6.0"
   },
   "peerDependencies": {
-    "@shaderfrog/glsl-parser": "^5.0.0-beta.4",
+    "@shaderfrog/glsl-parser": "^6.0.0-beta.7",
     "babylonjs": ">=4",
     "playcanvas": "^1.65.3",
     "three": ">=0.50"

package/plugins/babylon/importers.js

@@ -18,7 +18,7 @@ var importers = {
         // from the original shader and the right imports added
         //
         // Also need to show babylon compile errors in the UI
-        convertAst: function (ast, type) {
+        convertAst: function (ast, options) {
             // Babylon has no normalmatrix. They do have a normal attribute. So undo any
             // multiplication by normalMatrix?
             var seen = {};

package/plugins/playcanvas/importers.js

@@ -10,7 +10,7 @@ var nodeInputMap = {
 };
 var importers = {
     three: {
-        convertAst: function (ast, type) {
+        convertAst: function (ast, options) {
             throw new Error('Not implemented');
         },
         nodeInputMap: (_a = {},

package/plugins/three/importers.d.ts

@@ -1,4 +1,4 @@
 import { EngineImporters } from '../../engine';
-export declare const defaultShadertoyVertex = "\nprecision highp float;\nprecision highp int;\n\nattribute vec3 position;\nattribute vec2 uv;\nvarying vec2 vUv;\n\nvoid main() {\n  vUv = uv;\n  gl_Position = vec4(position * 2.0, 1.0);\n}\n";
+export declare const defaultShadertoyVertex = "\nprecision highp float;\nprecision highp int;\n\nuniform mat4 modelMatrix;\nuniform mat4 modelViewMatrix;\nuniform mat4 projectionMatrix;\nuniform mat4 viewMatrix;\nuniform mat3 normalMatrix;\n\nattribute vec3 position;\nattribute vec3 normal;\nattribute vec2 uv;\nattribute vec2 uv2;\n\nvarying vec2 vUv;\nvarying vec3 vPosition;\nvarying vec3 vNormal;\n\nvoid main() {\n  vUv = uv;\n  vPosition = position;\n  vNormal = normal;\n  gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);\n}\n";
 declare const importers: EngineImporters;
 export default importers;

package/plugins/three/importers.js

@@ -1,20 +1,33 @@
 import { renameBindings, renameFunction, } from '@shaderfrog/glsl-parser/parser/utils';
 import { findMainOrThrow, makeStatement } from '../../util/ast';
-export var defaultShadertoyVertex = "\nprecision highp float;\nprecision highp int;\n\nattribute vec3 position;\nattribute vec2 uv;\nvarying vec2 vUv;\n\nvoid main() {\n  vUv = uv;\n  gl_Position = vec4(position * 2.0, 1.0);\n}\n";
+import { range } from '../../util/math';
+export var defaultShadertoyVertex = "\nprecision highp float;\nprecision highp int;\n\nuniform mat4 modelMatrix;\nuniform mat4 modelViewMatrix;\nuniform mat4 projectionMatrix;\nuniform mat4 viewMatrix;\nuniform mat3 normalMatrix;\n\nattribute vec3 position;\nattribute vec3 normal;\nattribute vec2 uv;\nattribute vec2 uv2;\n\nvarying vec2 vUv;\nvarying vec3 vPosition;\nvarying vec3 vNormal;\n\nvoid main() {\n  vUv = uv;\n  vPosition = position;\n  vNormal = normal;\n  gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);\n}\n";
 var importers = {
     shadertoy: {
         code: {
             defaultShadertoyVertex: defaultShadertoyVertex,
         },
-        convertAst: function (ast, type) {
-            ast.program.unshift(makeStatement('uniform vec2 renderResolution', '\n')[0]);
+        convertAst: function (ast, options) {
+            var isUv = (options === null || options === void 0 ? void 0 : options.importType) === 'uv';
+            var isScreen = !isUv;
+            if (isScreen) {
+                ast.program.unshift(makeStatement('uniform vec2 renderResolution', '\n')[0]);
+            }
+            else {
+                ast.program.unshift(makeStatement('varying vec2 vUv', '\n')[0]);
+            }
             // These do not catch variables in preprocessor definitions! See "SAD HACK"
-            //if (ast.scopes.some((s) => 'iTime' in s.bindings)) {
-            ast.program.unshift(makeStatement('uniform float time')[0]);
-            //}
-            //if (ast.scopes.some((s) => 'iMouse' in s.bindings)) {
-            ast.program.unshift(makeStatement('uniform vec2 mouse')[0]);
-            //}
+            if (ast.scopes.some(function (s) { return 'iTime' in s.bindings; })) {
+                ast.program.unshift(makeStatement('uniform float time')[0]);
+            }
+            if (ast.scopes.some(function (s) { return 'iMouse' in s.bindings; })) {
+                ast.program.unshift(makeStatement('uniform vec2 mouse')[0]);
+            }
+            range(0, 9).forEach(function (i) {
+                if (ast.scopes.some(function (s) { return "iChannel".concat(i) in s.bindings; })) {
+                    ast.program.unshift(makeStatement("uniform sampler2D iChannel".concat(i))[0]);
+                }
+            });
             ast.program.unshift(makeStatement('precision highp int', '\n')[0]);
             ast.program.unshift(makeStatement('precision highp float')[0]);
             ast.scopes[0].functions.main = renameFunction(ast.scopes[0].functions.mainImage, 'main');
@@ -33,13 +46,23 @@ var importers = {
                         return 'mouse';
                     }
                     if (name === 'iResolution') {
-                        return 'renderResolution';
+                        if (isUv) {
+                            return 'vec2(1.0)';
+                        }
+                        else {
+                            return 'renderResolution';
+                        }
                     }
                     if (name === 'fragColor') {
                         return 'gl_FragColor';
                     }
                     if (name === 'fragCoord') {
-                        return 'gl_FragCoord.xy';
+                        if (isUv) {
+                            return 'vUv';
+                        }
+                        else {
+                            return 'gl_FragCoord.xy';
+                        }
                     }
                     return name;
                 });
@@ -49,7 +72,7 @@ var importers = {
         edgeMap: {},
     },
     babylon: {
-        convertAst: function (ast, type) {
+        convertAst: function (ast, options) {
             ast.scopes[0].bindings = renameBindings(ast.scopes[0].bindings, function (name) {
                 return name === 'vMainUV1' ? 'vUv' : name === 'vNormalW' ? 'vNormal' : name;
             });

package/plugins/three/threngine.test.js

@@ -129,7 +129,7 @@ it('threngine shadertoy import', function () { return __awaiter(void 0, void 0,
     return __generator(this, function (_a) {
         testImport = "\nvoid mainImage( out vec4 fragColor, in vec2 fragCoord ){\n  vec3 rd = normalize(vec3(2.*fragCoord - iResolution.xy, iResolution.y));\n  fragColor = vec4(sqrt(clamp(col, 0., 1.)), 1.0 * iTime);\n}\n";
         p = parser.parse(testImport);
-        importers.shadertoy.convertAst(p, 'fragment');
+        importers.shadertoy.convertAst(p, { type: 'fragment' });
         expect(generate(p)).toContain("\nprecision highp float;\nprecision highp int;\n\nuniform vec2 mouse;\nuniform float time;\nuniform vec2 renderResolution;\n\nvoid main() {\n  vec3 rd = normalize(vec3(2.*gl_FragCoord.xy - renderResolution.xy, renderResolution.y));\n  gl_FragColor = vec4(sqrt(clamp(col, 0., 1.)), 1.0 * time);\n}\n");
         return [2 /*return*/];
     });

package/util/math.d.ts

@@ -0,0 +1,2 @@
+export declare const randomBetween: (min: number, max: number) => number;
+export declare const range: (start: number, end: number) => number[];

package/util/math.js

@@ -0,0 +1,6 @@
+export var randomBetween = function (min, max) {
+    return Math.random() * (max - min) + min;
+};
+export var range = function (start, end) {
+    return Array.from({ length: end - start }, function (_, i) { return i + start; });
+};