@tolokoban/tgd 2.0.117 → 2.0.120
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/lib/dist/bounding-box.js +2 -2
- package/lib/dist/buffer/buffer.js +7 -9
- package/lib/dist/camera/camera-orthographic.d.ts +1 -0
- package/lib/dist/camera/camera-orthographic.d.ts.map +1 -1
- package/lib/dist/camera/camera-orthographic.js +13 -3
- package/lib/dist/camera/camera-perspective.d.ts +1 -0
- package/lib/dist/camera/camera-perspective.d.ts.map +1 -1
- package/lib/dist/camera/camera-perspective.js +13 -3
- package/lib/dist/camera/camera.d.ts +1 -0
- package/lib/dist/camera/camera.d.ts.map +1 -1
- package/lib/dist/camera/camera.js +7 -8
- package/lib/dist/canvas/gizmo/gizmo.js +16 -15
- package/lib/dist/canvas/landscape/landscape.js +8 -2
- package/lib/dist/code/math.js +6 -3
- package/lib/dist/code/noise.js +18 -6
- package/lib/dist/color/color.d.ts +1 -1
- package/lib/dist/color/color.d.ts.map +1 -1
- package/lib/dist/color/color.js +16 -2
- package/lib/dist/context/animation/animation-manager.js +4 -6
- package/lib/dist/context/context.d.ts +13 -1
- package/lib/dist/context/context.d.ts.map +1 -1
- package/lib/dist/context/context.js +55 -22
- package/lib/dist/context/webgl-params.d.ts +9 -3
- package/lib/dist/context/webgl-params.d.ts.map +1 -1
- package/lib/dist/context/webgl-params.js +39 -12
- package/lib/dist/controller/camera/orbit.js +26 -6
- package/lib/dist/dataset/dataset.d.ts.map +1 -1
- package/lib/dist/dataset/dataset.js +26 -35
- package/lib/dist/debug/console.js +6 -4
- package/lib/dist/debug/debug.js +5 -6
- package/lib/dist/factory/mesh-glb.d.ts +4 -6
- package/lib/dist/factory/mesh-glb.d.ts.map +1 -1
- package/lib/dist/factory/mesh-glb.js +6 -6
- package/lib/dist/filter/blur.js +14 -8
- package/lib/dist/filter/filter.js +2 -3
- package/lib/dist/filter/hue-rotation.js +2 -2
- package/lib/dist/geometry/geometry.js +7 -10
- package/lib/dist/geometry/grid.js +3 -3
- package/lib/dist/geometry/tools/marching-cubes/marching-cubes.js +2 -3
- package/lib/dist/input/frame.d.ts +50 -0
- package/lib/dist/input/frame.d.ts.map +1 -0
- package/lib/dist/input/frame.js +124 -0
- package/lib/dist/input/gamepad.js +9 -17
- package/lib/dist/input/pointer.d.ts.map +1 -1
- package/lib/dist/input/pointer.js +53 -22
- package/lib/dist/light/light.js +2 -3
- package/lib/dist/loader/asset.js +11 -14
- package/lib/dist/loader/binary.js +44 -51
- package/lib/dist/loader/font.d.ts +13 -0
- package/lib/dist/loader/font.d.ts.map +1 -0
- package/lib/dist/loader/font.js +28 -0
- package/lib/dist/loader/image.js +13 -16
- package/lib/dist/loader/index.d.ts +1 -0
- package/lib/dist/loader/index.d.ts.map +1 -1
- package/lib/dist/loader/index.js +2 -1
- package/lib/dist/loader/video.js +13 -16
- package/lib/dist/log.js +2 -3
- package/lib/dist/material/camera-light.d.ts +1 -0
- package/lib/dist/material/camera-light.d.ts.map +1 -1
- package/lib/dist/material/camera-light.js +7 -3
- package/lib/dist/material/diffuse.js +2 -3
- package/lib/dist/material/flat.js +2 -3
- package/lib/dist/material/glass.js +6 -8
- package/lib/dist/material/global.js +6 -8
- package/lib/dist/material/gltf.d.ts +29 -0
- package/lib/dist/material/gltf.d.ts.map +1 -0
- package/lib/dist/material/gltf.js +186 -0
- package/lib/dist/material/hull.js +4 -5
- package/lib/dist/material/index.d.ts +2 -0
- package/lib/dist/material/index.d.ts.map +1 -1
- package/lib/dist/material/index.js +3 -1
- package/lib/dist/material/material.js +5 -2
- package/lib/dist/material/mirror.d.ts +18 -0
- package/lib/dist/material/mirror.d.ts.map +1 -0
- package/lib/dist/material/mirror.js +56 -0
- package/lib/dist/material/solid.js +2 -3
- package/lib/dist/material/toon.js +7 -7
- package/lib/dist/math/mat4.js +3 -4
- package/lib/dist/math/transfo.js +11 -14
- package/lib/dist/math/vec4.d.ts +1 -0
- package/lib/dist/math/vec4.d.ts.map +1 -1
- package/lib/dist/math/vec4.js +18 -14
- package/lib/dist/painter/background/background.js +2 -2
- package/lib/dist/painter/clear.js +5 -6
- package/lib/dist/painter/filter/filter.js +9 -7
- package/lib/dist/painter/fragment-shader/fragment-shader.js +3 -5
- package/lib/dist/painter/framebuffer-msaa.js +5 -2
- package/lib/dist/painter/framebuffer.js +5 -8
- package/lib/dist/painter/gizmo/gizmo.d.ts.map +1 -1
- package/lib/dist/painter/gizmo/gizmo.js +10 -11
- package/lib/dist/painter/gizmo/painters/normal.js +4 -7
- package/lib/dist/painter/gizmo/painters/tips.d.ts.map +1 -1
- package/lib/dist/painter/gizmo/painters/tips.js +11 -13
- package/lib/dist/painter/group-camera.js +2 -3
- package/lib/dist/painter/group.js +6 -8
- package/lib/dist/painter/icon/icon.js +11 -9
- package/lib/dist/painter/icon/sprite.js +2 -3
- package/lib/dist/painter/lod/lod.js +26 -30
- package/lib/dist/painter/logic.js +2 -3
- package/lib/dist/painter/mesh/gltf/gltf.d.ts +27 -5
- package/lib/dist/painter/mesh/gltf/gltf.d.ts.map +1 -1
- package/lib/dist/painter/mesh/gltf/gltf.js +100 -52
- package/lib/dist/painter/mesh/mesh/mesh.js +24 -17
- package/lib/dist/painter/mix/mix.js +6 -7
- package/lib/dist/painter/node/node.js +11 -17
- package/lib/dist/painter/overlay/overlay.d.ts +15 -7
- package/lib/dist/painter/overlay/overlay.d.ts.map +1 -1
- package/lib/dist/painter/overlay/overlay.js +72 -22
- package/lib/dist/painter/painter.js +2 -2
- package/lib/dist/painter/points-cloud/points-cloud-morphing.js +12 -14
- package/lib/dist/painter/points-cloud/points-cloud.js +11 -12
- package/lib/dist/painter/program.js +24 -11
- package/lib/dist/painter/segments/segments-morphing.js +30 -14
- package/lib/dist/painter/segments/segments.js +33 -20
- package/lib/dist/painter/skybox/skybox.d.ts +18 -8
- package/lib/dist/painter/skybox/skybox.d.ts.map +1 -1
- package/lib/dist/painter/skybox/skybox.js +90 -44
- package/lib/dist/painter/sprites/accessor.js +2 -2
- package/lib/dist/painter/sprites/sprites-hue.js +18 -8
- package/lib/dist/painter/sprites/sprites.js +53 -20
- package/lib/dist/painter/state/state.d.ts +1 -1
- package/lib/dist/painter/state/state.d.ts.map +1 -1
- package/lib/dist/painter/state/state.js +6 -11
- package/lib/dist/painter/tubes/geometry.js +3 -4
- package/lib/dist/painter/tubes/tubes.js +3 -4
- package/lib/dist/painter/x-ray/background.js +2 -2
- package/lib/dist/painter/x-ray/x-ray.js +8 -5
- package/lib/dist/parser/gltf/gltf.d.ts +13 -5
- package/lib/dist/parser/gltf/gltf.d.ts.map +1 -1
- package/lib/dist/parser/gltf/gltf.js +113 -114
- package/lib/dist/parser/gltf/parser.d.ts.map +1 -1
- package/lib/dist/parser/gltf/parser.js +12 -1
- package/lib/dist/parser/mesh/wavefront.js +3 -5
- package/lib/dist/program/program.d.ts.map +1 -1
- package/lib/dist/program/program.js +6 -7
- package/lib/dist/reference-map.js +3 -5
- package/lib/dist/shader/code.js +2 -2
- package/lib/dist/texture/texture-cube.d.ts +19 -7
- package/lib/dist/texture/texture-cube.d.ts.map +1 -1
- package/lib/dist/texture/texture-cube.js +54 -2
- package/lib/dist/texture/texture2d.d.ts +9 -2
- package/lib/dist/texture/texture2d.d.ts.map +1 -1
- package/lib/dist/texture/texture2d.js +51 -49
- package/lib/dist/time/interval/interval.js +2 -3
- package/lib/dist/types/gltf.d.ts +2 -1
- package/lib/dist/types/gltf.d.ts.map +1 -1
- package/lib/dist/types/gltf.js +10 -4
- package/lib/dist/types/guards.js +2 -3
- package/lib/dist/types/input-pointer.d.ts +5 -0
- package/lib/dist/types/input-pointer.d.ts.map +1 -1
- package/lib/dist/types/texture-cube.d.ts +1 -0
- package/lib/dist/types/texture-cube.d.ts.map +1 -1
- package/lib/dist/uniform/ubo-camera.d.ts +2 -1
- package/lib/dist/uniform/ubo-camera.d.ts.map +1 -1
- package/lib/dist/uniform/ubo-camera.js +9 -2
- package/lib/dist/uniform/uniform-buffer-object.js +2 -2
- package/lib/dist/utils/action/camera.js +3 -4
- package/lib/dist/utils/animation/chain-transfo-interpolations.js +6 -2
- package/lib/dist/utils/animation/chain.js +12 -12
- package/lib/dist/utils/bbox.js +3 -3
- package/lib/dist/utils/canvas.js +3 -3
- package/lib/dist/utils/ensure.d.ts +2 -0
- package/lib/dist/utils/ensure.d.ts.map +1 -1
- package/lib/dist/utils/ensure.js +21 -5
- package/lib/dist/utils/fullscreen.js +31 -38
- package/lib/dist/utils/reference-map.js +3 -5
- package/lib/dist/utils/state/blend.d.ts +1 -1
- package/lib/dist/utils/state/blend.d.ts.map +1 -1
- package/lib/dist/utils/state/blend.js +28 -1
- package/lib/dist/utils/state/stencil.js +2 -2
- package/lib/dist/vao/vao.js +8 -9
- package/lib/dist/version.d.ts +1 -1
- package/lib/dist/version.js +1 -1
- package/lib/dist/wasm/function.js +2 -3
- package/lib/dist/wasm/index.js +16 -19
- package/lib/dist/wasm/wast.js +3 -4
- package/lib/dist/webgl/texture/texture2d.js +2 -3
- package/package.json +1 -1
- package/lib/dist/math/common.test.d.ts +0 -2
- package/lib/dist/math/common.test.d.ts.map +0 -1
- package/lib/dist/math/common.test.js +0 -22
- package/lib/dist/math/mat3.test.d.ts +0 -2
- package/lib/dist/math/mat3.test.d.ts.map +0 -1
- package/lib/dist/math/mat3.test.js +0 -32
- package/lib/dist/math/mat4.test.d.ts +0 -2
- package/lib/dist/math/mat4.test.d.ts.map +0 -1
- package/lib/dist/math/mat4.test.js +0 -57
- package/lib/dist/math/math.test.d.ts +0 -2
- package/lib/dist/math/math.test.d.ts.map +0 -1
- package/lib/dist/math/math.test.js +0 -23
- package/lib/dist/math/quat.test.d.ts +0 -3
- package/lib/dist/math/quat.test.d.ts.map +0 -1
- package/lib/dist/math/quat.test.js +0 -99
- package/lib/dist/math/vec3.test.d.ts +0 -2
- package/lib/dist/math/vec3.test.d.ts.map +0 -1
- package/lib/dist/math/vec3.test.js +0 -36
- package/lib/dist/math/vec4.test.d.ts +0 -2
- package/lib/dist/math/vec4.test.d.ts.map +0 -1
- package/lib/dist/math/vec4.test.js +0 -15
- package/lib/dist/painter/gizmo/painters/axes.1.d.ts +0 -14
- package/lib/dist/painter/gizmo/painters/axes.1.d.ts.map +0 -1
- package/lib/dist/painter/gizmo/painters/axes.1.js +0 -50
- package/lib/dist/painter/skybox/skybox.frag +0 -15
- package/lib/dist/painter/skybox/skybox.vert +0 -13
- package/lib/dist/utils/bbox.test.d.ts +0 -2
- package/lib/dist/utils/bbox.test.d.ts.map +0 -1
- package/lib/dist/utils/bbox.test.js +0 -45
- package/lib/dist/utils/template.test.d.ts +0 -2
- package/lib/dist/utils/template.test.d.ts.map +0 -1
- package/lib/dist/utils/template.test.js +0 -17
|
@@ -6,13 +6,12 @@ import { TgdShaderVertex } from "./../../shader/vertex.js";
|
|
|
6
6
|
import { TgdVertexArray } from "./../../vao/index.js";
|
|
7
7
|
export class TgdPainterMix extends TgdPainter {
|
|
8
8
|
constructor(context, options = {}) {
|
|
9
|
-
var _a, _b, _c;
|
|
10
9
|
super();
|
|
11
10
|
this.context = context;
|
|
12
11
|
this.texture1 = options.texture1;
|
|
13
12
|
this.texture2 = options.texture2;
|
|
14
|
-
this.strength =
|
|
15
|
-
this.z =
|
|
13
|
+
this.strength = options.strength ?? 0.5;
|
|
14
|
+
this.z = options.z ?? 0.999999;
|
|
16
15
|
const vert = new TgdShaderVertex({
|
|
17
16
|
attributes: {
|
|
18
17
|
attPoint: "vec2",
|
|
@@ -46,7 +45,7 @@ export class TgdPainterMix extends TgdPainter {
|
|
|
46
45
|
const vao = createVAO(context, program, options.flipY ? -1 : +1);
|
|
47
46
|
this.program = program;
|
|
48
47
|
this.vao = vao;
|
|
49
|
-
this.name =
|
|
48
|
+
this.name = options.name ?? `Mix/${this.name}`;
|
|
50
49
|
}
|
|
51
50
|
delete() {
|
|
52
51
|
this.program.delete();
|
|
@@ -58,8 +57,8 @@ export class TgdPainterMix extends TgdPainter {
|
|
|
58
57
|
program.use();
|
|
59
58
|
program.uniform1f("uniZ", this.z);
|
|
60
59
|
program.uniform1f("uniStrength", strength);
|
|
61
|
-
texture1
|
|
62
|
-
texture2
|
|
60
|
+
texture1?.activate(0, program, "uniTexture1");
|
|
61
|
+
texture2?.activate(1, program, "uniTexture2");
|
|
63
62
|
vao.bind();
|
|
64
63
|
gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
|
|
65
64
|
vao.unbind();
|
|
@@ -77,4 +76,4 @@ function createVAO(context, program, flipY = +1) {
|
|
|
77
76
|
throw new Error("Unable to create WebGL VAO!");
|
|
78
77
|
return vao;
|
|
79
78
|
}
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWl4LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3BhaW50ZXIvbWl4L21peC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDakQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFBO0FBQ2pELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFDekMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDeEQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBRXBELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxVQUFVLENBQUE7QUFXekMsTUFBTSxPQUFPLGFBQWMsU0FBUSxVQUFVO0lBU3pDLFlBQ3FCLE9BQXVDLEVBQ3hELFVBQXlDLEVBQUU7UUFFM0MsS0FBSyxFQUFFLENBQUE7UUFIVSxZQUFPLEdBQVAsT0FBTyxDQUFnQztRQUl4RCxJQUFJLENBQUMsUUFBUSxHQUFHLE9BQU8sQ0FBQyxRQUFRLENBQUE7UUFDaEMsSUFBSSxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFBO1FBQ2hDLElBQUksQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFDLFFBQVEsSUFBSSxHQUFHLENBQUE7UUFDdkMsSUFBSSxDQUFDLENBQUMsR0FBRyxPQUFPLENBQUMsQ0FBQyxJQUFJLFFBQVEsQ0FBQTtRQUU5QixNQUFNLElBQUksR0FBRyxJQUFJLGVBQWUsQ0FBQztZQUM3QixVQUFVLEVBQUU7Z0JBQ1IsUUFBUSxFQUFFLE1BQU07Z0JBQ2hCLEtBQUssRUFBRSxNQUFNO2FBQ2hCO1lBQ0QsT0FBTyxFQUFFO2dCQUNMLEtBQUssRUFBRSxNQUFNO2FBQ2hCO1lBQ0QsUUFBUSxFQUFFO2dCQUNOLElBQUksRUFBRSxPQUFPO2FBQ2hCO1lBQ0QsUUFBUSxFQUFFLENBQUMsZ0JBQWdCLEVB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
|
|
@@ -49,16 +49,15 @@ export class TgdPainterNode extends TgdPainter {
|
|
|
49
49
|
for (const child of children)
|
|
50
50
|
this.add(child);
|
|
51
51
|
this.transfo = new TgdTransfo(transfo);
|
|
52
|
-
this.logic = logic
|
|
52
|
+
this.logic = logic?.bind(this);
|
|
53
53
|
this.name = name;
|
|
54
54
|
}
|
|
55
55
|
delete() {
|
|
56
|
-
var _a;
|
|
57
56
|
for (const child of this.nodes) {
|
|
58
57
|
child.delete();
|
|
59
58
|
}
|
|
60
59
|
for (const target of this.targets)
|
|
61
|
-
|
|
60
|
+
target.delete?.();
|
|
62
61
|
}
|
|
63
62
|
add(...children) {
|
|
64
63
|
for (const child of children) {
|
|
@@ -93,18 +92,17 @@ export class TgdPainterNode extends TgdPainter {
|
|
|
93
92
|
return [...this.targets];
|
|
94
93
|
}
|
|
95
94
|
paint(time, delta) {
|
|
96
|
-
|
|
97
|
-
(_a = this.logic) === null || _a === void 0 ? void 0 : _a.call(this, time, delta);
|
|
95
|
+
this.logic?.(time, delta);
|
|
98
96
|
this.parentMatrix.reset();
|
|
99
97
|
const fringe = [this];
|
|
100
98
|
while (fringe.length > 0) {
|
|
101
99
|
const node = fringe.shift();
|
|
102
100
|
node.globalMatrix.from(node.parentMatrix).multiply(node.transfo.matrix);
|
|
103
|
-
|
|
101
|
+
node.logic?.(time, delta);
|
|
104
102
|
for (const target of node.targets) {
|
|
105
103
|
target.transfo.matrix.from(node.globalMatrix);
|
|
106
104
|
if (this.paintTheTargets)
|
|
107
|
-
|
|
105
|
+
target.paint?.(time, delta);
|
|
108
106
|
}
|
|
109
107
|
for (const child of node.nodes) {
|
|
110
108
|
child.parentMatrix.from(node.globalMatrix);
|
|
@@ -120,31 +118,27 @@ export class TgdPainterNode extends TgdPainter {
|
|
|
120
118
|
get hierarchy() {
|
|
121
119
|
return {
|
|
122
120
|
[this.active ? this.name : `${this.name} (Inactive)`]: [
|
|
123
|
-
...this.targets.map((target, index) => {
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
[(_a = target.name) !== null && _a !== void 0 ? _a : `target#${index}`]: null,
|
|
127
|
-
});
|
|
128
|
-
}),
|
|
121
|
+
...this.targets.map((target, index) => ({
|
|
122
|
+
[target.name ?? `target#${index}`]: null,
|
|
123
|
+
})),
|
|
129
124
|
...this.nodes.map((painter) => painter.hierarchy),
|
|
130
125
|
],
|
|
131
126
|
};
|
|
132
127
|
}
|
|
133
128
|
}
|
|
134
129
|
function actualDebug(out, node, indent = "| ") {
|
|
135
|
-
var _a, _b;
|
|
136
130
|
out.add(`${indent}${node.name} [${format(node.transfo.orientation)}] (${format(node.transfo.position)})\n`, {
|
|
137
131
|
bold: true,
|
|
138
132
|
});
|
|
139
133
|
const targets = node.getTargets();
|
|
140
134
|
if (targets.length > 0) {
|
|
141
135
|
if (targets.length === 1) {
|
|
142
|
-
out.add(`${indent} Target: ${
|
|
136
|
+
out.add(`${indent} Target: ${targets[0].name ?? "..."}\n`);
|
|
143
137
|
}
|
|
144
138
|
else {
|
|
145
139
|
out.add(`${indent} Targets (${targets.length})\n`);
|
|
146
140
|
for (const target of targets) {
|
|
147
|
-
out.add(`${indent} ${
|
|
141
|
+
out.add(`${indent} ${target.name ?? "..."}\n`);
|
|
148
142
|
}
|
|
149
143
|
}
|
|
150
144
|
}
|
|
@@ -160,4 +154,4 @@ function format(vec) {
|
|
|
160
154
|
const list = [...vec].map((v) => v.toFixed(3));
|
|
161
155
|
return list.join(", ");
|
|
162
156
|
}
|
|
163
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
157
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9kZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wYWludGVyL25vZGUvbm9kZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQ3ZDLE9BQU8sRUFBRSxPQUFPLEVBQThCLE1BQU0sV0FBVyxDQUFBO0FBRS9ELE9BQU8sRUFBRSxVQUFVLEVBQTBCLE1BQU0sb0JBQW9CLENBQUE7QUFDdkUsT0FBTyxFQUFpQyxVQUFVLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFnQnRFOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBK0JHO0FBQ0gsTUFBTSxPQUFPLGNBQWUsU0FBUSxVQUFVO0lBYTFDLFlBQVksVUFBMEMsRUFBRTtRQUNwRCxLQUFLLEVBQUUsQ0FBQTtRQVZNLGlCQUFZLEdBQUcsSUFBSSxPQUFPLEVBQUUsQ0FBQTtRQUM3Qzs7V0FFRztRQUNjLGlCQUFZLEdBQUcsSUFBSSxPQUFPLEVBQUUsQ0FBQTtRQUM1QixVQUFLLEdBQXFCLEVBQUUsQ0FBQTtRQUM1QixZQUFPLEdBQXVDLEVBQUUsQ0FBQTtRQUs3RCxNQUFNLEVBQUUsUUFBUSxHQUFHLEVBQUUsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLGVBQWUsR0FBRyxJQUFJLEVBQUUsSUFBSSxHQUFHLGtCQUFrQixJQUFJLENBQUMsSUFBSSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUE7UUFDL0csSUFBSSxDQUFDLGVBQWUsR0FBRyxlQUFlLENBQUE7UUFDdEMsS0FBSyxNQUFNLEtBQUssSUFBSSxRQUFRO1lBQUUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUM3QyxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQ3RDLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUM5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
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { TgdContext } from "../../context";
|
|
2
2
|
import { TgdEvent } from "../../event";
|
|
3
|
-
import type { TgdInputPointerEventMove, TgdInputPointerEventTap } from "../../index";
|
|
3
|
+
import type { TgdInputPointerEventMove, TgdInputPointerEventTap, TgdInputPointerEventTapMultiple, TgdInputPointerEventZoom } from "../../index";
|
|
4
4
|
import type { TgdTexture2D } from "../../texture";
|
|
5
5
|
import { TgdPainter } from "../painter";
|
|
6
6
|
export interface TgdPainterOverlayOptions {
|
|
@@ -45,9 +45,13 @@ export declare class TgdPainterOverlay extends TgdPainter {
|
|
|
45
45
|
width: number;
|
|
46
46
|
height: number;
|
|
47
47
|
}>;
|
|
48
|
-
readonly
|
|
49
|
-
readonly
|
|
50
|
-
readonly
|
|
48
|
+
readonly eventTap: TgdEvent<Readonly<TgdInputPointerEventTap>>;
|
|
49
|
+
readonly eventTapMultiple: TgdEvent<Readonly<TgdInputPointerEventTapMultiple>>;
|
|
50
|
+
readonly eventMoveStart: TgdEvent<Readonly<TgdInputPointerEventMove>>;
|
|
51
|
+
readonly eventMove: TgdEvent<Readonly<TgdInputPointerEventMove>>;
|
|
52
|
+
readonly eventHover: TgdEvent<Readonly<TgdInputPointerEventMove>>;
|
|
53
|
+
readonly eventMoveEnd: TgdEvent<Readonly<TgdInputPointerEventMove>>;
|
|
54
|
+
readonly eventZoom: TgdEvent<Readonly<TgdInputPointerEventZoom>>;
|
|
51
55
|
alignX: number;
|
|
52
56
|
alignY: number;
|
|
53
57
|
scaleX: number;
|
|
@@ -65,9 +69,13 @@ export declare class TgdPainterOverlay extends TgdPainter {
|
|
|
65
69
|
private prg;
|
|
66
70
|
private vao;
|
|
67
71
|
constructor(context: TgdContext, { alignX, alignY, scaleX, scaleY, width, height, margin, z, texture, }?: Partial<TgdPainterOverlayOptions>);
|
|
68
|
-
private
|
|
69
|
-
private
|
|
70
|
-
private
|
|
72
|
+
private readonly handleZoom;
|
|
73
|
+
private readonly handleTap;
|
|
74
|
+
private readonly handleTapMultiple;
|
|
75
|
+
private readonly handleHover;
|
|
76
|
+
private readonly handleMove;
|
|
77
|
+
private readonly handleMoveStart;
|
|
78
|
+
private readonly handleMoveEnd;
|
|
71
79
|
delete(): void;
|
|
72
80
|
paint(time: number, delta: number): void;
|
|
73
81
|
private checkForResizeEvent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"overlay.d.ts","sourceRoot":"","sources":["../../../src/painter/overlay/overlay.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAE9C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"overlay.d.ts","sourceRoot":"","sources":["../../../src/painter/overlay/overlay.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,11 +9,25 @@ export class TgdPainterOverlay extends TgdPainter {
|
|
|
9
9
|
super();
|
|
10
10
|
this.context = context;
|
|
11
11
|
this.eventResize = new TgdEvent();
|
|
12
|
-
this.
|
|
13
|
-
this.
|
|
14
|
-
this.
|
|
12
|
+
this.eventTap = new TgdEvent();
|
|
13
|
+
this.eventTapMultiple = new TgdEvent();
|
|
14
|
+
this.eventMoveStart = new TgdEvent();
|
|
15
|
+
this.eventMove = new TgdEvent();
|
|
16
|
+
this.eventHover = new TgdEvent();
|
|
17
|
+
this.eventMoveEnd = new TgdEvent();
|
|
18
|
+
this.eventZoom = new TgdEvent();
|
|
15
19
|
this.lastWidth = 0;
|
|
16
20
|
this.lastHeight = 0;
|
|
21
|
+
this.handleZoom = (evtScreen) => {
|
|
22
|
+
const x = this.xScreenToLayout(evtScreen.current.x);
|
|
23
|
+
const y = this.yScreenToLayout(evtScreen.current.y);
|
|
24
|
+
if (Math.abs(x) > 1 || Math.abs(y) > 1)
|
|
25
|
+
return;
|
|
26
|
+
const evtOverlay = structuredClone(evtScreen);
|
|
27
|
+
evtOverlay.current.x = x;
|
|
28
|
+
evtOverlay.current.y = y;
|
|
29
|
+
this.eventZoom.dispatch(evtOverlay);
|
|
30
|
+
};
|
|
17
31
|
this.handleTap = (evtScreen) => {
|
|
18
32
|
const x = this.xScreenToLayout(evtScreen.x);
|
|
19
33
|
const y = this.yScreenToLayout(evtScreen.y);
|
|
@@ -22,7 +36,17 @@ export class TgdPainterOverlay extends TgdPainter {
|
|
|
22
36
|
const evtOverlay = structuredClone(evtScreen);
|
|
23
37
|
evtOverlay.x = x;
|
|
24
38
|
evtOverlay.y = y;
|
|
25
|
-
this.
|
|
39
|
+
this.eventTap.dispatch(evtOverlay);
|
|
40
|
+
};
|
|
41
|
+
this.handleTapMultiple = (evtScreen) => {
|
|
42
|
+
const x = this.xScreenToLayout(evtScreen.x);
|
|
43
|
+
const y = this.yScreenToLayout(evtScreen.y);
|
|
44
|
+
if (Math.abs(x) > 1 || Math.abs(y) > 1)
|
|
45
|
+
return;
|
|
46
|
+
const evtOverlay = structuredClone(evtScreen);
|
|
47
|
+
evtOverlay.x = x;
|
|
48
|
+
evtOverlay.y = y;
|
|
49
|
+
this.eventTapMultiple.dispatch(evtOverlay);
|
|
26
50
|
};
|
|
27
51
|
this.handleHover = (evtScreen) => {
|
|
28
52
|
const x = this.xScreenToLayout(evtScreen.current.x);
|
|
@@ -32,7 +56,7 @@ export class TgdPainterOverlay extends TgdPainter {
|
|
|
32
56
|
const evtOverlay = structuredClone(evtScreen);
|
|
33
57
|
evtOverlay.current.x = x;
|
|
34
58
|
evtOverlay.current.y = y;
|
|
35
|
-
return this.
|
|
59
|
+
return this.eventHover.dispatch(evtOverlay);
|
|
36
60
|
};
|
|
37
61
|
this.handleMove = (evtScreen) => {
|
|
38
62
|
const x = this.xScreenToLayout(evtScreen.current.x);
|
|
@@ -42,13 +66,32 @@ export class TgdPainterOverlay extends TgdPainter {
|
|
|
42
66
|
const evtOverlay = structuredClone(evtScreen);
|
|
43
67
|
evtOverlay.current.x = x;
|
|
44
68
|
evtOverlay.current.y = y;
|
|
45
|
-
return this.
|
|
69
|
+
return this.eventMove.dispatch(evtOverlay);
|
|
70
|
+
};
|
|
71
|
+
this.handleMoveStart = (evtScreen) => {
|
|
72
|
+
const x = this.xScreenToLayout(evtScreen.current.x);
|
|
73
|
+
const y = this.yScreenToLayout(evtScreen.current.y);
|
|
74
|
+
if (Math.abs(x) > 1 || Math.abs(y) > 1)
|
|
75
|
+
return;
|
|
76
|
+
const evtOverlay = structuredClone(evtScreen);
|
|
77
|
+
evtOverlay.current.x = x;
|
|
78
|
+
evtOverlay.current.y = y;
|
|
79
|
+
return this.eventMoveStart.dispatch(evtOverlay);
|
|
80
|
+
};
|
|
81
|
+
this.handleMoveEnd = (evtScreen) => {
|
|
82
|
+
const x = this.xScreenToLayout(evtScreen.current.x);
|
|
83
|
+
const y = this.yScreenToLayout(evtScreen.current.y);
|
|
84
|
+
if (Math.abs(x) > 1 || Math.abs(y) > 1)
|
|
85
|
+
return;
|
|
86
|
+
const evtOverlay = structuredClone(evtScreen);
|
|
87
|
+
evtOverlay.current.x = x;
|
|
88
|
+
evtOverlay.current.y = y;
|
|
89
|
+
return this.eventMoveEnd.dispatch(evtOverlay);
|
|
46
90
|
};
|
|
47
91
|
this.xScreenToLayout = (xScreen) => {
|
|
48
|
-
var _a;
|
|
49
92
|
const { context, alignX, marginLeft, marginRight } = this;
|
|
50
93
|
const marginPx = marginLeft + marginRight;
|
|
51
|
-
const widthPx =
|
|
94
|
+
const widthPx = this.width ?? context.width - marginPx;
|
|
52
95
|
const frameWidthPx = context.width - widthPx - marginPx;
|
|
53
96
|
const screenPerPixel = 2 / context.width;
|
|
54
97
|
const center = marginLeft + (widthPx + (1 + alignX) * frameWidthPx - context.width) / 2;
|
|
@@ -56,10 +99,9 @@ export class TgdPainterOverlay extends TgdPainter {
|
|
|
56
99
|
return (xScreen - center * screenPerPixel) * factor;
|
|
57
100
|
};
|
|
58
101
|
this.xLayoutToScreen = (xLayout) => {
|
|
59
|
-
var _a;
|
|
60
102
|
const { context, alignX, marginLeft, marginRight } = this;
|
|
61
103
|
const marginPx = marginLeft + marginRight;
|
|
62
|
-
const widthPx =
|
|
104
|
+
const widthPx = this.width ?? context.width - marginPx;
|
|
63
105
|
const frameWidthPx = context.width - widthPx - marginPx;
|
|
64
106
|
const screenPerPixel = 2 / context.width;
|
|
65
107
|
const center = marginLeft + (widthPx + (1 + alignX) * frameWidthPx - context.width) / 2;
|
|
@@ -67,10 +109,9 @@ export class TgdPainterOverlay extends TgdPainter {
|
|
|
67
109
|
return xLayout * factor + center * screenPerPixel;
|
|
68
110
|
};
|
|
69
111
|
this.yScreenToLayout = (yScreen) => {
|
|
70
|
-
var _a;
|
|
71
112
|
const { context, alignY, marginTop, marginBottom } = this;
|
|
72
113
|
const marginPx = marginTop + marginBottom;
|
|
73
|
-
const heightPx =
|
|
114
|
+
const heightPx = this.height ?? context.height - marginPx;
|
|
74
115
|
const frameHeightPx = context.height - heightPx - marginPx;
|
|
75
116
|
const screenPerPixel = 2 / context.height;
|
|
76
117
|
const center = marginBottom + (heightPx + (1 + alignY) * frameHeightPx - context.height) / 2;
|
|
@@ -78,10 +119,9 @@ export class TgdPainterOverlay extends TgdPainter {
|
|
|
78
119
|
return (yScreen - center * screenPerPixel) * factor;
|
|
79
120
|
};
|
|
80
121
|
this.yLayoutToScreen = (yLayout) => {
|
|
81
|
-
var _a;
|
|
82
122
|
const { context, alignY, marginTop, marginBottom } = this;
|
|
83
123
|
const marginPx = marginTop + marginBottom;
|
|
84
|
-
const heightPx =
|
|
124
|
+
const heightPx = this.height ?? context.height - marginPx;
|
|
85
125
|
const frameHeightPx = context.height - heightPx - marginPx;
|
|
86
126
|
const screenPerPixel = 2 / context.height;
|
|
87
127
|
const center = marginBottom + (heightPx + (1 + alignY) * frameHeightPx - context.height) / 2;
|
|
@@ -157,14 +197,25 @@ export class TgdPainterOverlay extends TgdPainter {
|
|
|
157
197
|
this.prg = prg;
|
|
158
198
|
this.vao = vao;
|
|
159
199
|
const { pointer } = context.inputs;
|
|
160
|
-
pointer.eventTap.addListener(this.handleTap);
|
|
161
|
-
pointer.
|
|
162
|
-
pointer.
|
|
200
|
+
pointer.eventTap.addListener(this.handleTap, 1);
|
|
201
|
+
pointer.eventTapMultiple.addListener(this.handleTapMultiple, 1);
|
|
202
|
+
pointer.eventMoveStart.addListener(this.handleMoveStart, 1);
|
|
203
|
+
pointer.eventMove.addListener(this.handleMove, 1);
|
|
204
|
+
pointer.eventHover.addListener(this.handleHover, 1);
|
|
205
|
+
pointer.eventMoveEnd.addListener(this.handleMoveEnd, 1);
|
|
206
|
+
pointer.eventZoom.addListener(this.handleZoom, 1);
|
|
163
207
|
}
|
|
164
208
|
delete() {
|
|
165
209
|
const { context } = this;
|
|
166
210
|
if (context) {
|
|
167
|
-
|
|
211
|
+
const { pointer } = context.inputs;
|
|
212
|
+
pointer.eventTap.removeListener(this.handleTap);
|
|
213
|
+
pointer.eventTapMultiple.removeListener(this.handleTapMultiple);
|
|
214
|
+
pointer.eventMoveStart.removeListener(this.handleMoveStart);
|
|
215
|
+
pointer.eventMove.removeListener(this.handleMove);
|
|
216
|
+
pointer.eventHover.removeListener(this.handleHover);
|
|
217
|
+
pointer.eventMoveEnd.removeListener(this.handleMoveEnd);
|
|
218
|
+
pointer.eventZoom.removeListener(this.handleZoom);
|
|
168
219
|
}
|
|
169
220
|
this.prg.delete();
|
|
170
221
|
this.vao.delete();
|
|
@@ -194,10 +245,9 @@ export class TgdPainterOverlay extends TgdPainter {
|
|
|
194
245
|
vao.unbind();
|
|
195
246
|
}
|
|
196
247
|
checkForResizeEvent() {
|
|
197
|
-
var _a, _b;
|
|
198
248
|
const { context, lastWidth, lastHeight, marginLeft, marginRight, marginTop, marginBottom } = this;
|
|
199
|
-
const width = Math.max(0,
|
|
200
|
-
const height = Math.max(0,
|
|
249
|
+
const width = Math.max(0, this.width ?? context.width - marginLeft - marginRight);
|
|
250
|
+
const height = Math.max(0, this.height ?? context.height - marginTop - marginBottom);
|
|
201
251
|
if (width !== lastWidth || height !== lastHeight) {
|
|
202
252
|
this.lastWidth = width;
|
|
203
253
|
this.lastHeight = height;
|
|
@@ -205,4 +255,4 @@ export class TgdPainterOverlay extends TgdPainter {
|
|
|
205
255
|
}
|
|
206
256
|
}
|
|
207
257
|
}
|
|
208
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"overlay.js","sourceRoot":"","sources":["../../../src/painter/overlay/overlay.ts"],"names":[],"mappings":"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"}
|
|
258
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"overlay.js","sourceRoot":"","sources":["../../../src/painter/overlay/overlay.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,9 +15,9 @@ export class TgdPainter {
|
|
|
15
15
|
};
|
|
16
16
|
}
|
|
17
17
|
debug(caption) {
|
|
18
|
-
console.debug(caption
|
|
18
|
+
console.debug(caption ?? `${this.name} (id: ${this.id}, active: ${this.active})`);
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
21
|
TgdPainter.log = new TgdLogger();
|
|
22
22
|
TgdPainter.counter = 0;
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFpbnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wYWludGVyL3BhaW50ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLFVBQVUsQ0FBQTtBQUlwQyxNQUFNLE9BQWdCLFVBQVU7SUFBaEM7UUFLb0IsT0FBRSxHQUFHLFVBQVUsQ0FBQyxPQUFPLEVBQUUsQ0FBQTtRQUV6Qzs7O1dBR0c7UUFDSSxTQUFJLEdBQUcsV0FBVyxJQUFJLENBQUMsRUFBRSxFQUFFLENBQUE7UUFFM0IsV0FBTSxHQUFHLElBQUksQ0FBQTtJQWV4QixDQUFDO0lBVEcsSUFBSSxTQUFTO1FBQ1QsT0FBTztZQUNILENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsSUFBSSxhQUFhLENBQUMsRUFBRSxJQUFJO1NBQzlELENBQUE7SUFDTCxDQUFDO0lBRUQsS0FBSyxDQUFDLE9BQWdCO1FBQ2xCLE9BQU8sQ0FBQyxLQUFLLENBQUMsT0FBTyxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksVUFBVSxJQUFJLENBQUMsRUFBRSxhQUFhLElBQUksQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFBO0lBQ3RGLENBQUM7O0FBMUJlLGNBQUcsR0FBRyxJQUFJLFNBQVMsRUFBRSxBQUFsQixDQUFrQjtBQUV0QixrQkFBTyxHQUFHLENBQUMsQUFBSixDQUFJIn0=
|
|
@@ -28,7 +28,6 @@ export class TgdPainterPointsCloudMorphing extends TgdPainter {
|
|
|
28
28
|
];
|
|
29
29
|
}
|
|
30
30
|
constructor(context, options) {
|
|
31
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
32
31
|
super();
|
|
33
32
|
this.context = context;
|
|
34
33
|
/**
|
|
@@ -43,15 +42,15 @@ export class TgdPainterPointsCloudMorphing extends TgdPainter {
|
|
|
43
42
|
this.shadowThickness = 1;
|
|
44
43
|
this.light = 1;
|
|
45
44
|
this.datasets = [];
|
|
46
|
-
this.name =
|
|
47
|
-
this.mix =
|
|
48
|
-
this.radiusMultiplier =
|
|
49
|
-
this.minSizeInPixels =
|
|
50
|
-
this.specularExponent =
|
|
51
|
-
this.specularIntensity =
|
|
52
|
-
this.shadowIntensity =
|
|
53
|
-
this.shadowThickness =
|
|
54
|
-
this.light =
|
|
45
|
+
this.name = options.name ?? this.name;
|
|
46
|
+
this.mix = options.mix ?? 0;
|
|
47
|
+
this.radiusMultiplier = options.radiusMultiplier ?? 1;
|
|
48
|
+
this.minSizeInPixels = options.minSizeInPixels ?? 0;
|
|
49
|
+
this.specularExponent = options.specularExponent ?? 10;
|
|
50
|
+
this.specularIntensity = options.specularIntensity ?? 0.33;
|
|
51
|
+
this.shadowIntensity = options.shadowIntensity ?? 0.5;
|
|
52
|
+
this.shadowThickness = options.shadowThickness ?? 1;
|
|
53
|
+
this.light = options.light ?? 1;
|
|
55
54
|
if (options.texture) {
|
|
56
55
|
this.texture = options.texture;
|
|
57
56
|
this.textureMustBeDeleted = false;
|
|
@@ -99,12 +98,11 @@ export class TgdPainterPointsCloudMorphing extends TgdPainter {
|
|
|
99
98
|
vao.unbind();
|
|
100
99
|
}
|
|
101
100
|
createDataset(data, suffix) {
|
|
102
|
-
var _a;
|
|
103
101
|
const { point } = data;
|
|
104
102
|
if (point.length % 4 !== 0) {
|
|
105
103
|
throw new Error(`[TgdPainterPointsCloud] point.length must be a multiple of 4! Current value: ${point.length}`);
|
|
106
104
|
}
|
|
107
|
-
const uv =
|
|
105
|
+
const uv = data.uv ?? new Float32Array(point.length / 2);
|
|
108
106
|
if (uv.length % 2 !== 0) {
|
|
109
107
|
throw new Error(`[TgdPainterPointsCloud] uv.length must be a multiple of 2! Current value: ${uv.length}`);
|
|
110
108
|
}
|
|
@@ -179,7 +177,7 @@ export class TgdPainterPointsCloudMorphing extends TgdPainter {
|
|
|
179
177
|
functions: {
|
|
180
178
|
render: [
|
|
181
179
|
"vec4 render(vec4 color) {",
|
|
182
|
-
render
|
|
180
|
+
render ?? [
|
|
183
181
|
"vec2 coords = 2.0 * (gl_PointCoord - vec2(.5));",
|
|
184
182
|
"float len = 1.0 - dot(coords, coords);",
|
|
185
183
|
"if (len < 0.0) discard;",
|
|
@@ -197,4 +195,4 @@ export class TgdPainterPointsCloudMorphing extends TgdPainter {
|
|
|
197
195
|
return program;
|
|
198
196
|
}
|
|
199
197
|
}
|
|
200
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
198
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"points-cloud-morphing.js","sourceRoot":"","sources":["../../../src/painter/points-cloud/points-cloud-morphing.ts"],"names":[],"mappings":"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"}
|