@tolokoban/tgd 2.0.88 → 2.0.91
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.d.ts +1 -1
- package/lib/dist/bounding-box.d.ts.map +1 -1
- package/lib/dist/context/context.d.ts +6 -4
- package/lib/dist/context/context.d.ts.map +1 -1
- package/lib/dist/context/context.js +9 -9
- package/lib/dist/context/webgl-params.d.ts +51 -0
- package/lib/dist/context/webgl-params.d.ts.map +1 -0
- package/lib/dist/context/webgl-params.js +152 -0
- package/lib/dist/filter/blur.d.ts.map +1 -1
- package/lib/dist/filter/blur.js +5 -13
- package/lib/dist/filter/index.d.ts +1 -0
- package/lib/dist/filter/index.d.ts.map +1 -1
- package/lib/dist/filter/index.js +2 -1
- package/lib/dist/filter/multiply.d.ts +13 -0
- package/lib/dist/filter/multiply.d.ts.map +1 -0
- package/lib/dist/filter/multiply.js +28 -0
- package/lib/dist/filter/verbatim.d.ts.map +1 -1
- package/lib/dist/filter/verbatim.js +1 -5
- package/lib/dist/geometry/tubes.d.ts +19 -0
- package/lib/dist/geometry/tubes.d.ts.map +1 -0
- package/lib/dist/geometry/tubes.js +78 -0
- package/lib/dist/index.d.ts +1 -1
- package/lib/dist/index.d.ts.map +1 -1
- package/lib/dist/index.js +2 -2
- package/lib/dist/material/glass.d.ts +3 -3
- package/lib/dist/material/glass.d.ts.map +1 -1
- package/lib/dist/material/glass.js +13 -15
- package/lib/dist/material/global.d.ts +2 -2
- package/lib/dist/material/global.d.ts.map +1 -1
- package/lib/dist/material/global.js +5 -7
- package/lib/dist/material/material.d.ts +10 -2
- package/lib/dist/material/material.d.ts.map +1 -1
- package/lib/dist/material/material.js +3 -3
- package/lib/dist/math/vec3.d.ts +2 -1
- package/lib/dist/math/vec3.d.ts.map +1 -1
- package/lib/dist/math/vec3.js +14 -4
- package/lib/dist/painter/background/background.d.ts +2 -0
- package/lib/dist/painter/background/background.d.ts.map +1 -1
- package/lib/dist/painter/background/background.js +7 -7
- package/lib/dist/painter/background-with-depth/background-with-depth.d.ts.map +1 -1
- package/lib/dist/painter/background-with-depth/background-with-depth.js +10 -7
- package/lib/dist/painter/filter/filter.d.ts +9 -9
- package/lib/dist/painter/filter/filter.d.ts.map +1 -1
- package/lib/dist/painter/filter/filter.js +80 -89
- package/lib/dist/painter/framebuffer-msaa.d.ts +1 -0
- package/lib/dist/painter/framebuffer-msaa.d.ts.map +1 -1
- package/lib/dist/painter/framebuffer-msaa.js +5 -2
- package/lib/dist/painter/framebuffer.d.ts +16 -3
- package/lib/dist/painter/framebuffer.d.ts.map +1 -1
- package/lib/dist/painter/framebuffer.js +19 -8
- package/lib/dist/painter/index.d.ts +2 -1
- package/lib/dist/painter/index.d.ts.map +1 -1
- package/lib/dist/painter/index.js +3 -2
- package/lib/dist/painter/mesh/gltf/gltf.d.ts +6 -4
- package/lib/dist/painter/mesh/gltf/gltf.d.ts.map +1 -1
- package/lib/dist/painter/mesh/gltf/gltf.js +5 -5
- package/lib/dist/painter/mesh/mesh/mesh.d.ts +3 -0
- package/lib/dist/painter/mesh/mesh/mesh.d.ts.map +1 -1
- package/lib/dist/painter/mesh/mesh/mesh.js +4 -4
- package/lib/dist/painter/mix/index.d.ts +2 -0
- package/lib/dist/painter/mix/index.d.ts.map +1 -0
- package/lib/dist/painter/mix/index.js +2 -0
- package/lib/dist/painter/mix/mix.d.ts +25 -0
- package/lib/dist/painter/mix/mix.d.ts.map +1 -0
- package/lib/dist/painter/mix/mix.js +85 -0
- package/lib/dist/painter/segments/segments-morphing.d.ts +13 -4
- package/lib/dist/painter/segments/segments-morphing.d.ts.map +1 -1
- package/lib/dist/painter/segments/segments-morphing.js +40 -38
- package/lib/dist/painter/segments/segments.d.ts +15 -5
- package/lib/dist/painter/segments/segments.d.ts.map +1 -1
- package/lib/dist/painter/segments/segments.js +39 -37
- package/lib/dist/painter/skybox/skybox.d.ts +4 -4
- package/lib/dist/painter/skybox/skybox.d.ts.map +1 -1
- package/lib/dist/painter/skybox/skybox.js +7 -9
- package/lib/dist/painter/state/state.d.ts +15 -6
- package/lib/dist/painter/state/state.d.ts.map +1 -1
- package/lib/dist/painter/state/state.js +40 -27
- package/lib/dist/painter/tubes/capsule.d.ts +11 -0
- package/lib/dist/painter/tubes/capsule.d.ts.map +1 -0
- package/lib/dist/painter/tubes/capsule.js +109 -0
- package/lib/dist/painter/tubes/ellipse.d.ts +32 -0
- package/lib/dist/painter/tubes/ellipse.d.ts.map +1 -0
- package/lib/dist/painter/tubes/ellipse.js +62 -0
- package/lib/dist/painter/tubes/geometry.d.ts +8 -0
- package/lib/dist/painter/tubes/geometry.d.ts.map +1 -0
- package/lib/dist/painter/tubes/geometry.js +78 -0
- package/lib/dist/painter/tubes/index.d.ts +2 -0
- package/lib/dist/painter/tubes/index.d.ts.map +1 -0
- package/lib/dist/painter/tubes/index.js +2 -0
- package/lib/dist/painter/tubes/segments-morphing.d.ts +89 -0
- package/lib/dist/painter/tubes/segments-morphing.d.ts.map +1 -0
- package/lib/dist/painter/tubes/segments-morphing.js +215 -0
- package/lib/dist/painter/tubes/segments.d.ts +133 -0
- package/lib/dist/painter/tubes/segments.d.ts.map +1 -0
- package/lib/dist/painter/tubes/segments.js +270 -0
- package/lib/dist/painter/tubes/tubes.d.ts +26 -0
- package/lib/dist/painter/tubes/tubes.d.ts.map +1 -0
- package/lib/dist/painter/tubes/tubes.js +62 -0
- package/lib/dist/painter/tubes/types.d.ts +45 -0
- package/lib/dist/painter/tubes/types.d.ts.map +1 -0
- package/lib/dist/painter/tubes/types.js +2 -0
- package/lib/dist/painter/tubes/vertices.d.ts +10 -0
- package/lib/dist/painter/tubes/vertices.d.ts.map +1 -0
- package/lib/dist/painter/tubes/vertices.js +31 -0
- package/lib/dist/painter/x-ray/x-ray.d.ts +2 -0
- package/lib/dist/painter/x-ray/x-ray.d.ts.map +1 -1
- package/lib/dist/painter/x-ray/x-ray.js +5 -5
- package/lib/dist/parser/gltf/gltf.d.ts +6 -4
- package/lib/dist/parser/gltf/gltf.d.ts.map +1 -1
- package/lib/dist/parser/gltf/gltf.js +8 -12
- package/lib/dist/texture/texture-depth.d.ts +3 -0
- package/lib/dist/texture/texture-depth.d.ts.map +1 -1
- package/lib/dist/texture/texture-depth.js +1 -1
- package/lib/dist/texture/texture2d.d.ts +4 -1
- package/lib/dist/texture/texture2d.d.ts.map +1 -1
- package/lib/dist/texture/texture2d.js +10 -7
- package/lib/dist/types/index.d.ts +1 -1
- package/lib/dist/types/index.d.ts.map +1 -1
- package/lib/dist/types/index.js +2 -2
- package/lib/dist/utils/functions.d.ts +2 -0
- package/lib/dist/utils/functions.d.ts.map +1 -0
- package/lib/dist/utils/functions.js +4 -0
- package/lib/dist/utils/state/blend.d.ts +13 -4
- package/lib/dist/utils/state/blend.d.ts.map +1 -1
- package/lib/dist/utils/state/blend.js +21 -22
- package/lib/dist/utils/state/cull.d.ts +13 -4
- package/lib/dist/utils/state/cull.d.ts.map +1 -1
- package/lib/dist/utils/state/cull.js +15 -16
- package/lib/dist/utils/state/depth.d.ts +13 -4
- package/lib/dist/utils/state/depth.d.ts.map +1 -1
- package/lib/dist/utils/state/depth.js +19 -20
- package/package.json +1 -1
|
@@ -0,0 +1,215 @@
|
|
|
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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
|
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
import type { TgdBuffer, TgdBufferOptionTarget, TgdBufferOptionUsage } from "../../buffer";
|
|
2
|
+
import type { TgdCamera } from "../../camera";
|
|
3
|
+
import type { WebglParams } from "../../context/webgl-params";
|
|
4
|
+
import { TgdDataset } from "../../dataset";
|
|
5
|
+
import { type TgdMaterial } from "../../material";
|
|
6
|
+
import { TgdTransfo } from "../../math";
|
|
7
|
+
import { TgdPainter } from "../painter";
|
|
8
|
+
import type { ArrayNumber2, ArrayNumber4 } from "../../types";
|
|
9
|
+
type DatasetOption = TgdPainterSegments | InstanceDataset | (() => InstanceDataset);
|
|
10
|
+
export type TgdPainterSegmentsOptions = {
|
|
11
|
+
/**
|
|
12
|
+
* Number of faces around the cylinder.
|
|
13
|
+
* Min is 3.
|
|
14
|
+
*
|
|
15
|
+
* Default to **3**.
|
|
16
|
+
*/
|
|
17
|
+
roundness?: number;
|
|
18
|
+
/**
|
|
19
|
+
* With orthographic camera, this is a value in pixels.
|
|
20
|
+
*/
|
|
21
|
+
minRadius?: number;
|
|
22
|
+
/**
|
|
23
|
+
* Multiply all the radii by this value.
|
|
24
|
+
*
|
|
25
|
+
* Default to `1`.
|
|
26
|
+
*/
|
|
27
|
+
radiusMultiplier?: number;
|
|
28
|
+
/**
|
|
29
|
+
* Material to apply to the resulting mesh.
|
|
30
|
+
*/
|
|
31
|
+
material?: TgdMaterial;
|
|
32
|
+
/**
|
|
33
|
+
* If a `TgdPainterSegments` is given, then the
|
|
34
|
+
* data will be shared between the painters.
|
|
35
|
+
*/
|
|
36
|
+
dataset: DatasetOption;
|
|
37
|
+
};
|
|
38
|
+
/**
|
|
39
|
+
* @example
|
|
40
|
+
* ```
|
|
41
|
+
* const factory = new TgdPainterSegmentsData()
|
|
42
|
+
* factory.add(
|
|
43
|
+
* [0, 0, 0, .2],
|
|
44
|
+
* [1, 0, 0, .1],
|
|
45
|
+
* )
|
|
46
|
+
* factory.add(
|
|
47
|
+
* [0, 0, 0, .2],
|
|
48
|
+
* [0, 1, 0, .1],
|
|
49
|
+
* )
|
|
50
|
+
* factory.add(
|
|
51
|
+
* [0, 0, 0, .2],
|
|
52
|
+
* [0, 0, 1, .1],
|
|
53
|
+
* )
|
|
54
|
+
* const segments = new TgdPainterSegments(
|
|
55
|
+
* segment, factory
|
|
56
|
+
* )
|
|
57
|
+
* ```
|
|
58
|
+
*/
|
|
59
|
+
export declare class TgdPainterSegments extends TgdPainter {
|
|
60
|
+
protected readonly context: {
|
|
61
|
+
gl: WebGL2RenderingContext;
|
|
62
|
+
webglParams: WebglParams;
|
|
63
|
+
camera: TgdCamera;
|
|
64
|
+
};
|
|
65
|
+
static createDataset({ attXYZR0, attUV0, attInfluence0, attXYZR1, attUV1, attInfluence1, buffer, usage, target, }?: Partial<{
|
|
66
|
+
attXYZR0: string;
|
|
67
|
+
attUV0: string;
|
|
68
|
+
attInfluence0: string;
|
|
69
|
+
attXYZR1: string;
|
|
70
|
+
attUV1: string;
|
|
71
|
+
attInfluence1: string;
|
|
72
|
+
buffer: TgdBuffer;
|
|
73
|
+
target: TgdBufferOptionTarget;
|
|
74
|
+
usage: TgdBufferOptionUsage;
|
|
75
|
+
}>): TgdDataset;
|
|
76
|
+
readonly transfo: TgdTransfo;
|
|
77
|
+
minRadius: number;
|
|
78
|
+
radiusMultiplier: number;
|
|
79
|
+
radiusConstant: number;
|
|
80
|
+
radiusSwitch: number;
|
|
81
|
+
instanceCount: number;
|
|
82
|
+
private readonly vao;
|
|
83
|
+
private readonly prg;
|
|
84
|
+
private readonly vertexCount;
|
|
85
|
+
private readonly material;
|
|
86
|
+
constructor(context: {
|
|
87
|
+
gl: WebGL2RenderingContext;
|
|
88
|
+
webglParams: WebglParams;
|
|
89
|
+
camera: TgdCamera;
|
|
90
|
+
}, options: TgdPainterSegmentsOptions);
|
|
91
|
+
getBuffer(): TgdBuffer | undefined;
|
|
92
|
+
delete(): void;
|
|
93
|
+
paint(time: number, delay: number): void;
|
|
94
|
+
}
|
|
95
|
+
type InstanceDataset = TgdDataset;
|
|
96
|
+
export declare class TgdPainterSegmentsData {
|
|
97
|
+
private _count;
|
|
98
|
+
private readonly attXYZR0;
|
|
99
|
+
private readonly attUV0;
|
|
100
|
+
private readonly attInfluence0;
|
|
101
|
+
private readonly attXYZR1;
|
|
102
|
+
private readonly attUV1;
|
|
103
|
+
private readonly attInfluence1;
|
|
104
|
+
get count(): number;
|
|
105
|
+
getXYZR0(index: number): ArrayNumber4;
|
|
106
|
+
getXYZR1(index: number): ArrayNumber4;
|
|
107
|
+
/**
|
|
108
|
+
* @param XYZR0 (x,y,z) and radius of point A.
|
|
109
|
+
* @param XYZR1 (x,y,z) and radius of point B.
|
|
110
|
+
* @param UV0 Texture coordinates for point A.
|
|
111
|
+
* @param UV1 Texture coordinates for point B.
|
|
112
|
+
* @param radiusMultiplierInfluence0 If you put 0, the radius won't change regardless to the currently applied radius multiplicator.
|
|
113
|
+
* @param radiusMultiplierInfluence1
|
|
114
|
+
*/
|
|
115
|
+
add(XYZR0: ArrayNumber4, XYZR1: ArrayNumber4, UV0?: ArrayNumber2, UV1?: ArrayNumber2, radiusMultiplierInfluence0?: number, radiusMultiplierInfluence1?: number): void;
|
|
116
|
+
/**
|
|
117
|
+
* You can rename the attributes if you need to use
|
|
118
|
+
* them in another Painter.
|
|
119
|
+
*/
|
|
120
|
+
readonly makeDataset: (args?: Partial<{
|
|
121
|
+
attXYZR0: string;
|
|
122
|
+
attUV0: string;
|
|
123
|
+
attInfluence0: string;
|
|
124
|
+
attXYZR1: string;
|
|
125
|
+
attUV1: string;
|
|
126
|
+
attInfluence1: string;
|
|
127
|
+
buffer: TgdBuffer;
|
|
128
|
+
target: TgdBufferOptionTarget;
|
|
129
|
+
usage: TgdBufferOptionUsage;
|
|
130
|
+
}>) => InstanceDataset;
|
|
131
|
+
}
|
|
132
|
+
export {};
|
|
133
|
+
//# sourceMappingURL=segments.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"segments.d.ts","sourceRoot":"","sources":["../../../src/painter/tubes/segments.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,270 @@
|
|
|
1
|
+
import { TgdDataset } from "./../../dataset/index.js";
|
|
2
|
+
import { TgdMaterialFaceOrientation } from "./../../material/index.js";
|
|
3
|
+
import { TgdTransfo } from "./../../math/index.js";
|
|
4
|
+
import { TgdPainter } from "./../painter.js";
|
|
5
|
+
import { TgdProgram } from "./../../program/index.js";
|
|
6
|
+
import { TgdShaderFragment, TgdShaderVertex } from "./../../shader/index.js";
|
|
7
|
+
import { TgdVertexArray } from "./../../vao/index.js";
|
|
8
|
+
import { makeCapsule } from "./capsule.js";
|
|
9
|
+
/**
|
|
10
|
+
* @example
|
|
11
|
+
* ```
|
|
12
|
+
* const factory = new TgdPainterSegmentsData()
|
|
13
|
+
* factory.add(
|
|
14
|
+
* [0, 0, 0, .2],
|
|
15
|
+
* [1, 0, 0, .1],
|
|
16
|
+
* )
|
|
17
|
+
* factory.add(
|
|
18
|
+
* [0, 0, 0, .2],
|
|
19
|
+
* [0, 1, 0, .1],
|
|
20
|
+
* )
|
|
21
|
+
* factory.add(
|
|
22
|
+
* [0, 0, 0, .2],
|
|
23
|
+
* [0, 0, 1, .1],
|
|
24
|
+
* )
|
|
25
|
+
* const segments = new TgdPainterSegments(
|
|
26
|
+
* segment, factory
|
|
27
|
+
* )
|
|
28
|
+
* ```
|
|
29
|
+
*/
|
|
30
|
+
export class TgdPainterSegments extends TgdPainter {
|
|
31
|
+
static createDataset({ attXYZR0 = "attXYZR0", attUV0 = "attUV0", attInfluence0 = "attInfluence0", attXYZR1 = "attXYZR1", attUV1 = "attUV1", attInfluence1 = "attInfluence1", buffer, usage, target, } = {}) {
|
|
32
|
+
const dataset = new TgdDataset({
|
|
33
|
+
[attXYZR0]: "vec4",
|
|
34
|
+
[attUV0]: "vec2",
|
|
35
|
+
[attInfluence0]: "float",
|
|
36
|
+
[attXYZR1]: "vec4",
|
|
37
|
+
[attUV1]: "vec2",
|
|
38
|
+
[attInfluence1]: "float",
|
|
39
|
+
}, {
|
|
40
|
+
divisor: 1,
|
|
41
|
+
buffer,
|
|
42
|
+
usage,
|
|
43
|
+
target,
|
|
44
|
+
});
|
|
45
|
+
return dataset;
|
|
46
|
+
}
|
|
47
|
+
constructor(context, options) {
|
|
48
|
+
var _a, _b, _c, _d, _e;
|
|
49
|
+
super();
|
|
50
|
+
this.context = context;
|
|
51
|
+
this.transfo = new TgdTransfo();
|
|
52
|
+
this.minRadius = 1;
|
|
53
|
+
this.radiusMultiplier = 1;
|
|
54
|
+
this.radiusConstant = 1;
|
|
55
|
+
this.radiusSwitch = 0;
|
|
56
|
+
this.instanceCount = 0;
|
|
57
|
+
this.name = `TgdPainterSegments#${this.id}`;
|
|
58
|
+
this.radiusMultiplier = (_a = options.radiusMultiplier) !== null && _a !== void 0 ? _a : 1;
|
|
59
|
+
const { roundness = 3, minRadius = 1, dataset } = options;
|
|
60
|
+
const geometry = makeCapsule(roundness);
|
|
61
|
+
const material = (_b = options.material) !== null && _b !== void 0 ? _b : new TgdMaterialFaceOrientation();
|
|
62
|
+
this.material = material;
|
|
63
|
+
material.attPosition = geometry.attPosition;
|
|
64
|
+
material.attNormal = geometry.attNormal;
|
|
65
|
+
material.attUV = "((attUV0 + attUV1) * .5)";
|
|
66
|
+
this.minRadius = minRadius;
|
|
67
|
+
if (roundness > 127) {
|
|
68
|
+
throw new Error("[TgdPainterSegments] Max roundness is 127!");
|
|
69
|
+
}
|
|
70
|
+
if (roundness < 0) {
|
|
71
|
+
throw new Error("[TgdPainterSegments] Min roundness is 0!");
|
|
72
|
+
}
|
|
73
|
+
const vert = new TgdShaderVertex({
|
|
74
|
+
uniforms: Object.assign({ uniTransfoMatrix: "mat4", uniModelViewMatrix: "mat4", uniProjectionMatrix: "mat4", uniMinRadius: "float", uniRadiusMultiplier: "float" }, material.uniforms),
|
|
75
|
+
attributes: {
|
|
76
|
+
[geometry.attPosition]: "vec3",
|
|
77
|
+
[geometry.attNormal]: "vec3",
|
|
78
|
+
attTip: "float",
|
|
79
|
+
attXYZR0: "vec4",
|
|
80
|
+
attXYZR1: "vec4",
|
|
81
|
+
attUV0: "vec2",
|
|
82
|
+
attUV1: "vec2",
|
|
83
|
+
},
|
|
84
|
+
varying: Object.assign(Object.assign({}, material.varyings), { varNormal: "vec3" }),
|
|
85
|
+
functions: Object.assign(Object.assign({}, material.extraVertexShaderFunctions), { applyMaterial: [
|
|
86
|
+
"void applyMaterial() {",
|
|
87
|
+
[material.vertexShaderCode],
|
|
88
|
+
"}",
|
|
89
|
+
], getPosition: [
|
|
90
|
+
"vec4 getPosition(vec4 pos) {",
|
|
91
|
+
[(_c = material.vertexShaderCodeForGetPosition) !== null && _c !== void 0 ? _c : "return pos;"],
|
|
92
|
+
"}",
|
|
93
|
+
] }),
|
|
94
|
+
mainCode: [
|
|
95
|
+
"vec3 normal = NORMAL;",
|
|
96
|
+
"vec3 pos = POSITION;",
|
|
97
|
+
"vec4 xyzr = mix(attXYZR0, attXYZR1, attTip);",
|
|
98
|
+
"vec3 center = xyzr.xyz;",
|
|
99
|
+
"float radius = max(",
|
|
100
|
+
[
|
|
101
|
+
"xyzr.w * uniRadiusMultiplier,",
|
|
102
|
+
"uniMinRadius * (uniProjectionMatrix * uniModelViewMatrix * uniTransfoMatrix * vec4(center, 1)).w",
|
|
103
|
+
],
|
|
104
|
+
");",
|
|
105
|
+
"vec3 dir = attXYZR1.xyz - attXYZR0.xyz;",
|
|
106
|
+
"float len = length(dir);",
|
|
107
|
+
"if (len == 0.0) {",
|
|
108
|
+
["// Just a sphere", "pos *= radius;", "pos += center.xyz;"],
|
|
109
|
+
"} else {",
|
|
110
|
+
[
|
|
111
|
+
"// Full capsule",
|
|
112
|
+
"vec3 Z = dir / len;",
|
|
113
|
+
"vec3 v = abs(Z.z) > 0.7 ? vec3(1,0,0) : vec3(0,0,1);",
|
|
114
|
+
"vec3 Y = cross(v, Z);",
|
|
115
|
+
"vec3 X = cross(Y, Z);",
|
|
116
|
+
"mat3 mat = mat3(X, Y, Z);",
|
|
117
|
+
"pos *= radius;",
|
|
118
|
+
"pos = mat * pos + center.xyz;",
|
|
119
|
+
"normal = mat * normal;",
|
|
120
|
+
],
|
|
121
|
+
"}",
|
|
122
|
+
"gl_Position = uniProjectionMatrix * uniModelViewMatrix * uniTransfoMatrix * vec4(pos, 1);",
|
|
123
|
+
"applyMaterial();",
|
|
124
|
+
"varNormal = normal;",
|
|
125
|
+
],
|
|
126
|
+
}).code;
|
|
127
|
+
const frag = new TgdShaderFragment({
|
|
128
|
+
uniforms: material.uniforms,
|
|
129
|
+
outputs: { FragColor: "vec4" },
|
|
130
|
+
varying: material.varyings,
|
|
131
|
+
functions: Object.assign(Object.assign({}, material.extraFragmentShaderFunctions), { applyMaterial: [
|
|
132
|
+
"vec4 applyMaterial() {",
|
|
133
|
+
[material.fragmentShaderCode],
|
|
134
|
+
"}",
|
|
135
|
+
] }),
|
|
136
|
+
mainCode: ["FragColor = applyMaterial();"],
|
|
137
|
+
}).code;
|
|
138
|
+
const prg = new TgdProgram(context.gl, {
|
|
139
|
+
name: `TgdPainterSegments/TgdProgram#${this.id}`,
|
|
140
|
+
vert,
|
|
141
|
+
frag,
|
|
142
|
+
});
|
|
143
|
+
this.prg = prg;
|
|
144
|
+
if (dataset instanceof TgdPainterSegments) {
|
|
145
|
+
if (dataset.vao.gl !== context.gl) {
|
|
146
|
+
throw new Error("[TgdPainterSegments] You cannot share a VAO accross different contexts!");
|
|
147
|
+
}
|
|
148
|
+
this.vao = dataset.vao;
|
|
149
|
+
this.vao.share();
|
|
150
|
+
this.instanceCount = dataset.instanceCount;
|
|
151
|
+
}
|
|
152
|
+
else if (dataset) {
|
|
153
|
+
const instance = extract(dataset);
|
|
154
|
+
instance.addAttributes({
|
|
155
|
+
attXYZR0: "vec4",
|
|
156
|
+
attUV0: "vec2",
|
|
157
|
+
attInfluence0: "float",
|
|
158
|
+
attXYZR1: "vec4",
|
|
159
|
+
attUV1: "vec2",
|
|
160
|
+
attInfluence1: "float",
|
|
161
|
+
});
|
|
162
|
+
this.vao = new TgdVertexArray(context.gl, prg, [geometry.dataset, instance], geometry.elements);
|
|
163
|
+
this.instanceCount = instance.count;
|
|
164
|
+
}
|
|
165
|
+
else {
|
|
166
|
+
console.error("[TgdPainterSegments] options =", options); // @FIXME: Remove this line written on 2026-02-04 at 19:53
|
|
167
|
+
throw new Error("option `dataset` of TgdPainterSegments is undefined!");
|
|
168
|
+
}
|
|
169
|
+
this.vertexCount = (_e = (_d = geometry.elements) === null || _d === void 0 ? void 0 : _d.length) !== null && _e !== void 0 ? _e : 0;
|
|
170
|
+
}
|
|
171
|
+
getBuffer() {
|
|
172
|
+
return this.vao.getBuffer(1);
|
|
173
|
+
}
|
|
174
|
+
delete() {
|
|
175
|
+
this.vao.delete();
|
|
176
|
+
this.prg.delete();
|
|
177
|
+
}
|
|
178
|
+
paint(time, delay) {
|
|
179
|
+
var _a, _b;
|
|
180
|
+
const { context, prg, vao, vertexCount, instanceCount, material } = this;
|
|
181
|
+
const { gl, camera } = context;
|
|
182
|
+
gl.disable(gl.DITHER);
|
|
183
|
+
prg.use();
|
|
184
|
+
(_b = (_a = this.material).setUniforms) === null || _b === void 0 ? void 0 : _b.call(_a, { program: prg, context, time, delay });
|
|
185
|
+
prg.uniform1f("uniMinRadius", (this.minRadius * 2) / gl.drawingBufferHeight);
|
|
186
|
+
prg.uniform1f("uniRadiusMultiplier", this.radiusMultiplier);
|
|
187
|
+
prg.uniformMatrix4fv("uniTransfoMatrix", this.transfo.matrix);
|
|
188
|
+
prg.uniformMatrix4fv("uniModelViewMatrix", camera.matrixModelView);
|
|
189
|
+
prg.uniformMatrix4fv("uniProjectionMatrix", camera.matrixProjection);
|
|
190
|
+
material.applyState(this.context, () => {
|
|
191
|
+
vao.bind();
|
|
192
|
+
gl.drawElementsInstanced(gl.TRIANGLES, vertexCount, gl.UNSIGNED_SHORT, 0, instanceCount);
|
|
193
|
+
vao.unbind();
|
|
194
|
+
});
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
export class TgdPainterSegmentsData {
|
|
198
|
+
constructor() {
|
|
199
|
+
this._count = 0;
|
|
200
|
+
this.attXYZR0 = [];
|
|
201
|
+
this.attUV0 = [];
|
|
202
|
+
this.attInfluence0 = [];
|
|
203
|
+
this.attXYZR1 = [];
|
|
204
|
+
this.attUV1 = [];
|
|
205
|
+
this.attInfluence1 = [];
|
|
206
|
+
/**
|
|
207
|
+
* You can rename the attributes if you need to use
|
|
208
|
+
* them in another Painter.
|
|
209
|
+
*/
|
|
210
|
+
this.makeDataset = (args = {}) => {
|
|
211
|
+
const dataset = TgdPainterSegments.createDataset(args);
|
|
212
|
+
const { attXYZR0 = "attXYZR0", attUV0 = "attUV0", attInfluence0 = "attInfluence0", attXYZR1 = "attXYZR1", attUV1 = "attUV1", attInfluence1 = "attInfluence1", } = args;
|
|
213
|
+
dataset.set(attXYZR0, new Float32Array(this.attXYZR0));
|
|
214
|
+
dataset.set(attUV0, new Float32Array(this.attUV0));
|
|
215
|
+
dataset.set(attInfluence0, new Float32Array(this.attInfluence0));
|
|
216
|
+
dataset.set(attXYZR1, new Float32Array(this.attXYZR1));
|
|
217
|
+
dataset.set(attUV1, new Float32Array(this.attUV1));
|
|
218
|
+
dataset.set(attInfluence1, new Float32Array(this.attInfluence1));
|
|
219
|
+
return dataset;
|
|
220
|
+
};
|
|
221
|
+
}
|
|
222
|
+
get count() {
|
|
223
|
+
return this._count;
|
|
224
|
+
}
|
|
225
|
+
getXYZR0(index) {
|
|
226
|
+
var _a, _b, _c, _d;
|
|
227
|
+
const arr = this.attXYZR0;
|
|
228
|
+
const offset = index * 4;
|
|
229
|
+
return [
|
|
230
|
+
(_a = arr[offset + 0]) !== null && _a !== void 0 ? _a : 0,
|
|
231
|
+
(_b = arr[offset + 1]) !== null && _b !== void 0 ? _b : 0,
|
|
232
|
+
(_c = arr[offset + 2]) !== null && _c !== void 0 ? _c : 0,
|
|
233
|
+
(_d = arr[offset + 3]) !== null && _d !== void 0 ? _d : 0,
|
|
234
|
+
];
|
|
235
|
+
}
|
|
236
|
+
getXYZR1(index) {
|
|
237
|
+
var _a, _b, _c, _d;
|
|
238
|
+
const arr = this.attXYZR1;
|
|
239
|
+
const offset = index * 4;
|
|
240
|
+
return [
|
|
241
|
+
(_a = arr[offset + 0]) !== null && _a !== void 0 ? _a : 0,
|
|
242
|
+
(_b = arr[offset + 1]) !== null && _b !== void 0 ? _b : 0,
|
|
243
|
+
(_c = arr[offset + 2]) !== null && _c !== void 0 ? _c : 0,
|
|
244
|
+
(_d = arr[offset + 3]) !== null && _d !== void 0 ? _d : 0,
|
|
245
|
+
];
|
|
246
|
+
}
|
|
247
|
+
/**
|
|
248
|
+
* @param XYZR0 (x,y,z) and radius of point A.
|
|
249
|
+
* @param XYZR1 (x,y,z) and radius of point B.
|
|
250
|
+
* @param UV0 Texture coordinates for point A.
|
|
251
|
+
* @param UV1 Texture coordinates for point B.
|
|
252
|
+
* @param radiusMultiplierInfluence0 If you put 0, the radius won't change regardless to the currently applied radius multiplicator.
|
|
253
|
+
* @param radiusMultiplierInfluence1
|
|
254
|
+
*/
|
|
255
|
+
add(XYZR0, XYZR1, UV0 = [0, 0], UV1 = [0, 0], radiusMultiplierInfluence0 = 1, radiusMultiplierInfluence1 = 1) {
|
|
256
|
+
this.attXYZR0.push(...XYZR0);
|
|
257
|
+
this.attUV0.push(...UV0);
|
|
258
|
+
this.attInfluence0.push(radiusMultiplierInfluence0);
|
|
259
|
+
this.attXYZR1.push(...XYZR1);
|
|
260
|
+
this.attUV1.push(...UV1);
|
|
261
|
+
this.attInfluence1.push(radiusMultiplierInfluence1);
|
|
262
|
+
this._count++;
|
|
263
|
+
}
|
|
264
|
+
}
|
|
265
|
+
function extract(arg) {
|
|
266
|
+
if (typeof arg === "function")
|
|
267
|
+
return arg();
|
|
268
|
+
return arg;
|
|
269
|
+
}
|
|
270
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"segments.js","sourceRoot":"","sources":["../../../src/painter/tubes/segments.ts"],"names":[],"mappings":"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"}
|