@tolokoban/tgd 2.0.135 → 2.0.137
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 +19 -0
- package/lib/dist/context/context.d.ts +4 -1
- package/lib/dist/context/context.d.ts.map +1 -1
- package/lib/dist/context/context.js +22 -13
- package/lib/dist/context/extensions.d.ts +174 -0
- package/lib/dist/context/extensions.d.ts.map +1 -0
- package/lib/dist/context/extensions.js +41 -0
- package/lib/dist/controller/camera/orbit.js +3 -3
- package/lib/dist/dataset/dataset.d.ts +2 -0
- package/lib/dist/dataset/dataset.d.ts.map +1 -1
- package/lib/dist/dataset/dataset.js +16 -1
- package/lib/dist/filter/filter.d.ts +5 -4
- package/lib/dist/filter/filter.d.ts.map +1 -1
- package/lib/dist/filter/filter.js +7 -4
- package/lib/dist/geometry/geometry.d.ts +2 -0
- package/lib/dist/geometry/geometry.d.ts.map +1 -1
- package/lib/dist/geometry/geometry.js +16 -2
- package/lib/dist/geometry/tools/index.d.ts +1 -0
- package/lib/dist/geometry/tools/index.d.ts.map +1 -1
- package/lib/dist/geometry/tools/index.js +2 -1
- package/lib/dist/geometry/tools/join.d.ts +8 -0
- package/lib/dist/geometry/tools/join.d.ts.map +1 -0
- package/lib/dist/geometry/tools/join.js +134 -0
- package/lib/dist/input/pointer.d.ts.map +1 -1
- package/lib/dist/input/pointer.js +6 -5
- package/lib/dist/material/flat-texture.d.ts +1 -1
- package/lib/dist/material/flat-texture.d.ts.map +1 -1
- package/lib/dist/material/flat-texture.js +1 -1
- package/lib/dist/painter/filter/filter.d.ts +1 -0
- package/lib/dist/painter/filter/filter.d.ts.map +1 -1
- package/lib/dist/painter/filter/filter.js +29 -3
- package/lib/dist/painter/framebuffer.d.ts.map +1 -1
- package/lib/dist/painter/framebuffer.js +2 -3
- package/lib/dist/painter/group.d.ts.map +1 -1
- package/lib/dist/painter/group.js +11 -4
- package/lib/dist/painter/overlay/overlay.d.ts.map +1 -1
- package/lib/dist/painter/overlay/overlay.js +8 -10
- package/lib/dist/painter/painter.d.ts +3 -2
- package/lib/dist/painter/painter.d.ts.map +1 -1
- package/lib/dist/painter/painter.js +13 -5
- package/lib/dist/painter/particles/particles.d.ts +4 -1
- package/lib/dist/painter/particles/particles.d.ts.map +1 -1
- package/lib/dist/painter/particles/particles.js +27 -6
- package/lib/dist/painter/program.js +4 -19
- package/lib/dist/texture/texture-depth.d.ts +2 -2
- package/lib/dist/texture/texture-depth.d.ts.map +1 -1
- package/lib/dist/texture/texture-depth.js +11 -13
- package/lib/dist/texture/texture2d.d.ts +11 -7
- package/lib/dist/texture/texture2d.d.ts.map +1 -1
- package/lib/dist/texture/texture2d.js +141 -79
- package/lib/dist/types/elements.d.ts +1 -0
- package/lib/dist/types/elements.d.ts.map +1 -1
- package/lib/dist/types/elements.js +10 -1
- package/lib/dist/utils/id.d.ts +2 -0
- package/lib/dist/utils/id.d.ts.map +1 -0
- package/lib/dist/utils/id.js +5 -0
- package/lib/dist/utils/index.d.ts +5 -2
- package/lib/dist/utils/index.d.ts.map +1 -1
- package/lib/dist/utils/index.js +6 -3
- package/lib/dist/utils/texture.d.ts +5 -0
- package/lib/dist/utils/texture.d.ts.map +1 -0
- package/lib/dist/utils/texture.js +17 -0
- package/lib/dist/utils/value.d.ts +12 -0
- package/lib/dist/utils/value.d.ts.map +1 -0
- package/lib/dist/utils/value.js +31 -0
- package/lib/dist/version.d.ts +1 -1
- package/lib/dist/version.js +1 -1
- package/package.json +2 -2
|
@@ -1,13 +1,22 @@
|
|
|
1
1
|
import { TgdLogger } from "./../log.js";
|
|
2
|
+
import { nextId } from "./../utils/id.js";
|
|
2
3
|
export class TgdPainter {
|
|
3
|
-
constructor() {
|
|
4
|
-
this.id =
|
|
4
|
+
constructor(name) {
|
|
5
|
+
this.id = nextId();
|
|
5
6
|
/**
|
|
6
7
|
* This attribute has no other purpose than debugging.
|
|
7
8
|
* Its value is not used by Tgd.
|
|
8
9
|
*/
|
|
9
|
-
this.name =
|
|
10
|
+
this.name = `${this.id} Painter`;
|
|
10
11
|
this.active = true;
|
|
12
|
+
if (name)
|
|
13
|
+
this.name = `${this.id} ${name}`;
|
|
14
|
+
}
|
|
15
|
+
get nameUniq() {
|
|
16
|
+
const { name, id } = this;
|
|
17
|
+
if (name.startsWith(id))
|
|
18
|
+
return name;
|
|
19
|
+
return `${id} ${name}`;
|
|
11
20
|
}
|
|
12
21
|
get hierarchy() {
|
|
13
22
|
return {
|
|
@@ -19,5 +28,4 @@ export class TgdPainter {
|
|
|
19
28
|
}
|
|
20
29
|
}
|
|
21
30
|
TgdPainter.log = new TgdLogger();
|
|
22
|
-
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFpbnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wYWludGVyL3BhaW50ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLFVBQVUsQ0FBQTtBQUlwQyxNQUFNLE9BQWdCLFVBQVU7SUFBaEM7UUFLb0IsT0FBRSxHQUFHLFVBQVUsQ0FBQyxPQUFPLEVBQUUsQ0FBQTtRQUV6Qzs7O1dBR0c7UUFDSSxTQUFJLEdBQUcsV0FBVyxJQUFJLENBQUMsRUFBRSxFQUFFLENBQUE7UUFFM0IsV0FBTSxHQUFHLElBQUksQ0FBQTtJQWV4QixDQUFDO0lBVEcsSUFBSSxTQUFTO1FBQ1QsT0FBTztZQUNILENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsSUFBSSxhQUFhLENBQUMsRUFBRSxJQUFJO1NBQzlELENBQUE7SUFDTCxDQUFDO0lBRUQsS0FBSyxDQUFDLE9BQWdCO1FBQ2xCLE9BQU8sQ0FBQyxLQUFLLENBQUMsT0FBTyxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksVUFBVSxJQUFJLENBQUMsRUFBRSxhQUFhLElBQUksQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFBO0lBQ3RGLENBQUM7O0FBMUJlLGNBQUcsR0FBRyxJQUFJLFNBQVMsRUFBRSxBQUFsQixDQUFrQjtBQUVwQixrQkFBTyxHQUFHLENBQUMsQUFBSixDQUFJIn0=
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFpbnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wYWludGVyL3BhaW50ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLFVBQVUsQ0FBQTtBQUNwQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBSXRDLE1BQU0sT0FBZ0IsVUFBVTtJQWE1QixZQUFZLElBQWE7UUFWVCxPQUFFLEdBQUcsTUFBTSxFQUFFLENBQUE7UUFFN0I7OztXQUdHO1FBQ0ksU0FBSSxHQUFHLEdBQUcsSUFBSSxDQUFDLEVBQUUsVUFBVSxDQUFBO1FBRTNCLFdBQU0sR0FBRyxJQUFJLENBQUE7UUFHaEIsSUFBSSxJQUFJO1lBQUUsSUFBSSxDQUFDLElBQUksR0FBRyxHQUFHLElBQUksQ0FBQyxFQUFFLElBQUksSUFBSSxFQUFFLENBQUE7SUFDOUMsQ0FBQztJQUVELElBQUksUUFBUTtRQUNSLE1BQU0sRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLEdBQUcsSUFBSSxDQUFBO1FBQ3pCLElBQUksSUFBSSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7WUFBRSxPQUFPLElBQUksQ0FBQTtRQUNwQyxPQUFPLEdBQUcsRUFBRSxJQUFJLElBQUksRUFBRSxDQUFBO0lBQzFCLENBQUM7SUFNRCxJQUFJLFNBQVM7UUFDVCxPQUFPO1lBQ0gsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxJQUFJLGFBQWEsQ0FBQyxFQUFFLElBQUk7U0FDOUQsQ0FBQTtJQUNMLENBQUM7SUFFRCxLQUFLLENBQUMsT0FBZ0I7UUFDbEIsT0FBTyxDQUFDLEtBQUssQ0FBQyxPQUFPLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxVQUFVLElBQUksQ0FBQyxFQUFFLGFBQWEsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUE7SUFDdEYsQ0FBQzs7QUFsQ2UsY0FBRyxHQUFHLElBQUksU0FBUyxFQUFFLEFBQWxCLENBQWtCIn0=
|
|
@@ -3,6 +3,7 @@ import { TgdShaderFragment, TgdShaderVertex } from "../../shader";
|
|
|
3
3
|
import { TgdPainter } from "../painter";
|
|
4
4
|
import { TgdContext } from "../../context";
|
|
5
5
|
import { TgdProgram } from "../../program";
|
|
6
|
+
import { TgdTexture2D, TgdTextureCube } from "../../texture";
|
|
6
7
|
export interface TgdPainterParticlesUniformsContext {
|
|
7
8
|
time: number;
|
|
8
9
|
delta: number;
|
|
@@ -16,6 +17,7 @@ export interface TgdPainterParticlesOptions {
|
|
|
16
17
|
vert: TgdShaderVertex;
|
|
17
18
|
frag: TgdShaderFragment;
|
|
18
19
|
};
|
|
20
|
+
textures?: Record<string, TgdTexture2D | TgdTextureCube>;
|
|
19
21
|
setUniforms?(options: TgdPainterParticlesUniformsContext): void;
|
|
20
22
|
prefixAttribute?: string;
|
|
21
23
|
prefixVarying?: string;
|
|
@@ -26,11 +28,12 @@ export declare class TgdPainterParticles extends TgdPainter {
|
|
|
26
28
|
readonly count: number;
|
|
27
29
|
drawMode: "POINTS" | "LINES" | "TRIANGLES";
|
|
28
30
|
setUniforms?: (options: TgdPainterParticlesUniformsContext) => void;
|
|
31
|
+
private readonly textures;
|
|
29
32
|
private readonly vaos;
|
|
30
33
|
private readonly buffers;
|
|
31
34
|
private readonly prg;
|
|
32
35
|
private pingPong;
|
|
33
|
-
constructor(context: TgdContext, { name, dataset, shader, drawMode, setUniforms, prefixAttribute, prefixVarying, }: TgdPainterParticlesOptions);
|
|
36
|
+
constructor(context: TgdContext, { name, dataset, shader, drawMode, textures, setUniforms, prefixAttribute, prefixVarying, }: TgdPainterParticlesOptions);
|
|
34
37
|
paint(time: number, delta: number): void;
|
|
35
38
|
delete(): void;
|
|
36
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"particles.d.ts","sourceRoot":"","sources":["../../../src/painter/particles/particles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"particles.d.ts","sourceRoot":"","sources":["../../../src/painter/particles/particles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE3D,MAAM,WAAW,kCAAkC;IAC/C,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,GAAG,EAAE,UAAU,CAAA;CAClB;AAED,MAAM,WAAW,0BAA0B;IACvC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,UAAU,CAAA;IACnB,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,WAAW,CAAA;IAC1C,MAAM,EAAE;QACJ,IAAI,EAAE,eAAe,CAAA;QACrB,IAAI,EAAE,iBAAiB,CAAA;KAC1B,CAAA;IACD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,cAAc,CAAC,CAAA;IACxD,WAAW,CAAC,CAAC,OAAO,EAAE,kCAAkC,GAAG,IAAI,CAAA;IAC/D,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,aAAa,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,qBAAa,mBAAoB,SAAQ,UAAU;aAgB3B,OAAO,EAAE,UAAU;IAfvC,SAAS,CAAC,MAAM,CAAC,OAAO,SAAI;IAE5B,SAAgB,KAAK,EAAE,MAAM,CAAA;IAEtB,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,WAAW,CAAA;IAE1C,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,kCAAkC,KAAK,IAAI,CAAA;IAE1E,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA+C;IACxE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAkC;IACvD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwB;IAChD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAY;IAChC,OAAO,CAAC,QAAQ,CAAI;gBAGA,OAAO,EAAE,UAAU,EACnC,EACI,IAAI,EACJ,OAAO,EACP,MAAM,EACN,QAAQ,EACR,QAAa,EACb,WAAW,EACX,eAAuB,EACvB,aAAqB,GACxB,EAAE,0BAA0B;IA0EjC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAyBxC,MAAM,IAAI,IAAI;CAajB"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { TgdPainter } from "../painter.js";
|
|
2
|
-
import { resolveErrorMessage } from "./../../utils/index.js";
|
|
2
|
+
import { resolveErrorMessage, tgdTextureRecordToUniforms } from "./../../utils/index.js";
|
|
3
3
|
import { TgdProgram } from "./../../program/index.js";
|
|
4
4
|
import { TgdVertexArray } from "./../../vao/index.js";
|
|
5
5
|
export class TgdPainterParticles extends TgdPainter {
|
|
6
|
-
constructor(context, { name, dataset, shader, drawMode, setUniforms, prefixAttribute = "att", prefixVarying = "var", }) {
|
|
6
|
+
constructor(context, { name, dataset, shader, drawMode, textures = {}, setUniforms, prefixAttribute = "att", prefixVarying = "var", }) {
|
|
7
7
|
super();
|
|
8
8
|
this.context = context;
|
|
9
9
|
this.pingPong = 0;
|
|
10
10
|
this.name = name ?? `TgdPainterParticles#${TgdPainterParticles.counter++}`;
|
|
11
|
+
this.textures = textures;
|
|
11
12
|
this.setUniforms = setUniforms;
|
|
12
13
|
this.drawMode = drawMode;
|
|
13
14
|
try {
|
|
@@ -15,6 +16,15 @@ export class TgdPainterParticles extends TgdPainter {
|
|
|
15
16
|
const varyings = [];
|
|
16
17
|
const vert = shader.vert.clone();
|
|
17
18
|
const frag = shader.frag.clone();
|
|
19
|
+
const uniformsForTextures = tgdTextureRecordToUniforms(textures);
|
|
20
|
+
vert.uniforms = {
|
|
21
|
+
...vert.uniforms,
|
|
22
|
+
...uniformsForTextures,
|
|
23
|
+
};
|
|
24
|
+
frag.uniforms = {
|
|
25
|
+
...frag.uniforms,
|
|
26
|
+
...uniformsForTextures,
|
|
27
|
+
};
|
|
18
28
|
for (const attName of Object.keys(vert.attributes)) {
|
|
19
29
|
if (!attName.startsWith(prefixAttribute)) {
|
|
20
30
|
throw new Error(`All attributes must be prefixed with "${prefixAttribute}"! But "${attName}" is not.
|
|
@@ -23,10 +33,10 @@ If you don't want any prefix, just set "prefixAttribute" to "".`);
|
|
|
23
33
|
}
|
|
24
34
|
const varName = `${prefixVarying}${attName.slice(prefixAttribute.length)}`;
|
|
25
35
|
vert.varying[varName] = vert.attributes[attName];
|
|
26
|
-
frag.varying[varName] = vert.varying[varName];
|
|
27
36
|
vert.mainCodeHeaders.push(`${varName} = ${attName};`);
|
|
28
37
|
varyings.push(varName);
|
|
29
38
|
}
|
|
39
|
+
frag.varying = structuredClone(vert.varying);
|
|
30
40
|
dataset.usage = "DYNAMIC_READ";
|
|
31
41
|
this.count = dataset.count;
|
|
32
42
|
const prg = new TgdProgram(gl, {
|
|
@@ -38,7 +48,13 @@ If you don't want any prefix, just set "prefixAttribute" to "".`);
|
|
|
38
48
|
},
|
|
39
49
|
});
|
|
40
50
|
this.prg = prg;
|
|
41
|
-
prg.
|
|
51
|
+
prg.use();
|
|
52
|
+
const samplerNames = Object.keys(textures);
|
|
53
|
+
for (let unit = 0; unit < samplerNames.length; unit++) {
|
|
54
|
+
const uniformName = samplerNames[unit];
|
|
55
|
+
const texture = textures[uniformName];
|
|
56
|
+
texture.activate(unit, prg, uniformName);
|
|
57
|
+
}
|
|
42
58
|
const vaoIn = new TgdVertexArray(gl, prg, [dataset]);
|
|
43
59
|
const bufferIn = vaoIn.getBuffer(0);
|
|
44
60
|
if (!bufferIn)
|
|
@@ -59,11 +75,16 @@ If you don't want any prefix, just set "prefixAttribute" to "".`);
|
|
|
59
75
|
}
|
|
60
76
|
}
|
|
61
77
|
paint(time, delta) {
|
|
62
|
-
const { context, drawMode, prg, vaos, buffers, count, pingPong, setUniforms } = this;
|
|
78
|
+
const { context, textures, drawMode, prg, vaos, buffers, count, pingPong, setUniforms } = this;
|
|
63
79
|
const { gl } = context;
|
|
64
80
|
const src = pingPong;
|
|
65
81
|
const dst = 1 - pingPong;
|
|
66
82
|
prg.use();
|
|
83
|
+
let unit = 0;
|
|
84
|
+
for (const name of Object.keys(textures)) {
|
|
85
|
+
const texture = textures[name];
|
|
86
|
+
texture.activate(unit++, prg, name);
|
|
87
|
+
}
|
|
67
88
|
if (setUniforms) {
|
|
68
89
|
setUniforms({ time, delta, prg });
|
|
69
90
|
}
|
|
@@ -92,4 +113,4 @@ If you don't want any prefix, just set "prefixAttribute" to "".`);
|
|
|
92
113
|
}
|
|
93
114
|
}
|
|
94
115
|
TgdPainterParticles.counter = 0;
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
116
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFydGljbGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3BhaW50ZXIvcGFydGljbGVzL3BhcnRpY2xlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBR3ZDLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSwwQkFBMEIsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUM1RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBQ3pDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxVQUFVLENBQUE7QUF1QnpDLE1BQU0sT0FBTyxtQkFBb0IsU0FBUSxVQUFVO0lBZS9DLFlBQ29CLE9BQW1CLEVBQ25DLEVBQ0ksSUFBSSxFQUNKLE9BQU8sRUFDUCxNQUFNLEVBQ04sUUFBUSxFQUNSLFFBQVEsR0FBRyxFQUFFLEVBQ2IsV0FBVyxFQUNYLGVBQWUsR0FBRyxLQUFLLEVBQ3ZCLGFBQWEsR0FBRyxLQUFLLEdBQ0k7UUFFN0IsS0FBSyxFQUFFLENBQUE7UUFaUyxZQUFPLEdBQVAsT0FBTyxDQUFZO1FBSC9CLGFBQVEsR0FBRyxDQUFDLENBQUE7UUFnQmhCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxJQUFJLHVCQUF1QixtQkFBbUIsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFBO1FBQzFFLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFBO1FBQ3hCLElBQUksQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFBO1FBQzlCLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFBO1FBQ3hCLElBQUksQ0FBQztZQUNELE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUE7WUFDdEIsTUFBTSxRQUFRLEdBQWEsRUFBRSxDQUFBO1lBQzdCLE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUE7WUFDaEMsTUFBTSxJQUFJLEdB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
|
|
@@ -2,8 +2,8 @@ import { TgdDataset } from "./../dataset/index.js";
|
|
|
2
2
|
import { TgdConsole } from "./../debug/index.js";
|
|
3
3
|
import { TgdProgram } from "./../program/index.js";
|
|
4
4
|
import { TgdShaderFragment, TgdShaderVertex, tgdCodeStringify, } from "./../shader/index.js";
|
|
5
|
-
import { ensureArray, webglElementTypeFromTypedArray, webglLookup } from "./../utils/index.js";
|
|
6
|
-
import { TgdPainterLogic,
|
|
5
|
+
import { ensureArray, tgdTextureRecordToUniforms, webglElementTypeFromTypedArray, webglLookup } from "./../utils/index.js";
|
|
6
|
+
import { TgdPainterLogic, TgdVertexArray } from "./../index.js";
|
|
7
7
|
import { TgdUniformBufferObject } from "./../uniform/uniform-buffer-object.js";
|
|
8
8
|
import { TgdPainter } from "./painter.js";
|
|
9
9
|
import { TgdPainterState } from "./state/index.js";
|
|
@@ -66,7 +66,7 @@ export class TgdPainterProgram extends TgdPainter {
|
|
|
66
66
|
});
|
|
67
67
|
this.drawMode = typeof drawMode === "number" ? drawMode : context.gl[drawMode];
|
|
68
68
|
const uniformsHeader = ensureArray(this.uniformsToCode(uniforms));
|
|
69
|
-
const uniformsForTextures =
|
|
69
|
+
const uniformsForTextures = tgdTextureRecordToUniforms(textures);
|
|
70
70
|
const vertexShader = new TgdShaderVertex({
|
|
71
71
|
...vert,
|
|
72
72
|
uniforms: uniformsForTextures,
|
|
@@ -292,19 +292,4 @@ function resolveInstancesCount(datasets) {
|
|
|
292
292
|
.filter((ds) => ds.divisor > 0)
|
|
293
293
|
.map((ds) => ` ${ds.name}: count == ${ds.count} / ${ds.divisor} == ${ds.count / ds.divisor}`)}`);
|
|
294
294
|
}
|
|
295
|
-
function texturesToUniforms(textures) {
|
|
296
|
-
const uniforms = {};
|
|
297
|
-
for (const name of Object.keys(textures)) {
|
|
298
|
-
uniforms[name] = resolveTextureType(textures[name]);
|
|
299
|
-
}
|
|
300
|
-
return uniforms;
|
|
301
|
-
}
|
|
302
|
-
function resolveTextureType(texture) {
|
|
303
|
-
if (texture instanceof TgdTexture2D)
|
|
304
|
-
return "sampler2D";
|
|
305
|
-
if (texture instanceof TgdTextureCube)
|
|
306
|
-
return "samplerCube";
|
|
307
|
-
console.error("[resolveTextureType] Don't know the type of this texture:", texture);
|
|
308
|
-
throw new Error("[resolveTextureType] Don't know the type of this texture!");
|
|
309
|
-
}
|
|
310
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"program.js","sourceRoot":"","sources":["../../src/painter/program.ts"],"names":[],"mappings":"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"}
|
|
295
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"program.js","sourceRoot":"","sources":["../../src/painter/program.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,11 @@ import { TgdContext } from "../context";
|
|
|
3
3
|
interface TgdTextureDepthStorage {
|
|
4
4
|
width: number;
|
|
5
5
|
height: number;
|
|
6
|
-
|
|
6
|
+
format: "DEPTH_COMPONENT16 / DEPTH_COMPONENT / UNSIGNED_SHORT" | "DEPTH_COMPONENT16 / DEPTH_COMPONENT / UNSIGNED_INT" | "DEPTH_COMPONENT24 / DEPTH_COMPONENT / UNSIGNED_INT" | "DEPTH_COMPONENT32F / DEPTH_COMPONENT / FLOAT" | "DEPTH24_STENCIL8 / DEPTH_STENCIL / UNSIGNED_INT_24_8" | "DEPTH32F_STENCIL8 / DEPTH_STENCIL / FLOAT_32_UNSIGNED_INT_24_8_REV";
|
|
7
7
|
}
|
|
8
8
|
export declare class TgdTextureDepth extends TgdTexture2D {
|
|
9
9
|
readonly context: TgdContext;
|
|
10
|
-
constructor(context: TgdContext, { width, height,
|
|
10
|
+
constructor(context: TgdContext, { width, height, format, }?: Partial<TgdTextureDepthStorage>);
|
|
11
11
|
readonly resize: (width: number, height: number) => void;
|
|
12
12
|
private readonly resize16;
|
|
13
13
|
private readonly resize24;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"texture-depth.d.ts","sourceRoot":"","sources":["../../src/texture/texture-depth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,UAAU,sBAAsB;IAC5B,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,
|
|
1
|
+
{"version":3,"file":"texture-depth.d.ts","sourceRoot":"","sources":["../../src/texture/texture-depth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,UAAU,sBAAsB;IAC5B,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EACA,sDAAsD,GACtD,oDAAoD,GACpD,oDAAoD,GACpD,8CAA8C,GAC9C,sDAAsD,GACtD,oEAAoE,CAAA;CAC7E;AAED,qBAAa,eAAgB,SAAQ,YAAY;aAEzB,OAAO,EAAE,UAAU;gBAAnB,OAAO,EAAE,UAAU,EACnC,EACI,KAAS,EACT,MAAU,EACV,MAA6D,GAChE,GAAE,OAAO,CAAC,sBAAsB,CAAM;IAoB3C,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;IAExD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAgBxB;IAED,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAgBxB;IAED,OAAO,CAAC,QAAQ,CAAC,SAAS,CAMzB;CACJ"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { TgdTexture2D } from "./texture2d.js";
|
|
2
2
|
export class TgdTextureDepth extends TgdTexture2D {
|
|
3
|
-
constructor(context, { width = 1, height = 1,
|
|
3
|
+
constructor(context, { width = 1, height = 1, format = "DEPTH_COMPONENT24 / DEPTH_COMPONENT / UNSIGNED_INT", } = {}) {
|
|
4
4
|
super(context, {
|
|
5
|
-
storage: { width, height,
|
|
5
|
+
storage: { width, height, format },
|
|
6
6
|
});
|
|
7
7
|
this.context = context;
|
|
8
8
|
this.resize16 = (width, height) => {
|
|
@@ -29,17 +29,15 @@ export class TgdTextureDepth extends TgdTexture2D {
|
|
|
29
29
|
wrapS: "CLAMP_TO_EDGE",
|
|
30
30
|
wrapT: "CLAMP_TO_EDGE",
|
|
31
31
|
});
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
this.resize = this.resize32F;
|
|
41
|
-
break;
|
|
32
|
+
if (format.startsWith("DEPTH_COMPONENT16")) {
|
|
33
|
+
this.resize = this.resize16;
|
|
34
|
+
}
|
|
35
|
+
else if (format.startsWith("DEPTH_COMPONENT24")) {
|
|
36
|
+
this.resize = this.resize24;
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
this.resize = this.resize32F;
|
|
42
40
|
}
|
|
43
41
|
}
|
|
44
42
|
}
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGV4dHVyZS1kZXB0aC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXh0dXJlL3RleHR1cmUtZGVwdGgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQWUxQyxNQUFNLE9BQU8sZUFBZ0IsU0FBUSxZQUFZO0lBQzdDLFlBQ29CLE9BQW1CLEVBQ25DLEVBQ0ksS0FBSyxHQUFHLENBQUMsRUFDVCxNQUFNLEdBQUcsQ0FBQyxFQUNWLE1BQU0sR0FBRyxvREFBb0QsTUFDNUIsRUFBRTtRQUV2QyxLQUFLLENBQUMsT0FBTyxFQUFFO1lBQ1gsT0FBTyxFQUFFLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUU7U0FDckMsQ0FBQyxDQUFBO1FBVGMsWUFBTyxHQUFQLE9BQU8sQ0FBWTtRQTJCdEIsYUFBUSxHQUFHLENBQUMsS0FBYSxFQUFFLE1BQWMsRUFBRSxFQUFFO1lBQzFELE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxJQUFJLENBQUE7WUFDeEIsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQTtZQUV0QixJQUFJLENBQUMsSUFBSSxFQUFFLENBQUE7WUFDWCxFQUFFLENBQUMsVUFBVSxDQUNULEVBQUUsQ0FBQyxVQUFVLEVBQ2IsQ0FBQyxFQUNELEVBQUUsQ0FBQyxpQkFBaUIsRUFDcEIsS0FBSyxFQUNMLE1BQU0sRUFDTixDQUFDLEVBQ0QsRUFBRSxDQUFDLGVBQWUsRUFDbEIsRUFBRSxDQUFDLGNBQWMsRUFDakIsSUFBSSxDQUNQLENBQUE7UUFDTCxDQUFDLENBQUE7UUFFZ0IsYUFBUSxHQUFHLENBQUMsS0FBYSxFQUFFLE1BQWMsRUFBRSxFQUFFO1lBQzFELE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxJQUFJLENBQUE7WUFDeEIsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQTtZQUV0QixJQUFJLENBQUMsSUFBSSxFQUFFLENBQUE7WUFDWCxFQUFFLENBQUMsVUFBVSxDQUNULEVBQUUsQ0FBQyxVQUFVLEVBQ2IsQ0FBQyxFQUNELEVBQUUsQ0FBQyxpQkFBaUIsRUFDcEIsS0FBSyxFQUNMLE1BQU0sRUFDTixDQUFDLEVBQ0QsRUFBRSxDQUFDLGVBQWUsRUFDbEIsRUFBRSxDQUFDLFlBQVksRUFDZixJQUFJLENBQ1AsQ0FBQTtRQUNMLENBQUMsQ0FBQTtRQUVnQixjQUFTLEdBQUcsQ0FBQyxLQUFhLEVBQUUsTUFBYyxFQUFFLEVBQUU7WUFDM0QsTUFBTSxFQUFFLE9BQU8sRUFBRSxHQUFHLElBQUksQ0FBQTtZQUN4QixNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFBO1lBRXRCLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQTtZQUNYLEVBQUUsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLFVBQVUsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLGtCQUFrQixFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxlQUFlLEVBQUUsRUFBRSxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsQ0FBQTtRQUNoSCxDQUFDLENBQUE7UUEzREcsSUFBSSxDQUFDLFNBQVMsQ0FBQztZQUNYLFNBQVMsRUFBRSxTQUFTO1lBQ3BCLFNBQVMsRUFBRSxTQUFTO1lBQ3BCLEtBQUssRUFBRSxlQUFlO1lBQ3RCLEtBQUssRUFBRSxlQUFlO1NBQ3pCLENBQUMsQ0FBQTtRQUNGLElBQUksTUFBTSxDQUFDLFVBQVUsQ0FBQyxtQkFBbUIsQ0FBQyxFQUFFLENBQUM7WUFDekMsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFBO1FBQy9CLENBQUM7YUFBTSxJQUFJLE1BQU0sQ0FBQyxVQUFVLENBQUMsbUJBQW1CLENBQUMsRUFBRSxDQUFDO1lBQ2hELElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQTtRQUMvQixDQUFDO2FBQU0sQ0FBQztZQUNKLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQTtRQUNoQyxDQUFDO0lBQ0wsQ0FBQztDQStDSiJ9
|
|
@@ -5,7 +5,7 @@ import type { TgdFilter } from "../filter";
|
|
|
5
5
|
import { TgdVec4 } from "../math";
|
|
6
6
|
import { TgdProgram } from "../program";
|
|
7
7
|
import { ArrayNumber4, type WebglImage, type WebglTexParameter } from "../types";
|
|
8
|
-
import { type
|
|
8
|
+
import { type WebglTextureParameters } from "../webgl";
|
|
9
9
|
import { type LoadBmpOptions } from "./types";
|
|
10
10
|
interface TgdTexture2DStorage {
|
|
11
11
|
width: number;
|
|
@@ -17,7 +17,7 @@ interface TgdTexture2DStorage {
|
|
|
17
17
|
* Default to `false`.
|
|
18
18
|
*/
|
|
19
19
|
premultipliedAlpha: boolean;
|
|
20
|
-
|
|
20
|
+
format: "R8 / RED / UNSIGNED_BYTE" | "R8_SNORM / RED / BYTE" | "R16F / RED / HALF_FLOAT" | "R16F / RED / FLOAT" | "R32F / RED / FLOAT" | "R8UI / RED_INTEGER / UNSIGNED_BYTE" | "R8I / RED_INTEGER / BYTE" | "R16UI / RED_INTEGER / UNSIGNED_SHORT" | "R16I / RED_INTEGER / SHORT" | "R32UI / RED_INTEGER / UNSIGNED_INT" | "R32I / RED_INTEGER / INT" | "RG8 / RG / UNSIGNED_BYTE" | "RG8_SNORM / RG / BYTE" | "RG16F / RG / HALF_FLOAT" | "RG16F / RG / FLOAT" | "RG32F / RG / FLOAT" | "RG8UI / RG_INTEGER / UNSIGNED_BYTE" | "RG8I / RG_INTEGER / BYTE" | "RG16UI / RG_INTEGER / UNSIGNED_SHORT" | "RG16I / RG_INTEGER / SHORT" | "RG32UI / RG_INTEGER / UNSIGNED_INT" | "RG32I / RG_INTEGER / INT" | "RGB8 / RGB / UNSIGNED_BYTE" | "SRGB8 / RGB / UNSIGNED_BYTE" | "RGB565 / RGB / UNSIGNED_BYTE" | "RGB565 / RGB / UNSIGNED_SHORT_5_6_5" | "RGB8_SNORM / RGB / BYTE" | "R11F_G11F_B10F / RGB / UNSIGNED_INT_10F_11F_11F_REV" | "R11F_G11F_B10F / RGB / HALF_FLOAT" | "R11F_G11F_B10F / RGB / FLOAT" | "RGB9_E5 / RGB / UNSIGNED_INT_5_9_9_9_REV" | "RGB9_E5 / RGB / HALF_FLOAT" | "RGB9_E5 / RGB / FLOAT" | "RGB16F / RGB / HALF_FLOAT" | "RGB16F / RGB / FLOAT" | "RGB32F / RGB / FLOAT" | "RGB8UI / RGB_INTEGER / UNSIGNED_BYTE" | "RGB8I / RGB_INTEGER / BYTE" | "RGB16UI / RGB_INTEGER / UNSIGNED_SHORT" | "RGB16I / RGB_INTEGER / SHORT" | "RGB32UI / RGB_INTEGER / UNSIGNED_INT" | "RGB32I / RGB_INTEGER / INT" | "RGBA8 / RGBA / UNSIGNED_BYTE" | "SRGB8_ALPHA8 / RGBA / UNSIGNED_BYTE" | "RGBA8_SNORM / RGBA / BYTE" | "RGB5_A1 / RGBA / UNSIGNED_BYTE" | "RGB5_A1 / RGBA / UNSIGNED_SHORT_5_5_5_1" | "RGB5_A1 / RGBA / UNSIGNED_INT_2_10_10_10_REV" | "RGBA4 / RGBA / UNSIGNED_BYTE" | "RGBA4 / RGBA / UNSIGNED_SHORT_4_4_4_4" | "RGB10_A2 / RGBA / UNSIGNED_INT_2_10_10_10_REV" | "RGBA16F / RGBA / HALF_FLOAT" | "RGBA16F / RGBA / FLOAT" | "RGBA32F / RGBA / FLOAT" | "RGBA8UI / RGBA_INTEGER / UNSIGNED_BYTE" | "RGBA8I / RGBA_INTEGER / BYTE" | "RGBA16UI / RGBA_INTEGER / UNSIGNED_SHORT" | "RGBA16I / RGBA_INTEGER / SHORT" | "RGBA32UI / RGBA_INTEGER / UNSIGNED_INT" | "RGBA32I / RGBA_INTEGER / INT" | "DEPTH_COMPONENT16 / DEPTH_COMPONENT / UNSIGNED_SHORT" | "DEPTH_COMPONENT16 / DEPTH_COMPONENT / UNSIGNED_INT" | "DEPTH_COMPONENT24 / DEPTH_COMPONENT / UNSIGNED_INT" | "DEPTH_COMPONENT32F / DEPTH_COMPONENT / FLOAT" | "DEPTH24_STENCIL8 / DEPTH_STENCIL / UNSIGNED_INT_24_8" | "DEPTH32F_STENCIL8 / DEPTH_STENCIL / FLOAT_32_UNSIGNED_INT_24_8_REV";
|
|
21
21
|
}
|
|
22
22
|
export interface TgdTexture2DOptions {
|
|
23
23
|
name?: string;
|
|
@@ -42,15 +42,20 @@ export declare class TgdTexture2D {
|
|
|
42
42
|
private _height;
|
|
43
43
|
private readonly storage;
|
|
44
44
|
private params;
|
|
45
|
+
private videoUpdater;
|
|
45
46
|
private static counter;
|
|
46
47
|
constructor(context: TgdContext, options?: TgdTexture2DOptions);
|
|
47
48
|
clone(name?: string): TgdTexture2D;
|
|
48
|
-
get
|
|
49
|
-
private set
|
|
49
|
+
get format(): TgdTexture2DStorage["format"];
|
|
50
|
+
private set format(value);
|
|
51
|
+
get internalFormat(): number;
|
|
52
|
+
get sourceFormat(): number;
|
|
53
|
+
get sourceType(): number;
|
|
50
54
|
delete(): void;
|
|
51
55
|
get width(): number;
|
|
52
56
|
get height(): number;
|
|
53
57
|
private createTexture;
|
|
58
|
+
private splitFormat;
|
|
54
59
|
resize(w: number, h: number): void;
|
|
55
60
|
private checkError;
|
|
56
61
|
get glTexture(): WebGLTexture;
|
|
@@ -65,13 +70,12 @@ export declare class TgdTexture2D {
|
|
|
65
70
|
onLoad?: () => void;
|
|
66
71
|
}): this;
|
|
67
72
|
applyFilter(filter: TgdFilter): this;
|
|
68
|
-
loadData(data: Uint8Array | Uint8ClampedArray, options: {
|
|
73
|
+
loadData(data: Uint8Array | Uint8ClampedArray | Float32Array, options: {
|
|
69
74
|
width: number;
|
|
70
75
|
height: number;
|
|
71
|
-
internalFormat: WebglTextureInternalFormat;
|
|
72
|
-
format: "RED" | "RG" | "RGB" | "RGBA" | "RED_INTEGER" | "RG_INTEGER" | "RGB_INTEGER" | "RGBA_INTEGER";
|
|
73
76
|
level?: number;
|
|
74
77
|
offset?: number;
|
|
78
|
+
format?: TgdTexture2DStorage["format"];
|
|
75
79
|
}): this;
|
|
76
80
|
/**
|
|
77
81
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"texture2d.d.ts","sourceRoot":"","sources":["../../src/texture/texture2d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,YAAY,EAAgB,KAAK,UAAU,EAAE,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAGhG,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"texture2d.d.ts","sourceRoot":"","sources":["../../src/texture/texture2d.ts"],"names":[],"mappings":"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"}
|