@tolokoban/tgd 2.0.75 → 2.0.77
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.
|
@@ -31,13 +31,43 @@ export interface TgdPainterPointsCloudOptions {
|
|
|
31
31
|
mustDeleteTexture?: boolean;
|
|
32
32
|
texture?: TgdTexture2D;
|
|
33
33
|
/**
|
|
34
|
-
* The content of a fragment shader function
|
|
34
|
+
* The content of a fragment shader function that takes
|
|
35
35
|
* `vec4 color` as argument and must return a `vec4` color.
|
|
36
36
|
*
|
|
37
|
+
* The following uniforms are available:
|
|
38
|
+
*
|
|
39
|
+
* ```glsl
|
|
40
|
+
* uniform float uniSpecularExponent;
|
|
41
|
+
* uniform float uniSpecularIntensity;
|
|
42
|
+
* uniform float uniShadowThickness;
|
|
43
|
+
* uniform float uniShadowIntensity;
|
|
44
|
+
* uniform float uniLight;
|
|
45
|
+
* ```
|
|
46
|
+
*
|
|
37
47
|
* You can also use `TgdPainterPointsCloud.fragCode*()` static functions
|
|
38
48
|
* to provide preset functions.
|
|
39
49
|
*/
|
|
40
50
|
fragCode?: TgdCodeBloc;
|
|
51
|
+
/**
|
|
52
|
+
* Default to 10
|
|
53
|
+
*/
|
|
54
|
+
specularExponent?: number;
|
|
55
|
+
/**
|
|
56
|
+
* Default to 0.33
|
|
57
|
+
*/
|
|
58
|
+
specularIntensity?: number;
|
|
59
|
+
/**
|
|
60
|
+
* Default to 0.5
|
|
61
|
+
*/
|
|
62
|
+
shadowIntensity?: number;
|
|
63
|
+
/**
|
|
64
|
+
* Default to 1
|
|
65
|
+
*/
|
|
66
|
+
shadowThickness?: number;
|
|
67
|
+
/**
|
|
68
|
+
* Default to 1
|
|
69
|
+
*/
|
|
70
|
+
light?: number;
|
|
41
71
|
}
|
|
42
72
|
export declare class TgdPainterPointsCloud extends TgdPainter {
|
|
43
73
|
readonly context: TgdContext;
|
|
@@ -49,6 +79,7 @@ export declare class TgdPainterPointsCloud extends TgdPainter {
|
|
|
49
79
|
specularIntensity: number;
|
|
50
80
|
shadowThickness: number;
|
|
51
81
|
shadowIntensity: number;
|
|
82
|
+
light: number;
|
|
52
83
|
}>): TgdCodeBloc;
|
|
53
84
|
readonly count: number;
|
|
54
85
|
texture: TgdTexture2D;
|
|
@@ -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,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,OAAO,CAAC,EAAE,YAAY,CAAA;IACtB
|
|
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,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,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;CA+DxB"}
|
|
@@ -11,19 +11,34 @@ export class TgdPainterPointsCloud extends TgdPainter {
|
|
|
11
11
|
* Draw spheres with simple diffuse/specular material.
|
|
12
12
|
*/
|
|
13
13
|
static fragCodeSphere(options = {}) {
|
|
14
|
-
const { specularExponent
|
|
14
|
+
const { specularExponent, specularIntensity, shadowThickness, shadowIntensity, light, } = options;
|
|
15
|
+
const SpE = typeof specularExponent === "number"
|
|
16
|
+
? specularExponent.toFixed(6)
|
|
17
|
+
: "uniSpecularExponent";
|
|
18
|
+
const SpI = typeof specularIntensity === "number"
|
|
19
|
+
? specularIntensity.toFixed(6)
|
|
20
|
+
: "uniSpecularIntensity";
|
|
21
|
+
const ShT = typeof shadowThickness === "number"
|
|
22
|
+
? shadowThickness.toFixed(6)
|
|
23
|
+
: "uniShadowThickness";
|
|
24
|
+
const ShI = typeof shadowIntensity === "number"
|
|
25
|
+
? shadowIntensity.toFixed(6)
|
|
26
|
+
: "uniShadowIntensity";
|
|
27
|
+
const L = typeof light === "number" ? light.toFixed(6) : "uniLight";
|
|
15
28
|
return [
|
|
16
29
|
"vec2 coords = 2.0 * (gl_PointCoord - vec2(.5));",
|
|
17
30
|
"float len = 1.0 - dot(coords, coords);",
|
|
18
31
|
"if (len < 0.0) discard;",
|
|
19
32
|
"gl_FragDepth = gl_FragCoord.z - len * 1e-5;",
|
|
20
|
-
`float light = smoothstep(0.0, ${
|
|
21
|
-
|
|
22
|
-
|
|
33
|
+
`float light = smoothstep(0.0, ${ShT}, len) * ${ShI} + (1.0 - ${ShI});`,
|
|
34
|
+
specularIntensity
|
|
35
|
+
? `float spec = pow(len, ${SpE}) * ${SpI};`
|
|
36
|
+
: "// No specular.",
|
|
37
|
+
`return color * vec4(vec3(light * ${L}), 1.0) + vec4(vec3(spec), 0.0);`,
|
|
23
38
|
];
|
|
24
39
|
}
|
|
25
40
|
constructor(context, options) {
|
|
26
|
-
var _a, _b, _c, _d, _e;
|
|
41
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
27
42
|
super();
|
|
28
43
|
this.context = context;
|
|
29
44
|
this.radiusMultiplier = 1;
|
|
@@ -36,12 +51,17 @@ export class TgdPainterPointsCloud extends TgdPainter {
|
|
|
36
51
|
this.name = (_a = options.name) !== null && _a !== void 0 ? _a : this.name;
|
|
37
52
|
this.radiusMultiplier = (_b = options.radiusMultiplier) !== null && _b !== void 0 ? _b : 1;
|
|
38
53
|
this.minSizeInPixels = (_c = options.minSizeInPixels) !== null && _c !== void 0 ? _c : 0;
|
|
54
|
+
this.specularExponent = (_d = options.specularExponent) !== null && _d !== void 0 ? _d : 10;
|
|
55
|
+
this.specularIntensity = (_e = options.specularIntensity) !== null && _e !== void 0 ? _e : 0.33;
|
|
56
|
+
this.shadowIntensity = (_f = options.shadowIntensity) !== null && _f !== void 0 ? _f : 0.5;
|
|
57
|
+
this.shadowThickness = (_g = options.shadowThickness) !== null && _g !== void 0 ? _g : 1;
|
|
58
|
+
this.light = (_h = options.light) !== null && _h !== void 0 ? _h : 1;
|
|
39
59
|
this.dataPoint = options.dataPoint;
|
|
40
60
|
if ((this.dataPoint.length & 3) !== 0) {
|
|
41
61
|
throw new Error(`dataPoint must have a length that is an integral multiple of 4: [x, y, z, radius, ...]!\ndataPoint.length === ${this.dataPoint.length}`);
|
|
42
62
|
}
|
|
43
63
|
this.dataUV =
|
|
44
|
-
(
|
|
64
|
+
(_j = options.dataUV) !== null && _j !== void 0 ? _j : new Float32Array(this.dataPoint.length >> 1);
|
|
45
65
|
if (this.dataPoint.length !== this.dataUV.length * 2) {
|
|
46
66
|
const message = `dataUV must be half of the size of dataPoint: [u, v, ...]!\ndataPoint.length === ${this.dataPoint.length}, \ndataUV.length === ${this.dataUV.length}`;
|
|
47
67
|
console.error("[TgdPainterPointsCloud]", message);
|
|
@@ -52,7 +72,7 @@ export class TgdPainterPointsCloud extends TgdPainter {
|
|
|
52
72
|
}
|
|
53
73
|
if (options.texture) {
|
|
54
74
|
this.texture = options.texture;
|
|
55
|
-
this.textureMustBeDeleted = (
|
|
75
|
+
this.textureMustBeDeleted = (_k = options.mustDeleteTexture) !== null && _k !== void 0 ? _k : false;
|
|
56
76
|
}
|
|
57
77
|
else {
|
|
58
78
|
this.texture = new TgdTexture2D(context).loadBitmap(tgdCanvasCreateGradientHorizontal(128, tgdColorMakeHueWheel({ luminance: 0.2 })));
|
|
@@ -103,11 +123,6 @@ export class TgdPainterPointsCloud extends TgdPainter {
|
|
|
103
123
|
uniMinSizeInPixels: "float",
|
|
104
124
|
uniRadiusMultiplier: "float",
|
|
105
125
|
uniHalfScreenHeightInPixels: "float",
|
|
106
|
-
uniSpecularExponent: "float",
|
|
107
|
-
uniSpecularIntensity: "float",
|
|
108
|
-
uniShadowIntensity: "float",
|
|
109
|
-
uniShadowThickness: "float",
|
|
110
|
-
uniLight: "float",
|
|
111
126
|
uniModelViewMatrix: "mat4",
|
|
112
127
|
uniProjectionMatrix: "mat4",
|
|
113
128
|
},
|
|
@@ -132,6 +147,11 @@ export class TgdPainterPointsCloud extends TgdPainter {
|
|
|
132
147
|
const frag = new TgdShaderFragment({
|
|
133
148
|
uniforms: {
|
|
134
149
|
uniTexture: "sampler2D",
|
|
150
|
+
uniSpecularExponent: "float",
|
|
151
|
+
uniSpecularIntensity: "float",
|
|
152
|
+
uniShadowIntensity: "float",
|
|
153
|
+
uniShadowThickness: "float",
|
|
154
|
+
uniLight: "float",
|
|
135
155
|
},
|
|
136
156
|
varying: {
|
|
137
157
|
varUV: "vec2",
|
|
@@ -145,10 +165,11 @@ export class TgdPainterPointsCloud extends TgdPainter {
|
|
|
145
165
|
"float len = 1.0 - dot(coords, coords);",
|
|
146
166
|
"if (len < 0.0) discard;",
|
|
147
167
|
"gl_FragDepth = gl_FragCoord.z - len * 1e-5;",
|
|
148
|
-
`float light = smoothstep(0.0, uniShadowThickness, len) * uniShadowIntensity + (1 - uniShadowIntensity);`,
|
|
168
|
+
`float light = smoothstep(0.0, uniShadowThickness, len) * uniShadowIntensity + (1.0 - uniShadowIntensity);`,
|
|
149
169
|
`float spec = pow(len, uniSpecularExponent) * uniSpecularIntensity;`,
|
|
150
170
|
"return color * vec4(vec3(light * uniLight), 1.0) + vec4(vec3(spec), 0.0);",
|
|
151
171
|
],
|
|
172
|
+
"}",
|
|
152
173
|
],
|
|
153
174
|
},
|
|
154
175
|
mainCode: [
|
|
@@ -160,4 +181,4 @@ export class TgdPainterPointsCloud extends TgdPainter {
|
|
|
160
181
|
return program;
|
|
161
182
|
}
|
|
162
183
|
}
|
|
163
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
184
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"points-cloud.js","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;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAEzC,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAA;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,EAAe,iBAAiB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAsE7E,MAAM,OAAO,qBAAsB,SAAQ,UAAU;IACjD;;OAEG;IACH,MAAM,CAAC,cAAc,CACjB,UAMK,EAAE;QAEP,MAAM,EACF,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,EACf,eAAe,EACf,KAAK,GACR,GAAG,OAAO,CAAA;QACX,MAAM,GAAG,GACL,OAAO,gBAAgB,KAAK,QAAQ;YAChC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;YAC7B,CAAC,CAAC,qBAAqB,CAAA;QAC/B,MAAM,GAAG,GACL,OAAO,iBAAiB,KAAK,QAAQ;YACjC,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;YAC9B,CAAC,CAAC,sBAAsB,CAAA;QAChC,MAAM,GAAG,GACL,OAAO,eAAe,KAAK,QAAQ;YAC/B,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5B,CAAC,CAAC,oBAAoB,CAAA;QAC9B,MAAM,GAAG,GACL,OAAO,eAAe,KAAK,QAAQ;YAC/B,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5B,CAAC,CAAC,oBAAoB,CAAA;QAC9B,MAAM,CAAC,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;QACnE,OAAO;YACH,iDAAiD;YACjD,wCAAwC;YACxC,yBAAyB;YACzB,6CAA6C;YAC7C,iCAAiC,GAAG,YAAY,GAAG,aAAa,GAAG,IAAI;YACvE,iBAAiB;gBACb,CAAC,CAAC,yBAAyB,GAAG,OAAO,GAAG,GAAG;gBAC3C,CAAC,CAAC,iBAAiB;YACvB,oCAAoC,CAAC,kCAAkC;SAC1E,CAAA;IACL,CAAC;IAoBD,YACoB,OAAmB,EACnC,OAAqC;;QAErC,KAAK,EAAE,CAAA;QAHS,YAAO,GAAP,OAAO,CAAY;QAjBhC,qBAAgB,GAAG,CAAC,CAAA;QACpB,oBAAe,GAAG,CAAC,CAAA;QAEnB,qBAAgB,GAAG,EAAE,CAAA;QACrB,sBAAiB,GAAG,IAAI,CAAA;QACxB,oBAAe,GAAG,GAAG,CAAA;QACrB,oBAAe,GAAG,CAAC,CAAA;QACnB,UAAK,GAAG,CAAC,CAAA;QAcZ,IAAI,CAAC,IAAI,GAAG,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,CAAC,IAAI,CAAA;QACrC,IAAI,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,CAAC,CAAA;QACrD,IAAI,CAAC,eAAe,GAAG,MAAA,OAAO,CAAC,eAAe,mCAAI,CAAC,CAAA;QACnD,IAAI,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,EAAE,CAAA;QACtD,IAAI,CAAC,iBAAiB,GAAG,MAAA,OAAO,CAAC,iBAAiB,mCAAI,IAAI,CAAA;QAC1D,IAAI,CAAC,eAAe,GAAG,MAAA,OAAO,CAAC,eAAe,mCAAI,GAAG,CAAA;QACrD,IAAI,CAAC,eAAe,GAAG,MAAA,OAAO,CAAC,eAAe,mCAAI,CAAC,CAAA;QACnD,IAAI,CAAC,KAAK,GAAG,MAAA,OAAO,CAAC,KAAK,mCAAI,CAAC,CAAA;QAC/B,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAA;QAClC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CACX,iHAAiH,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAC3I,CAAA;QACL,CAAC;QACD,IAAI,CAAC,MAAM;YACP,MAAA,OAAO,CAAC,MAAM,mCAAI,IAAI,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,CAAC,CAAA;QAClE,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnD,MAAM,OAAO,GAAG,oFAAoF,IAAI,CAAC,SAAS,CAAC,MAAM,yBAAyB,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAA;YACtK,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAA;YACjD,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,OAAO,CAAC,CAAA;YAC3D,OAAO,CAAC,KAAK,CACT,0CAA0C,EAC1C,IAAI,CAAC,SAAS,CACjB,CAAA;YACD,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;YACnE,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAA;QAC5B,CAAC;QACD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;YAC9B,IAAI,CAAC,oBAAoB,GAAG,MAAA,OAAO,CAAC,iBAAiB,mCAAI,KAAK,CAAA;QAClE,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,GAAG,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC,UAAU,CAC/C,iCAAiC,CAC7B,GAAG,EACH,oBAAoB,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAC3C,CACJ,CAAA;YACD,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAA;QACpC,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAA;QACpC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;QACnC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACnD,IAAI,CAAC,GAAG,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;IAC3E,CAAC;IAED,MAAM;QACF,IAAI,IAAI,CAAC,oBAAoB;YAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAA;QACpD,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAA;QACrB,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAA;IACrB,CAAC;IAED,KAAK;QACD,MAAM,EACF,OAAO,EACP,OAAO,EACP,GAAG,EACH,OAAO,EACP,KAAK,EACL,gBAAgB,EAChB,eAAe,GAClB,GAAG,IAAI,CAAA;QACR,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;QAC9B,OAAO,CAAC,GAAG,EAAE,CAAA;QACb,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;QAC1C,OAAO,CAAC,SAAS,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAA;QAC1D,OAAO,CAAC,SAAS,CAAC,oBAAoB,EAAE,eAAe,CAAC,CAAA;QACxD,OAAO,CAAC,SAAS,CAAC,6BAA6B,EAAE,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC,CAAA;QACtE,OAAO,CAAC,SAAS,CAAC,qBAAqB,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAC/D,OAAO,CAAC,SAAS,CAAC,sBAAsB,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAA;QACjE,OAAO,CAAC,SAAS,CAAC,oBAAoB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;QAC7D,OAAO,CAAC,SAAS,CAAC,oBAAoB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;QAC7D,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QACzC,OAAO,CAAC,gBAAgB,CAAC,oBAAoB,EAAE,MAAM,CAAC,eAAe,CAAC,CAAA;QACtE,OAAO,CAAC,gBAAgB,CAAC,qBAAqB,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAA;QACxE,GAAG,CAAC,IAAI,EAAE,CAAA;QACV,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,CAAA;QAClC,GAAG,CAAC,MAAM,EAAE,CAAA;IAChB,CAAC;IAEO,aAAa;QACjB,MAAM,OAAO,GAAG,IAAI,UAAU,CAAC;YAC3B,QAAQ,EAAE,MAAM;YAChB,KAAK,EAAE,MAAM;SAChB,CAAC,CAAA;QACF,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QACvC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QACjC,OAAO,OAAO,CAAA;IAClB,CAAC;IAEO,aAAa,CAAC,MAAoB;QACtC,MAAM,IAAI,GAAG,IAAI,eAAe,CAAC;YAC7B,QAAQ,EAAE;gBACN,kBAAkB,EAAE,OAAO;gBAC3B,mBAAmB,EAAE,OAAO;gBAC5B,2BAA2B,EAAE,OAAO;gBACpC,kBAAkB,EAAE,MAAM;gBAC1B,mBAAmB,EAAE,MAAM;aAC9B;YACD,UAAU,EAAE;gBACR,QAAQ,EAAE,MAAM;gBAChB,KAAK,EAAE,MAAM;aAChB;YACD,OAAO,EAAE;gBACL,KAAK,EAAE,MAAM;aAChB;YACD,QAAQ,EAAE;gBACN,gBAAgB;gBAChB,4BAA4B;gBAC5B,uCAAuC;gBACvC,iEAAiE;gBACjE,qBAAqB;gBACrB,uBAAuB;gBACvB,8EAA8E;gBAC9E,IAAI;aACP;SACJ,CAAC,CAAC,IAAI,CAAA;QACP,MAAM,IAAI,GAAG,IAAI,iBAAiB,CAAC;YAC/B,QAAQ,EAAE;gBACN,UAAU,EAAE,WAAW;gBACvB,mBAAmB,EAAE,OAAO;gBAC5B,oBAAoB,EAAE,OAAO;gBAC7B,kBAAkB,EAAE,OAAO;gBAC3B,kBAAkB,EAAE,OAAO;gBAC3B,QAAQ,EAAE,OAAO;aACpB;YACD,OAAO,EAAE;gBACL,KAAK,EAAE,MAAM;aAChB;YACD,OAAO,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;YAC9B,SAAS,EAAE;gBACP,MAAM,EAAE;oBACJ,2BAA2B;oBAC3B,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI;wBACN,iDAAiD;wBACjD,wCAAwC;wBACxC,yBAAyB;wBACzB,6CAA6C;wBAC7C,2GAA2G;wBAC3G,oEAAoE;wBACpE,2EAA2E;qBAC9E;oBACD,GAAG;iBACN;aACJ;YACD,QAAQ,EAAE;gBACN,0CAA0C;gBAC1C,4BAA4B;aAC/B;SACJ,CAAC,CAAC,IAAI,CAAA;QACP,MAAM,OAAO,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;QAC/D,OAAO,OAAO,CAAA;IAClB,CAAC;CACJ"}
|