@triforge/shader-core 0.2.0 → 0.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/bundle.js
CHANGED
|
@@ -84,6 +84,12 @@ var OutputSocket = class {
|
|
|
84
84
|
};
|
|
85
85
|
|
|
86
86
|
// src/core/ShaderNode.ts
|
|
87
|
+
function finiteOr(value, fallback) {
|
|
88
|
+
return Number.isFinite(value) ? value : fallback;
|
|
89
|
+
}
|
|
90
|
+
function sanitizeVec3(v) {
|
|
91
|
+
return [finiteOr(v[0], 0), finiteOr(v[1], 0), finiteOr(v[2], 0)];
|
|
92
|
+
}
|
|
87
93
|
function hexToRgb(hex) {
|
|
88
94
|
const h = hex.replace("#", "");
|
|
89
95
|
return [
|
|
@@ -178,14 +184,14 @@ var ShaderNode = class {
|
|
|
178
184
|
if (type === "float" && typeof literal === "number") {
|
|
179
185
|
socket.uniformName = `u_${this.id}_${name}`;
|
|
180
186
|
this._uniformMap.set(name, socket.uniformName);
|
|
181
|
-
this.parameters[name] = literal;
|
|
187
|
+
this.parameters[name] = finiteOr(literal, 0);
|
|
182
188
|
}
|
|
183
189
|
if (type === "color" && !(value instanceof OutputSocket)) {
|
|
184
190
|
if (typeof literal === "string" || Array.isArray(literal)) {
|
|
185
191
|
socket.uniformName = `u_${this.id}_${name}`;
|
|
186
192
|
this._uniformMap.set(name, socket.uniformName);
|
|
187
193
|
this._colorParams.add(name);
|
|
188
|
-
this.parameters[name] = typeof literal === "string" ? hexToRgb(literal) : literal;
|
|
194
|
+
this.parameters[name] = typeof literal === "string" ? hexToRgb(literal) : sanitizeVec3(literal);
|
|
189
195
|
}
|
|
190
196
|
}
|
|
191
197
|
sockets[name] = socket;
|
|
@@ -217,7 +223,7 @@ var ShaderNode = class {
|
|
|
217
223
|
Object.defineProperty(this.parameters, paramName, {
|
|
218
224
|
get: () => uniforms[uniformName].value,
|
|
219
225
|
set: (v) => {
|
|
220
|
-
uniforms[uniformName].value = v;
|
|
226
|
+
uniforms[uniformName].value = sanitizeVec3(v);
|
|
221
227
|
},
|
|
222
228
|
enumerable: true,
|
|
223
229
|
configurable: true
|
|
@@ -226,7 +232,7 @@ var ShaderNode = class {
|
|
|
226
232
|
Object.defineProperty(this.parameters, paramName, {
|
|
227
233
|
get: () => uniforms[uniformName].value,
|
|
228
234
|
set: (v) => {
|
|
229
|
-
uniforms[uniformName].value = v;
|
|
235
|
+
uniforms[uniformName].value = finiteOr(v, 0);
|
|
230
236
|
},
|
|
231
237
|
enumerable: true,
|
|
232
238
|
configurable: true
|
|
@@ -322,9 +328,10 @@ var CompileContext = class _CompileContext {
|
|
|
322
328
|
if (socket.type === "color") {
|
|
323
329
|
const raw = socket.defaultValue;
|
|
324
330
|
const rgb = typeof raw === "string" ? _CompileContext.hexToRgbArray(raw) : Array.isArray(raw) ? raw : [1, 1, 1];
|
|
325
|
-
this._uniforms[socket.uniformName] = { value: rgb };
|
|
331
|
+
this._uniforms[socket.uniformName] = { value: rgb.map((n) => Number.isFinite(n) ? n : 0) };
|
|
326
332
|
} else {
|
|
327
|
-
|
|
333
|
+
const n = socket.defaultValue;
|
|
334
|
+
this._uniforms[socket.uniformName] = { value: Number.isFinite(n) ? n : 0 };
|
|
328
335
|
}
|
|
329
336
|
}
|
|
330
337
|
return socket.uniformName;
|
|
@@ -478,8 +485,10 @@ ${callsBlock}
|
|
|
478
485
|
// ── Literal conversion ────────────────────────────────────────────
|
|
479
486
|
toLiteral(value, type) {
|
|
480
487
|
switch (type) {
|
|
481
|
-
case "float":
|
|
482
|
-
|
|
488
|
+
case "float": {
|
|
489
|
+
const n = typeof value === "number" && Number.isFinite(value) ? value : 0;
|
|
490
|
+
return n.toFixed(4);
|
|
491
|
+
}
|
|
483
492
|
case "color":
|
|
484
493
|
return typeof value === "string" ? this.hexToVec3(value) : "vec3(1.0, 1.0, 1.0)";
|
|
485
494
|
case "vector":
|
|
@@ -1 +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;
|
|
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;IAkClD,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;IAwBjB,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"}
|
|
@@ -71,10 +71,12 @@ export class CompileContext {
|
|
|
71
71
|
const rgb = typeof raw === 'string'
|
|
72
72
|
? CompileContext.hexToRgbArray(raw)
|
|
73
73
|
: (Array.isArray(raw) ? raw : [1, 1, 1]);
|
|
74
|
-
|
|
74
|
+
// Guard against NaN/Infinity reaching the GPU uniform.
|
|
75
|
+
this._uniforms[socket.uniformName] = { value: rgb.map(n => Number.isFinite(n) ? n : 0) };
|
|
75
76
|
}
|
|
76
77
|
else {
|
|
77
|
-
|
|
78
|
+
const n = socket.defaultValue;
|
|
79
|
+
this._uniforms[socket.uniformName] = { value: Number.isFinite(n) ? n : 0 };
|
|
78
80
|
}
|
|
79
81
|
}
|
|
80
82
|
return socket.uniformName;
|
|
@@ -263,8 +265,11 @@ ${callsBlock}
|
|
|
263
265
|
// ── Literal conversion ────────────────────────────────────────────
|
|
264
266
|
toLiteral(value, type) {
|
|
265
267
|
switch (type) {
|
|
266
|
-
case 'float':
|
|
267
|
-
|
|
268
|
+
case 'float': {
|
|
269
|
+
// Guard against NaN/Infinity reaching the shader source as an invalid GLSL literal.
|
|
270
|
+
const n = typeof value === 'number' && Number.isFinite(value) ? value : 0;
|
|
271
|
+
return n.toFixed(4);
|
|
272
|
+
}
|
|
268
273
|
case 'color':
|
|
269
274
|
return typeof value === 'string'
|
|
270
275
|
? this.hexToVec3(value)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShaderNode.d.ts","sourceRoot":"","sources":["../../src/core/ShaderNode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"ShaderNode.d.ts","sourceRoot":"","sources":["../../src/core/ShaderNode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAsBjD,6DAA6D;AAC7D,KAAK,QAAQ,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;AAE/C,8CAA8C;AAC9C,KAAK,SAAS,GAAG,UAAU,CAAA;AAE3B,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAK,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAK,MAAM,CAAA;IAChB,IAAI,EAAM,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAA;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED;;;GAGG;AACH,8BAAsB,UAAU;IAC9B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IAEnB,2EAA2E;IAC3E,YAAY,CAAC,EAAE,MAAM,CAAA;IAErB;;;;;OAKG;IACH,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAEvC;;;;;;;;OAQG;IACH,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAK;IAElE,2EAA2E;IAC3E,OAAO,CAAC,WAAW,CAAmC;IACtD,yDAAyD;IACzD,OAAO,CAAC,YAAY,CAAkC;gBAE1C,QAAQ,EAAE,MAAM;IAI5B,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAA;IAC/B,QAAQ,KAAK,QAAQ,IAAI,YAAY,CAAA;IAErC,QAAQ,CAAC,eAAe,IAAK,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACjE,QAAQ,CAAC,gBAAgB,IAAI,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC;IAEzD;;;;;;;;;OASG;IACH,gBAAgB,IAAI,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;IAIzG;;;OAGG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY;IAelC;;;OAGG;IACH,QAAQ,CAAC,WAAW,IAAI,MAAM;IAE9B;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,qBAAqB,EAAE,cAAc,GAAG,MAAM;IAE/E;;;;OAIG;IACH,MAAM,CAAC,mBAAmB,UAAQ;IAElC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,YAAY,CACpB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAC7B,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAkCvC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CACrB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAC9B,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC;IAQ/B;;;;OAIG;IACH,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC,GAAG,IAAI;CAqBpE"}
|
package/dist/core/ShaderNode.js
CHANGED
|
@@ -2,6 +2,13 @@ import { ShaderNodeError } from './ShaderNodeError.js';
|
|
|
2
2
|
import { ShaderConfig } from './ShaderConfig.js';
|
|
3
3
|
import { InputSocket } from './InputSocket.js';
|
|
4
4
|
import { OutputSocket } from './OutputSocket.js';
|
|
5
|
+
/** Guards against NaN/Infinity reaching a GLSL uniform (would emit invalid GLSL literals like "NaN"). */
|
|
6
|
+
function finiteOr(value, fallback) {
|
|
7
|
+
return Number.isFinite(value) ? value : fallback;
|
|
8
|
+
}
|
|
9
|
+
function sanitizeVec3(v) {
|
|
10
|
+
return [finiteOr(v[0], 0), finiteOr(v[1], 0), finiteOr(v[2], 0)];
|
|
11
|
+
}
|
|
5
12
|
function hexToRgb(hex) {
|
|
6
13
|
const h = hex.replace('#', '');
|
|
7
14
|
return [
|
|
@@ -92,7 +99,7 @@ export class ShaderNode {
|
|
|
92
99
|
if (type === 'float' && typeof literal === 'number') {
|
|
93
100
|
socket.uniformName = `u_${this.id}_${name}`;
|
|
94
101
|
this._uniformMap.set(name, socket.uniformName);
|
|
95
|
-
this.parameters[name] = literal;
|
|
102
|
+
this.parameters[name] = finiteOr(literal, 0);
|
|
96
103
|
}
|
|
97
104
|
// Auto-register unconnected color inputs as vec3 uniforms
|
|
98
105
|
if (type === 'color' && !(value instanceof OutputSocket)) {
|
|
@@ -100,7 +107,9 @@ export class ShaderNode {
|
|
|
100
107
|
socket.uniformName = `u_${this.id}_${name}`;
|
|
101
108
|
this._uniformMap.set(name, socket.uniformName);
|
|
102
109
|
this._colorParams.add(name);
|
|
103
|
-
this.parameters[name] = typeof literal === 'string'
|
|
110
|
+
this.parameters[name] = typeof literal === 'string'
|
|
111
|
+
? hexToRgb(literal)
|
|
112
|
+
: sanitizeVec3(literal);
|
|
104
113
|
}
|
|
105
114
|
}
|
|
106
115
|
sockets[name] = socket;
|
|
@@ -131,7 +140,7 @@ export class ShaderNode {
|
|
|
131
140
|
if (this._colorParams.has(paramName)) {
|
|
132
141
|
Object.defineProperty(this.parameters, paramName, {
|
|
133
142
|
get: () => uniforms[uniformName].value,
|
|
134
|
-
set: (v) => { uniforms[uniformName].value = v; },
|
|
143
|
+
set: (v) => { uniforms[uniformName].value = sanitizeVec3(v); },
|
|
135
144
|
enumerable: true,
|
|
136
145
|
configurable: true,
|
|
137
146
|
});
|
|
@@ -139,7 +148,7 @@ export class ShaderNode {
|
|
|
139
148
|
else {
|
|
140
149
|
Object.defineProperty(this.parameters, paramName, {
|
|
141
150
|
get: () => uniforms[uniformName].value,
|
|
142
|
-
set: (v) => { uniforms[uniformName].value = v; },
|
|
151
|
+
set: (v) => { uniforms[uniformName].value = finiteOr(v, 0); },
|
|
143
152
|
enumerable: true,
|
|
144
153
|
configurable: true,
|
|
145
154
|
});
|