@triforge/shader-core 0.1.2 → 0.2.0

package/dist/bundle.js

@@ -308,7 +308,14 @@ var CompileContext = class _CompileContext {
    */
   resolveInput(socket) {
     if (socket.connection) {
-      return this.outputVar(socket.connection.node, socket.connection.name);
+      const varName = this.outputVar(socket.connection.node, socket.connection.name);
+      if (socket.type === "vector" && socket.connection.type !== "vector") {
+        return `(${varName}).xy`;
+      }
+      if (socket.type === "color" && socket.connection.type === "vector") {
+        return `vec3(${varName}, 0.0)`;
+      }
+      return varName;
     }
     if (socket.uniformName !== null) {
       if (!(socket.uniformName in this._uniforms)) {
@@ -421,6 +428,8 @@ var CompileContext = class _CompileContext {
   typesCompatible(from, to) {
     if (from === to) return true;
     if ((from === "shader" || from === "color") && (to === "shader" || to === "color")) return true;
+    if ((from === "color" || from === "shader") && to === "vector") return true;
+    if (from === "vector" && to === "color") return true;
     return false;
   }
   // ── GLSL builders ─────────────────────────────────────────────────
@@ -2033,7 +2042,7 @@ var ImageTexture = class extends ProcessNode {
     return `uniform sampler2D ${this.uniformName};`;
   }
   compileCall(ctx) {
-    const uv = this._inputs.vector.isConnected() ? ctx.outputVar(this._inputs.vector.connection.node, this._inputs.vector.connection.name) : "vUv";
+    const uv = this._inputs.vector.isConnected() ? ctx.resolveInput(this._inputs.vector) : "vUv";
     const cv = ctx.outputVar(this, "Color");
     const av = ctx.outputVar(this, "Alpha");
     return [
@@ -2644,7 +2653,7 @@ vec3 _st_wavelength(float w) {
 };
 
 // src/nodes/process/NormalMap.ts
-var NormalMap = class extends ProcessNode {
+var NormalMap = class _NormalMap extends ProcessNode {
   get nodeType() {
     return "NormalMap";
   }
@@ -2657,19 +2666,35 @@ var NormalMap = class extends ProcessNode {
       category: "Vector",
       color: "#4a3a8a",
       cost: "medium",
-      costNote: "Samples input Fac four times for gradient computation."
+      costNote: "Builds a derivative-based TBN frame per fragment."
     };
   }
   static {
     this.glslFunction = `
-vec3 _st_normalMap(float fac, float strength) {
-  return vec3(0.0, 1.0, 0.0);
+vec3 _st_normalMap(vec3 sampledColor, float strength, vec3 N, vec3 P, vec2 uv) {
+  vec3 n = sampledColor * 2.0 - 1.0;
+  n.xy *= strength;
+
+  // Derivative-based cotangent frame (Sch\xFCler) \u2014 no vertex tangent attribute needed.
+  vec3 dp1  = dFdx(P);
+  vec3 dp2  = dFdy(P);
+  vec2 duv1 = dFdx(uv);
+  vec2 duv2 = dFdy(uv);
+
+  vec3 dp2perp = cross(dp2, N);
+  vec3 dp1perp = cross(N, dp1);
+  vec3 T = dp2perp * duv1.x + dp1perp * duv2.x;
+  vec3 B = dp2perp * duv1.y + dp1perp * duv2.y;
+
+  float invmax = inversesqrt(max(dot(T, T), dot(B, B)));
+  mat3 TBN = mat3(T * invmax, B * invmax, N);
+  return normalize(TBN * n);
 }`;
   }
   constructor(inputs = {}) {
     super("NormalMap");
     this._inputs = this.createInputs(inputs, {
-      fac: ["float", 0.5],
+      color: ["color", [0.5, 0.5, 1]],
       strength: ["float", inputs.strength ?? 1]
     });
     this._outputs = this.createOutputs({ Normal: "color" });
@@ -2681,17 +2706,13 @@ vec3 _st_normalMap(float fac, float strength) {
     return this._outputs;
   }
   compileDefs() {
-    return "";
+    return _NormalMap.glslFunction;
   }
   compileCall(ctx) {
-    const facVar = this._inputs.fac.isConnected() ? ctx.outputVar(this._inputs.fac.connection.node, this._inputs.fac.connection.name) : ctx.resolveInput(this._inputs.fac);
+    const color = ctx.resolveInput(this._inputs.color);
     const strength = ctx.resolveInput(this._inputs.strength);
     const normalVar = ctx.outputVar(this, "Normal");
-    return [
-      `float _nm_nx_${this.id} = dFdx(${facVar});`,
-      `float _nm_ny_${this.id} = dFdy(${facVar});`,
-      `vec3  ${normalVar} = normalize(vec3(-_nm_nx_${this.id} * ${strength}, 1.0, -_nm_ny_${this.id} * ${strength}));`
-    ].join("\n  ");
+    return `vec3 ${normalVar} = _st_normalMap(${color}, ${strength}, normalize(vNormal), vPosition, vUv);`;
   }
 };
 
@@ -2793,10 +2814,12 @@ vec3 _st_rotateZ(vec3 v, float a) {
   constructor(inputs = {}) {
     super("Mapping");
     this.mode = inputs.mode ?? "TEXTURE";
-    this.loc = inputs.location ?? [0, 0, 0];
-    this.rot = inputs.rotation ?? [0, 0, 0];
-    this.scl = inputs.scale ?? [1, 1, 1];
-    this._inputs = this.createInputs(inputs, { vector: ["color", null] });
+    this._inputs = this.createInputs(inputs, {
+      vector: ["color", null],
+      location: ["color", inputs.location ?? [0, 0, 0]],
+      rotation: ["color", inputs.rotation ?? [0, 0, 0]],
+      scale: ["color", inputs.scale ?? [1, 1, 1]]
+    });
     this._outputs = this.createOutputs({ Vector: "color" });
   }
   getInputSockets() {
@@ -2810,18 +2833,19 @@ vec3 _st_rotateZ(vec3 v, float a) {
   }
   compileCall(ctx) {
     const v = ctx.resolveInput(this._inputs.vector);
+    const loc = ctx.resolveInput(this._inputs.location);
+    const rot = ctx.resolveInput(this._inputs.rotation);
+    const scl = ctx.resolveInput(this._inputs.scale);
     const out = ctx.outputVar(this, "Vector");
-    const toRad = (d) => (d * Math.PI / 180).toFixed(6);
-    const [lx, ly, lz] = this.loc;
-    const [rx, ry, rz] = this.rot.map(Number);
-    const [sx, sy, sz] = this.scl;
+    const toRad = (Math.PI / 180).toFixed(6);
     return [
       `vec3 _mp_v_${this.id} = ${v};`,
-      `_mp_v_${this.id} = _mp_v_${this.id} - vec3(${lx.toFixed(4)}, ${ly.toFixed(4)}, ${lz.toFixed(4)});`,
-      `_mp_v_${this.id} = _st_rotateX(_mp_v_${this.id}, ${toRad(rx)});`,
-      `_mp_v_${this.id} = _st_rotateY(_mp_v_${this.id}, ${toRad(ry)});`,
-      `_mp_v_${this.id} = _st_rotateZ(_mp_v_${this.id}, ${toRad(rz)});`,
-      `_mp_v_${this.id} = _mp_v_${this.id} * vec3(${sx.toFixed(4)}, ${sy.toFixed(4)}, ${sz.toFixed(4)});`,
+      `vec3 _mp_r_${this.id} = ${rot} * ${toRad};`,
+      `_mp_v_${this.id} = _mp_v_${this.id} - ${loc};`,
+      `_mp_v_${this.id} = _st_rotateX(_mp_v_${this.id}, _mp_r_${this.id}.x);`,
+      `_mp_v_${this.id} = _st_rotateY(_mp_v_${this.id}, _mp_r_${this.id}.y);`,
+      `_mp_v_${this.id} = _st_rotateZ(_mp_v_${this.id}, _mp_r_${this.id}.z);`,
+      `_mp_v_${this.id} = _mp_v_${this.id} * ${scl};`,
       `vec3 ${out} = _mp_v_${this.id};`
     ].join("\n  ");
   }
@@ -4859,6 +4883,7 @@ var ShaderScript = class extends ProcessNode {
     const defs = {};
     const supplied = {};
     for (const [name, spec] of Object.entries(config.inputs ?? {})) {
+      assertGlslIdentifier(name, "ShaderScript input name");
       if (Array.isArray(spec)) {
         const [type, defaultVal] = spec;
         defs[name] = [type, defaultVal];
@@ -4868,6 +4893,9 @@ var ShaderScript = class extends ProcessNode {
         supplied[name] = sock;
       }
     }
+    for (const name of Object.keys(this._outputDecl)) {
+      assertGlslIdentifier(name, "ShaderScript output name");
+    }
     this._inputs = this.createInputs(supplied, defs);
     this._outputs = this.createOutputs(this._outputDecl);
   }

package/dist/core/CompileContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CompileContext.d.ts","sourceRoot":"","sources":["../../src/core/CompileContext.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAI,MAAM,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,QAAQ,EAAQ,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC,CAAA;IAClD,KAAK,EAAW,UAAU,EAAE,CAAA;CAC7B;AAED;;;;;;;;;GASG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,OAAO,CAAqD;IACpE,OAAO,CAAC,QAAQ,CAAoD;IACpE,OAAO,CAAC,KAAK,CAAgD;IAC7D,OAAO,CAAC,WAAW,CAAiD;IACpE,OAAO,CAAC,IAAI,CAAiD;IAC7D,OAAO,CAAC,KAAK,CAAgD;IAC7D,OAAO,CAAC,SAAS,CAA4C;IAC7D,OAAO,CAAC,SAAS,CAAuD;IACxE,0FAA0F;IAC1F,OAAO,CAAC,iBAAiB,CAAiE;IAI1F,OAAO,CAAC,UAAU,EAAE,UAAU,GAAG,gBAAgB;IAcjD;;;OAGG;IACH,SAAS,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAKvD;;;;;OAKG;IACH,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,MAAM;IAuBlD,OAAO,CAAC,KAAK;IA8Bb,OAAO,CAAC,IAAI;IAyBZ,OAAO,CAAC,QAAQ;IA0BhB,OAAO,CAAC,QAAQ;IAKhB,OAAO,CAAC,YAAY;IAsCpB,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,iBAAiB;IAuBzB,OAAO,CAAC,wBAAwB;IAMhC,OAAO,CAAC,mBAAmB;IA2B3B,OAAO,CAAC,SAAS;IAqBjB,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;IAS3D,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAQrC,OAAO,CAAC,SAAS;CAGlB"}
+{"version":3,"file":"CompileContext.d.ts","sourceRoot":"","sources":["../../src/core/CompileContext.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAI,MAAM,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,QAAQ,EAAQ,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC,CAAA;IAClD,KAAK,EAAW,UAAU,EAAE,CAAA;CAC7B;AAED;;;;;;;;;GASG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,OAAO,CAAqD;IACpE,OAAO,CAAC,QAAQ,CAAoD;IACpE,OAAO,CAAC,KAAK,CAAgD;IAC7D,OAAO,CAAC,WAAW,CAAiD;IACpE,OAAO,CAAC,IAAI,CAAiD;IAC7D,OAAO,CAAC,KAAK,CAAgD;IAC7D,OAAO,CAAC,SAAS,CAA4C;IAC7D,OAAO,CAAC,SAAS,CAAuD;IACxE,0FAA0F;IAC1F,OAAO,CAAC,iBAAiB,CAAiE;IAI1F,OAAO,CAAC,UAAU,EAAE,UAAU,GAAG,gBAAgB;IAcjD;;;OAGG;IACH,SAAS,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAKvD;;;;;OAKG;IACH,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,MAAM;IAgClD,OAAO,CAAC,KAAK;IA8Bb,OAAO,CAAC,IAAI;IAyBZ,OAAO,CAAC,QAAQ;IA0BhB,OAAO,CAAC,QAAQ;IAKhB,OAAO,CAAC,YAAY;IAsCpB,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,iBAAiB;IAuBzB,OAAO,CAAC,wBAAwB;IAMhC,OAAO,CAAC,mBAAmB;IA2B3B,OAAO,CAAC,SAAS;IAqBjB,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;IAS3D,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAQrC,OAAO,CAAC,SAAS;CAGlB"}

package/dist/core/CompileContext.js

@@ -53,7 +53,16 @@ export class CompileContext {
      */
     resolveInput(socket) {
         if (socket.connection) {
-            return this.outputVar(socket.connection.node, socket.connection.name);
+            const varName = this.outputVar(socket.connection.node, socket.connection.name);
+            // vec3 (color/shader) → vec2 (vector) implicit conversion, e.g. Mapping.Vector → ImageTexture.vector
+            if (socket.type === 'vector' && socket.connection.type !== 'vector') {
+                return `(${varName}).xy`;
+            }
+            // vec2 (vector) → vec3 (color) implicit conversion, e.g. TextureCoordinate.UV → Mapping.vector
+            if (socket.type === 'color' && socket.connection.type === 'vector') {
+                return `vec3(${varName}, 0.0)`;
+            }
+            return varName;
         }
         if (socket.uniformName !== null) {
             if (!(socket.uniformName in this._uniforms)) {
@@ -192,6 +201,13 @@ export class CompileContext {
         // shader and color are both vec3 — compatible
         if ((from === 'shader' || from === 'color') && (to === 'shader' || to === 'color'))
             return true;
+        // vec3 (color/shader) implicitly narrows to vec2 (vector) via .xy, mirroring Blender's
+        // Mapping (vector output) → Image Texture Vector panning graph
+        if ((from === 'color' || from === 'shader') && to === 'vector')
+            return true;
+        // vec2 (vector) implicitly widens to vec3 (color), e.g. Texture Coordinate UV → Mapping.vector
+        if (from === 'vector' && to === 'color')
+            return true;
         return false;
     }
     // ── GLSL builders ─────────────────────────────────────────────────

package/dist/nodes/process/ImageTexture.js

@@ -41,7 +41,7 @@ export class ImageTexture extends ProcessNode {
     }
     compileCall(ctx) {
         const uv = this._inputs.vector.isConnected()
-            ? ctx.outputVar(this._inputs.vector.connection.node, this._inputs.vector.connection.name)
+            ? ctx.resolveInput(this._inputs.vector)
             : 'vUv';
         const cv = ctx.outputVar(this, 'Color');
         const av = ctx.outputVar(this, 'Alpha');

package/dist/nodes/process/Mapping.d.ts

@@ -22,9 +22,6 @@ export declare class Mapping extends ProcessNode {
     static instanceSpecificDef: boolean;
     get metadata(): NodeMetadata;
     static glslFunction: string;
-    private readonly loc;
-    private readonly rot;
-    private readonly scl;
     private readonly mode;
     private readonly _inputs;
     private readonly _outputs;

package/dist/nodes/process/Mapping.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Mapping.d.ts","sourceRoot":"","sources":["../../../src/nodes/process/Mapping.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAE9D,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAEnE,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAM,WAAW,CAAA;IACtB,MAAM,CAAC,EAAI,YAAY,CAAA;IACvB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC,KAAK,CAAC,EAAK,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;CACpC;AAED;;;;;;GAMG;AACH,qBAAa,OAAQ,SAAQ,WAAW;IACtC,IAAI,QAAQ,WAAuB;IACnC,MAAM,CAAC,mBAAmB,UAAQ;IAElC,IAAI,QAAQ,IAAI,YAAY,CAE3B;IAED,MAAM,CAAC,YAAY,SAYnB;IAEA,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA0B;IAC9C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA0B;IAC9C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA0B;IAC9C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAa;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2E;IACnG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmE;gBAEhF,MAAM,GAAE,aAAkB;IAUtC,eAAe;IACf,gBAAgB;IAChB,WAAW;IAEX,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,MAAM;CAkBzC"}
+{"version":3,"file":"Mapping.d.ts","sourceRoot":"","sources":["../../../src/nodes/process/Mapping.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAE9D,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAEnE,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAM,WAAW,CAAA;IACtB,MAAM,CAAC,EAAI,YAAY,CAAA;IACvB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC,KAAK,CAAC,EAAK,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;CACpC;AAED;;;;;;GAMG;AACH,qBAAa,OAAQ,SAAQ,WAAW;IACtC,IAAI,QAAQ,WAAuB;IACnC,MAAM,CAAC,mBAAmB,UAAQ;IAElC,IAAI,QAAQ,IAAI,YAAY,CAE3B;IAED,MAAM,CAAC,YAAY,SAYnB;IAEA,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAa;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2E;IACnG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmE;gBAEhF,MAAM,GAAE,aAAkB;IAYtC,eAAe;IACf,gBAAgB;IAChB,WAAW;IAEX,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,MAAM;CAmBzC"}

package/dist/nodes/process/Mapping.js

@@ -14,10 +14,12 @@ export class Mapping extends ProcessNode {
     constructor(inputs = {}) {
         super('Mapping');
         this.mode = inputs.mode ?? 'TEXTURE';
-        this.loc = inputs.location ?? [0, 0, 0];
-        this.rot = inputs.rotation ?? [0, 0, 0];
-        this.scl = inputs.scale ?? [1, 1, 1];
-        this._inputs = this.createInputs(inputs, { vector: ['color', null] });
+        this._inputs = this.createInputs(inputs, {
+            vector: ['color', null],
+            location: ['color', inputs.location ?? [0, 0, 0]],
+            rotation: ['color', inputs.rotation ?? [0, 0, 0]],
+            scale: ['color', inputs.scale ?? [1, 1, 1]],
+        });
         this._outputs = this.createOutputs({ Vector: 'color' });
     }
     getInputSockets() { return this._inputs; }
@@ -25,33 +27,34 @@ export class Mapping extends ProcessNode {
     compileDefs() { return Mapping.glslFunction; }
     compileCall(ctx) {
         const v = ctx.resolveInput(this._inputs.vector);
+        const loc = ctx.resolveInput(this._inputs.location);
+        const rot = ctx.resolveInput(this._inputs.rotation);
+        const scl = ctx.resolveInput(this._inputs.scale);
         const out = ctx.outputVar(this, 'Vector');
-        const toRad = (d) => (d * Math.PI / 180).toFixed(6);
-        const [lx, ly, lz] = this.loc;
-        const [rx, ry, rz] = this.rot.map(Number);
-        const [sx, sy, sz] = this.scl;
+        const toRad = (Math.PI / 180).toFixed(6);
         return [
             `vec3 _mp_v_${this.id} = ${v};`,
-            `_mp_v_${this.id} = _mp_v_${this.id} - vec3(${lx.toFixed(4)}, ${ly.toFixed(4)}, ${lz.toFixed(4)});`,
-            `_mp_v_${this.id} = _st_rotateX(_mp_v_${this.id}, ${toRad(rx)});`,
-            `_mp_v_${this.id} = _st_rotateY(_mp_v_${this.id}, ${toRad(ry)});`,
-            `_mp_v_${this.id} = _st_rotateZ(_mp_v_${this.id}, ${toRad(rz)});`,
-            `_mp_v_${this.id} = _mp_v_${this.id} * vec3(${sx.toFixed(4)}, ${sy.toFixed(4)}, ${sz.toFixed(4)});`,
+            `vec3 _mp_r_${this.id} = ${rot} * ${toRad};`,
+            `_mp_v_${this.id} = _mp_v_${this.id} - ${loc};`,
+            `_mp_v_${this.id} = _st_rotateX(_mp_v_${this.id}, _mp_r_${this.id}.x);`,
+            `_mp_v_${this.id} = _st_rotateY(_mp_v_${this.id}, _mp_r_${this.id}.y);`,
+            `_mp_v_${this.id} = _st_rotateZ(_mp_v_${this.id}, _mp_r_${this.id}.z);`,
+            `_mp_v_${this.id} = _mp_v_${this.id} * ${scl};`,
             `vec3 ${out} = _mp_v_${this.id};`,
         ].join('\n  ');
     }
 }
 Mapping.instanceSpecificDef = false;
-Mapping.glslFunction = `
-vec3 _st_rotateX(vec3 v, float a) {
-  float c = cos(a), s = sin(a);
-  return vec3(v.x, c * v.y - s * v.z, s * v.y + c * v.z);
-}
-vec3 _st_rotateY(vec3 v, float a) {
-  float c = cos(a), s = sin(a);
-  return vec3(c * v.x + s * v.z, v.y, -s * v.x + c * v.z);
-}
-vec3 _st_rotateZ(vec3 v, float a) {
-  float c = cos(a), s = sin(a);
-  return vec3(c * v.x - s * v.y, s * v.x + c * v.y, v.z);
+Mapping.glslFunction = `
+vec3 _st_rotateX(vec3 v, float a) {
+  float c = cos(a), s = sin(a);
+  return vec3(v.x, c * v.y - s * v.z, s * v.y + c * v.z);
+}
+vec3 _st_rotateY(vec3 v, float a) {
+  float c = cos(a), s = sin(a);
+  return vec3(c * v.x + s * v.z, v.y, -s * v.x + c * v.z);
+}
+vec3 _st_rotateZ(vec3 v, float a) {
+  float c = cos(a), s = sin(a);
+  return vec3(c * v.x - s * v.y, s * v.x + c * v.y, v.z);
 }`;

package/dist/nodes/process/NormalMap.d.ts

@@ -3,20 +3,24 @@ import type { NodeMetadata } from '../../core/ShaderNode.js';
 import type { CompileContext } from '../../core/CompileContext.js';
 import type { OutputSocket } from '../../core/OutputSocket.js';
 export interface NormalMapInputs {
-    fac?: OutputSocket;
+    color?: OutputSocket;
     strength?: number | OutputSocket;
 }
 /**
- * Normal Map — converts a float noise value into a surface normal.
- * Derives normals via numerical gradient of the input Fac value.
- * Connect to PrincipledBSDF.normal input for surface detail lighting.
+ * Normal Map — Blender "Normal Map" node equivalent.
+ * Decodes a tangent-space normal texture (RGB → vector, [0,1] → [-1,1]) and
+ * rotates it into world space using a derivative-based cotangent frame, so no
+ * explicit vertex tangent attribute is required.
+ *
+ * Connect ImageTexture.Color (sampling a non-color / linear normal map texture)
+ * to `color`. Connect the result to PrincipledBSDF.normal.
  *
  * Inputs:
- *   fac      (float)  — greyscale height value, typically from NoiseTexture.Fac
- *   strength (float)  — normal intensity [0-10]  default: 1.0
+ *   color    (color) — sampled RGB normal texture, still in [0,1] range
+ *   strength (float) — normal intensity, default: 1.0
  *
  * Outputs:
- *   Normal (vector) — perturbed surface normal, ready for PrincipledBSDF.normal
+ *   Normal (color) — world-space perturbed normal, ready for PrincipledBSDF.normal
  */
 export declare class NormalMap extends ProcessNode {
     get nodeType(): string;

package/dist/nodes/process/NormalMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NormalMap.d.ts","sourceRoot":"","sources":["../../../src/nodes/process/NormalMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAE9D,MAAM,WAAW,eAAe;IAC9B,GAAG,CAAC,EAAO,YAAY,CAAA;IACvB,QAAQ,CAAC,EAAE,MAAM,GAAG,YAAY,CAAA;CACjC;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,SAAU,SAAQ,WAAW;IACxC,IAAI,QAAQ,WAAyB;IACrC,MAAM,CAAC,mBAAmB,UAAQ;IAElC,IAAI,QAAQ,IAAI,YAAY,CAQ3B;IAED,MAAM,CAAC,YAAY,SAGnB;IAEA,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2E;IACnG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmE;gBAEhF,MAAM,GAAE,eAAoB;IASxC,eAAe;IACf,gBAAgB;IAChB,WAAW;IAEX,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,MAAM;CAezC"}
+{"version":3,"file":"NormalMap.d.ts","sourceRoot":"","sources":["../../../src/nodes/process/NormalMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAE9D,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAK,YAAY,CAAA;IACvB,QAAQ,CAAC,EAAE,MAAM,GAAG,YAAY,CAAA;CACjC;AAED;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,SAAU,SAAQ,WAAW;IACxC,IAAI,QAAQ,WAAyB;IACrC,MAAM,CAAC,mBAAmB,UAAQ;IAElC,IAAI,QAAQ,IAAI,YAAY,CAQ3B;IAED,MAAM,CAAC,YAAY,SAmBnB;IAEA,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2E;IACnG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmE;gBAEhF,MAAM,GAAE,eAAoB;IASxC,eAAe;IACf,gBAAgB;IAChB,WAAW;IAEX,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,MAAM;CAOzC"}

package/dist/nodes/process/NormalMap.js

@@ -1,15 +1,19 @@
 import { ProcessNode } from '../../core/ProcessNode.js';
 /**
- * Normal Map — converts a float noise value into a surface normal.
- * Derives normals via numerical gradient of the input Fac value.
- * Connect to PrincipledBSDF.normal input for surface detail lighting.
+ * Normal Map — Blender "Normal Map" node equivalent.
+ * Decodes a tangent-space normal texture (RGB → vector, [0,1] → [-1,1]) and
+ * rotates it into world space using a derivative-based cotangent frame, so no
+ * explicit vertex tangent attribute is required.
+ *
+ * Connect ImageTexture.Color (sampling a non-color / linear normal map texture)
+ * to `color`. Connect the result to PrincipledBSDF.normal.
  *
  * Inputs:
- *   fac      (float)  — greyscale height value, typically from NoiseTexture.Fac
- *   strength (float)  — normal intensity [0-10]  default: 1.0
+ *   color    (color) — sampled RGB normal texture, still in [0,1] range
+ *   strength (float) — normal intensity, default: 1.0
  *
  * Outputs:
- *   Normal (vector) — perturbed surface normal, ready for PrincipledBSDF.normal
+ *   Normal (color) — world-space perturbed normal, ready for PrincipledBSDF.normal
  */
 export class NormalMap extends ProcessNode {
     get nodeType() { return 'NormalMap'; }
@@ -19,36 +23,45 @@ export class NormalMap extends ProcessNode {
             category: 'Vector',
             color: '#4a3a8a',
             cost: 'medium',
-            costNote: 'Samples input Fac four times for gradient computation.',
+            costNote: 'Builds a derivative-based TBN frame per fragment.',
         };
     }
     constructor(inputs = {}) {
         super('NormalMap');
         this._inputs = this.createInputs(inputs, {
-            fac: ['float', 0.5],
+            color: ['color', [0.5, 0.5, 1.0]],
             strength: ['float', inputs.strength ?? 1.0],
         });
         this._outputs = this.createOutputs({ Normal: 'color' });
     }
     getInputSockets() { return this._inputs; }
     getOutputSockets() { return this._outputs; }
-    compileDefs() { return ''; }
+    compileDefs() { return NormalMap.glslFunction; }
     compileCall(ctx) {
-        const facVar = this._inputs.fac.isConnected()
-            ? ctx.outputVar(this._inputs.fac.connection.node, this._inputs.fac.connection.name)
-            : ctx.resolveInput(this._inputs.fac);
+        const color = ctx.resolveInput(this._inputs.color);
         const strength = ctx.resolveInput(this._inputs.strength);
         const normalVar = ctx.outputVar(this, 'Normal');
-        // Numerical gradient — samples fac variable neighbour delta via world position
-        return [
-            `float _nm_nx_${this.id} = dFdx(${facVar});`,
-            `float _nm_ny_${this.id} = dFdy(${facVar});`,
-            `vec3  ${normalVar} = normalize(vec3(-_nm_nx_${this.id} * ${strength}, 1.0, -_nm_ny_${this.id} * ${strength}));`,
-        ].join('\n  ');
+        return `vec3 ${normalVar} = _st_normalMap(${color}, ${strength}, normalize(vNormal), vPosition, vUv);`;
     }
 }
 NormalMap.instanceSpecificDef = false;
-NormalMap.glslFunction = `
-vec3 _st_normalMap(float fac, float strength) {
-  return vec3(0.0, 1.0, 0.0);
+NormalMap.glslFunction = `
+vec3 _st_normalMap(vec3 sampledColor, float strength, vec3 N, vec3 P, vec2 uv) {
+  vec3 n = sampledColor * 2.0 - 1.0;
+  n.xy *= strength;
+
+  // Derivative-based cotangent frame (Schüler) — no vertex tangent attribute needed.
+  vec3 dp1  = dFdx(P);
+  vec3 dp2  = dFdy(P);
+  vec2 duv1 = dFdx(uv);
+  vec2 duv2 = dFdy(uv);
+
+  vec3 dp2perp = cross(dp2, N);
+  vec3 dp1perp = cross(N, dp1);
+  vec3 T = dp2perp * duv1.x + dp1perp * duv2.x;
+  vec3 B = dp2perp * duv1.y + dp1perp * duv2.y;
+
+  float invmax = inversesqrt(max(dot(T, T), dot(B, B)));
+  mat3 TBN = mat3(T * invmax, B * invmax, N);
+  return normalize(TBN * n);
 }`;

package/dist/nodes/process/ShaderScript.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ShaderScript.d.ts","sourceRoot":"","sources":["../../../src/nodes/process/ShaderScript.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAK9D;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,EAAE,OAAO,CAAC,CAAA;AAEhF,oDAAoD;AACpD,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC,CAAA;AAEtF,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,MAAM,CAAC,EAAG,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,YAAY,CAAC,CAAA;IAExD,2CAA2C;IAC3C,OAAO,CAAC,EAAE,gBAAgB,CAAA;IAE1B;;;;;;;;;OASG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb,yDAAyD;IACzD,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAID;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,qBAAa,YAAa,SAAQ,WAAW;IAC3C,IAAI,QAAQ,WAA4B;IACxC,MAAM,CAAC,mBAAmB,UAAO;IAEjC,IAAI,QAAQ,IAAI,YAAY,CAQ3B;IAED,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IACrC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IACrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmB;IAC/C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+E;IACvG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;gBAE/C,MAAM,EAAE,kBAAkB;IA8BtC,eAAe;IACf,gBAAgB;IAEhB,mDAAmD;IACnD,WAAW,IAAI,MAAM;IAErB;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,MAAM;IAkCxC,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,aAAa;CAKtB"}
+{"version":3,"file":"ShaderScript.d.ts","sourceRoot":"","sources":["../../../src/nodes/process/ShaderScript.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAEvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAK9D;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,EAAE,OAAO,CAAC,CAAA;AAEhF,oDAAoD;AACpD,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC,CAAA;AAEtF,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,MAAM,CAAC,EAAG,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,YAAY,CAAC,CAAA;IAExD,2CAA2C;IAC3C,OAAO,CAAC,EAAE,gBAAgB,CAAA;IAE1B;;;;;;;;;OASG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb,yDAAyD;IACzD,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAID;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,qBAAa,YAAa,SAAQ,WAAW;IAC3C,IAAI,QAAQ,WAA4B;IACxC,MAAM,CAAC,mBAAmB,UAAO;IAEjC,IAAI,QAAQ,IAAI,YAAY,CAQ3B;IAED,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IACrC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IACrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmB;IAC/C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+E;IACvG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;gBAE/C,MAAM,EAAE,kBAAkB;IAmCtC,eAAe;IACf,gBAAgB;IAEhB,mDAAmD;IACnD,WAAW,IAAI,MAAM;IAErB;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,MAAM;IAkCxC,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,aAAa;CAKtB"}

package/dist/nodes/process/ShaderScript.js

@@ -1,4 +1,5 @@
 import { ProcessNode } from '../../core/ProcessNode.js';
+import { assertGlslIdentifier } from '../../core/glslIdentifier.js';
 // ── ShaderScript node ─────────────────────────────────────────────────────────
 /**
  * ShaderScript — Blender "Script Node (OSL)" equivalent for st-shader-core.
@@ -47,6 +48,7 @@ export class ShaderScript extends ProcessNode {
         const defs = {};
         const supplied = {};
         for (const [name, spec] of Object.entries(config.inputs ?? {})) {
+            assertGlslIdentifier(name, 'ShaderScript input name');
             if (Array.isArray(spec)) {
                 // ['float'|'color'|'vector'|'shader', defaultValue]
                 const [type, defaultVal] = spec;
@@ -60,6 +62,9 @@ export class ShaderScript extends ProcessNode {
                 supplied[name] = sock;
             }
         }
+        for (const name of Object.keys(this._outputDecl)) {
+            assertGlslIdentifier(name, 'ShaderScript output name');
+        }
         this._inputs = this.createInputs(supplied, defs);
         this._outputs = this.createOutputs(this._outputDecl);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triforge/shader-core",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "GLSL shader library for Three.js with Blender workflow",
   "type": "module",
   "main": "./dist/index.js",