@tolokoban/tgd 2.0.118 → 2.0.121
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.d.ts +3 -0
- package/lib/dist/context/animation/animation-manager.d.ts.map +1 -1
- package/lib/dist/context/animation/animation-manager.js +10 -11
- package/lib/dist/context/console.d.ts +12 -0
- package/lib/dist/context/console.d.ts.map +1 -0
- package/lib/dist/context/console.js +31 -0
- package/lib/dist/context/context.d.ts +23 -1
- package/lib/dist/context/context.d.ts.map +1 -1
- package/lib/dist/context/context.js +65 -26
- 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.d.ts +1 -1
- package/lib/dist/geometry/tools/marching-cubes/marching-cubes.d.ts.map +1 -1
- package/lib/dist/geometry/tools/marching-cubes/marching-cubes.js +2 -10
- 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/mat2.d.ts +1 -1
- package/lib/dist/math/mat2.d.ts.map +1 -1
- package/lib/dist/math/mat2.js +5 -5
- package/lib/dist/math/mat3.d.ts.map +1 -1
- package/lib/dist/math/mat3.js +4 -4
- 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.d.ts +1 -1
- package/lib/dist/painter/framebuffer.d.ts.map +1 -1
- package/lib/dist/painter/framebuffer.js +8 -11
- package/lib/dist/painter/gizmo/gizmo.d.ts.map +1 -1
- package/lib/dist/painter/gizmo/gizmo.js +5 -5
- 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 +10 -8
- 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 +28 -6
- package/lib/dist/painter/mesh/gltf/gltf.d.ts.map +1 -1
- package/lib/dist/painter/mesh/gltf/gltf.js +99 -53
- 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.js +14 -19
- 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.d.ts +2 -2
- package/lib/dist/painter/points-cloud/points-cloud.d.ts.map +1 -1
- package/lib/dist/painter/points-cloud/points-cloud.js +20 -21
- package/lib/dist/painter/program.js +24 -11
- package/lib/dist/painter/segments/segments-morphing.js +30 -14
- package/lib/dist/painter/segments/segments.d.ts +1 -1
- package/lib/dist/painter/segments/segments.d.ts.map +1 -1
- package/lib/dist/painter/segments/segments.js +34 -21
- 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 +89 -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.d.ts.map +1 -1
- package/lib/dist/painter/sprites/sprites.js +53 -21
- 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 +20 -8
- 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 +10 -3
- package/lib/dist/texture/texture2d.d.ts.map +1 -1
- package/lib/dist/texture/texture2d.js +54 -52
- 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
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { TgdPainter } from "../painter.js";
|
|
1
|
+
import { tgdColorMakeHueWheel } from "./../../color/index.js";
|
|
3
2
|
import { TgdDataset } from "./../../dataset/index.js";
|
|
4
3
|
import { TgdProgram } from "./../../program/index.js";
|
|
5
|
-
import { TgdVertexArray } from "./../../vao/index.js";
|
|
6
|
-
import { tgdCanvasCreateGradientHorizontal } from "./../../utils/index.js";
|
|
7
|
-
import { tgdColorMakeHueWheel } from "./../../color/index.js";
|
|
8
4
|
import { TgdShaderFragment, TgdShaderVertex } from "./../../shader/index.js";
|
|
5
|
+
import { TgdTexture2D } from "./../../texture/index.js";
|
|
6
|
+
import { tgdCanvasCreateGradientHorizontal } from "./../../utils/index.js";
|
|
7
|
+
import { TgdVertexArray } from "./../../vao/index.js";
|
|
8
|
+
import { TgdPainter } from "../painter.js";
|
|
9
9
|
export class TgdPainterPointsCloud extends TgdPainter {
|
|
10
10
|
/**
|
|
11
11
|
* Draw spheres with simple diffuse/specular material.
|
|
@@ -28,7 +28,6 @@ export class TgdPainterPointsCloud 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
|
this.radiusMultiplier = 1;
|
|
@@ -38,25 +37,25 @@ export class TgdPainterPointsCloud extends TgdPainter {
|
|
|
38
37
|
this.shadowIntensity = 0.5;
|
|
39
38
|
this.shadowThickness = 1;
|
|
40
39
|
this.light = 1;
|
|
41
|
-
this.name =
|
|
42
|
-
this.radiusMultiplier =
|
|
43
|
-
this.minSizeInPixels =
|
|
44
|
-
this.specularExponent =
|
|
45
|
-
this.specularIntensity =
|
|
46
|
-
this.shadowIntensity =
|
|
47
|
-
this.shadowThickness =
|
|
48
|
-
this.light =
|
|
40
|
+
this.name = options.name ?? this.name;
|
|
41
|
+
this.radiusMultiplier = options.radiusMultiplier ?? 1;
|
|
42
|
+
this.minSizeInPixels = options.minSizeInPixels ?? 0;
|
|
43
|
+
this.specularExponent = options.specularExponent ?? 10;
|
|
44
|
+
this.specularIntensity = options.specularIntensity ?? 0.33;
|
|
45
|
+
this.shadowIntensity = options.shadowIntensity ?? 0.5;
|
|
46
|
+
this.shadowThickness = options.shadowThickness ?? 1;
|
|
47
|
+
this.light = options.light ?? 1;
|
|
49
48
|
this.dataPoint = options.dataPoint;
|
|
50
49
|
if ((this.dataPoint.length & 3) !== 0) {
|
|
51
50
|
throw new Error(`dataPoint must have a length that is an integral multiple of 4: [x, y, z, radius, ...]!\ndataPoint.length === ${this.dataPoint.length}`);
|
|
52
51
|
}
|
|
53
|
-
this.dataUV =
|
|
52
|
+
this.dataUV = options.dataUV ?? new Float32Array(this.dataPoint.length >> 1);
|
|
54
53
|
if (this.dataPoint.length !== this.dataUV.length * 2) {
|
|
55
54
|
const message = `dataUV must be half of the size of dataPoint: [u, v, ...]!\ndataPoint.length === ${this.dataPoint.length}, \ndataUV.length === ${this.dataUV.length}`;
|
|
56
|
-
console.error("[TgdPainterPointsCloud]", message);
|
|
57
|
-
console.error("[TgdPainterPointsCloud] options =", options);
|
|
58
|
-
console.error("[TgdPainterPointsCloud] this.dataPoint =", this.dataPoint);
|
|
59
|
-
console.error("[TgdPainterPointsCloud] this.dataUV =", this.dataUV);
|
|
55
|
+
context.console.error("[TgdPainterPointsCloud]", message);
|
|
56
|
+
context.console.error("[TgdPainterPointsCloud] options =", options);
|
|
57
|
+
context.console.error("[TgdPainterPointsCloud] this.dataPoint =", this.dataPoint);
|
|
58
|
+
context.console.error("[TgdPainterPointsCloud] this.dataUV =", this.dataUV);
|
|
60
59
|
throw new Error(message);
|
|
61
60
|
}
|
|
62
61
|
if (options.texture) {
|
|
@@ -151,7 +150,7 @@ export class TgdPainterPointsCloud extends TgdPainter {
|
|
|
151
150
|
functions: {
|
|
152
151
|
render: [
|
|
153
152
|
"vec4 render(vec4 color) {",
|
|
154
|
-
render
|
|
153
|
+
render ?? [
|
|
155
154
|
"vec2 coords = 2.0 * (gl_PointCoord - vec2(.5));",
|
|
156
155
|
"float len = 1.0 - dot(coords, coords);",
|
|
157
156
|
"if (len < 0.0) discard;",
|
|
@@ -169,4 +168,4 @@ export class TgdPainterPointsCloud extends TgdPainter {
|
|
|
169
168
|
return program;
|
|
170
169
|
}
|
|
171
170
|
}
|
|
172
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
171
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"points-cloud.js","sourceRoot":"","sources":["../../../src/painter/points-cloud/points-cloud.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ export class TgdPainterProgram extends TgdPainter {
|
|
|
25
25
|
const texture = textures[name];
|
|
26
26
|
texture.activate(unit++, prg, name);
|
|
27
27
|
}
|
|
28
|
-
onEnter
|
|
28
|
+
onEnter?.(time, delta);
|
|
29
29
|
for (const block of uniformBlocks) {
|
|
30
30
|
block.updateData();
|
|
31
31
|
}
|
|
@@ -67,8 +67,19 @@ export class TgdPainterProgram extends TgdPainter {
|
|
|
67
67
|
this.drawMode = typeof drawMode === "number" ? drawMode : context.gl[drawMode];
|
|
68
68
|
const uniformsHeader = ensureArray(this.uniformsToCode(uniforms));
|
|
69
69
|
const uniformsForTextures = texturesToUniforms(textures);
|
|
70
|
-
const vertexShader = new TgdShaderVertex(
|
|
71
|
-
|
|
70
|
+
const vertexShader = new TgdShaderVertex({
|
|
71
|
+
...vert,
|
|
72
|
+
uniforms: uniformsForTextures,
|
|
73
|
+
attributes: resolveAttributesFromDataset(datasets),
|
|
74
|
+
header: [...uniformsHeader, ...ensureArray(vert.header)],
|
|
75
|
+
varying,
|
|
76
|
+
});
|
|
77
|
+
const fragmentShader = new TgdShaderFragment({
|
|
78
|
+
...frag,
|
|
79
|
+
uniforms: uniformsForTextures,
|
|
80
|
+
header: [...uniformsHeader, ...ensureArray(vert.header)],
|
|
81
|
+
varying,
|
|
82
|
+
});
|
|
72
83
|
const program = new TgdProgram(context.gl, {
|
|
73
84
|
vert: vertexShader,
|
|
74
85
|
frag: fragmentShader,
|
|
@@ -83,10 +94,13 @@ export class TgdPainterProgram extends TgdPainter {
|
|
|
83
94
|
}
|
|
84
95
|
const vao = new TgdVertexArray(context.gl, program, datasets, elements);
|
|
85
96
|
this.vao = vao;
|
|
86
|
-
this.painterState = new TgdPainterState(context,
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
97
|
+
this.painterState = new TgdPainterState(context, {
|
|
98
|
+
...state,
|
|
99
|
+
children: [new TgdPainterLogic(this.internalPaint)],
|
|
100
|
+
});
|
|
101
|
+
this.elementsCount = elementsCount ?? resolveElementsCount(datasets, elements);
|
|
102
|
+
this.elementsOffset = elementsOffset ?? 0;
|
|
103
|
+
this.instancesCount = instancesCount ?? resolveInstancesCount(datasets);
|
|
90
104
|
this.hasElements = !!elements;
|
|
91
105
|
this.elementsType = elements ? webglElementTypeFromTypedArray(elements) : 0;
|
|
92
106
|
const setBindingPoints = new Set();
|
|
@@ -141,8 +155,7 @@ export class TgdPainterProgram extends TgdPainter {
|
|
|
141
155
|
}
|
|
142
156
|
}
|
|
143
157
|
delete() {
|
|
144
|
-
|
|
145
|
-
(_a = this.onDelete) === null || _a === void 0 ? void 0 : _a.call(this);
|
|
158
|
+
this.onDelete?.();
|
|
146
159
|
for (const block of this.uniformBlocksToDelete) {
|
|
147
160
|
block.delete();
|
|
148
161
|
}
|
|
@@ -153,7 +166,7 @@ export class TgdPainterProgram extends TgdPainter {
|
|
|
153
166
|
this.painterState.paint(time, delta);
|
|
154
167
|
}
|
|
155
168
|
debug(caption) {
|
|
156
|
-
console.debug(caption
|
|
169
|
+
console.debug(caption ?? this.name);
|
|
157
170
|
console.debug({
|
|
158
171
|
drawMode: webglLookup(this.drawMode),
|
|
159
172
|
elementsCount: this.elementsCount,
|
|
@@ -294,4 +307,4 @@ function resolveTextureType(texture) {
|
|
|
294
307
|
console.error("[resolveTextureType] Don't know the type of this texture:", texture);
|
|
295
308
|
throw new Error("[resolveTextureType] Don't know the type of this texture!");
|
|
296
309
|
}
|
|
297
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"program.js","sourceRoot":"","sources":["../../src/painter/program.ts"],"names":[],"mappings":"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"}
|
|
310
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"program.js","sourceRoot":"","sources":["../../src/painter/program.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,6 @@ import { makeCapsule } from "./capsule.js";
|
|
|
31
31
|
export class TgdPainterSegmentsMorphing extends TgdPainter {
|
|
32
32
|
// private readonly painter: TgdPainter
|
|
33
33
|
constructor(context, options) {
|
|
34
|
-
var _a, _b, _c, _d, _e;
|
|
35
34
|
super();
|
|
36
35
|
this.context = context;
|
|
37
36
|
this.transfo = new TgdTransfo();
|
|
@@ -46,13 +45,13 @@ export class TgdPainterSegmentsMorphing extends TgdPainter {
|
|
|
46
45
|
*/
|
|
47
46
|
this.mix = 0;
|
|
48
47
|
this.name = `TgdPainterSegments#${this.id}`;
|
|
49
|
-
this.radiusMultiplier =
|
|
48
|
+
this.radiusMultiplier = options.radiusMultiplier ?? 1;
|
|
50
49
|
const { roundness = 3, minRadius = 1, datasetsPairs } = options;
|
|
51
50
|
if (datasetsPairs.length === 0) {
|
|
52
51
|
throw new Error('[TgdPainterSegmentsMorphing] "datasetsPairs" must contain at least one pair of datasets!');
|
|
53
52
|
}
|
|
54
53
|
const geometry = makeCapsule(roundness);
|
|
55
|
-
const material =
|
|
54
|
+
const material = options.material ?? new TgdMaterialFaceOrientation();
|
|
56
55
|
this.material = material;
|
|
57
56
|
material.attPosition = geometry.attPosition;
|
|
58
57
|
material.attNormal = "normal";
|
|
@@ -74,7 +73,16 @@ export class TgdPainterSegmentsMorphing extends TgdPainter {
|
|
|
74
73
|
})
|
|
75
74
|
.loadBitmap(tgdCanvasCreatePalette(["#f44", "#ff4", "#4f4", "#4ff", "#44f"]));
|
|
76
75
|
const vert = new TgdShaderVertex({
|
|
77
|
-
uniforms:
|
|
76
|
+
uniforms: {
|
|
77
|
+
uniMix: "float",
|
|
78
|
+
uniTransfoMatrix: "mat4",
|
|
79
|
+
uniModelViewMatrix: "mat4",
|
|
80
|
+
uniProjectionMatrix: "mat4",
|
|
81
|
+
uniPixelPerScreenUnit: "float",
|
|
82
|
+
uniMinRadiusInPixel: "float",
|
|
83
|
+
uniRadiusMultiplier: "float",
|
|
84
|
+
...material.uniforms,
|
|
85
|
+
},
|
|
78
86
|
attributes: {
|
|
79
87
|
[geometry.attPosition]: "vec4",
|
|
80
88
|
[geometry.attNormal]: "vec3",
|
|
@@ -88,16 +96,22 @@ export class TgdPainterSegmentsMorphing extends TgdPainter {
|
|
|
88
96
|
attUV1_A: "vec2",
|
|
89
97
|
attUV1_B: "vec2",
|
|
90
98
|
},
|
|
91
|
-
varying:
|
|
92
|
-
|
|
99
|
+
varying: {
|
|
100
|
+
...material.varyings,
|
|
101
|
+
},
|
|
102
|
+
functions: {
|
|
103
|
+
...material.extraVertexShaderFunctions,
|
|
104
|
+
getPosition: [
|
|
93
105
|
"vec4 getPosition(vec4 pos) {",
|
|
94
|
-
[
|
|
106
|
+
[material.vertexShaderCodeForGetPosition ?? "return pos;"],
|
|
95
107
|
"}",
|
|
96
|
-
],
|
|
108
|
+
],
|
|
109
|
+
applyMaterial: [
|
|
97
110
|
"void applyMaterial(vec3 position, vec3 normal, vec2 uv) {",
|
|
98
111
|
[material.vertexShaderCode],
|
|
99
112
|
"}",
|
|
100
|
-
]
|
|
113
|
+
],
|
|
114
|
+
},
|
|
101
115
|
mainCode: [
|
|
102
116
|
"vec4 attXYZR0 = mix(attXYZR0_A, attXYZR0_B, uniMix);",
|
|
103
117
|
"vec4 attXYZR1 = mix(attXYZR1_A, attXYZR1_B, uniMix);",
|
|
@@ -141,7 +155,10 @@ export class TgdPainterSegmentsMorphing extends TgdPainter {
|
|
|
141
155
|
uniforms: material.uniforms,
|
|
142
156
|
outputs: { FragColor: "vec4" },
|
|
143
157
|
varying: material.varyings,
|
|
144
|
-
functions:
|
|
158
|
+
functions: {
|
|
159
|
+
...material.extraFragmentShaderFunctions,
|
|
160
|
+
applyMaterial: ["vec4 applyMaterial() {", [material.fragmentShaderCode], "}"],
|
|
161
|
+
},
|
|
145
162
|
mainCode: ["FragColor = applyMaterial();"],
|
|
146
163
|
}).code;
|
|
147
164
|
const prg = new TgdProgram(context.gl, {
|
|
@@ -174,7 +191,7 @@ export class TgdPainterSegmentsMorphing extends TgdPainter {
|
|
|
174
191
|
this.instanceCount = datasetA.count;
|
|
175
192
|
return vao;
|
|
176
193
|
});
|
|
177
|
-
this.vertexCount =
|
|
194
|
+
this.vertexCount = geometry.elements?.length ?? 0;
|
|
178
195
|
}
|
|
179
196
|
delete() {
|
|
180
197
|
for (const vao of this.vaos)
|
|
@@ -182,12 +199,11 @@ export class TgdPainterSegmentsMorphing extends TgdPainter {
|
|
|
182
199
|
this.prg.delete();
|
|
183
200
|
}
|
|
184
201
|
paint(time, delta) {
|
|
185
|
-
var _a, _b;
|
|
186
202
|
const { context, prg, vao, vertexCount, instanceCount, material } = this;
|
|
187
203
|
const { gl, camera } = context;
|
|
188
204
|
gl.disable(gl.DITHER);
|
|
189
205
|
prg.use();
|
|
190
|
-
|
|
206
|
+
this.material.setUniforms?.({ program: prg, context, time, delta });
|
|
191
207
|
prg.uniform1f("uniMix", this.mix);
|
|
192
208
|
prg.uniform1f("uniPixelPerScreenUnit", gl.drawingBufferHeight);
|
|
193
209
|
prg.uniform1f("uniMinRadiusInPixel", this.minRadius);
|
|
@@ -210,4 +226,4 @@ function extract(arg) {
|
|
|
210
226
|
return arg();
|
|
211
227
|
return arg;
|
|
212
228
|
}
|
|
213
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
229
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"segments-morphing.js","sourceRoot":"","sources":["../../../src/painter/segments/segments-morphing.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import type { TgdBuffer, TgdBufferOptionTarget, TgdBufferOptionUsage } from "../../buffer";
|
|
2
|
+
import { TgdContext } from "../../context";
|
|
2
3
|
import { TgdDataset } from "../../dataset";
|
|
3
4
|
import { type TgdMaterial } from "../../material";
|
|
4
5
|
import { TgdTransfo } from "../../math";
|
|
5
6
|
import { TgdPainter } from "../painter";
|
|
6
7
|
import type { ArrayNumber2, ArrayNumber4 } from "../../types";
|
|
7
|
-
import { TgdContext } from "../../context";
|
|
8
8
|
type DatasetOption = TgdPainterSegments | InstanceDataset | (() => InstanceDataset);
|
|
9
9
|
export type TgdPainterSegmentsOptions = {
|
|
10
10
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"segments.d.ts","sourceRoot":"","sources":["../../../src/painter/segments/segments.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"segments.d.ts","sourceRoot":"","sources":["../../../src/painter/segments/segments.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,6 @@ export class TgdPainterSegments extends TgdPainter {
|
|
|
45
45
|
return dataset;
|
|
46
46
|
}
|
|
47
47
|
constructor(context, options) {
|
|
48
|
-
var _a, _b, _c, _d, _e;
|
|
49
48
|
super();
|
|
50
49
|
this.context = context;
|
|
51
50
|
this.transfo = new TgdTransfo();
|
|
@@ -55,10 +54,10 @@ export class TgdPainterSegments extends TgdPainter {
|
|
|
55
54
|
this.radiusSwitch = 0;
|
|
56
55
|
this.instanceCount = 0;
|
|
57
56
|
this.name = `TgdPainterSegments#${this.id}`;
|
|
58
|
-
this.radiusMultiplier =
|
|
57
|
+
this.radiusMultiplier = options.radiusMultiplier ?? 1;
|
|
59
58
|
const { roundness = 3, minRadius = 1, dataset } = options;
|
|
60
59
|
const geometry = makeCapsule(roundness);
|
|
61
|
-
const material =
|
|
60
|
+
const material = options.material ?? new TgdMaterialFaceOrientation();
|
|
62
61
|
this.material = material;
|
|
63
62
|
material.attPosition = geometry.attPosition;
|
|
64
63
|
material.attNormal = "normal"; // geometry.attNormal
|
|
@@ -71,7 +70,15 @@ export class TgdPainterSegments extends TgdPainter {
|
|
|
71
70
|
throw new Error("[TgdPainterSegments] Min roundness is 0!");
|
|
72
71
|
}
|
|
73
72
|
const vert = new TgdShaderVertex({
|
|
74
|
-
uniforms:
|
|
73
|
+
uniforms: {
|
|
74
|
+
uniTransfoMatrix: "mat4",
|
|
75
|
+
uniModelViewMatrix: "mat4",
|
|
76
|
+
uniProjectionMatrix: "mat4",
|
|
77
|
+
uniPixelPerScreenUnit: "float",
|
|
78
|
+
uniMinRadiusInPixel: "float",
|
|
79
|
+
uniRadiusMultiplier: "float",
|
|
80
|
+
...material.uniforms,
|
|
81
|
+
},
|
|
75
82
|
attributes: {
|
|
76
83
|
[geometry.attPosition]: "vec4",
|
|
77
84
|
[geometry.attNormal]: "vec3",
|
|
@@ -81,16 +88,22 @@ export class TgdPainterSegments extends TgdPainter {
|
|
|
81
88
|
attUV0: "vec2",
|
|
82
89
|
attUV1: "vec2",
|
|
83
90
|
},
|
|
84
|
-
varying:
|
|
85
|
-
|
|
91
|
+
varying: {
|
|
92
|
+
...material.varyings,
|
|
93
|
+
},
|
|
94
|
+
functions: {
|
|
95
|
+
...material.extraVertexShaderFunctions,
|
|
96
|
+
getPosition: [
|
|
86
97
|
"vec4 getPosition(vec4 pos) {",
|
|
87
|
-
[
|
|
98
|
+
[material.vertexShaderCodeForGetPosition ?? "return pos;"],
|
|
88
99
|
"}",
|
|
89
|
-
],
|
|
100
|
+
],
|
|
101
|
+
applyMaterial: [
|
|
90
102
|
"void applyMaterial(vec3 position, vec3 normal, vec2 uv) {",
|
|
91
103
|
[material.vertexShaderCode],
|
|
92
104
|
"}",
|
|
93
|
-
]
|
|
105
|
+
],
|
|
106
|
+
},
|
|
94
107
|
mainCode: [
|
|
95
108
|
`vec3 normal = ${geometry.attNormal};`,
|
|
96
109
|
`vec3 pos = getPosition(${geometry.attPosition}).xyz;`,
|
|
@@ -129,8 +142,11 @@ export class TgdPainterSegments extends TgdPainter {
|
|
|
129
142
|
header: material.fragmentShaderHeader,
|
|
130
143
|
uniforms: material.uniforms,
|
|
131
144
|
outputs: { FragColor: "vec4" },
|
|
132
|
-
varying:
|
|
133
|
-
functions:
|
|
145
|
+
varying: { ...material.varyings },
|
|
146
|
+
functions: {
|
|
147
|
+
...material.extraFragmentShaderFunctions,
|
|
148
|
+
applyMaterial: ["vec4 applyMaterial() {", [material.fragmentShaderCode], "}"],
|
|
149
|
+
},
|
|
134
150
|
mainCode: ["FragColor = applyMaterial();"],
|
|
135
151
|
}).code;
|
|
136
152
|
const prg = new TgdProgram(context.gl, {
|
|
@@ -161,13 +177,13 @@ export class TgdPainterSegments extends TgdPainter {
|
|
|
161
177
|
this.instanceCount = instance.count;
|
|
162
178
|
}
|
|
163
179
|
else {
|
|
164
|
-
console.error("[TgdPainterSegments] options =", options);
|
|
180
|
+
context.console.error("[TgdPainterSegments] options =", options);
|
|
165
181
|
throw new Error("option `dataset` of TgdPainterSegments is undefined!");
|
|
166
182
|
}
|
|
167
|
-
this.vertexCount =
|
|
183
|
+
this.vertexCount = geometry.elements?.length ?? 0;
|
|
168
184
|
}
|
|
169
185
|
debug(caption) {
|
|
170
|
-
this.prg.debug(caption
|
|
186
|
+
this.prg.debug(caption ?? this.name);
|
|
171
187
|
}
|
|
172
188
|
getBuffer() {
|
|
173
189
|
return this.vao.getBuffer(1);
|
|
@@ -177,12 +193,11 @@ export class TgdPainterSegments extends TgdPainter {
|
|
|
177
193
|
this.prg.delete();
|
|
178
194
|
}
|
|
179
195
|
paint(time, delta) {
|
|
180
|
-
var _a, _b;
|
|
181
196
|
const { context, prg, vao, vertexCount, instanceCount, material } = this;
|
|
182
197
|
const { gl, camera } = context;
|
|
183
198
|
gl.disable(gl.DITHER);
|
|
184
199
|
prg.use();
|
|
185
|
-
|
|
200
|
+
this.material.setUniforms?.({ program: prg, context, time, delta });
|
|
186
201
|
prg.uniform1f("uniPixelPerScreenUnit", gl.drawingBufferHeight);
|
|
187
202
|
prg.uniform1f("uniMinRadiusInPixel", this.minRadius);
|
|
188
203
|
prg.uniform1f("uniRadiusMultiplier", this.radiusMultiplier);
|
|
@@ -225,16 +240,14 @@ export class TgdPainterSegmentsData {
|
|
|
225
240
|
return this._count;
|
|
226
241
|
}
|
|
227
242
|
getXYZR0(index) {
|
|
228
|
-
var _a, _b, _c, _d;
|
|
229
243
|
const arr = this.attXYZR0;
|
|
230
244
|
const offset = index * 4;
|
|
231
|
-
return [
|
|
245
|
+
return [arr[offset + 0] ?? 0, arr[offset + 1] ?? 0, arr[offset + 2] ?? 0, arr[offset + 3] ?? 0];
|
|
232
246
|
}
|
|
233
247
|
getXYZR1(index) {
|
|
234
|
-
var _a, _b, _c, _d;
|
|
235
248
|
const arr = this.attXYZR1;
|
|
236
249
|
const offset = index * 4;
|
|
237
|
-
return [
|
|
250
|
+
return [arr[offset + 0] ?? 0, arr[offset + 1] ?? 0, arr[offset + 2] ?? 0, arr[offset + 3] ?? 0];
|
|
238
251
|
}
|
|
239
252
|
/**
|
|
240
253
|
* @param XYZR0 (x,y,z) and radius of point A.
|
|
@@ -259,4 +272,4 @@ function extract(arg) {
|
|
|
259
272
|
return arg();
|
|
260
273
|
return arg;
|
|
261
274
|
}
|
|
262
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"segments.js","sourceRoot":"","sources":["../../../src/painter/segments/segments.ts"],"names":[],"mappings":"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"}
|
|
275
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"segments.js","sourceRoot":"","sources":["../../../src/painter/segments/segments.ts"],"names":[],"mappings":"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"}
|