@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,133 +0,0 @@
|
|
|
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
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"segments.d.ts","sourceRoot":"","sources":["../../../src/painter/tubes/segments.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,270 +0,0 @@
|
|
|
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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"}
|