@tolokoban/tgd 2.0.91 → 2.0.94
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/color/color.d.ts +5 -0
- package/lib/dist/color/color.d.ts.map +1 -1
- package/lib/dist/color/color.js +25 -6
- package/lib/dist/material/flat.d.ts +1 -1
- package/lib/dist/material/flat.d.ts.map +1 -1
- package/lib/dist/material/flat.js +1 -1
- package/lib/dist/material/index.d.ts +1 -0
- package/lib/dist/material/index.d.ts.map +1 -1
- package/lib/dist/material/index.js +2 -1
- package/lib/dist/material/solid.d.ts +11 -0
- package/lib/dist/material/solid.d.ts.map +1 -0
- package/lib/dist/material/solid.js +19 -0
- package/lib/dist/painter/points-cloud/points-cloud-morphing.d.ts.map +1 -1
- package/lib/dist/painter/points-cloud/points-cloud-morphing.js +8 -6
- package/lib/dist/painter/points-cloud/points-cloud.d.ts.map +1 -1
- package/lib/dist/painter/points-cloud/points-cloud.js +8 -6
- package/lib/dist/painter/sprites/sprites.d.ts.map +1 -1
- package/lib/dist/painter/sprites/sprites.js +3 -1
- package/package.json +1 -1
- package/lib/dist/geometry/tubes.d.ts +0 -19
- package/lib/dist/geometry/tubes.d.ts.map +0 -1
- package/lib/dist/geometry/tubes.js +0 -78
- package/lib/dist/painter/tubes/capsule.d.ts +0 -11
- package/lib/dist/painter/tubes/capsule.d.ts.map +0 -1
- package/lib/dist/painter/tubes/capsule.js +0 -109
- package/lib/dist/painter/tubes/segments-morphing.d.ts +0 -89
- package/lib/dist/painter/tubes/segments-morphing.d.ts.map +0 -1
- package/lib/dist/painter/tubes/segments-morphing.js +0 -215
- package/lib/dist/painter/tubes/segments.d.ts +0 -133
- package/lib/dist/painter/tubes/segments.d.ts.map +0 -1
- package/lib/dist/painter/tubes/segments.js +0 -270
|
@@ -1,78 +0,0 @@
|
|
|
1
|
-
import { TgdDataset } from "./../dataset/index.js";
|
|
2
|
-
import { webglElementTypeArrayFromNumberArray } from "./../utils/index.js";
|
|
3
|
-
import { TgdGeometry } from "./geometry.js";
|
|
4
|
-
export class TgdGeometryTubes extends TgdGeometry {
|
|
5
|
-
constructor({ center = [0, 0, 0], radius = 1, subdivisions = 2, } = {}) {
|
|
6
|
-
const dataset = new TgdDataset({
|
|
7
|
-
POSITION: "vec3",
|
|
8
|
-
NORMAL: "vec3",
|
|
9
|
-
});
|
|
10
|
-
const positions = [];
|
|
11
|
-
const normals = [];
|
|
12
|
-
const elements = [];
|
|
13
|
-
createIcosahedron(positions, normals, elements, center, radius);
|
|
14
|
-
for (let loop = 0; loop < subdivisions; loop++) {
|
|
15
|
-
subdivide(positions, normals, elements, center, radius);
|
|
16
|
-
}
|
|
17
|
-
dataset.set("POSITION", new Float32Array(positions));
|
|
18
|
-
dataset.set("NORMAL", new Float32Array(normals));
|
|
19
|
-
super({
|
|
20
|
-
dataset,
|
|
21
|
-
elements: webglElementTypeArrayFromNumberArray(elements),
|
|
22
|
-
drawMode: "TRIANGLES",
|
|
23
|
-
});
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
function createIcosahedron(positions, normals, elements, center, radius) {
|
|
27
|
-
const [cx, cy, cz] = center;
|
|
28
|
-
normals.push(-0, -1, -0, 0.7236, -0.4472, 0.5257, -0.2764, -0.4472, 0.8507, -0.8944, -0.4472, -0, -0.2764, -0.4472, -0.8507, 0.7236, -0.4472, -0.5257, 0.2764, 0.4472, 0.8507, -0.7236, 0.4472, 0.5257, -0.7236, 0.4472, -0.5257, 0.2764, 0.4472, -0.8507, 0.8944, 0.4472, -0, -0, 1, -0);
|
|
29
|
-
for (let i = 0; i < normals.length; i += 3) {
|
|
30
|
-
positions.push(normals[i + 0] * radius + cx, normals[i + 1] * radius + cy, normals[i + 2] * radius + cz);
|
|
31
|
-
}
|
|
32
|
-
// prettier-ignore
|
|
33
|
-
elements.push(0, 1, 2, 1, 0, 5, 0, 2, 3, 0, 3, 4, 0, 4, 5, 1, 5, 10, 2, 1, 6, 3, 2, 7, 4, 3, 8, 5, 4, 9, 1, 10, 6, 2, 6, 7, 3, 7, 8, 4, 8, 9, 5, 9, 10, 6, 10, 11, 7, 6, 11, 8, 7, 11, 9, 8, 11, 10, 9, 11);
|
|
34
|
-
}
|
|
35
|
-
/**
|
|
36
|
-
* Each triangle will be divided in 4 sub triangles.
|
|
37
|
-
*/
|
|
38
|
-
function subdivide(positions, normals, elements, center, radius) {
|
|
39
|
-
const [cx, cy, cz] = center;
|
|
40
|
-
const newElements = [];
|
|
41
|
-
let pointsCount = Math.floor(positions.length / 3);
|
|
42
|
-
const indexesOfMidPoints = new Map();
|
|
43
|
-
const indexOfMidPoint = (indexA, indexB) => {
|
|
44
|
-
const idxA = Math.min(indexA, indexB);
|
|
45
|
-
const idxB = Math.max(indexA, indexB);
|
|
46
|
-
const key = `${idxA}/${idxB}`;
|
|
47
|
-
const indexFromCache = indexesOfMidPoints.get(key);
|
|
48
|
-
if (typeof indexFromCache === "number")
|
|
49
|
-
return indexFromCache;
|
|
50
|
-
const [nx, ny, nz] = averageNormal(normals, idxA, idxB);
|
|
51
|
-
normals.push(nx, ny, nz);
|
|
52
|
-
positions.push(nx * radius + cx, ny * radius + cy, nz * radius + cz);
|
|
53
|
-
const newIndex = pointsCount++;
|
|
54
|
-
indexesOfMidPoints.set(key, newIndex);
|
|
55
|
-
return newIndex;
|
|
56
|
-
};
|
|
57
|
-
for (let e = 0; e < elements.length; e += 3) {
|
|
58
|
-
const i0 = elements[e + 0];
|
|
59
|
-
const i1 = elements[e + 1];
|
|
60
|
-
const i2 = elements[e + 2];
|
|
61
|
-
const i01 = indexOfMidPoint(i0, i1);
|
|
62
|
-
const i12 = indexOfMidPoint(i1, i2);
|
|
63
|
-
const i02 = indexOfMidPoint(i0, i2);
|
|
64
|
-
// prettier-ignore
|
|
65
|
-
newElements.push(i0, i01, i02, i01, i1, i12, i01, i12, i02, i02, i12, i2);
|
|
66
|
-
}
|
|
67
|
-
elements.splice(0);
|
|
68
|
-
elements.push(...newElements);
|
|
69
|
-
}
|
|
70
|
-
function averageNormal(normals, i0, i1) {
|
|
71
|
-
const x = normals[i0 * 3 + 0] + normals[i1 * 3 + 0];
|
|
72
|
-
const y = normals[i0 * 3 + 1] + normals[i1 * 3 + 1];
|
|
73
|
-
const z = normals[i0 * 3 + 2] + normals[i1 * 3 + 2];
|
|
74
|
-
// eslint-disable-next-line unicorn/prefer-modern-math-apis
|
|
75
|
-
const inv3 = 1 / Math.sqrt(x * x + y * y + z * z);
|
|
76
|
-
return [x * inv3, y * inv3, z * inv3];
|
|
77
|
-
}
|
|
78
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHViZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZ2VvbWV0cnkvdHViZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUd6QyxPQUFPLEVBQUUsb0NBQW9DLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDakUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQWV4QyxNQUFNLE9BQU8sZ0JBQWlCLFNBQVEsV0FBVztJQUM3QyxZQUFZLEVBQ1IsTUFBTSxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsRUFDbEIsTUFBTSxHQUFHLENBQUMsRUFDVixZQUFZLEdBQUcsQ0FBQyxNQUNTLEVBQUU7UUFDM0IsTUFBTSxPQUFPLEdBQUcsSUFBSSxVQUFVLENBQUM7WUFDM0IsUUFBUSxFQUFFLE1BQU07WUFDaEIsTUFBTSxFQUFFLE1BQU07U0FDakIsQ0FBQyxDQUFBO1FBQ0YsTUFBTSxTQUFTLEdBQWEsRUFBRSxDQUFBO1FBQzlCLE1BQU0sT0FBTyxHQUFhLEVBQUUsQ0FBQTtRQUM1QixNQUFNLFFBQVEsR0FBYSxFQUFFLENBQUE7UUFDN0IsaUJBQWlCLENBQUMsU0FBUyxFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFBO1FBQy9ELEtBQUssSUFBSSxJQUFJLEdBQUcsQ0FBQyxFQUFFLElBQUksR0FBRyxZQUFZLEVBQUUsSUFBSSxFQUFFLEVBQUUsQ0FBQztZQUM3QyxTQUFTLENBQUMsU0FBUyxFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFBO1FBQzNELENBQUM7UUFDRCxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsRUFBRSxJQUFJLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFBO1FBQ3BELE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxF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RUFBRSxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtJQUNuRCxNQUFNLENBQUMsR0FBRyxPQUFPLENBQUMsRUFBRSxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxPQUFPLENBQUMsRUFBRSxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtJQUNuRCxNQUFNLENBQUMsR0FBRyxPQUFPLENBQUMsRUFBRSxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxPQUFPLENBQUMsRUFBRSxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtJQUNuRCwyREFBMkQ7SUFDM0QsTUFBTSxJQUFJLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtJQUNqRCxPQUFPLENBQUMsQ0FBQyxHQUFHLElBQUksRUFBRSxDQUFDLEdBQUcsSUFBSSxFQUFFLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQTtBQUN6QyxDQUFDIn0=
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import { TgdGeometry } from "../../geometry";
|
|
2
|
-
/**
|
|
3
|
-
* The capsule is a 3D shape mae of a cylinder
|
|
4
|
-
* and two hemispheres, all of radius 1.
|
|
5
|
-
* The roundness gives use the number of faces around the cylinder.
|
|
6
|
-
* Every vertex has 4 coordinates: x, y, z, and a number that will
|
|
7
|
-
* be 0.0 for bottom tip, and 1.1 for top tip.
|
|
8
|
-
* The cylinder is aligned along Z axis.
|
|
9
|
-
*/
|
|
10
|
-
export declare function makeCapsule(roundness: number): TgdGeometry;
|
|
11
|
-
//# sourceMappingURL=capsule.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"capsule.d.ts","sourceRoot":"","sources":["../../../src/painter/tubes/capsule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAI3C;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,CAgG1D"}
|
|
@@ -1,109 +0,0 @@
|
|
|
1
|
-
import { TgdDataset } from "./../../dataset/index.js";
|
|
2
|
-
import { TgdGeometry } from "./../../geometry/index.js";
|
|
3
|
-
const TAU = 2 * Math.PI;
|
|
4
|
-
/**
|
|
5
|
-
* The capsule is a 3D shape mae of a cylinder
|
|
6
|
-
* and two hemispheres, all of radius 1.
|
|
7
|
-
* The roundness gives use the number of faces around the cylinder.
|
|
8
|
-
* Every vertex has 4 coordinates: x, y, z, and a number that will
|
|
9
|
-
* be 0.0 for bottom tip, and 1.1 for top tip.
|
|
10
|
-
* The cylinder is aligned along Z axis.
|
|
11
|
-
*/
|
|
12
|
-
export function makeCapsule(roundness) {
|
|
13
|
-
roundness = Math.max(3, roundness);
|
|
14
|
-
const tips = [];
|
|
15
|
-
const offset = [];
|
|
16
|
-
const elements = [];
|
|
17
|
-
const angleStep = TAU / roundness;
|
|
18
|
-
for (let face = 0; face < roundness; face++) {
|
|
19
|
-
const angle = angleStep * face;
|
|
20
|
-
const x = Math.cos(angle);
|
|
21
|
-
const y = Math.sin(angle);
|
|
22
|
-
offset.push(x, y, +1);
|
|
23
|
-
tips.push(1);
|
|
24
|
-
offset.push(x, y, -1);
|
|
25
|
-
tips.push(0);
|
|
26
|
-
const top1 = face * 2;
|
|
27
|
-
const bottom1 = top1 + 1;
|
|
28
|
-
const top2 = ((face + 1) % roundness) * 2;
|
|
29
|
-
const bottom2 = top2 + 1;
|
|
30
|
-
elements.push(top2, top1, bottom1);
|
|
31
|
-
elements.push(top2, bottom1, bottom2);
|
|
32
|
-
}
|
|
33
|
-
const rings = Math.max(2, Math.ceil(roundness / 2));
|
|
34
|
-
const angleStepRing = (0.5 * Math.PI) / rings;
|
|
35
|
-
for (let ring = 1; ring < rings; ring++) {
|
|
36
|
-
const phi = angleStepRing * ring;
|
|
37
|
-
const z = Math.sin(phi);
|
|
38
|
-
const radius = Math.cos(phi);
|
|
39
|
-
for (let face1 = 0; face1 < roundness; face1++) {
|
|
40
|
-
const angle = angleStep * face1;
|
|
41
|
-
const x = Math.cos(angle) * radius;
|
|
42
|
-
const y = Math.sin(angle) * radius;
|
|
43
|
-
offset.push(x, y, z + 1);
|
|
44
|
-
tips.push(1);
|
|
45
|
-
offset.push(x, y, -z - 1);
|
|
46
|
-
tips.push(0);
|
|
47
|
-
const face2 = (face1 + 1) % roundness;
|
|
48
|
-
const idx0 = (ring - 1) * roundness * 2;
|
|
49
|
-
const idx1 = ring * roundness * 2;
|
|
50
|
-
const top1r0 = idx0 + face1 * 2;
|
|
51
|
-
const top2r0 = idx0 + face2 * 2;
|
|
52
|
-
const top1r1 = idx1 + face1 * 2;
|
|
53
|
-
const top2r1 = idx1 + face2 * 2;
|
|
54
|
-
elements.push(top1r0, top2r0, top2r1);
|
|
55
|
-
elements.push(top2r1, top1r1, top1r0);
|
|
56
|
-
elements.push(top1r0 + 1, top2r1 + 1, top2r0 + 1);
|
|
57
|
-
elements.push(top2r1 + 1, top1r0 + 1, top1r1 + 1);
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
offset.push(0, 0, +2);
|
|
61
|
-
tips.push(1);
|
|
62
|
-
offset.push(0, 0, -2);
|
|
63
|
-
tips.push(0);
|
|
64
|
-
const baseIndex = tips.length - 2 * (roundness + 1);
|
|
65
|
-
const endIndex = tips.length - 2;
|
|
66
|
-
for (let face0 = 0; face0 < roundness; face0++) {
|
|
67
|
-
const face1 = (face0 + 1) % roundness;
|
|
68
|
-
const idx0 = face0 * 2 + baseIndex;
|
|
69
|
-
const idx1 = face1 * 2 + baseIndex;
|
|
70
|
-
elements.push(idx0 + 0, idx1 + 0, endIndex + 0);
|
|
71
|
-
elements.push(idx1 + 1, idx0 + 1, endIndex + 1);
|
|
72
|
-
}
|
|
73
|
-
const capsule = new TgdDataset({
|
|
74
|
-
attTip: "float",
|
|
75
|
-
POSITION: "vec3",
|
|
76
|
-
NORMAL: "vec3",
|
|
77
|
-
});
|
|
78
|
-
capsule.set("POSITION", new Float32Array(offset));
|
|
79
|
-
capsule.set("attTip", new Float32Array(tips));
|
|
80
|
-
const geometry = new TgdGeometry({
|
|
81
|
-
dataset: capsule,
|
|
82
|
-
elements: new Uint16Array(elements),
|
|
83
|
-
computeNormalsIfMissing: true,
|
|
84
|
-
// attPosition: "attPosition",
|
|
85
|
-
// attNormal: "attNormal",
|
|
86
|
-
});
|
|
87
|
-
const { set, get } = capsule.getAttribAccessor("NORMAL");
|
|
88
|
-
// The cylinder must be really flat
|
|
89
|
-
for (let idx = 0; idx < roundness * 2; idx += 2) {
|
|
90
|
-
set(0, idx, 2);
|
|
91
|
-
set(0, idx + 1, 2);
|
|
92
|
-
const x = (get(idx, 0) + get(idx + 1, 0)) / 2;
|
|
93
|
-
const y = (get(idx, 1) + get(idx + 1, 1)) / 2;
|
|
94
|
-
set(x, idx, 0);
|
|
95
|
-
set(y, idx, 1);
|
|
96
|
-
set(x, idx + 1, 0);
|
|
97
|
-
set(y, idx + 1, 1);
|
|
98
|
-
}
|
|
99
|
-
// We collapse the cylinder because it will
|
|
100
|
-
// be instantiated with two tips points and radii.
|
|
101
|
-
for (let idx = 0; idx < tips.length; idx++) {
|
|
102
|
-
const shiftZ = tips[idx] === 0 ? +1 : -1;
|
|
103
|
-
offset[idx * 3 + 2] += shiftZ;
|
|
104
|
-
}
|
|
105
|
-
capsule.set("POSITION", new Float32Array(offset));
|
|
106
|
-
capsule.set("attTip", new Float32Array(tips));
|
|
107
|
-
return geometry;
|
|
108
|
-
}
|
|
109
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2Fwc3VsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wYWludGVyL3R1YmVzL2NhcHN1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBRTNDLE1BQU0sR0FBRyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsRUFBRSxDQUFBO0FBRXZCOzs7Ozs7O0dBT0c7QUFDSCxNQUFNLFVBQVUsV0FBVyxDQUFDLFNBQWlCO0lBQ3pDLFNBQVMsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxTQUFTLENBQUMsQ0FBQTtJQUNsQyxNQUFNLElBQUksR0FBYSxFQUFFLENBQUE7SUFDekIsTUFBTSxNQUFNLEdBQWEsRUFBRSxDQUFBO0lBQzNCLE1BQU0sUUFBUSxHQUFhLEVBQUUsQ0FBQTtJQUM3QixNQUFNLFNBQVMsR0FBRyxHQUFHLEdBQUcsU0FBUyxDQUFBO0lBQ2pDLEtBQUssSUFBSSxJQUFJLEdBQUcsQ0FBQyxFQUFFLElBQUksR0FBRyxTQUFTLEVBQUUsSUFBSSxFQUFFLEVBQUUsQ0FBQztRQUMxQyxNQUFNLEtBQUssR0FBRyxTQUFTLEdBQUcsSUFBSSxDQUFBO1FBQzlCLE1BQU0sQ0FBQyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDekIsTUFBTSxDQUFDLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUN6QixNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUNyQixJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQ1osTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDckIsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUNaLE1BQU0sSUFBSSxHQUFHLElBQUksR0FBRyxDQUFDLENBQUE7UUFDckIsTUFBTSxPQUFPLEdBQUcsSUFBSSxHQUFHLENBQUMsQ0FBQTtRQUN4QixNQUFNLElBQUksR0FBRyxDQUFDLENBQUMsSUFBSSxHQUFHLENBQUMsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUN6QyxNQUFNLE9BQU8sR0FBRyxJQUFJLEdBQUcsQ0FBQyxDQUFBO1FBQ3hCLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQTtRQUNsQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUE7SUFDekMsQ0FBQztJQUNELE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDbkQsTUFBTSxhQUFhLEdBQUcsQ0FBQyxHQUFHLEdBQUcsSUFBSSxDQUFDLEVBQUUsQ0FBQyxHQUFHLEtBQUssQ0FBQTtJQUM3QyxLQUFLLElBQUksSUFBSSxHQUFHLENBQUMsRUFBRSxJQUFJLEdBQUcsS0FBSyxFQUFFLElBQUksRUFBRSxFQUFFLENBQUM7UUFDdEMsTUFBTSxHQUFHLEdBQUcsYUFBYSxHQUFHLElBQUksQ0FBQTtRQUNoQyxNQUFNLENBQUMsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ3ZCLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDNUIsS0FBSyxJQUFJLEtBQUssR0FBRyxDQUFDLEVBQUUsS0FBSyxHQUFHLFNBQVMsRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUFDO1lBQzdDLE1BQU0sS0FBSyxHQUFHLFNBQVMsR0FBRyxLQUFLLENBQUE7WUFDL0IsTUFBTSxDQUFDLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxNQUFNLENBQUE7WUFDbEMsTUFBTSxDQUFDLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxNQUFNLENBQUE7WUFDbEMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtZQUN4QixJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQ1osTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFBO1lBQ3pCLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDWixNQUFNLEtBQUssR0FBRyxDQUFDLEtBQUssR0FBRyxDQUFDLENBQUMsR0FBRyxTQUFTLENBQUE7WUFDckMsTUFBTSxJQUFJLEdBQUcsQ0FBQyxJQUFJLEdBQUcsQ0FBQyxDQUFDLEdBQUcsU0FBUyxHQUFHLENBQUMsQ0FBQTtZQUN2QyxNQUFNLElBQUksR0FBRyxJQUFJLEdBQUcsU0FBUyxHQUFHLENBQUMsQ0FBQTtZQUNqQyxNQUFNLE1BQU0sR0FBRyxJQUFJLEdBQUcsS0FBSyxHQUFHLENBQUMsQ0FBQTtZQUMvQixNQUFNLE1BQU0sR0FBRyxJQUFJLEdBQUcsS0FBSyxHQUFHLENBQUMsQ0FBQTtZQUMvQixNQUFNLE1BQU0sR0FBRyxJQUFJLEdBQUcsS0FBSyxHQUFHLENBQUMsQ0FBQTtZQUMvQixNQUFNLE1BQU0sR0FBRyxJQUFJLEdBQUcsS0FBSyxHQUFHLENBQUMsQ0FBQTtZQUMvQixRQUFRLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUE7WUFDckMsUUFBUSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFBO1lBQ3JDLFFBQVEsQ0FBQyxJQUFJLENBQUMsTUFBTSxHQUFHLENB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
|
|
@@ -1,89 +0,0 @@
|
|
|
1
|
-
import type { TgdCamera } from "../../camera";
|
|
2
|
-
import type { WebglParams } from "../../context/webgl-params";
|
|
3
|
-
import type { TgdDataset } from "../../dataset";
|
|
4
|
-
import { type TgdMaterial } from "../../material";
|
|
5
|
-
import { TgdTransfo } from "../../math";
|
|
6
|
-
import { TgdPainter } from "../painter";
|
|
7
|
-
import { TgdTexture2D } from "../../texture";
|
|
8
|
-
type DatasetOption = TgdDataset | (() => TgdDataset);
|
|
9
|
-
export type TgdPainterSegmentsMorphingOptions = {
|
|
10
|
-
/**
|
|
11
|
-
* Number of faces around the cylinder.
|
|
12
|
-
* Min is 3.
|
|
13
|
-
* Default to **3**.
|
|
14
|
-
*/
|
|
15
|
-
roundness?: number;
|
|
16
|
-
/**
|
|
17
|
-
* With orthographic camera, this is a value in pixels.
|
|
18
|
-
*/
|
|
19
|
-
minRadius?: number;
|
|
20
|
-
/**
|
|
21
|
-
* Multiply all the radii by this value.
|
|
22
|
-
*
|
|
23
|
-
* Default to `1`.
|
|
24
|
-
*/
|
|
25
|
-
radiusMultiplier?: number;
|
|
26
|
-
/**
|
|
27
|
-
* Material to apply to the resulting mesh.
|
|
28
|
-
*/
|
|
29
|
-
material?: TgdMaterial;
|
|
30
|
-
/**
|
|
31
|
-
* If a `TgdPainterSegments` is given, then the
|
|
32
|
-
* data will be shared between the painters.
|
|
33
|
-
*/
|
|
34
|
-
datasetsPairs: [DatasetOption, DatasetOption][];
|
|
35
|
-
};
|
|
36
|
-
/**
|
|
37
|
-
* @example
|
|
38
|
-
* ```
|
|
39
|
-
* const factory = new TgdPainterSegmentsData()
|
|
40
|
-
* factory.add(
|
|
41
|
-
* [0, 0, 0, .2],
|
|
42
|
-
* [1, 0, 0, .1],
|
|
43
|
-
* )
|
|
44
|
-
* factory.add(
|
|
45
|
-
* [0, 0, 0, .2],
|
|
46
|
-
* [0, 1, 0, .1],
|
|
47
|
-
* )
|
|
48
|
-
* factory.add(
|
|
49
|
-
* [0, 0, 0, .2],
|
|
50
|
-
* [0, 0, 1, .1],
|
|
51
|
-
* )
|
|
52
|
-
* const segments = new TgdPainterSegments(
|
|
53
|
-
* segment, factory
|
|
54
|
-
* )
|
|
55
|
-
* ```
|
|
56
|
-
*/
|
|
57
|
-
export declare class TgdPainterSegmentsMorphing extends TgdPainter {
|
|
58
|
-
protected readonly context: {
|
|
59
|
-
gl: WebGL2RenderingContext;
|
|
60
|
-
webglParams: WebglParams;
|
|
61
|
-
camera: TgdCamera;
|
|
62
|
-
};
|
|
63
|
-
readonly transfo: TgdTransfo;
|
|
64
|
-
colorTexture: TgdTexture2D;
|
|
65
|
-
minRadius: number;
|
|
66
|
-
radiusMultiplier: number;
|
|
67
|
-
radiusConstant: number;
|
|
68
|
-
radiusSwitch: number;
|
|
69
|
-
instanceCount: number;
|
|
70
|
-
/**
|
|
71
|
-
* Mix between two datasets of a pair.
|
|
72
|
-
* 0.0 for the first one, 1.0 for the second one.
|
|
73
|
-
*/
|
|
74
|
-
mix: number;
|
|
75
|
-
private readonly vaos;
|
|
76
|
-
private readonly prg;
|
|
77
|
-
private readonly vertexCount;
|
|
78
|
-
private readonly material;
|
|
79
|
-
constructor(context: {
|
|
80
|
-
gl: WebGL2RenderingContext;
|
|
81
|
-
webglParams: WebglParams;
|
|
82
|
-
camera: TgdCamera;
|
|
83
|
-
}, options: TgdPainterSegmentsMorphingOptions);
|
|
84
|
-
delete(): void;
|
|
85
|
-
paint(time: number, delay: number): void;
|
|
86
|
-
private get vao();
|
|
87
|
-
}
|
|
88
|
-
export {};
|
|
89
|
-
//# sourceMappingURL=segments-morphing.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"segments-morphing.d.ts","sourceRoot":"","sources":["../../../src/painter/tubes/segments-morphing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,KAAK,WAAW,EAA8B,MAAM,eAAe,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAK3C,KAAK,aAAa,GAAG,UAAU,GAAG,CAAC,MAAM,UAAU,CAAC,CAAA;AAEpD,MAAM,MAAM,iCAAiC,GAAG;IAC5C;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB;;OAEG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAA;IACtB;;;OAGG;IACH,aAAa,EAAE,CAAC,aAAa,EAAE,aAAa,CAAC,EAAE,CAAA;CAClD,CAAA;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,0BAA2B,SAAQ,UAAU;IAsBlD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE;QACxB,EAAE,EAAE,sBAAsB,CAAA;QAC1B,WAAW,EAAE,WAAW,CAAA;QACxB,MAAM,EAAE,SAAS,CAAA;KACpB;IAzBL,SAAgB,OAAO,aAAmB;IACnC,YAAY,EAAE,YAAY,CAAA;IAC1B,SAAS,SAAI;IACb,gBAAgB,SAAI;IACpB,cAAc,SAAI;IAClB,YAAY,SAAI;IAChB,aAAa,SAAI;IACxB;;;OAGG;IACI,GAAG,SAAI;IAEd,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAkB;IACvC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAY;IAChC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAa;gBAKf,OAAO,EAAE;QACxB,EAAE,EAAE,sBAAsB,CAAA;QAC1B,WAAW,EAAE,WAAW,CAAA;QACxB,MAAM,EAAE,SAAS,CAAA;KACpB,EACD,OAAO,EAAE,iCAAiC;IAuK9C,MAAM,IAAI,IAAI;IAKd,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IA4BxC,OAAO,KAAK,GAAG,GAEd;CACJ"}
|
|
@@ -1,215 +0,0 @@
|
|
|
1
|
-
import { TgdMaterialFaceOrientation } from "./../../material/index.js";
|
|
2
|
-
import { TgdTransfo } from "./../../math/index.js";
|
|
3
|
-
import { TgdPainter } from "./../painter.js";
|
|
4
|
-
import { TgdProgram } from "./../../program/index.js";
|
|
5
|
-
import { TgdShaderFragment, TgdShaderVertex } from "./../../shader/index.js";
|
|
6
|
-
import { TgdTexture2D } from "./../../texture/index.js";
|
|
7
|
-
import { tgdCanvasCreatePalette } from "./../../utils/index.js";
|
|
8
|
-
import { TgdVertexArray } from "./../../vao/index.js";
|
|
9
|
-
import { makeCapsule } from "./geometry.js";
|
|
10
|
-
/**
|
|
11
|
-
* @example
|
|
12
|
-
* ```
|
|
13
|
-
* const factory = new TgdPainterSegmentsData()
|
|
14
|
-
* factory.add(
|
|
15
|
-
* [0, 0, 0, .2],
|
|
16
|
-
* [1, 0, 0, .1],
|
|
17
|
-
* )
|
|
18
|
-
* factory.add(
|
|
19
|
-
* [0, 0, 0, .2],
|
|
20
|
-
* [0, 1, 0, .1],
|
|
21
|
-
* )
|
|
22
|
-
* factory.add(
|
|
23
|
-
* [0, 0, 0, .2],
|
|
24
|
-
* [0, 0, 1, .1],
|
|
25
|
-
* )
|
|
26
|
-
* const segments = new TgdPainterSegments(
|
|
27
|
-
* segment, factory
|
|
28
|
-
* )
|
|
29
|
-
* ```
|
|
30
|
-
*/
|
|
31
|
-
export class TgdPainterSegmentsMorphing extends TgdPainter {
|
|
32
|
-
// private readonly painter: TgdPainter
|
|
33
|
-
constructor(context, options) {
|
|
34
|
-
var _a, _b, _c, _d, _e;
|
|
35
|
-
super();
|
|
36
|
-
this.context = context;
|
|
37
|
-
this.transfo = new TgdTransfo();
|
|
38
|
-
this.minRadius = 1;
|
|
39
|
-
this.radiusMultiplier = 1;
|
|
40
|
-
this.radiusConstant = 1;
|
|
41
|
-
this.radiusSwitch = 0;
|
|
42
|
-
this.instanceCount = 0;
|
|
43
|
-
/**
|
|
44
|
-
* Mix between two datasets of a pair.
|
|
45
|
-
* 0.0 for the first one, 1.0 for the second one.
|
|
46
|
-
*/
|
|
47
|
-
this.mix = 0;
|
|
48
|
-
this.name = `TgdPainterSegments#${this.id}`;
|
|
49
|
-
this.radiusMultiplier = (_a = options.radiusMultiplier) !== null && _a !== void 0 ? _a : 1;
|
|
50
|
-
const { roundness = 3, minRadius = 1, datasetsPairs } = options;
|
|
51
|
-
if (datasetsPairs.length === 0) {
|
|
52
|
-
throw new Error('[TgdPainterSegmentsMorphing] "datasetsPairs" must contain at least one pair of datasets!');
|
|
53
|
-
}
|
|
54
|
-
const geometry = makeCapsule(roundness);
|
|
55
|
-
const material = (_b = options.material) !== null && _b !== void 0 ? _b : new TgdMaterialFaceOrientation();
|
|
56
|
-
this.material = material;
|
|
57
|
-
material.attPosition = geometry.attPosition;
|
|
58
|
-
material.attNormal = geometry.attNormal;
|
|
59
|
-
material.attUV =
|
|
60
|
-
"((mix(attUV0_A, attUV0_B, uniMix) + mix(attUV1_A, attUV1_B, uniMix)) * .5)";
|
|
61
|
-
this.minRadius = minRadius;
|
|
62
|
-
if (roundness > 127) {
|
|
63
|
-
throw new Error("[TgdPainterSegments] Max roundness is 127!");
|
|
64
|
-
}
|
|
65
|
-
if (roundness < 0) {
|
|
66
|
-
throw new Error("[TgdPainterSegments] Min roundness is 0!");
|
|
67
|
-
}
|
|
68
|
-
this.colorTexture = new TgdTexture2D(context)
|
|
69
|
-
.setParams({
|
|
70
|
-
magFilter: "NEAREST",
|
|
71
|
-
minFilter: "NEAREST",
|
|
72
|
-
wrapR: "CLAMP_TO_EDGE",
|
|
73
|
-
wrapS: "CLAMP_TO_EDGE",
|
|
74
|
-
wrapT: "CLAMP_TO_EDGE",
|
|
75
|
-
})
|
|
76
|
-
.loadBitmap(tgdCanvasCreatePalette(["#f44", "#ff4", "#4f4", "#4ff", "#44f"]));
|
|
77
|
-
const vert = new TgdShaderVertex({
|
|
78
|
-
uniforms: Object.assign({ uniMix: "float", uniTransfoMatrix: "mat4", uniModelViewMatrix: "mat4", uniProjectionMatrix: "mat4", uniMinRadius: "float", uniRadiusMultiplier: "float" }, material.uniforms),
|
|
79
|
-
attributes: {
|
|
80
|
-
[geometry.attPosition]: "vec3",
|
|
81
|
-
[geometry.attNormal]: "vec3",
|
|
82
|
-
attTip: "float",
|
|
83
|
-
attXYZR0_A: "vec4",
|
|
84
|
-
attXYZR0_B: "vec4",
|
|
85
|
-
attXYZR1_A: "vec4",
|
|
86
|
-
attXYZR1_B: "vec4",
|
|
87
|
-
attUV0_A: "vec2",
|
|
88
|
-
attUV0_B: "vec2",
|
|
89
|
-
attUV1_A: "vec2",
|
|
90
|
-
attUV1_B: "vec2",
|
|
91
|
-
},
|
|
92
|
-
varying: Object.assign(Object.assign({}, material.varyings), { varNormal: "vec3" }),
|
|
93
|
-
functions: Object.assign(Object.assign({}, material.extraVertexShaderFunctions), { applyMaterial: [
|
|
94
|
-
"void applyMaterial() {",
|
|
95
|
-
[material.vertexShaderCode],
|
|
96
|
-
"}",
|
|
97
|
-
], getPosition: [
|
|
98
|
-
"vec4 getPosition(vec4 pos) {",
|
|
99
|
-
[(_c = material.vertexShaderCodeForGetPosition) !== null && _c !== void 0 ? _c : "return pos;"],
|
|
100
|
-
"}",
|
|
101
|
-
] }),
|
|
102
|
-
mainCode: [
|
|
103
|
-
"vec4 attXYZR0 = mix(attXYZR0_A, attXYZR0_B, uniMix);",
|
|
104
|
-
"vec4 attXYZR1 = mix(attXYZR1_A, attXYZR1_B, uniMix);",
|
|
105
|
-
"vec2 attUV0 = mix(attUV0_A, attUV0_B, uniMix);",
|
|
106
|
-
"vec2 attUV1 = mix(attUV1_A, attUV1_B, uniMix);",
|
|
107
|
-
"vec3 normal = NORMAL;",
|
|
108
|
-
"vec3 pos = POSITION;",
|
|
109
|
-
"vec4 xyzr = mix(attXYZR0, attXYZR1, attTip);",
|
|
110
|
-
"vec3 center = xyzr.xyz;",
|
|
111
|
-
"float radius = max(",
|
|
112
|
-
[
|
|
113
|
-
"xyzr.w * uniRadiusMultiplier,",
|
|
114
|
-
"uniMinRadius * (uniProjectionMatrix * uniModelViewMatrix * uniTransfoMatrix * vec4(center, 1)).w",
|
|
115
|
-
],
|
|
116
|
-
");",
|
|
117
|
-
"vec3 dir = attXYZR1.xyz - attXYZR0.xyz;",
|
|
118
|
-
"float len = length(dir);",
|
|
119
|
-
"if (len == 0.0) {",
|
|
120
|
-
["// Just a sphere", "pos *= radius;", "pos += center.xyz;"],
|
|
121
|
-
"} else {",
|
|
122
|
-
[
|
|
123
|
-
"// Full capsule",
|
|
124
|
-
"vec3 Z = dir / len;",
|
|
125
|
-
"vec3 v = abs(Z.z) > 0.7 ? vec3(1,0,0) : vec3(0,0,1);",
|
|
126
|
-
"vec3 Y = cross(v, Z);",
|
|
127
|
-
"vec3 X = cross(Y, Z);",
|
|
128
|
-
"mat3 mat = mat3(X, Y, Z);",
|
|
129
|
-
"pos *= radius;",
|
|
130
|
-
"pos = mat * pos + center.xyz;",
|
|
131
|
-
"normal = mat * normal;",
|
|
132
|
-
],
|
|
133
|
-
"}",
|
|
134
|
-
"gl_Position = uniProjectionMatrix * uniModelViewMatrix * uniTransfoMatrix * vec4(pos, 1);",
|
|
135
|
-
"applyMaterial();",
|
|
136
|
-
"varNormal = normal;",
|
|
137
|
-
],
|
|
138
|
-
}).code;
|
|
139
|
-
const frag = new TgdShaderFragment({
|
|
140
|
-
uniforms: material.uniforms,
|
|
141
|
-
outputs: { FragColor: "vec4" },
|
|
142
|
-
varying: material.varyings,
|
|
143
|
-
functions: Object.assign(Object.assign({}, material.extraFragmentShaderFunctions), { applyMaterial: [
|
|
144
|
-
"vec4 applyMaterial() {",
|
|
145
|
-
[material.fragmentShaderCode],
|
|
146
|
-
"}",
|
|
147
|
-
] }),
|
|
148
|
-
mainCode: ["FragColor = applyMaterial();"],
|
|
149
|
-
}).code;
|
|
150
|
-
const prg = new TgdProgram(context.gl, {
|
|
151
|
-
name: `TgdPainterSegments/TgdProgram#${this.id}`,
|
|
152
|
-
vert,
|
|
153
|
-
frag,
|
|
154
|
-
});
|
|
155
|
-
this.prg = prg;
|
|
156
|
-
this.vaos = datasetsPairs.map(([A, B]) => {
|
|
157
|
-
const datasetA = extract(A).renameAttributes([
|
|
158
|
-
"attXYZR0_A",
|
|
159
|
-
"attUV0_A",
|
|
160
|
-
"attInfluence0_A",
|
|
161
|
-
"attXYZR1_A",
|
|
162
|
-
"attUV1_A",
|
|
163
|
-
"attInfluence1_A",
|
|
164
|
-
]);
|
|
165
|
-
const datasetB = extract(B).renameAttributes([
|
|
166
|
-
"attXYZR0_B",
|
|
167
|
-
"attUV0_B",
|
|
168
|
-
"attInfluence0_B",
|
|
169
|
-
"attXYZR1_B",
|
|
170
|
-
"attUV1_B",
|
|
171
|
-
"attInfluence1_B",
|
|
172
|
-
]);
|
|
173
|
-
if (datasetA.count !== datasetB.count) {
|
|
174
|
-
throw new Error(`[TgdPainterSegmentsMorphing] Datasets of a pair must have the same count, but we got ${datasetA.count} ≠ ${datasetB.count}!`);
|
|
175
|
-
}
|
|
176
|
-
const vao = new TgdVertexArray(context.gl, prg, [geometry.dataset, datasetA, datasetB], geometry.elements);
|
|
177
|
-
this.instanceCount = datasetA.count;
|
|
178
|
-
return vao;
|
|
179
|
-
});
|
|
180
|
-
this.vertexCount = (_e = (_d = geometry.elements) === null || _d === void 0 ? void 0 : _d.length) !== null && _e !== void 0 ? _e : 0;
|
|
181
|
-
}
|
|
182
|
-
delete() {
|
|
183
|
-
for (const vao of this.vaos)
|
|
184
|
-
vao.delete();
|
|
185
|
-
this.prg.delete();
|
|
186
|
-
}
|
|
187
|
-
paint(time, delay) {
|
|
188
|
-
var _a, _b;
|
|
189
|
-
const { context, prg, vao, vertexCount, instanceCount, material } = this;
|
|
190
|
-
const { gl, camera } = context;
|
|
191
|
-
gl.disable(gl.DITHER);
|
|
192
|
-
prg.use();
|
|
193
|
-
(_b = (_a = this.material).setUniforms) === null || _b === void 0 ? void 0 : _b.call(_a, { program: prg, context, time, delay });
|
|
194
|
-
prg.uniform1f("uniMix", this.mix);
|
|
195
|
-
prg.uniform1f("uniRadiusMultiplier", this.radiusMultiplier);
|
|
196
|
-
prg.uniform1f("uniMinRadius", (this.minRadius * 2) / gl.drawingBufferHeight);
|
|
197
|
-
prg.uniformMatrix4fv("uniTransfoMatrix", this.transfo.matrix);
|
|
198
|
-
prg.uniformMatrix4fv("uniModelViewMatrix", camera.matrixModelView);
|
|
199
|
-
prg.uniformMatrix4fv("uniProjectionMatrix", camera.matrixProjection);
|
|
200
|
-
material.applyState(this.context, () => {
|
|
201
|
-
vao.bind();
|
|
202
|
-
gl.drawElementsInstanced(gl.TRIANGLES, vertexCount, gl.UNSIGNED_SHORT, 0, instanceCount);
|
|
203
|
-
vao.unbind();
|
|
204
|
-
});
|
|
205
|
-
}
|
|
206
|
-
get vao() {
|
|
207
|
-
return this.vaos[0];
|
|
208
|
-
}
|
|
209
|
-
}
|
|
210
|
-
function extract(arg) {
|
|
211
|
-
if (typeof arg === "function")
|
|
212
|
-
return arg();
|
|
213
|
-
return arg;
|
|
214
|
-
}
|
|
215
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VnbWVudHMtbW9ycGhpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcGFpbnRlci90dWJlcy9zZWdtZW50cy1tb3JwaGluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQW9CLDBCQUEwQixFQUFFLE1BQU0sZUFBZSxDQUFBO0FBQzVFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxXQUFXLENBQUE7QUFDdEMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFBO0FBQ2pELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFDekMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLGVBQWUsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUNoRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBQzNDLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUNuRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sVUFBVSxDQUFBO0FBQ3pDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFnQ3hDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQW9CRztBQUNILE1BQU0sT0FBTywwQkFBMkIsU0FBUSxVQUFVO0lBbUJ0RCx1Q0FBdUM7SUFFdkMsWUFDdUIsT0FJbEIsRUFDRCxPQUEwQzs7UUFFMUMsS0FBSyxFQUFFLENBQUE7UUFQWSxZQUFPLEdBQVAsT0FBTyxDQUl6QjtRQXpCVyxZQUFPLEdBQUcsSUFBSSxVQUFVLEVBQUUsQ0FBQTtRQUVuQyxjQUFTLEdBQUcsQ0FBQyxDQUFBO1FBQ2IscUJBQWdCLEdBQUcsQ0FBQyxDQUFBO1FBQ3BCLG1CQUFjLEdBQUcsQ0FBQyxDQUFBO1FBQ2xCLGlCQUFZLEdBQUcsQ0FBQyxDQUFBO1FBQ2hCLGtCQUFhLEdBQUcsQ0FBQyxDQUFBO1FBQ3hCOzs7V0FHRztRQUNJLFFBQUcsR0FBRyxDQUFDLENBQUE7UUFrQlYs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
|