@tolokoban/tgd 2.0.139 → 2.0.141
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/README.md +18 -0
- package/lib/dist/camera/camera.d.ts +13 -2
- package/lib/dist/camera/camera.d.ts.map +1 -1
- package/lib/dist/camera/camera.js +43 -10
- package/lib/dist/context/console.d.ts +5 -5
- package/lib/dist/context/console.d.ts.map +1 -1
- package/lib/dist/context/console.js +26 -26
- package/lib/dist/context/context.d.ts +12 -2
- package/lib/dist/context/context.d.ts.map +1 -1
- package/lib/dist/context/context.js +28 -6
- package/lib/dist/dataset/dataset.d.ts.map +1 -1
- package/lib/dist/dataset/dataset.js +22 -9
- package/lib/dist/debug/tools.d.ts +1 -1
- package/lib/dist/debug/tools.d.ts.map +1 -1
- package/lib/dist/debug/tools.js +3 -3
- package/lib/dist/material/diffuse.d.ts.map +1 -1
- package/lib/dist/material/diffuse.js +7 -6
- package/lib/dist/material/flat-texture.d.ts.map +1 -1
- package/lib/dist/material/flat-texture.js +7 -9
- package/lib/dist/material/flat.d.ts.map +1 -1
- package/lib/dist/material/flat.js +2 -2
- package/lib/dist/material/material.d.ts +5 -2
- package/lib/dist/material/material.d.ts.map +1 -1
- package/lib/dist/material/material.js +83 -4
- package/lib/dist/math/mat4.d.ts +1 -1
- package/lib/dist/math/mat4.d.ts.map +1 -1
- package/lib/dist/math/mat4.js +58 -14
- package/lib/dist/painter/gizmo/gizmo.d.ts +3 -3
- package/lib/dist/painter/gizmo/gizmo.d.ts.map +1 -1
- package/lib/dist/painter/gizmo/gizmo.js +11 -7
- package/lib/dist/painter/gizmo/painters/normal.d.ts +2 -2
- package/lib/dist/painter/gizmo/painters/normal.d.ts.map +1 -1
- package/lib/dist/painter/gizmo/painters/normal.js +30 -6
- package/lib/dist/painter/group.d.ts +1 -0
- package/lib/dist/painter/group.d.ts.map +1 -1
- package/lib/dist/painter/group.js +3 -1
- package/lib/dist/painter/mesh/mesh/mesh.d.ts.map +1 -1
- package/lib/dist/painter/mesh/mesh/mesh.js +20 -7
- package/lib/dist/painter/points-cloud/points-cloud-morphing.d.ts +15 -8
- package/lib/dist/painter/points-cloud/points-cloud-morphing.d.ts.map +1 -1
- package/lib/dist/painter/points-cloud/points-cloud-morphing.js +53 -48
- package/lib/dist/painter/points-cloud/points-cloud.d.ts +17 -11
- package/lib/dist/painter/points-cloud/points-cloud.d.ts.map +1 -1
- package/lib/dist/painter/points-cloud/points-cloud.js +56 -54
- package/lib/dist/painter/points-cloud/shaders/frag-flat.d.ts +3 -0
- package/lib/dist/painter/points-cloud/shaders/frag-flat.d.ts.map +1 -0
- package/lib/dist/painter/points-cloud/shaders/frag-flat.js +9 -0
- package/lib/dist/painter/points-cloud/shaders/frag-sphere.d.ts +44 -0
- package/lib/dist/painter/points-cloud/shaders/frag-sphere.d.ts.map +1 -0
- package/lib/dist/painter/points-cloud/shaders/frag-sphere.js +33 -0
- package/lib/dist/painter/points-cloud/shaders/vert.d.ts +4 -0
- package/lib/dist/painter/points-cloud/shaders/vert.d.ts.map +1 -0
- package/lib/dist/painter/points-cloud/shaders/vert.js +34 -0
- package/lib/dist/painter/program.d.ts +1 -1
- package/lib/dist/painter/program.d.ts.map +1 -1
- package/lib/dist/painter/program.js +12 -8
- package/lib/dist/painter/segments/segments.d.ts.map +1 -1
- package/lib/dist/painter/segments/segments.js +3 -1
- package/lib/dist/shader/code.d.ts +2 -2
- package/lib/dist/shader/code.d.ts.map +1 -1
- package/lib/dist/shader/code.js +5 -2
- package/lib/dist/version.d.ts +1 -1
- package/lib/dist/version.js +1 -1
- package/package.json +2 -1
|
@@ -44,7 +44,9 @@ export class TgdDataset {
|
|
|
44
44
|
bytesPerElement: Float32Array.BYTES_PER_ELEMENT,
|
|
45
45
|
divisor,
|
|
46
46
|
getter(view, byteOffset) {
|
|
47
|
-
const offset = byteOffset >= view.byteLength
|
|
47
|
+
const offset = byteOffset >= view.byteLength
|
|
48
|
+
? byteOffset % view.byteLength
|
|
49
|
+
: byteOffset;
|
|
48
50
|
return view.getFloat32(offset, true);
|
|
49
51
|
},
|
|
50
52
|
setter(view, byteOffset, value) {
|
|
@@ -68,7 +70,8 @@ export class TgdDataset {
|
|
|
68
70
|
}
|
|
69
71
|
}
|
|
70
72
|
assertAttributes(attributesDefinition) {
|
|
71
|
-
if (JSON.stringify(attributesDefinition) !==
|
|
73
|
+
if (JSON.stringify(attributesDefinition) !==
|
|
74
|
+
JSON.stringify(this.attributesDefinition)) {
|
|
72
75
|
throw new Error(`This TgdDataset was expected to have these attributes:\n${JSON.stringify(attributesDefinition, null, 2)}\nbut it has these attributes instead:\n${JSON.stringify(this.attributesDefinition, null, 2)}`);
|
|
73
76
|
}
|
|
74
77
|
}
|
|
@@ -208,11 +211,15 @@ export class TgdDataset {
|
|
|
208
211
|
const stride = this.stride;
|
|
209
212
|
return {
|
|
210
213
|
get(index, dimension = 0) {
|
|
211
|
-
const byteOffset = definition.byteOffset +
|
|
214
|
+
const byteOffset = definition.byteOffset +
|
|
215
|
+
stride * index +
|
|
216
|
+
dimension * definition.bytesPerElement;
|
|
212
217
|
return definition.getter(view, byteOffset);
|
|
213
218
|
},
|
|
214
219
|
set(value, index, dimension = 0) {
|
|
215
|
-
const byteOffset = definition.byteOffset +
|
|
220
|
+
const byteOffset = definition.byteOffset +
|
|
221
|
+
stride * index +
|
|
222
|
+
dimension * definition.bytesPerElement;
|
|
216
223
|
definition.setter(view, byteOffset, value);
|
|
217
224
|
},
|
|
218
225
|
};
|
|
@@ -242,7 +249,7 @@ export class TgdDataset {
|
|
|
242
249
|
* @param param2
|
|
243
250
|
*/
|
|
244
251
|
set(attribName, value, { byteOffset = 0, byteStride, first = 0, count = Number.POSITIVE_INFINITY, targetFirst = 0, } = {}) {
|
|
245
|
-
const { bytesPerElement, dimension, byteOffset: attribByteOffset } = this.getDef(attribName);
|
|
252
|
+
const { bytesPerElement, dimension, byteOffset: attribByteOffset, } = this.getDef(attribName);
|
|
246
253
|
const buffer = value instanceof ArrayBuffer ? value : value.buffer;
|
|
247
254
|
const chunkLength = bytesPerElement * dimension;
|
|
248
255
|
const sourceStride = byteStride ?? chunkLength;
|
|
@@ -305,11 +312,17 @@ export class TgdDataset {
|
|
|
305
312
|
return lines.map((line) => `${indent}${line}`).join("\n");
|
|
306
313
|
}
|
|
307
314
|
debug(caption = "Dataset") {
|
|
308
|
-
console.debug(caption, " count:", this.count, " target:", this.target, " usage:", this.usage);
|
|
309
|
-
const rows = [
|
|
315
|
+
console.debug(caption, " count:", this.count, " target:", this.target, " usage:", this.usage, " divisor:", this.divisor);
|
|
316
|
+
const rows = [
|
|
317
|
+
["Name", "type", "offset"],
|
|
318
|
+
];
|
|
310
319
|
for (const attName of Object.keys(this.definitions)) {
|
|
311
320
|
const definition = this.definitions[attName];
|
|
312
|
-
rows.push([
|
|
321
|
+
rows.push([
|
|
322
|
+
attName,
|
|
323
|
+
this.attributesDefinition[attName],
|
|
324
|
+
`${definition.byteOffset}`,
|
|
325
|
+
]);
|
|
313
326
|
}
|
|
314
327
|
const sizes = [0, 1, 2].map((index) => rows.reduce((previous, current) => Math.max(previous, current[index].length), 0));
|
|
315
328
|
for (const [name, type, offset] of rows)
|
|
@@ -351,4 +364,4 @@ function resizeSlow(inBuff, newSize) {
|
|
|
351
364
|
return outBuff;
|
|
352
365
|
}
|
|
353
366
|
const resize = typeof ArrayBuffer.prototype.transfer === "function" ? resizeFast : resizeSlow;
|
|
354
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dataset.js","sourceRoot":"","sources":["../../src/dataset/dataset.ts"],"names":[],"mappings":"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"}
|
|
367
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dataset.js","sourceRoot":"","sources":["../../src/dataset/dataset.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare function padColOfNumbers(values: number[], decimals?: number): string[];
|
|
1
|
+
export declare function padColOfNumbers(values: number[], decimals?: number, lenght?: number): string[];
|
|
2
2
|
//# sourceMappingURL=tools.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/debug/tools.ts"],"names":[],"mappings":"AAAA,wBAAgB,eAAe,
|
|
1
|
+
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/debug/tools.ts"],"names":[],"mappings":"AAAA,wBAAgB,eAAe,CAC9B,MAAM,EAAE,MAAM,EAAE,EAChB,QAAQ,SAAI,EACZ,MAAM,SAAK,GACT,MAAM,EAAE,CAWV"}
|
package/lib/dist/debug/tools.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export function padColOfNumbers(values, decimals = 6) {
|
|
2
|
-
const p =
|
|
1
|
+
export function padColOfNumbers(values, decimals = 6, lenght = 12) {
|
|
2
|
+
const p = 10 ** decimals;
|
|
3
3
|
const out = [];
|
|
4
4
|
let max = 0;
|
|
5
5
|
for (const value of values) {
|
|
@@ -10,4 +10,4 @@ export function padColOfNumbers(values, decimals = 6) {
|
|
|
10
10
|
}
|
|
11
11
|
return out.map((txt) => txt.padStart(max, " "));
|
|
12
12
|
}
|
|
13
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9vbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGVidWcvdG9vbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxVQUFVLGVBQWUsQ0FDOUIsTUFBZ0IsRUFDaEIsUUFBUSxHQUFHLENBQUMsRUFDWixNQUFNLEdBQUcsRUFBRTtJQUVYLE1BQU0sQ0FBQyxHQUFHLEVBQUUsSUFBSSxRQUFRLENBQUE7SUFDeEIsTUFBTSxHQUFHLEdBQWEsRUFBRSxDQUFBO0lBQ3hCLElBQUksR0FBRyxHQUFHLENBQUMsQ0FBQTtJQUNYLEtBQUssTUFBTSxLQUFLLElBQUksTUFBTSxFQUFFLENBQUM7UUFDNUIsTUFBTSxDQUFDLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLEdBQUcsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ25DLE1BQU0sR0FBRyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDL0IsR0FBRyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUMvQixHQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQ2QsQ0FBQztJQUNELE9BQU8sR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQTtBQUNoRCxDQUFDIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diffuse.d.ts","sourceRoot":"","sources":["../../src/material/diffuse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAW,OAAO,EAAE,MAAM,WAAW,CAAA;AAG5C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,KAAK,EACX,YAAY,EAGZ,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,MAAM,MAAM,yBAAyB,GAAG,OAAO,CAAC;IAC/C,KAAK,EAAE,OAAO,GAAG,YAAY,GAAG,YAAY,CAAA;IAC5C,KAAK,EAAE,QAAQ,CAAA;IACf,OAAO,EAAE,QAAQ,CAAA;IACjB,gBAAgB,EAAE,MAAM,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;IACzB,kBAAkB,EAAE,OAAO,CAAA;IAC3B;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAA;CAChB,CAAC,CAAA;AAIF,qBAAa,kBAAmB,SAAQ,WAAW;IAC3C,KAAK,WAEV;IACK,OAAO,WAAuD;IAC9D,gBAAgB,SAAK;IACrB,iBAAiB,SAAI;IACrB,QAAQ,SAAI;IACnB,SAAgB,OAAO,EAAE,YAAY,GAAG,IAAI,CAAA;IAE5C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAC3C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;gBAEjC,OAAO,GAAE,yBAA8B;
|
|
1
|
+
{"version":3,"file":"diffuse.d.ts","sourceRoot":"","sources":["../../src/material/diffuse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAW,OAAO,EAAE,MAAM,WAAW,CAAA;AAG5C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,KAAK,EACX,YAAY,EAGZ,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,MAAM,MAAM,yBAAyB,GAAG,OAAO,CAAC;IAC/C,KAAK,EAAE,OAAO,GAAG,YAAY,GAAG,YAAY,CAAA;IAC5C,KAAK,EAAE,QAAQ,CAAA;IACf,OAAO,EAAE,QAAQ,CAAA;IACjB,gBAAgB,EAAE,MAAM,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;IACzB,kBAAkB,EAAE,OAAO,CAAA;IAC3B;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAA;CAChB,CAAC,CAAA;AAIF,qBAAa,kBAAmB,SAAQ,WAAW;IAC3C,KAAK,WAEV;IACK,OAAO,WAAuD;IAC9D,gBAAgB,SAAK;IACrB,iBAAiB,SAAI;IACrB,QAAQ,SAAI;IACnB,SAAgB,OAAO,EAAE,YAAY,GAAG,IAAI,CAAA;IAE5C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAC3C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;gBAEjC,OAAO,GAAE,yBAA8B;CA2FnD"}
|
|
@@ -21,7 +21,7 @@ export class TgdMaterialDiffuse extends TgdMaterial {
|
|
|
21
21
|
};
|
|
22
22
|
const fragmentShaderCode = [
|
|
23
23
|
hasTexture
|
|
24
|
-
? "vec4 color = texture(
|
|
24
|
+
? "vec4 color = texture(uniTextureColor, varUV);"
|
|
25
25
|
: `vec4 color = vec4(${colorOrTexture.join(", ")});`,
|
|
26
26
|
"if (color.a < uniAlphaCut) discard;",
|
|
27
27
|
`vec3 normal = ${options.lockLightsToCamera ? "mat3(uniModelViewMatrix) * " : ""}normalize(varNormal);`,
|
|
@@ -45,7 +45,6 @@ export class TgdMaterialDiffuse extends TgdMaterial {
|
|
|
45
45
|
};
|
|
46
46
|
if (hasTexture) {
|
|
47
47
|
varyings.varUV = "vec2";
|
|
48
|
-
uniforms.texDiffuse = "sampler2D";
|
|
49
48
|
}
|
|
50
49
|
const vertexShaderCode = () => {
|
|
51
50
|
const code = [
|
|
@@ -58,6 +57,11 @@ export class TgdMaterialDiffuse extends TgdMaterial {
|
|
|
58
57
|
};
|
|
59
58
|
super({
|
|
60
59
|
uniforms,
|
|
60
|
+
textures: hasTexture
|
|
61
|
+
? {
|
|
62
|
+
uniTextureColor: colorOrTexture,
|
|
63
|
+
}
|
|
64
|
+
: {},
|
|
61
65
|
varyings,
|
|
62
66
|
vertexShaderCode,
|
|
63
67
|
fragmentShaderCode,
|
|
@@ -70,9 +74,6 @@ export class TgdMaterialDiffuse extends TgdMaterial {
|
|
|
70
74
|
program.uniform3fv("uniAmbient", this.ambientColor);
|
|
71
75
|
program.uniform1f("uniSpecularExponent", this.specularExponent);
|
|
72
76
|
program.uniform1f("uniSpecularIntensity", this.specularIntensity);
|
|
73
|
-
const { texture } = this;
|
|
74
|
-
if (texture)
|
|
75
|
-
texture.activate(0, program, "texDiffuse");
|
|
76
77
|
},
|
|
77
78
|
});
|
|
78
79
|
this.light = new TgdLight({
|
|
@@ -100,4 +101,4 @@ export class TgdMaterialDiffuse extends TgdMaterial {
|
|
|
100
101
|
}
|
|
101
102
|
}
|
|
102
103
|
}
|
|
103
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
104
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlmZnVzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tYXRlcmlhbC9kaWZmdXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDckMsT0FBTyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxXQUFXLENBQUE7QUFHNUMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQU0zQyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBZ0J4QyxNQUFNLGFBQWEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQTtBQUVuRCxNQUFNLE9BQU8sa0JBQW1CLFNBQVEsV0FBVztJQWFsRCxZQUFZLFVBQXFDLEVBQUU7UUFDbEQsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLFFBQVEsSUFBSSxDQUFDLENBQUE7UUFDdEMsTUFBTSxjQUFjLEdBQ25CLE9BQU8sQ0FBQyxLQUFLLFlBQVksWUFBWTtZQUNwQyxDQUFDLENBQUMsT0FBTyxDQUFDLEtBQUs7WUFDZixDQUFDLENBQUMsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLEtBQUssSUFBSSxhQUFhLENBQUMsQ0FBQTtRQUMvQyxNQUFNLFVBQVUsR0FBRyxjQUFjLFlBQVksWUFBWSxDQUFBO1FBQ3pELE1BQU0sUUFBUSxHQUF5QztZQUN0RCxXQUFXLEVBQUUsT0FBTztZQUNwQixRQUFRLEVBQUUsTUFBTTtZQUNoQixXQUFXLEVBQUUsTUFBTTtZQUNuQixVQUFVLEVBQUUsTUFBTTtZQUNsQixtQkFBbUIsRUFBRSxPQUFPO1lBQzVCLG9CQUFvQixFQUFFLE9BQU87WUFDN0Isa0JBQWtCLEVBQUUsTUFBTTtTQUMxQixDQUFBO1FBQ0QsTUFBTSxrQkFBa0IsR0FBZ0I7WUFDdkMsVUFBVTtnQkFDVCxDQUFDLENBQUMsK0NB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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flat-texture.d.ts","sourceRoot":"","sources":["../../src/material/flat-texture.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAEhD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,MAAM,MAAM,6BAA6B,GAAG;
|
|
1
|
+
{"version":3,"file":"flat-texture.d.ts","sourceRoot":"","sources":["../../src/material/flat-texture.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAEhD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,MAAM,MAAM,6BAA6B,GAAG;IAC3C,OAAO,EAAE,YAAY,CAAA;CACrB,CAAA;AAED,qBAAa,sBAAuB,SAAQ,WAAW;IACtD,OAAO,CAAC,QAAQ,CAA4B;gBAEhC,OAAO,EAAE,6BAA6B;IAuBlD,IAAI,OAAO,IAIU,YAAY,GAAG,IAAI,CAFvC;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,EAIvC;CACD"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import { TgdMaterial } from "./material.js";
|
|
2
2
|
export class TgdMaterialFlatTexture extends TgdMaterial {
|
|
3
3
|
constructor(options) {
|
|
4
|
-
const
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const fragmentShaderCode = ["return texture(uniTexture, varUV);"];
|
|
4
|
+
const fragmentShaderCode = [
|
|
5
|
+
"return texture(uniTextureColor, varUV);",
|
|
6
|
+
];
|
|
8
7
|
const varyings = {
|
|
9
8
|
varUV: "vec2",
|
|
10
9
|
};
|
|
@@ -13,13 +12,12 @@ export class TgdMaterialFlatTexture extends TgdMaterial {
|
|
|
13
12
|
return code;
|
|
14
13
|
};
|
|
15
14
|
super({
|
|
16
|
-
uniforms,
|
|
17
15
|
varyings,
|
|
16
|
+
textures: {
|
|
17
|
+
uniTextureColor: options.texture,
|
|
18
|
+
},
|
|
18
19
|
vertexShaderCode,
|
|
19
20
|
fragmentShaderCode,
|
|
20
|
-
setUniforms: ({ program }) => {
|
|
21
|
-
this._texture?.activate(0, program, "uniTexture");
|
|
22
|
-
},
|
|
23
21
|
});
|
|
24
22
|
this._texture = null;
|
|
25
23
|
this._texture = options.texture;
|
|
@@ -33,4 +31,4 @@ export class TgdMaterialFlatTexture extends TgdMaterial {
|
|
|
33
31
|
this._texture = texture;
|
|
34
32
|
}
|
|
35
33
|
}
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmxhdC10ZXh0dXJlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21hdGVyaWFsL2ZsYXQtdGV4dHVyZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBTXhDLE1BQU0sT0FBTyxzQkFBdUIsU0FBUSxXQUFXO0lBR3RELFlBQVksT0FBc0M7UUFDakQsTUFBTSxrQkFBa0IsR0FBZ0I7WUFDdkMseUNBQXlDO1NBQ3pDLENBQUE7UUFDRCxNQUFNLFFBQVEsR0FBMkM7WUFDeEQsS0FBSyxFQUFFLE1BQU07U0FDYixDQUFBO1FBQ0QsTUFBTSxnQkFBZ0IsR0FBRyxHQUFHLEVBQUU7WUFDN0IsTUFBTSxJQUFJLEdBQWdCLENBQUMsV0FBVyxJQUFJLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQTtZQUNwRCxPQUFPLElBQUksQ0FBQTtRQUNaLENBQUMsQ0FBQTtRQUVELEtBQUssQ0FBQztZQUNMLFFBQVE7WUFDUixRQUFRLEVBQUU7Z0JBQ1QsZUFBZSxFQUFFLE9BQU8sQ0FBQyxPQUFPO2FBQ2hDO1lBQ0QsZ0JBQWdCO1lBQ2hCLGtCQUFrQjtTQUNsQixDQUFDLENBQUE7UUFyQkssYUFBUSxHQUF3QixJQUFJLENBQUE7UUFzQjNDLElBQUksQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQTtJQUNoQyxDQUFDO0lBRUQsSUFBSSxPQUFPO1FBQ1YsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFBO0lBQ3JCLENBQUM7SUFFRCxJQUFJLE9BQU8sQ0FBQyxPQUE0QjtRQUN2QyxJQUFJLElBQUksQ0FBQyxRQUFRLEtBQUssT0FBTztZQUFFLE9BQU07UUFFckMsSUFBSSxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUE7SUFDeEIsQ0FBQztDQUNEIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flat.d.ts","sourceRoot":"","sources":["../../src/material/flat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"flat.d.ts","sourceRoot":"","sources":["../../src/material/flat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC;IAC5C,KAAK,EAAE,YAAY,GAAG,OAAO,CAAA;CAC7B,CAAC,CAAA;AAIF,qBAAa,eAAgB,SAAQ,WAAW;gBACnC,OAAO,GAAE,sBAA2B;CAUhD"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { TgdVec4 } from "./../math/index.js";
|
|
2
2
|
import { TgdMaterial } from "./material.js";
|
|
3
|
-
const DEFAULT_COLOR = [
|
|
3
|
+
const DEFAULT_COLOR = [1, 0, 1, 1];
|
|
4
4
|
export class TgdMaterialFlat extends TgdMaterial {
|
|
5
5
|
constructor(options = {}) {
|
|
6
6
|
const color = new TgdVec4(options.color ?? DEFAULT_COLOR);
|
|
@@ -12,4 +12,4 @@ export class TgdMaterialFlat extends TgdMaterial {
|
|
|
12
12
|
});
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
15
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmxhdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tYXRlcmlhbC9mbGF0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxXQUFXLENBQUE7QUFFbkMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQU14QyxNQUFNLGFBQWEsR0FBaUIsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtBQUVoRCxNQUFNLE9BQU8sZUFBZ0IsU0FBUSxXQUFXO0lBQy9DLFlBQVksVUFBa0MsRUFBRTtRQUMvQyxNQUFNLEtBQUssR0FBRyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBSyxJQUFJLGFBQWEsQ0FBQyxDQUFBO1FBRXpELEtBQUssQ0FBQztZQUNMLFFBQVEsRUFBRTtnQkFDVCxRQUFRLEVBQUUsTUFBTTthQUNoQjtZQUNELGtCQUFrQixFQUFFLENBQUMsZUFBZSxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUM7U0FDekQsQ0FBQyxDQUFBO0lBQ0gsQ0FBQztDQUNEIn0=
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { WebglParams } from "../context/webgl-params";
|
|
2
2
|
import type { TgdProgram } from "../program";
|
|
3
3
|
import type { TgdCodeBloc, TgdCodeFunctions } from "../shader/code";
|
|
4
|
-
import { TgdContext, type TgdPainterStateOptions, type WebglAttributeType, type WebglUniformType } from "..";
|
|
4
|
+
import { type TgdContext, type TgdPainterStateOptions, type TgdTexture2D, type TgdTextureCube, type WebglAttributeType, type WebglUniformType } from "..";
|
|
5
5
|
export interface TgdMaterialContext {
|
|
6
6
|
context: TgdContext;
|
|
7
7
|
program: TgdProgram;
|
|
@@ -34,6 +34,7 @@ export interface TgdMaterialOptions {
|
|
|
34
34
|
uniforms: {
|
|
35
35
|
[name: string]: WebglUniformType;
|
|
36
36
|
};
|
|
37
|
+
textures: Record<string, TgdTexture2D | TgdTextureCube>;
|
|
37
38
|
/**
|
|
38
39
|
* Example: `layout(origin_upper_left) in vec4 gl_FragCoord;`
|
|
39
40
|
*/
|
|
@@ -94,8 +95,10 @@ export declare class TgdMaterial {
|
|
|
94
95
|
readonly uniforms: {
|
|
95
96
|
[name: string]: WebglUniformType;
|
|
96
97
|
};
|
|
98
|
+
readonly textures: Record<string, TgdTexture2D | TgdTextureCube>;
|
|
97
99
|
private readonly _fragmentShaderCode;
|
|
98
100
|
private readonly _fragmentShaderHeader;
|
|
101
|
+
static mix(materialAt0: TgdMaterial, materialAt1: TgdMaterial, varying: string): TgdMaterial;
|
|
99
102
|
/**
|
|
100
103
|
* The code of a `vec4 applyMaterial()` function.
|
|
101
104
|
*/
|
|
@@ -126,6 +129,6 @@ export declare class TgdMaterial {
|
|
|
126
129
|
webglParams: WebglParams;
|
|
127
130
|
}, action: () => void): void;
|
|
128
131
|
readonly delete: () => void;
|
|
129
|
-
constructor({ attPosition, attNormal, attTangent, attUV, varyings, uniforms, fragmentShaderCode, fragmentShaderHeader, extraFragmentShaderFunctions, vertexShaderCode, extraVertexShaderFunctions, vertexShaderCodeForGetPosition, setUniforms, state, debug, delete: deleteFunction, }: Partial<TgdMaterialOptions>);
|
|
132
|
+
constructor({ attPosition, attNormal, attTangent, attUV, varyings, uniforms, textures, fragmentShaderCode, fragmentShaderHeader, extraFragmentShaderFunctions, vertexShaderCode, extraVertexShaderFunctions, vertexShaderCodeForGetPosition, setUniforms, state, debug, delete: deleteFunction, }: Partial<TgdMaterialOptions>);
|
|
130
133
|
}
|
|
131
134
|
//# sourceMappingURL=material.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"material.d.ts","sourceRoot":"","sources":["../../src/material/material.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"material.d.ts","sourceRoot":"","sources":["../../src/material/material.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,69 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { tgdCodeStringify } from "./../shader/index.js";
|
|
2
|
+
import { TgdPainterState, tgdTextureRecordToUniforms, } from "../index.js";
|
|
2
3
|
export class TgdMaterial {
|
|
4
|
+
static mix(materialAt0, materialAt1, varying) {
|
|
5
|
+
return new TgdMaterial({
|
|
6
|
+
attPosition: checkCompatibility("attPosition", materialAt0, materialAt1),
|
|
7
|
+
attNormal: checkCompatibility("attNormal", materialAt0, materialAt1),
|
|
8
|
+
attTangent: checkCompatibility("attTangent", materialAt0, materialAt1),
|
|
9
|
+
attUV: checkCompatibility("attUV", materialAt0, materialAt1),
|
|
10
|
+
textures: {
|
|
11
|
+
...materialAt0.textures,
|
|
12
|
+
...materialAt1.textures,
|
|
13
|
+
},
|
|
14
|
+
uniforms: {
|
|
15
|
+
...materialAt0.uniforms,
|
|
16
|
+
...materialAt1.uniforms,
|
|
17
|
+
},
|
|
18
|
+
varyings: {
|
|
19
|
+
[varying]: "float",
|
|
20
|
+
...materialAt0.varyings,
|
|
21
|
+
...materialAt1.varyings,
|
|
22
|
+
},
|
|
23
|
+
extraVertexShaderFunctions: {
|
|
24
|
+
...materialAt0.extraVertexShaderFunctions,
|
|
25
|
+
...materialAt1.extraVertexShaderFunctions,
|
|
26
|
+
},
|
|
27
|
+
extraFragmentShaderFunctions: {
|
|
28
|
+
...materialAt0.extraFragmentShaderFunctions,
|
|
29
|
+
...materialAt1.extraFragmentShaderFunctions,
|
|
30
|
+
computeMaterialColorAt0: [
|
|
31
|
+
"vec4 computeMaterialColorAt0() {",
|
|
32
|
+
materialAt0.fragmentShaderHeader,
|
|
33
|
+
materialAt0.fragmentShaderCode,
|
|
34
|
+
"}",
|
|
35
|
+
],
|
|
36
|
+
computeMaterialColorAt1: [
|
|
37
|
+
"vec4 computeMaterialColorAt1() {",
|
|
38
|
+
materialAt1.fragmentShaderHeader,
|
|
39
|
+
materialAt1.fragmentShaderCode,
|
|
40
|
+
"}",
|
|
41
|
+
],
|
|
42
|
+
},
|
|
43
|
+
vertexShaderCode: [
|
|
44
|
+
tgdCodeStringify(materialAt0.vertexShaderCode),
|
|
45
|
+
tgdCodeStringify(materialAt1.vertexShaderCode),
|
|
46
|
+
],
|
|
47
|
+
vertexShaderCodeForGetPosition: [
|
|
48
|
+
tgdCodeStringify(materialAt0.vertexShaderCodeForGetPosition),
|
|
49
|
+
tgdCodeStringify(materialAt1.vertexShaderCodeForGetPosition),
|
|
50
|
+
],
|
|
51
|
+
fragmentShaderCode: [
|
|
52
|
+
`return ${varying} < .5 ? computeMaterialColorAt0() : computeMaterialColorAt1();`,
|
|
53
|
+
"vec4 colorAt0 = computeMaterialColorAt0();",
|
|
54
|
+
"vec4 colorAt1 = computeMaterialColorAt1();",
|
|
55
|
+
`return mix(colorAt0, colorAt1, ${varying});`,
|
|
56
|
+
],
|
|
57
|
+
fragmentShaderHeader: [
|
|
58
|
+
tgdCodeStringify(materialAt0.fragmentShaderHeader),
|
|
59
|
+
tgdCodeStringify(materialAt1.fragmentShaderHeader),
|
|
60
|
+
],
|
|
61
|
+
setUniforms: (materialContext) => {
|
|
62
|
+
materialAt0.setUniforms?.(materialContext);
|
|
63
|
+
materialAt1.setUniforms?.(materialContext);
|
|
64
|
+
},
|
|
65
|
+
});
|
|
66
|
+
}
|
|
3
67
|
/**
|
|
4
68
|
* The code of a `vec4 applyMaterial()` function.
|
|
5
69
|
*/
|
|
@@ -49,7 +113,7 @@ export class TgdMaterial {
|
|
|
49
113
|
action,
|
|
50
114
|
});
|
|
51
115
|
}
|
|
52
|
-
constructor({ attPosition = "POSITION", attNormal = "NORMAL", attTangent = "CUSTOM_ATTRIBUTE_3", attUV = "TEXCOORD_0", varyings = {}, uniforms = {}, fragmentShaderCode = ["return vec4(1, .666, .1, 1);"], fragmentShaderHeader = [], extraFragmentShaderFunctions = {}, vertexShaderCode = [], extraVertexShaderFunctions = {}, vertexShaderCodeForGetPosition = "return pos;", setUniforms, state = {}, debug = false, delete: deleteFunction = () => { }, }) {
|
|
116
|
+
constructor({ attPosition = "POSITION", attNormal = "NORMAL", attTangent = "CUSTOM_ATTRIBUTE_3", attUV = "TEXCOORD_0", varyings = {}, uniforms = {}, textures = {}, fragmentShaderCode = ["return vec4(1, .666, .1, 1);"], fragmentShaderHeader = [], extraFragmentShaderFunctions = {}, vertexShaderCode = [], extraVertexShaderFunctions = {}, vertexShaderCodeForGetPosition = "return pos;", setUniforms, state = {}, debug = false, delete: deleteFunction = () => { }, }) {
|
|
53
117
|
this.debug = false;
|
|
54
118
|
this.delete = deleteFunction;
|
|
55
119
|
this.debug = debug;
|
|
@@ -58,7 +122,12 @@ export class TgdMaterial {
|
|
|
58
122
|
this.attTangent = attTangent;
|
|
59
123
|
this.attUV = attUV;
|
|
60
124
|
this.varyings = varyings;
|
|
61
|
-
this.
|
|
125
|
+
this.textures = textures;
|
|
126
|
+
const uniformsForTextures = tgdTextureRecordToUniforms(textures);
|
|
127
|
+
this.uniforms = {
|
|
128
|
+
...uniforms,
|
|
129
|
+
...uniformsForTextures,
|
|
130
|
+
};
|
|
62
131
|
this._fragmentShaderCode = fragmentShaderCode;
|
|
63
132
|
this._fragmentShaderHeader = fragmentShaderHeader;
|
|
64
133
|
this._extraFragmentShaderFunctions = extraFragmentShaderFunctions;
|
|
@@ -69,4 +138,14 @@ export class TgdMaterial {
|
|
|
69
138
|
this.state = state;
|
|
70
139
|
}
|
|
71
140
|
}
|
|
72
|
-
|
|
141
|
+
function checkCompatibility(attribute, materialAt0, materialAt1) {
|
|
142
|
+
const att0 = materialAt0[attribute];
|
|
143
|
+
const att1 = materialAt1[attribute];
|
|
144
|
+
if (att0 && att1) {
|
|
145
|
+
if (att0 !== att1) {
|
|
146
|
+
throw new Error(`"attPosition" is incompatible: "${att0}" vs "${att1}"!`);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
return att0 ?? att1;
|
|
150
|
+
}
|
|
151
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWF0ZXJpYWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWF0ZXJpYWwvbWF0ZXJpYWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBRTlDLE9BQU8sRUFFTixlQUFlLEVBSWYsMEJBQTBCLEdBRzFCLE1BQU0sSUFBSSxDQUFBO0FBd0VYLE1BQU0sT0FBTyxXQUFXO0lBMEJoQixNQUFNLENBQUMsR0FBRyxDQUNoQixXQUF3QixFQUN4QixXQUF3QixFQUN4QixPQUFlO1FBRWYsT0FBTyxJQUFJLFdBQVcsQ0FBQztZQUN0QixXQUFXLEVBQUUsa0JBQWtCLENBQUMsYUFBYSxFQUFFLFdBQVcsRUFBRSxXQUFXLENBQUM7WUFDeEUsU0FBUyxFQUFFLGtCQUFrQixDQUFDLFdBQVcsRUFBRSxXQUFXLEVBQUUsV0FBVyxDQUFDO1lBQ3BFLFVBQVUsRUFBRSxrQkFBa0IsQ0FBQyxZQUFZLEVBQUUsV0FBVyxFQUFFLFdBQVcsQ0FBQztZQUN0RSxLQUFLLEVBQUUsa0JBQWtCLENBQUMsT0FBTyxFQUFFLFdBQVcsRUFBRSxXQUFXLENBQUM7WUFDNUQsUUFBUSxFQUFFO2dCQUNULEdBQUcsV0FBVyxDQUFDLFFBQVE7Z0JBQ3ZCLEdBQUcsV0FBVyxDQUFDLFFBQVE7YUFDdkI7WUFDRCxRQUFRLEVBQUU7Z0JBQ1QsR0FBRyxXQUFXLENBQUMsUUFBUTtnQkFDdkIsR0FBRyxXQUFXLENBQUMsUUFBUTthQUN2QjtZQUNELFFBQVEsRUFBRTtnQkFDVCxDQUFDLE9BQU8sQ0FBQyxFQUFFLE9BQU87Z0JBQ2xCLEdBQUcsV0FBVyxDQUFDLFFBQVE7Z0JBQ3ZCLEdBQUcsV0FBVyxDQUFDLFFBQVE7YUFDdkI7WUFDRCwwQkFBMEIsRUFBRTtnQkFDM0IsR0FBRyxXQUFXLENBQUMsMEJBQTBCO2dCQUN6QyxHQUFHLFdBQVcsQ0FBQywwQkFBMEI7YUFDekM7WUFDRCw0QkFBNEIsRUFBRTtnQkFDN0IsR0FBRyxXQUFXLENBQUMsNEJBQTRCO2dCQUMzQyxHQUFHLFdBQVcsQ0FBQyw0QkFBNEI7Z0JBQzNDLHVCQUF1QixFQUFFO29CQUN4QixrQ0FBa0M7b0JBQ2xDLFdBQVcsQ0FBQyxvQkFBb0I7b0JBQ2hDLFdBQVcsQ0FBQyxrQkFBa0I7b0JBQzlCLEdBQUc7aUJBQ0g7Z0JBQ0QsdUJBQXVCLEVBQUU7b0JBQ3hCLGtDQUFrQztvQkFDbEMsV0FBVyxDQUFDLG9CQUFvQjtvQkFDaEMsV0FBVyxDQUFDLGtCQUFrQjtvQkFDOUIsR0FBRztpQkFDSDthQUNEO1lBQ0QsZ0JBQWdCLEVBQUU7Z0JBQ2pCLGdCQUFnQixDQUFDLFdBQVcsQ0FBQyxnQkFBZ0IsQ0FBQztnQkFDOUMsZ0JBQWdCLENBQUMsV0FBVyxDQUFDLGdCQUFnQixDQUFDO2FBQzlDO1lBQ0QsOEJBQThCLEVBQUU7Z0JBQy9CLGdCQUFnQixDQUFDLFdBQVcsQ0FBQyw4QkFBOEIsQ0FBQztnQkFDNUQsZ0JBQWdCLENBQUMsV0FBVyxDQUFDLDhCQUE4QixDQUFDO2FBQzVEO1lBQ0Qsa0JBQWtCLEVBQUU7Z0JBQ25CLFVBQVUsT0FBTyxnRUFBZ0U7Z0JBQ2pGLDRDQUE0QztnQkFDNUMsNENBQTRDO2dCQUM1QyxrQ0FBa0MsT0FBTyxJQUFJO2FBQzdDO1lBQ0Qsb0JBQW9CLEVBQUU7Z0JBQ3JCLGdCQUFnQixDQUFDLFdBQVcsQ0FBQyxvQkFBb0IsQ0FBQztnQkFDbEQsZ0JBQWdCLENBQUMsV0FBVyxDQUFDLG9CQUFvQixDQUFDO2FBQ2xEO1lBQ0QsV0FBVyxFQUFFLENBQUMsZUFBbUMsRUFBRSxFQUFFO2dCQUNwRCxXQUFXLENBQUMsV0FBVyxFQUFFLENBQUMsZUFBZSxDQUFDLENBQUE7Z0JBQzFDLFdBQVcsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxlQUFlLENBQUMsQ0FBQTtZQUMzQyxDQUFDO1NBQ0QsQ0FBQyxDQUFBO0lBQ0gsQ0FBQztJQUVEOztPQUVHO0lBQ0gsSUFBSSxrQkFBa0I7UUFDckIsSUFBSSxPQUFPLElBQUksQ0FBQyxtQkFBbUIsS0FBSyxVQUFVO1lBQ2pELE9BQU8sSUFBSSxDQUFDLG1CQUFtQixFQUFFLENBQUE7UUFDbEMsT0FBTyxJQUFJLENBQUMsbUJBQW1CLENBQUE7SUFDaEMsQ0FBQztJQUVELElBQUksb0JBQW9CO1FBQ3ZCLElBQUksT0FBTyxJQUFJLENBQUMscUJBQXFCLEtBQUssVUFBVTtZQUNuRCxPQUFPLElBQUksQ0FBQyxxQkFBcUIsRUFBRSxDQUFBO1FBQ3BDLE9BQU8sSUFBSSxDQUFDLHFCQUFxQixDQUFBO0lBQ2xDLENBQUM7SUFNRCxJQUFJLDRCQUE0QjtRQUMvQixJQUFJLE9BQU8sSUFBSSxDQUFDLDZCQUE2QixLQUFLLFVBQVU7WUFDM0QsT0FBTyxJQUFJLENBQUMsNkJBQTZCLEVBQUUsQ0FBQTtRQUM1QyxPQUFPLElBQUksQ0FBQyw2QkFBNkIsQ0FBQTtJQUMxQyxDQUFDO0lBSUQ7O09BRUc7SUFDSCxJQUFJLGdCQUFnQjtRQUNuQixJQUFJLE9BQU8sSUFBSSxDQUFDLGlCQUFpQixLQUFLLFVBQVU7WUFDL0MsT0FBTyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsQ0FBQTtRQUNoQyxPQUFPLElBQUksQ0FBQyxpQkFBaUIsQ0FBQTtJQUM5QixDQUFDO0lBTUQsSUFBSSwwQkFBMEI7UUFDN0IsSUFBSSxPQUFPLElBQUksQ0FBQywyQkFBMkIsS0FBSyxVQUFVO1lBQ3pELE9BQU8sSUFBSSxDQUFDLDJCQUEyQixFQUFFLENBQUE7UUFDMUMsT0FBTyxJQUFJLENBQUMsMkJBQTJCLENBQUE7SUFDeEMsQ0FBQztJQU1EOzs7Ozs7T0FNRztJQUNILElBQUksOEJBQThCO1FBQ2pDLElBQUksT0FBTyxJQUFJLENBQUMsK0JBQStCLEtBQUssVUFBVTtZQUM3RCxPQUFPLElBQUksQ0FBQywrQkFBK0IsRUFBRSxDQUFBO1FBQzlDLE9BQU8sSUFBSSxDQUFDLCtCQUErQixDQUFBO0lBQzVDLENBQUM7SUFRTSxVQUFVLENBQ2hCLE9BQWlFLEVBQ2pFLE1BQWtCO1FBRWxCLGVBQWUsQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFO1lBQzNCLEdBQUcsSUFBSSxDQUFDLEtBQUs7WUFDYixNQUFNO1NBQ04sQ0FBQyxDQUFBO0lBQ0gsQ0FBQztJQUlELFlBQVksRUFDWCxXQUFXLEdBQUcsVUFBVSxFQUN4QixTQUFTLEdBQUcsUUFBUSxFQUNwQixVQUFVLEdBQUcsb0JBQW9CLEVBQ2pDLEtBQUssR0FBRyxZQUFZLEVBQ3BCLFFBQVEsR0FBRyxFQUFFLEVBQ2IsUUFBUSxHQUFHLEVBQUUsRUFDYixRQUFRLEdBQUcsRUFBRSxFQUNiLGtCQUFrQixHQUFHLENBQUMsOEJBQThCLENBQUMsRUFDckQsb0JBQW9CLEdBQUcsRUFBRSxFQUN6Qiw0QkFBNEIsR0FBRyxFQUFFLEVBQ2pDLGdCQUFnQixHQUFHLEVBQUUsRUFDckIsMEJBQTBCLEdBQUcsRUFBRSxFQUMvQiw4QkFBOEIsR0FBRyxhQUFhLEVBQzlDLFdBQVcsRUFDWCxLQUFLLEdBQUcsRUFBRSxFQUNWLEtBQUssR0FBRyxLQUFLLEVBQ2IsTUFBTSxFQUFFLGNBQWMsR0FBRyxHQUFHLEVBQUUsR0FBRSxDQUFDLEdBQ0o7UUFoTXZCLFVBQUssR0FBRyxLQUFLLENBQUE7UUFpTW5CLElBQUksQ0FBQyxNQUFNLEdBQUcsY0FBYyxDQUFBO1FBQzVCLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFBO1FBQ2xCLElBQUksQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFBO1FBQzlCLElBQUksQ0FBQyxTQUFTLEdBQUcsU0FBUyxDQUFBO1FBQzFCLElBQUksQ0FBQyxVQUFVLEdBQUcsVUFBVSxDQUFBO1FBQzVCLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFBO1FBQ2xCLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFBO1FBQ3hCLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFBO1FBQ3hCLE1BQU0sbUJBQW1CLEdBQUcsMEJBQTBCLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDaEUsSUFBSSxDQUFDLFFBQVEsR0FBRztZQUNmLEdBQUcsUUFBUTtZQUNYLEdBQUcsbUJBQW1CO1NBQ3RCLENBQUE7UUFDRCxJQUFJLENBQUMsbUJBQW1CLEdBQUcsa0JBQWtCLENBQUE7UUFDN0MsSUFBSSxDQUFDLHFCQUFxQixHQUFHLG9CQUFvQixDQUFBO1FBQ2pELElBQUksQ0FBQyw2QkFBNkIsR0FBRyw0QkFBNEIsQ0FBQTtRQUNqRSxJQUFJLENBQUMsaUJBQWlCLEdBQUcsZ0JBQWdCLENBQUE7UUFDekMsSUFBSSxDQUFDLDJCQUEyQixHQUFHLDBCQUEwQixDQUFBO1FBQzdELElBQUksQ0FBQywrQkFBK0IsR0FBRyw4QkFBOEIsQ0FBQTtRQUNyRSxJQUFJLENBQUMsV0FBVyxHQUFHLFdBQVcsQ0FBQTtRQUM5QixJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQTtJQUNuQixDQUFDO0NBQ0Q7QUFFRCxTQUFTLGtCQUFrQixDQUMxQixTQUErRCxFQUMvRCxXQUF3QixFQUN4QixXQUF3QjtJQUV4QixNQUFNLElBQUksR0FBRyxXQUFXLENBQUMsU0FBUyxDQUFDLENBQUE7SUFDbkMsTUFBTSxJQUFJLEdBQUcsV0FBVyxDQUFDLFNBQVMsQ0FBQyxDQUFBO0lBQ25DLElBQUksSUFBSSxJQUFJLElBQUksRUFBRSxDQUFDO1FBQ2xCLElBQUksSUFBSSxLQUFLLElBQUksRUFBRSxDQUFDO1lBQ25CLE1BQU0sSUFBSSxLQUFLLENBQUMsbUNBQW1DLElBQUksU0FBUyxJQUFJLElBQUksQ0FBQyxDQUFBO1FBQzFFLENBQUM7SUFDRixDQUFDO0lBQ0QsT0FBTyxJQUFJLElBQUksSUFBSSxDQUFBO0FBQ3BCLENBQUMifQ==
|
package/lib/dist/math/mat4.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
+
import { ArrayNumber3, ArrayNumber4, ArrayNumber16 } from "..";
|
|
1
2
|
import { TgdMat3 } from "./mat3";
|
|
2
3
|
import { TgdQuat } from "./quat";
|
|
3
4
|
import { TgdVec3 } from "./vec3";
|
|
4
5
|
import { TgdVec4 } from "./vec4";
|
|
5
|
-
import { ArrayNumber16, ArrayNumber3, ArrayNumber4 } from "..";
|
|
6
6
|
/**
|
|
7
7
|
* Column-first 4x4 matrix.
|
|
8
8
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mat4.d.ts","sourceRoot":"","sources":["../../src/math/mat4.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mat4.d.ts","sourceRoot":"","sources":["../../src/math/mat4.ts"],"names":[],"mappings":"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"}
|