@tolokoban/tgd 2.0.90 → 2.0.92
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/math/vec3.d.ts +1 -1
- package/lib/dist/math/vec3.d.ts.map +1 -1
- package/lib/dist/math/vec3.js +6 -4
- 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/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
package/lib/dist/math/vec3.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ export declare class TgdVec3 extends Float32Array {
|
|
|
9
9
|
static Z: Readonly<TgdVec3>;
|
|
10
10
|
static newFrom([x, y, z]: TgdVec3 | TgdVec4 | ArrayNumber3 | ArrayNumber4): TgdVec3;
|
|
11
11
|
static newFromMix([x1, y1, z1]: TgdVec3 | TgdVec4 | ArrayNumber3 | ArrayNumber4, [x2, y2, z2]: TgdVec3 | TgdVec4 | ArrayNumber3 | ArrayNumber4, a?: number): TgdVec3;
|
|
12
|
-
static distance(from: TgdVec3 | TgdVec4, to: TgdVec3 | TgdVec4): number;
|
|
12
|
+
static distance(from: TgdVec3 | TgdVec4 | ArrayNumber3, to: TgdVec3 | TgdVec4 | ArrayNumber3): number;
|
|
13
13
|
static center(points: Array<TgdVec3 | ArrayNumber3>): TgdVec3;
|
|
14
14
|
constructor();
|
|
15
15
|
constructor(x: Readonly<TgdVec3 | ArrayNumber3>);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vec3.d.ts","sourceRoot":"","sources":["../../src/math/vec3.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,IAAI,CAAA;AAC3E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAErC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAErC,qBAAa,OAAQ,SAAQ,YAAY;IACrC,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAuB;IAClD,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAuB;IAClD,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAuB;IAElD,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAClB,OAAO,GACP,OAAO,GACP,YAAY,GACZ,YAAY,GAAG,OAAO;IAI5B,MAAM,CAAC,UAAU,CACb,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,YAAY,GAAG,YAAY,EAC7D,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,YAAY,GAAG,YAAY,EAC7D,CAAC,SAAM,GACR,OAAO;IAQV,MAAM,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"vec3.d.ts","sourceRoot":"","sources":["../../src/math/vec3.ts"],"names":[],"mappings":"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"}
|
package/lib/dist/math/vec3.js
CHANGED
|
@@ -13,9 +13,11 @@ export class TgdVec3 extends Float32Array {
|
|
|
13
13
|
return new TgdVec3(x, y, z);
|
|
14
14
|
}
|
|
15
15
|
static distance(from, to) {
|
|
16
|
-
const
|
|
17
|
-
const
|
|
18
|
-
const
|
|
16
|
+
const [x1, y1, z1] = from;
|
|
17
|
+
const [x2, y2, z2] = to;
|
|
18
|
+
const x = x2 - x1;
|
|
19
|
+
const y = y2 - y1;
|
|
20
|
+
const z = z2 - z1;
|
|
19
21
|
return Math.sqrt(x * x + y * y + z * z);
|
|
20
22
|
}
|
|
21
23
|
static center(points) {
|
|
@@ -249,4 +251,4 @@ export class TgdVec3 extends Float32Array {
|
|
|
249
251
|
TgdVec3.X = new TgdVec3(1, 0, 0);
|
|
250
252
|
TgdVec3.Y = new TgdVec3(0, 1, 0);
|
|
251
253
|
TgdVec3.Z = new TgdVec3(0, 0, 1);
|
|
252
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"vec3.js","sourceRoot":"","sources":["../../src/math/vec3.ts"],"names":[],"mappings":"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"}
|
|
254
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"vec3.js","sourceRoot":"","sources":["../../src/math/vec3.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"points-cloud-morphing.d.ts","sourceRoot":"","sources":["../../../src/painter/points-cloud/points-cloud-morphing.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAG9C,OAAO,EACH,KAAK,WAAW,EAGnB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAG3C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAEvC,UAAU,iCAAiC;IACvC;;;OAGG;IACH,KAAK,EAAE,YAAY,CAAA;IACnB;;;OAGG;IACH,EAAE,CAAC,EAAE,YAAY,CAAA;CACpB;AAED,MAAM,WAAW,oCAAoC;IACjD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,EAAE;QACF,iCAAiC;QACjC,iCAAiC;KACpC,EAAE,CAAA;IACH;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,OAAO,CAAC,EAAE,YAAY,CAAA;IACtB;;;;;;;;;;;;;;;;OAgBG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAA;IACtB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,qBAAa,6BAA8B,SAAQ,UAAU;aAuErC,OAAO,EAAE,UAAU;IAtEvC;;OAEG;IACH,MAAM,CAAC,cAAc,CACjB,OAAO,GAAE,OAAO,CAAC;QACb,gBAAgB,EAAE,MAAM,CAAA;QACxB,iBAAiB,EAAE,MAAM,CAAA;QACzB,eAAe,EAAE,MAAM,CAAA;QACvB,eAAe,EAAE,MAAM,CAAA;QACvB,KAAK,EAAE,MAAM,CAAA;KAChB,CAAM,GACR,WAAW;IAsCd;;OAEG;IACI,GAAG,SAAI;IACP,OAAO,EAAE,YAAY,CAAA;IACrB,gBAAgB,SAAI;IACpB,eAAe,SAAI;IAEnB,gBAAgB,SAAK;IACrB,iBAAiB,SAAO;IACxB,eAAe,SAAM;IACrB,eAAe,SAAI;IACnB,KAAK,SAAI;IAEhB,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAkB;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;gBAGb,OAAO,EAAE,UAAU,EACnC,OAAO,EAAE,oCAAoC;IA0CjD,MAAM,IAAI,IAAI;IAMd,KAAK,IAAI,IAAI;IA6Bb,OAAO,CAAC,aAAa;IAgCrB,IAAI,KAAK,WAGR;IAED,OAAO,KAAK,GAAG,GAGd;IAED,OAAO,CAAC,aAAa;
|
|
1
|
+
{"version":3,"file":"points-cloud-morphing.d.ts","sourceRoot":"","sources":["../../../src/painter/points-cloud/points-cloud-morphing.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAG9C,OAAO,EACH,KAAK,WAAW,EAGnB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAG3C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAEvC,UAAU,iCAAiC;IACvC;;;OAGG;IACH,KAAK,EAAE,YAAY,CAAA;IACnB;;;OAGG;IACH,EAAE,CAAC,EAAE,YAAY,CAAA;CACpB;AAED,MAAM,WAAW,oCAAoC;IACjD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,EAAE;QACF,iCAAiC;QACjC,iCAAiC;KACpC,EAAE,CAAA;IACH;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,OAAO,CAAC,EAAE,YAAY,CAAA;IACtB;;;;;;;;;;;;;;;;OAgBG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAA;IACtB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,qBAAa,6BAA8B,SAAQ,UAAU;aAuErC,OAAO,EAAE,UAAU;IAtEvC;;OAEG;IACH,MAAM,CAAC,cAAc,CACjB,OAAO,GAAE,OAAO,CAAC;QACb,gBAAgB,EAAE,MAAM,CAAA;QACxB,iBAAiB,EAAE,MAAM,CAAA;QACzB,eAAe,EAAE,MAAM,CAAA;QACvB,eAAe,EAAE,MAAM,CAAA;QACvB,KAAK,EAAE,MAAM,CAAA;KAChB,CAAM,GACR,WAAW;IAsCd;;OAEG;IACI,GAAG,SAAI;IACP,OAAO,EAAE,YAAY,CAAA;IACrB,gBAAgB,SAAI;IACpB,eAAe,SAAI;IAEnB,gBAAgB,SAAK;IACrB,iBAAiB,SAAO;IACxB,eAAe,SAAM;IACrB,eAAe,SAAI;IACnB,KAAK,SAAI;IAEhB,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAkB;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;gBAGb,OAAO,EAAE,UAAU,EACnC,OAAO,EAAE,oCAAoC;IA0CjD,MAAM,IAAI,IAAI;IAMd,KAAK,IAAI,IAAI;IA6Bb,OAAO,CAAC,aAAa;IAgCrB,IAAI,KAAK,WAGR;IAED,OAAO,KAAK,GAAG,GAGd;IAED,OAAO,CAAC,aAAa;CAsExB"}
|
|
@@ -99,7 +99,7 @@ export class TgdPainterPointsCloudMorphing extends TgdPainter {
|
|
|
99
99
|
program.uniform1f("uniMix", this.mix);
|
|
100
100
|
program.uniform1f("uniRadiusMultiplier", radiusMultiplier);
|
|
101
101
|
program.uniform1f("uniMinSizeInPixels", minSizeInPixels);
|
|
102
|
-
program.uniform1f("
|
|
102
|
+
program.uniform1f("uniScreenHeightInPixels", context.height);
|
|
103
103
|
program.uniform1f("uniSpecularExponent", this.specularExponent);
|
|
104
104
|
program.uniform1f("uniSpecularIntensity", this.specularIntensity);
|
|
105
105
|
program.uniform1f("uniShadowIntensity", this.shadowIntensity);
|
|
@@ -148,7 +148,7 @@ export class TgdPainterPointsCloudMorphing extends TgdPainter {
|
|
|
148
148
|
uniMix: "float",
|
|
149
149
|
uniMinSizeInPixels: "float",
|
|
150
150
|
uniRadiusMultiplier: "float",
|
|
151
|
-
|
|
151
|
+
uniScreenHeightInPixels: "float",
|
|
152
152
|
uniModelViewMatrix: "mat4",
|
|
153
153
|
uniProjectionMatrix: "mat4",
|
|
154
154
|
},
|
|
@@ -166,11 +166,13 @@ export class TgdPainterPointsCloudMorphing extends TgdPainter {
|
|
|
166
166
|
"vec2 attUV = mix(attUV_A, attUV_B, uniMix);",
|
|
167
167
|
"varUV = attUV;",
|
|
168
168
|
"float radius = attPoint.w;",
|
|
169
|
-
"vec4 point = vec4(attPoint.xyz, 1.0);",
|
|
170
|
-
"
|
|
169
|
+
"vec4 point = uniModelViewMatrix * vec4(attPoint.xyz, 1.0);",
|
|
170
|
+
"vec4 shift = point + vec4(0, uniRadiusMultiplier * radius, 0, 0);",
|
|
171
|
+
"gl_Position = uniProjectionMatrix * point;",
|
|
172
|
+
"vec4 screenShift = uniProjectionMatrix * shift;",
|
|
171
173
|
"gl_PointSize = max(",
|
|
172
174
|
" uniMinSizeInPixels,",
|
|
173
|
-
"
|
|
175
|
+
" abs(screenShift.y - gl_Position.y) * uniScreenHeightInPixels / gl_Position.w",
|
|
174
176
|
");",
|
|
175
177
|
],
|
|
176
178
|
}).code;
|
|
@@ -211,4 +213,4 @@ export class TgdPainterPointsCloudMorphing extends TgdPainter {
|
|
|
211
213
|
return program;
|
|
212
214
|
}
|
|
213
215
|
}
|
|
214
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
216
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"points-cloud-morphing.js","sourceRoot":"","sources":["../../../src/painter/points-cloud/points-cloud-morphing.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"points-cloud.d.ts","sourceRoot":"","sources":["../../../src/painter/points-cloud/points-cloud.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAIvC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,OAAO,EAAE,WAAW,EAAsC,MAAM,aAAa,CAAA;AAE7E,MAAM,WAAW,4BAA4B;IACzC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;OAGG;IACH,SAAS,EAAE,YAAY,CAAA;IACvB;;;OAGG;IACH,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,OAAO,CAAC,EAAE,YAAY,CAAA;IACtB;;;;;;;;;;;;;;;;OAgBG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAA;IACtB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,qBAAa,qBAAsB,SAAQ,UAAU;aAqE7B,OAAO,EAAE,UAAU;IApEvC;;OAEG;IACH,MAAM,CAAC,cAAc,CACjB,OAAO,GAAE,OAAO,CAAC;QACb,gBAAgB,EAAE,MAAM,CAAA;QACxB,iBAAiB,EAAE,MAAM,CAAA;QACzB,eAAe,EAAE,MAAM,CAAA;QACvB,eAAe,EAAE,MAAM,CAAA;QACvB,KAAK,EAAE,MAAM,CAAA;KAChB,CAAM,GACR,WAAW;IAsCd,SAAgB,KAAK,EAAE,MAAM,CAAA;IACtB,OAAO,EAAE,YAAY,CAAA;IACrB,gBAAgB,SAAI;IACpB,eAAe,SAAI;IAEnB,gBAAgB,SAAK;IACrB,iBAAiB,SAAO;IACxB,eAAe,SAAM;IACrB,eAAe,SAAI;IACnB,KAAK,SAAI;IAEhB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAc;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgB;gBAGhB,OAAO,EAAE,UAAU,EACnC,OAAO,EAAE,4BAA4B;IAgDzC,MAAM,IAAI,IAAI;IAMd,KAAK,IAAI,IAAI;IA4Bb,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,aAAa;
|
|
1
|
+
{"version":3,"file":"points-cloud.d.ts","sourceRoot":"","sources":["../../../src/painter/points-cloud/points-cloud.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAIvC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,OAAO,EAAE,WAAW,EAAsC,MAAM,aAAa,CAAA;AAE7E,MAAM,WAAW,4BAA4B;IACzC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;OAGG;IACH,SAAS,EAAE,YAAY,CAAA;IACvB;;;OAGG;IACH,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,OAAO,CAAC,EAAE,YAAY,CAAA;IACtB;;;;;;;;;;;;;;;;OAgBG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAA;IACtB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,qBAAa,qBAAsB,SAAQ,UAAU;aAqE7B,OAAO,EAAE,UAAU;IApEvC;;OAEG;IACH,MAAM,CAAC,cAAc,CACjB,OAAO,GAAE,OAAO,CAAC;QACb,gBAAgB,EAAE,MAAM,CAAA;QACxB,iBAAiB,EAAE,MAAM,CAAA;QACzB,eAAe,EAAE,MAAM,CAAA;QACvB,eAAe,EAAE,MAAM,CAAA;QACvB,KAAK,EAAE,MAAM,CAAA;KAChB,CAAM,GACR,WAAW;IAsCd,SAAgB,KAAK,EAAE,MAAM,CAAA;IACtB,OAAO,EAAE,YAAY,CAAA;IACrB,gBAAgB,SAAI;IACpB,eAAe,SAAI;IAEnB,gBAAgB,SAAK;IACrB,iBAAiB,SAAO;IACxB,eAAe,SAAM;IACrB,eAAe,SAAI;IACnB,KAAK,SAAI;IAEhB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAc;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgB;gBAGhB,OAAO,EAAE,UAAU,EACnC,OAAO,EAAE,4BAA4B;IAgDzC,MAAM,IAAI,IAAI;IAMd,KAAK,IAAI,IAAI;IA4Bb,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,aAAa;CAiExB"}
|
|
@@ -96,7 +96,7 @@ export class TgdPainterPointsCloud extends TgdPainter {
|
|
|
96
96
|
texture.activate(0, program, "uniTexture");
|
|
97
97
|
program.uniform1f("uniRadiusMultiplier", radiusMultiplier);
|
|
98
98
|
program.uniform1f("uniMinSizeInPixels", minSizeInPixels);
|
|
99
|
-
program.uniform1f("
|
|
99
|
+
program.uniform1f("uniScreenHeightInPixels", context.height);
|
|
100
100
|
program.uniform1f("uniSpecularExponent", this.specularExponent);
|
|
101
101
|
program.uniform1f("uniSpecularIntensity", this.specularIntensity);
|
|
102
102
|
program.uniform1f("uniShadowIntensity", this.shadowIntensity);
|
|
@@ -122,7 +122,7 @@ export class TgdPainterPointsCloud extends TgdPainter {
|
|
|
122
122
|
uniforms: {
|
|
123
123
|
uniMinSizeInPixels: "float",
|
|
124
124
|
uniRadiusMultiplier: "float",
|
|
125
|
-
|
|
125
|
+
uniScreenHeightInPixels: "float",
|
|
126
126
|
uniModelViewMatrix: "mat4",
|
|
127
127
|
uniProjectionMatrix: "mat4",
|
|
128
128
|
},
|
|
@@ -136,11 +136,13 @@ export class TgdPainterPointsCloud extends TgdPainter {
|
|
|
136
136
|
mainCode: [
|
|
137
137
|
"varUV = attUV;",
|
|
138
138
|
"float radius = attPoint.w;",
|
|
139
|
-
"vec4 point = vec4(attPoint.xyz, 1.0);",
|
|
140
|
-
"
|
|
139
|
+
"vec4 point = uniModelViewMatrix * vec4(attPoint.xyz, 1.0);",
|
|
140
|
+
"vec4 shift = point + vec4(0, uniRadiusMultiplier * radius, 0, 0);",
|
|
141
|
+
"gl_Position = uniProjectionMatrix * point;",
|
|
142
|
+
"vec4 screenShift = uniProjectionMatrix * shift;",
|
|
141
143
|
"gl_PointSize = max(",
|
|
142
144
|
" uniMinSizeInPixels,",
|
|
143
|
-
"
|
|
145
|
+
" abs(screenShift.y - gl_Position.y) * uniScreenHeightInPixels / gl_Position.w",
|
|
144
146
|
");",
|
|
145
147
|
],
|
|
146
148
|
}).code;
|
|
@@ -181,4 +183,4 @@ export class TgdPainterPointsCloud extends TgdPainter {
|
|
|
181
183
|
return program;
|
|
182
184
|
}
|
|
183
185
|
}
|
|
184
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
186
|
+
//# 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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"}
|
package/package.json
CHANGED
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
import type { TgdVec3, TgdVec4 } from "../math";
|
|
2
|
-
import type { ArrayNumber3, ArrayNumber4 } from "../types";
|
|
3
|
-
import { TgdGeometry } from "./geometry";
|
|
4
|
-
export interface TgdGeometryTubesOptions {
|
|
5
|
-
center?: ArrayNumber3 | ArrayNumber4 | TgdVec3 | TgdVec4;
|
|
6
|
-
radius?: number;
|
|
7
|
-
/**
|
|
8
|
-
* A value of 0 will get you a regular icosahedron.
|
|
9
|
-
* Then, each subdivision will cut every triangle in 3 new triangles.
|
|
10
|
-
*
|
|
11
|
-
* - Minimum: 0
|
|
12
|
-
* - Default: 2
|
|
13
|
-
*/
|
|
14
|
-
subdivisions?: number;
|
|
15
|
-
}
|
|
16
|
-
export declare class TgdGeometryTubes extends TgdGeometry {
|
|
17
|
-
constructor({ center, radius, subdivisions, }?: TgdGeometryTubesOptions);
|
|
18
|
-
}
|
|
19
|
-
//# sourceMappingURL=tubes.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"tubes.d.ts","sourceRoot":"","sources":["../../src/geometry/tubes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE5D,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,MAAM,WAAW,uBAAuB;IACpC,MAAM,CAAC,EAAE,YAAY,GAAG,YAAY,GAAG,OAAO,GAAG,OAAO,CAAA;IACxD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,qBAAa,gBAAiB,SAAQ,WAAW;gBACjC,EACR,MAAkB,EAClB,MAAU,EACV,YAAgB,GACnB,GAAE,uBAA4B;CAoBlC"}
|
|
@@ -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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
|