@directivegames/genesys.js 3.1.28 → 3.1.30
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/dist/games/index.d.ts +1 -0
- package/dist/games/index.js +2 -1
- package/dist/games/spline-mesh-demo.d.ts +17 -0
- package/dist/games/spline-mesh-demo.js +118 -0
- package/dist/genesys.min.mjs +246 -246
- package/dist/launcher.js +5 -1
- package/dist/src/actors/Actor.d.ts +2 -2
- package/dist/src/actors/Actor.js +9 -3
- package/dist/src/components/visual/SplineMeshComponent.d.ts +107 -0
- package/dist/src/components/visual/SplineMeshComponent.js +373 -0
- package/dist/src/components/visual/index.d.ts +1 -0
- package/dist/src/components/visual/index.js +2 -1
- package/dist/test/prefab.test.js +1 -1
- package/games/index.ts +1 -0
- package/games/spline-mesh-demo.ts +119 -0
- package/package.json +1 -1
- package/src/actors/Actor.ts +10 -2
- package/src/components/visual/SplineMeshComponent.ts +421 -0
- package/src/components/visual/index.ts +1 -0
|
@@ -0,0 +1,373 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
|
+
};
|
|
10
|
+
/**
|
|
11
|
+
* SplineMeshComponent generates a flat ribbon mesh along a Catmull-Rom spline.
|
|
12
|
+
*
|
|
13
|
+
* Use cases include roads, paths, rivers, and any geometry that follows a curved path.
|
|
14
|
+
* The component samples points along the spline and creates a ribbon with proper
|
|
15
|
+
* UV mapping for texture tiling based on world distance.
|
|
16
|
+
*
|
|
17
|
+
* Recommended usage (for humans and AI assistants):
|
|
18
|
+
* - Provide an array of control points defining the path
|
|
19
|
+
* - Adjust width, segments, and tension for desired appearance
|
|
20
|
+
* - Use uvScale to control texture tiling density
|
|
21
|
+
* - Enable showDebug to visualize control points and spline curve
|
|
22
|
+
*/
|
|
23
|
+
import * as THREE from 'three';
|
|
24
|
+
import { MaterialUtils } from '../../materials.js';
|
|
25
|
+
import { EngineClass } from '../../systems/ClassRegistry.js';
|
|
26
|
+
import { resourceManager } from '../../utils/ResourceManager.js';
|
|
27
|
+
import { isNode } from '../../utils/Utils.js';
|
|
28
|
+
import { PrimitiveComponent } from '../PrimitiveComponent.js';
|
|
29
|
+
let SplineMeshComponent = class SplineMeshComponent extends PrimitiveComponent {
|
|
30
|
+
static get DEFAULT_OPTIONS() {
|
|
31
|
+
return {
|
|
32
|
+
...PrimitiveComponent.DEFAULT_OPTIONS,
|
|
33
|
+
// Provide default starter points so the spline is visible when created
|
|
34
|
+
points: [
|
|
35
|
+
new THREE.Vector3(-2, 0, 0),
|
|
36
|
+
new THREE.Vector3(0, 0, 1),
|
|
37
|
+
new THREE.Vector3(2, 0, 0),
|
|
38
|
+
],
|
|
39
|
+
width: 1,
|
|
40
|
+
segments: 50,
|
|
41
|
+
closed: false,
|
|
42
|
+
tension: 0.5,
|
|
43
|
+
uvScale: 1,
|
|
44
|
+
material: '', // Asset path to material JSON file
|
|
45
|
+
showDebug: false,
|
|
46
|
+
physicsOptions: {
|
|
47
|
+
...PrimitiveComponent.DEFAULT_PHYSICS_OPTIONS,
|
|
48
|
+
enabled: false,
|
|
49
|
+
},
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
constructor(options = {}) {
|
|
53
|
+
super(options);
|
|
54
|
+
Object.defineProperty(this, "mesh", {
|
|
55
|
+
enumerable: true,
|
|
56
|
+
configurable: true,
|
|
57
|
+
writable: true,
|
|
58
|
+
value: null
|
|
59
|
+
});
|
|
60
|
+
Object.defineProperty(this, "curve", {
|
|
61
|
+
enumerable: true,
|
|
62
|
+
configurable: true,
|
|
63
|
+
writable: true,
|
|
64
|
+
value: null
|
|
65
|
+
});
|
|
66
|
+
Object.defineProperty(this, "debugGroup", {
|
|
67
|
+
enumerable: true,
|
|
68
|
+
configurable: true,
|
|
69
|
+
writable: true,
|
|
70
|
+
value: null
|
|
71
|
+
});
|
|
72
|
+
this.rebuildMesh();
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* Returns the THREE.Mesh object associated with this component
|
|
76
|
+
*/
|
|
77
|
+
getMesh() {
|
|
78
|
+
return this.mesh;
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* Returns the underlying Catmull-Rom curve
|
|
82
|
+
*/
|
|
83
|
+
getCurve() {
|
|
84
|
+
return this.curve;
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* Sets new control points and rebuilds the mesh
|
|
88
|
+
*/
|
|
89
|
+
setPoints(points) {
|
|
90
|
+
this.options.points = points;
|
|
91
|
+
this.rebuildMesh();
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* Sets the ribbon width and rebuilds the mesh
|
|
95
|
+
*/
|
|
96
|
+
setWidth(width) {
|
|
97
|
+
this.options.width = width;
|
|
98
|
+
this.rebuildMesh();
|
|
99
|
+
}
|
|
100
|
+
/**
|
|
101
|
+
* Sets the segment count and rebuilds the mesh
|
|
102
|
+
*/
|
|
103
|
+
setSegments(segments) {
|
|
104
|
+
this.options.segments = segments;
|
|
105
|
+
this.rebuildMesh();
|
|
106
|
+
}
|
|
107
|
+
/**
|
|
108
|
+
* Sets the Catmull-Rom tension and rebuilds the mesh
|
|
109
|
+
*/
|
|
110
|
+
setTension(tension) {
|
|
111
|
+
this.options.tension = tension;
|
|
112
|
+
this.rebuildMesh();
|
|
113
|
+
}
|
|
114
|
+
/**
|
|
115
|
+
* Sets the UV scale and rebuilds the mesh
|
|
116
|
+
*/
|
|
117
|
+
setUvScale(uvScale) {
|
|
118
|
+
this.options.uvScale = uvScale;
|
|
119
|
+
this.rebuildMesh();
|
|
120
|
+
}
|
|
121
|
+
/**
|
|
122
|
+
* Sets whether the spline is closed and rebuilds the mesh
|
|
123
|
+
*/
|
|
124
|
+
setClosed(closed) {
|
|
125
|
+
this.options.closed = closed;
|
|
126
|
+
this.rebuildMesh();
|
|
127
|
+
}
|
|
128
|
+
/**
|
|
129
|
+
* Sets the material for the mesh
|
|
130
|
+
*/
|
|
131
|
+
setMaterial(material) {
|
|
132
|
+
this.options.material = material;
|
|
133
|
+
if (this.mesh) {
|
|
134
|
+
resourceManager.loadGenericMaterial(material).then((loadedMaterial) => {
|
|
135
|
+
if (loadedMaterial && this.mesh) {
|
|
136
|
+
this.mesh.material = loadedMaterial;
|
|
137
|
+
}
|
|
138
|
+
});
|
|
139
|
+
}
|
|
140
|
+
else {
|
|
141
|
+
// Mesh doesn't exist yet - rebuild to create it with the new material
|
|
142
|
+
this.rebuildMesh();
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
/**
|
|
146
|
+
* Toggles debug visualization
|
|
147
|
+
*/
|
|
148
|
+
setShowDebug(show) {
|
|
149
|
+
this.options.showDebug = show;
|
|
150
|
+
this.updateDebugVisualization();
|
|
151
|
+
}
|
|
152
|
+
/**
|
|
153
|
+
* Rebuilds the ribbon mesh based on current options
|
|
154
|
+
*/
|
|
155
|
+
rebuildMesh() {
|
|
156
|
+
// Filter out null/undefined points and ensure they are Vector3 instances
|
|
157
|
+
// (points may be plain {x,y,z} objects after deserialization)
|
|
158
|
+
const rawPoints = this.options.points ?? [];
|
|
159
|
+
const points = rawPoints
|
|
160
|
+
.filter((p) => p != null)
|
|
161
|
+
.map(p => p instanceof THREE.Vector3 ? p : new THREE.Vector3(p.x, p.y, p.z));
|
|
162
|
+
if (points.length < 2) {
|
|
163
|
+
this.clearMesh();
|
|
164
|
+
return;
|
|
165
|
+
}
|
|
166
|
+
// Create the Catmull-Rom curve
|
|
167
|
+
this.curve = new THREE.CatmullRomCurve3(points, this.options.closed ?? false, 'catmullrom', this.options.tension ?? 0.5);
|
|
168
|
+
const segments = this.options.segments ?? 50;
|
|
169
|
+
const width = this.options.width ?? 1;
|
|
170
|
+
const uvScale = this.options.uvScale ?? 1;
|
|
171
|
+
const halfWidth = width / 2;
|
|
172
|
+
// Generate geometry
|
|
173
|
+
const geometry = this.generateRibbonGeometry(this.curve, segments, halfWidth, uvScale);
|
|
174
|
+
// Remove old mesh if exists
|
|
175
|
+
if (this.mesh) {
|
|
176
|
+
this.mesh.removeFromParent();
|
|
177
|
+
this.mesh.geometry.dispose();
|
|
178
|
+
}
|
|
179
|
+
// Create new mesh with default material initially
|
|
180
|
+
this.mesh = new THREE.Mesh(geometry, MaterialUtils.DefaultMaterial);
|
|
181
|
+
this.mesh.setTransient(true);
|
|
182
|
+
this.bindObject3DProperties(this.mesh, ['castShadow', 'receiveShadow']);
|
|
183
|
+
this.add(this.mesh);
|
|
184
|
+
// Load material if specified
|
|
185
|
+
if (!isNode() && this.options.material) {
|
|
186
|
+
resourceManager.loadGenericMaterial(this.options.material).then((loadedMaterial) => {
|
|
187
|
+
if (loadedMaterial && this.mesh) {
|
|
188
|
+
this.mesh.material = loadedMaterial;
|
|
189
|
+
}
|
|
190
|
+
});
|
|
191
|
+
}
|
|
192
|
+
// Update debug visualization
|
|
193
|
+
this.updateDebugVisualization();
|
|
194
|
+
}
|
|
195
|
+
/**
|
|
196
|
+
* Generates a ribbon geometry along the curve
|
|
197
|
+
*/
|
|
198
|
+
generateRibbonGeometry(curve, segments, halfWidth, uvScale) {
|
|
199
|
+
const vertices = [];
|
|
200
|
+
const normals = [];
|
|
201
|
+
const uvs = [];
|
|
202
|
+
const indices = [];
|
|
203
|
+
const totalLength = curve.getLength();
|
|
204
|
+
const up = new THREE.Vector3(0, 1, 0);
|
|
205
|
+
const tempTangent = new THREE.Vector3();
|
|
206
|
+
const tempNormal = new THREE.Vector3();
|
|
207
|
+
const tempBinormal = new THREE.Vector3();
|
|
208
|
+
// Sample points along the curve
|
|
209
|
+
for (let i = 0; i <= segments; i++) {
|
|
210
|
+
const t = i / segments;
|
|
211
|
+
const point = curve.getPointAt(t);
|
|
212
|
+
const tangent = curve.getTangentAt(t).normalize();
|
|
213
|
+
// Calculate binormal (perpendicular to tangent and up)
|
|
214
|
+
tempBinormal.crossVectors(up, tangent).normalize();
|
|
215
|
+
// Handle degenerate case when tangent is parallel to up
|
|
216
|
+
if (tempBinormal.lengthSq() < 0.001) {
|
|
217
|
+
tempBinormal.set(1, 0, 0);
|
|
218
|
+
}
|
|
219
|
+
// Calculate normal (perpendicular to tangent and binormal)
|
|
220
|
+
tempNormal.crossVectors(tangent, tempBinormal).normalize();
|
|
221
|
+
// Create two vertices at this point (left and right edges)
|
|
222
|
+
const leftPoint = point.clone().addScaledVector(tempBinormal, -halfWidth);
|
|
223
|
+
const rightPoint = point.clone().addScaledVector(tempBinormal, halfWidth);
|
|
224
|
+
vertices.push(leftPoint.x, leftPoint.y, leftPoint.z);
|
|
225
|
+
vertices.push(rightPoint.x, rightPoint.y, rightPoint.z);
|
|
226
|
+
// Normals point up
|
|
227
|
+
normals.push(tempNormal.x, tempNormal.y, tempNormal.z);
|
|
228
|
+
normals.push(tempNormal.x, tempNormal.y, tempNormal.z);
|
|
229
|
+
// UVs: U tiles along length based on world distance, V is 0-1 across width
|
|
230
|
+
const distanceAlongCurve = t * totalLength;
|
|
231
|
+
const u = distanceAlongCurve * uvScale;
|
|
232
|
+
uvs.push(u, 0); // Left edge
|
|
233
|
+
uvs.push(u, 1); // Right edge
|
|
234
|
+
}
|
|
235
|
+
// Generate indices for triangle strip (CCW winding for upward-facing normals)
|
|
236
|
+
for (let i = 0; i < segments; i++) {
|
|
237
|
+
const baseIndex = i * 2;
|
|
238
|
+
// First triangle: left[i] -> left[i+1] -> right[i]
|
|
239
|
+
indices.push(baseIndex, baseIndex + 2, baseIndex + 1);
|
|
240
|
+
// Second triangle: right[i] -> left[i+1] -> right[i+1]
|
|
241
|
+
indices.push(baseIndex + 1, baseIndex + 2, baseIndex + 3);
|
|
242
|
+
}
|
|
243
|
+
const geometry = new THREE.BufferGeometry();
|
|
244
|
+
geometry.setAttribute('position', new THREE.Float32BufferAttribute(vertices, 3));
|
|
245
|
+
geometry.setAttribute('normal', new THREE.Float32BufferAttribute(normals, 3));
|
|
246
|
+
geometry.setAttribute('uv', new THREE.Float32BufferAttribute(uvs, 2));
|
|
247
|
+
geometry.setIndex(indices);
|
|
248
|
+
return geometry;
|
|
249
|
+
}
|
|
250
|
+
/**
|
|
251
|
+
* Clears the current mesh
|
|
252
|
+
*/
|
|
253
|
+
clearMesh() {
|
|
254
|
+
if (this.mesh) {
|
|
255
|
+
this.mesh.removeFromParent();
|
|
256
|
+
this.mesh.geometry.dispose();
|
|
257
|
+
this.mesh = null;
|
|
258
|
+
}
|
|
259
|
+
this.curve = null;
|
|
260
|
+
this.clearDebugVisualization();
|
|
261
|
+
}
|
|
262
|
+
/**
|
|
263
|
+
* Updates debug visualization showing control points and spline
|
|
264
|
+
*/
|
|
265
|
+
updateDebugVisualization() {
|
|
266
|
+
this.clearDebugVisualization();
|
|
267
|
+
if (!this.options.showDebug || !this.curve) {
|
|
268
|
+
return;
|
|
269
|
+
}
|
|
270
|
+
this.debugGroup = new THREE.Group();
|
|
271
|
+
this.debugGroup.setTransient(true);
|
|
272
|
+
// Filter out null/undefined points and ensure they are Vector3 instances
|
|
273
|
+
const rawPoints = this.options.points ?? [];
|
|
274
|
+
const points = rawPoints
|
|
275
|
+
.filter((p) => p != null)
|
|
276
|
+
.map(p => p instanceof THREE.Vector3 ? p : new THREE.Vector3(p.x, p.y, p.z));
|
|
277
|
+
// Draw control point spheres
|
|
278
|
+
const sphereGeometry = new THREE.SphereGeometry(0.15);
|
|
279
|
+
const sphereMaterial = new THREE.MeshBasicMaterial({ color: 0xff0000 });
|
|
280
|
+
for (let i = 0; i < points.length; i++) {
|
|
281
|
+
const sphere = new THREE.Mesh(sphereGeometry, sphereMaterial);
|
|
282
|
+
sphere.position.copy(points[i]);
|
|
283
|
+
this.debugGroup.add(sphere);
|
|
284
|
+
}
|
|
285
|
+
// Draw spline curve line
|
|
286
|
+
const curvePoints = this.curve.getPoints(100);
|
|
287
|
+
const lineGeometry = new THREE.BufferGeometry().setFromPoints(curvePoints);
|
|
288
|
+
const lineMaterial = new THREE.LineBasicMaterial({ color: 0x00ff00 });
|
|
289
|
+
const line = new THREE.Line(lineGeometry, lineMaterial);
|
|
290
|
+
this.debugGroup.add(line);
|
|
291
|
+
// Draw tangent indicators at control points
|
|
292
|
+
const arrowMaterial = new THREE.LineBasicMaterial({ color: 0x0000ff });
|
|
293
|
+
for (let i = 0; i < points.length; i++) {
|
|
294
|
+
const t = this.options.closed ? i / points.length : i / (points.length - 1);
|
|
295
|
+
const tangent = this.curve.getTangentAt(Math.min(t, 1)).normalize();
|
|
296
|
+
const arrowPoints = [
|
|
297
|
+
points[i].clone(),
|
|
298
|
+
points[i].clone().addScaledVector(tangent, 0.5)
|
|
299
|
+
];
|
|
300
|
+
const arrowGeometry = new THREE.BufferGeometry().setFromPoints(arrowPoints);
|
|
301
|
+
const arrow = new THREE.Line(arrowGeometry, arrowMaterial);
|
|
302
|
+
this.debugGroup.add(arrow);
|
|
303
|
+
}
|
|
304
|
+
this.add(this.debugGroup);
|
|
305
|
+
}
|
|
306
|
+
/**
|
|
307
|
+
* Clears debug visualization
|
|
308
|
+
*/
|
|
309
|
+
clearDebugVisualization() {
|
|
310
|
+
if (this.debugGroup) {
|
|
311
|
+
this.debugGroup.removeFromParent();
|
|
312
|
+
this.debugGroup.traverse((child) => {
|
|
313
|
+
if (child instanceof THREE.Mesh || child instanceof THREE.Line) {
|
|
314
|
+
child.geometry.dispose();
|
|
315
|
+
if (Array.isArray(child.material)) {
|
|
316
|
+
child.material.forEach(m => m.dispose());
|
|
317
|
+
}
|
|
318
|
+
else {
|
|
319
|
+
child.material.dispose();
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
});
|
|
323
|
+
this.debugGroup = null;
|
|
324
|
+
}
|
|
325
|
+
}
|
|
326
|
+
calcBoundingBox() {
|
|
327
|
+
if (this.mesh) {
|
|
328
|
+
this.mesh.geometry.computeBoundingBox();
|
|
329
|
+
this._boundingBox.copy(this.mesh.geometry.boundingBox).applyMatrix4(this.mesh.matrixWorld);
|
|
330
|
+
}
|
|
331
|
+
}
|
|
332
|
+
getEditorClassIcon() {
|
|
333
|
+
return 'Icon_Path';
|
|
334
|
+
}
|
|
335
|
+
onEditorPropertyChanged(path, value, result) {
|
|
336
|
+
super.onEditorPropertyChanged(path, value, result);
|
|
337
|
+
// Rebuild mesh when any spline-related property changes
|
|
338
|
+
if (result.isOptions) {
|
|
339
|
+
if (path === 'material') {
|
|
340
|
+
this.setMaterial(value);
|
|
341
|
+
}
|
|
342
|
+
else if (path === 'points' || path.startsWith('points[') || path.startsWith('points.')) {
|
|
343
|
+
// Handle array changes: full replacement, element changes, or property changes
|
|
344
|
+
this.rebuildMesh();
|
|
345
|
+
}
|
|
346
|
+
else if (['width', 'segments', 'tension', 'uvScale', 'closed', 'showDebug'].includes(path)) {
|
|
347
|
+
this.rebuildMesh();
|
|
348
|
+
}
|
|
349
|
+
}
|
|
350
|
+
}
|
|
351
|
+
};
|
|
352
|
+
Object.defineProperty(SplineMeshComponent, "EDITOR_CLASS_META", {
|
|
353
|
+
enumerable: true,
|
|
354
|
+
configurable: true,
|
|
355
|
+
writable: true,
|
|
356
|
+
value: {
|
|
357
|
+
...PrimitiveComponent.EDITOR_CLASS_META,
|
|
358
|
+
points: { array: { child: { type: THREE.Vector3 } } },
|
|
359
|
+
width: { number: { min: 0.1, max: 100, step: 0.1, decimals: 2 } },
|
|
360
|
+
segments: { integer: { min: 2, max: 500, step: 1 } },
|
|
361
|
+
tension: { number: { min: 0, max: 1, step: 0.05, decimals: 2 } },
|
|
362
|
+
uvScale: { number: { min: 0.01, max: 10, step: 0.1, decimals: 2 } },
|
|
363
|
+
closed: { boolean: {} },
|
|
364
|
+
showDebug: { boolean: {} },
|
|
365
|
+
material: { type: ['material'] },
|
|
366
|
+
}
|
|
367
|
+
});
|
|
368
|
+
SplineMeshComponent = __decorate([
|
|
369
|
+
EngineClass('SplineMeshComponent'),
|
|
370
|
+
__metadata("design:paramtypes", [Object])
|
|
371
|
+
], SplineMeshComponent);
|
|
372
|
+
export { SplineMeshComponent };
|
|
373
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SplineMeshComponent.js","sourceRoot":"","sources":["../../../../src/components/visual/SplineMeshComponent.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AA0BvD,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,kBAA8C;IAiBrF,MAAM,KAAc,eAAe;QACjC,OAAO;YACL,GAAG,kBAAkB,CAAC,eAAe;YACrC,uEAAuE;YACvE,MAAM,EAAE;gBACN,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC3B,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC1B,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aAC3B;YACD,KAAK,EAAE,CAAC;YACR,QAAQ,EAAE,EAAE;YACZ,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,GAAG;YACZ,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE,EAAE,EAAG,mCAAmC;YAClD,SAAS,EAAE,KAAK;YAChB,cAAc,EAAE;gBACd,GAAG,kBAAkB,CAAC,uBAAuB;gBAC7C,OAAO,EAAE,KAAK;aACf;SACF,CAAC;IACJ,CAAC;IAED,YAAY,UAAsC,EAAE;QAClD,KAAK,CAAC,OAAO,CAAC,CAAC;QAxCT;;;;mBAA0B,IAAI;WAAC;QAC/B;;;;mBAAuC,IAAI;WAAC;QAC5C;;;;mBAAiC,IAAI;WAAC;QAuC5C,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACI,OAAO;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED;;OAEG;IACI,QAAQ;QACb,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED;;OAEG;IACI,SAAS,CAAC,MAAuB;QACtC,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;QAC7B,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACI,QAAQ,CAAC,KAAa;QAC3B,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;QAC3B,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACI,WAAW,CAAC,QAAgB;QACjC,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACjC,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACI,UAAU,CAAC,OAAe;QAC/B,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;QAC/B,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACI,UAAU,CAAC,OAAe;QAC/B,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;QAC/B,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACI,SAAS,CAAC,MAAe;QAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;QAC7B,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACI,WAAW,CAAC,QAA6B;QAC9C,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACjC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,eAAe,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,EAAE;gBACpE,IAAI,cAAc,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBAChC,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC;gBACtC,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,sEAAsE;YACtE,IAAI,CAAC,WAAW,EAAE,CAAC;QACrB,CAAC;IACH,CAAC;IAED;;OAEG;IACI,YAAY,CAAC,IAAa;QAC/B,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;QAC9B,IAAI,CAAC,wBAAwB,EAAE,CAAC;IAClC,CAAC;IAED;;OAEG;IACI,WAAW;QAChB,yEAAyE;QACzE,8DAA8D;QAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;QAC5C,MAAM,MAAM,GAAG,SAAS;aACrB,MAAM,CAAC,CAAC,CAAC,EAAsB,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;aAC5C,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,CAAE,CAAS,CAAC,CAAC,EAAG,CAAS,CAAC,CAAC,EAAG,CAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1G,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QAED,+BAA+B;QAC/B,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,gBAAgB,CACrC,MAAM,EACN,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,KAAK,EAC5B,YAAY,EACZ,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,GAAG,CAC5B,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;QAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC;QAC1C,MAAM,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;QAE5B,oBAAoB;QACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAEvF,4BAA4B;QAC5B,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC7B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QAC/B,CAAC;QAED,kDAAkD;QAClD,IAAI,CAAC,IAAI,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;QACpE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC7B,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEpB,6BAA6B;QAC7B,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YACvC,eAAe,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,EAAE;gBACjF,IAAI,cAAc,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBAChC,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC;gBACtC,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,6BAA6B;QAC7B,IAAI,CAAC,wBAAwB,EAAE,CAAC;IAClC,CAAC;IAED;;OAEG;IACK,sBAAsB,CAC5B,KAA6B,EAC7B,QAAgB,EAChB,SAAiB,EACjB,OAAe;QAEf,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAa,EAAE,CAAC;QACzB,MAAM,OAAO,GAAa,EAAE,CAAC;QAE7B,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QACtC,MAAM,EAAE,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACtC,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QACxC,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QACvC,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAEzC,gCAAgC;QAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;YACnC,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;YACvB,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAClC,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;YAElD,uDAAuD;YACvD,YAAY,CAAC,YAAY,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC;YAEnD,wDAAwD;YACxD,IAAI,YAAY,CAAC,QAAQ,EAAE,GAAG,KAAK,EAAE,CAAC;gBACpC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAC5B,CAAC;YAED,2DAA2D;YAC3D,UAAU,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,SAAS,EAAE,CAAC;YAE3D,2DAA2D;YAC3D,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC,SAAS,CAAC,CAAC;YAC1E,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,eAAe,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;YAE1E,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;YACrD,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;YAExD,mBAAmB;YACnB,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;YACvD,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;YAEvD,2EAA2E;YAC3E,MAAM,kBAAkB,GAAG,CAAC,GAAG,WAAW,CAAC;YAC3C,MAAM,CAAC,GAAG,kBAAkB,GAAG,OAAO,CAAC;YACvC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY;YAC5B,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa;QAC/B,CAAC;QAED,8EAA8E;QAC9E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;YAClC,MAAM,SAAS,GAAG,CAAC,GAAG,CAAC,CAAC;YAExB,mDAAmD;YACnD,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,CAAC,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;YACtD,uDAAuD;YACvD,OAAO,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,SAAS,GAAG,CAAC,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;QAC5C,QAAQ,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,KAAK,CAAC,sBAAsB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;QACjF,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,KAAK,CAAC,sBAAsB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9E,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,KAAK,CAAC,sBAAsB,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;QACtE,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE3B,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;OAEG;IACK,SAAS;QACf,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC7B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACnB,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,uBAAuB,EAAE,CAAC;IACjC,CAAC;IAED;;OAEG;IACK,wBAAwB;QAC9B,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAE/B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAC3C,OAAO;QACT,CAAC;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QACpC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAEnC,yEAAyE;QACzE,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;QAC5C,MAAM,MAAM,GAAG,SAAS;aACrB,MAAM,CAAC,CAAC,CAAC,EAAsB,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;aAC5C,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,CAAE,CAAS,CAAC,CAAC,EAAG,CAAS,CAAC,CAAC,EAAG,CAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAE1G,6BAA6B;QAC7B,MAAM,cAAc,GAAG,IAAI,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,cAAc,GAAG,IAAI,KAAK,CAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QAExE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,MAAM,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;YAC9D,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAChC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;QAED,yBAAyB;QACzB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC9C,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAC3E,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QACtE,MAAM,IAAI,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QACxD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE1B,4CAA4C;QAC5C,MAAM,aAAa,GAAG,IAAI,KAAK,CAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC5E,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;YACpE,MAAM,WAAW,GAAG;gBAClB,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE;gBACjB,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,CAAC;aAChD,CAAC;YACF,MAAM,aAAa,GAAG,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;YAC5E,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;YAC3D,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5B,CAAC;IAED;;OAEG;IACK,uBAAuB;QAC7B,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC;YACnC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;gBACjC,IAAI,KAAK,YAAY,KAAK,CAAC,IAAI,IAAI,KAAK,YAAY,KAAK,CAAC,IAAI,EAAE,CAAC;oBAC/D,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;oBACzB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;wBAClC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;oBAC3C,CAAC;yBAAM,CAAC;wBACN,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;oBAC3B,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACzB,CAAC;IACH,CAAC;IAEe,eAAe;QAC7B,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;YACxC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAY,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC9F,CAAC;IACH,CAAC;IAEe,kBAAkB;QAChC,OAAO,WAAW,CAAC;IACrB,CAAC;IAEe,uBAAuB,CAAC,IAAY,EAAE,KAAU,EAAE,MAAmC;QACnG,KAAK,CAAC,uBAAuB,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QAEnD,wDAAwD;QACxD,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;gBACxB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAC1B,CAAC;iBAAM,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBACzF,+EAA+E;gBAC/E,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,CAAC;iBAAM,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC7F,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;IACH,CAAC;;AAhXwB;;;;WAAqC;QAC5D,GAAG,kBAAkB,CAAC,iBAAiB;QACvC,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE;QACrD,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE;QACjE,QAAQ,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE;QACpD,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE;QAChE,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE;QACnE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACvB,SAAS,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC1B,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,UAAU,CAAC,EAAE;KACxB;EAVgC,CAU/B;AAfA,mBAAmB;IAD/B,WAAW,CAAC,qBAAqB,CAAC;;GACtB,mBAAmB,CAsX/B"}
|
|
@@ -21,4 +21,5 @@ export * from './TerrainMeshComponent.js';
|
|
|
21
21
|
export * from './SkyboxComponent.js';
|
|
22
22
|
export * from './FogComponent.js';
|
|
23
23
|
export * from './UI3DComponent.js';
|
|
24
|
-
|
|
24
|
+
export * from './SplineMeshComponent.js';
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvY29tcG9uZW50cy92aXN1YWwvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7O0dBUUc7QUFDSCxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsaUNBQWlDLENBQUM7QUFDaEQsY0FBYyw4QkFBOEIsQ0FBQztBQUM3QyxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyxxQ0FBcUMsQ0FBQztBQUNwRCxjQUFjLGlDQUFpQyxDQUFDO0FBQ2hELGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLCtCQUErQixDQUFDO0FBQzlDLGNBQWMsMkJBQTJCLENBQUM7QUFDMUMsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYywwQkFBMEIsQ0FBQyJ9
|
package/dist/test/prefab.test.js
CHANGED
|
@@ -53,7 +53,7 @@ QUnit.module('Prefab', hooks => {
|
|
|
53
53
|
for (let index = 0; index < 4; index++) {
|
|
54
54
|
const instanceRootData = [index === 0 ? -123 : undefined, index === 1 ? -456 : undefined];
|
|
55
55
|
const instanceComponentData = [index === 2 ? -789 : undefined, index === 3 ? -101 : undefined];
|
|
56
|
-
//
|
|
56
|
+
// load an instance actor then modify its properties
|
|
57
57
|
const instanceActor = await ENGINE.Actor.spawnPrefabActor(prefabName, {
|
|
58
58
|
position: instancePosition,
|
|
59
59
|
rotation: instanceRotation,
|
package/games/index.ts
CHANGED
|
@@ -12,6 +12,7 @@ export * from './performance-test-demo.js';
|
|
|
12
12
|
export * from './postprocess-demo.js';
|
|
13
13
|
export * from './ragdoll-demo-simple.js';
|
|
14
14
|
export * from './ragdoll-demo.js';
|
|
15
|
+
export * from './spline-mesh-demo.js';
|
|
15
16
|
export * from './swipe-tap-demo.js';
|
|
16
17
|
export * from './tween-demo.js';
|
|
17
18
|
export * from './ui-demo.js';
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import * as ENGINE from '@directivegames/genesys.js';
|
|
2
|
+
import * as THREE from 'three';
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* SplineMeshDemo showcases the SplineMeshComponent.
|
|
6
|
+
*
|
|
7
|
+
* Demonstrates:
|
|
8
|
+
* - Creating a road-like path using control points
|
|
9
|
+
* - Debug visualization of control points and spline curve
|
|
10
|
+
* - UV tiling for texture mapping
|
|
11
|
+
*/
|
|
12
|
+
export class SplineMeshDemo extends ENGINE.BaseGameLoop {
|
|
13
|
+
private splineActor: ENGINE.Actor | null = null;
|
|
14
|
+
private splineComponent: ENGINE.SplineMeshComponent | null = null;
|
|
15
|
+
|
|
16
|
+
protected override async preStart(): Promise<void> {
|
|
17
|
+
// Setup camera
|
|
18
|
+
const { pawn } = ENGINE.GameBuilder.createDefaultPawn(this.world, new THREE.Vector3(0, 15, 20));
|
|
19
|
+
const camera = pawn.getComponent(THREE.Camera)!;
|
|
20
|
+
camera.position.set(0, 15, 20);
|
|
21
|
+
camera.lookAt(0, 0, 0);
|
|
22
|
+
|
|
23
|
+
// Setup lighting
|
|
24
|
+
ENGINE.GameBuilder.createDefaultLighting(this.world);
|
|
25
|
+
|
|
26
|
+
// Create ground plane with grass color
|
|
27
|
+
const groundMaterial = new THREE.MeshStandardMaterial({ color: 0x228833 });
|
|
28
|
+
const groundGeometry = new THREE.BoxGeometry(50, 0.1, 50);
|
|
29
|
+
const ground = new ENGINE.Actor({
|
|
30
|
+
rootComponent: new ENGINE.MeshComponent({
|
|
31
|
+
position: new THREE.Vector3(0, -0.1, 0),
|
|
32
|
+
geometry: groundGeometry,
|
|
33
|
+
material: groundMaterial,
|
|
34
|
+
})
|
|
35
|
+
});
|
|
36
|
+
this.world.addActor(ground);
|
|
37
|
+
|
|
38
|
+
// Create a winding road path
|
|
39
|
+
this.createRoadPath();
|
|
40
|
+
|
|
41
|
+
// Create a river path
|
|
42
|
+
this.createRiverPath();
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
private createRoadPath(): void {
|
|
46
|
+
// Define control points for a winding road
|
|
47
|
+
const roadPoints = [
|
|
48
|
+
new THREE.Vector3(-15, 0, -10),
|
|
49
|
+
new THREE.Vector3(-8, 0, -5),
|
|
50
|
+
new THREE.Vector3(-3, 0, 0),
|
|
51
|
+
new THREE.Vector3(0, 0, 5),
|
|
52
|
+
new THREE.Vector3(5, 0, 3),
|
|
53
|
+
new THREE.Vector3(10, 0, -2),
|
|
54
|
+
new THREE.Vector3(15, 0, 0),
|
|
55
|
+
];
|
|
56
|
+
|
|
57
|
+
// Create the spline mesh component with a texture
|
|
58
|
+
this.splineComponent = new ENGINE.SplineMeshComponent({
|
|
59
|
+
points: roadPoints,
|
|
60
|
+
width: 3,
|
|
61
|
+
segments: 80,
|
|
62
|
+
tension: 0.3,
|
|
63
|
+
uvScale: 0.5,
|
|
64
|
+
material: '@engine/assets/dev/materials/RoadAsphalt.json',
|
|
65
|
+
showDebug: true, // Enable debug visualization
|
|
66
|
+
});
|
|
67
|
+
|
|
68
|
+
// Create actor and add component
|
|
69
|
+
this.splineActor = new ENGINE.Actor();
|
|
70
|
+
this.splineActor.rootComponent.add(this.splineComponent);
|
|
71
|
+
this.world.addActor(this.splineActor);
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
private createRiverPath(): void {
|
|
75
|
+
// Define control points for a river
|
|
76
|
+
const riverPoints = [
|
|
77
|
+
new THREE.Vector3(-12, 0.01, 8),
|
|
78
|
+
new THREE.Vector3(-6, 0.01, 12),
|
|
79
|
+
new THREE.Vector3(0, 0.01, 10),
|
|
80
|
+
new THREE.Vector3(6, 0.01, 14),
|
|
81
|
+
new THREE.Vector3(12, 0.01, 12),
|
|
82
|
+
];
|
|
83
|
+
|
|
84
|
+
// Create river material with blue color
|
|
85
|
+
const riverMaterial = new THREE.MeshStandardMaterial({
|
|
86
|
+
color: 0x2266aa,
|
|
87
|
+
roughness: 0.2,
|
|
88
|
+
metalness: 0.3,
|
|
89
|
+
transparent: true,
|
|
90
|
+
opacity: 0.8,
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
// Create the spline mesh component for river
|
|
94
|
+
const riverComponent = new ENGINE.SplineMeshComponent({
|
|
95
|
+
points: riverPoints,
|
|
96
|
+
width: 2,
|
|
97
|
+
segments: 60,
|
|
98
|
+
tension: 0.5,
|
|
99
|
+
uvScale: 1,
|
|
100
|
+
material: riverMaterial,
|
|
101
|
+
showDebug: true,
|
|
102
|
+
});
|
|
103
|
+
|
|
104
|
+
// Create actor and add component
|
|
105
|
+
const riverActor = new ENGINE.Actor();
|
|
106
|
+
riverActor.rootComponent.add(riverComponent);
|
|
107
|
+
this.world.addActor(riverActor);
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
public override destroy(): void {
|
|
111
|
+
if (this.splineActor) {
|
|
112
|
+
this.splineActor.destroy();
|
|
113
|
+
this.splineActor = null;
|
|
114
|
+
}
|
|
115
|
+
this.splineComponent = null;
|
|
116
|
+
super.destroy();
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
|
package/package.json
CHANGED
package/src/actors/Actor.ts
CHANGED
|
@@ -196,6 +196,7 @@ export class Actor<TOptions extends ActorOptions = ActorOptions> extends Playabl
|
|
|
196
196
|
constructor(readonly options: TOptions = {} as TOptions) {
|
|
197
197
|
super();
|
|
198
198
|
this.ctorArgOptions = options;
|
|
199
|
+
|
|
199
200
|
options = { ...Actor.DEFAULT_OPTIONS, ...options, };
|
|
200
201
|
this.name = ObjectNamingSystem.generateName(this);
|
|
201
202
|
this.actorTags = options.actorTags ? [...options.actorTags] : [];
|
|
@@ -236,6 +237,13 @@ export class Actor<TOptions extends ActorOptions = ActorOptions> extends Playabl
|
|
|
236
237
|
if (legacyPrefabName) {
|
|
237
238
|
this.prefabName = legacyPrefabName;
|
|
238
239
|
}
|
|
240
|
+
|
|
241
|
+
// HACK copy the ctorArgOptions and delete the transform data, so they get populated by the data stored in root component when loaded
|
|
242
|
+
// and also this won't mutate the original `options` passed in
|
|
243
|
+
this.ctorArgOptions = {...this.ctorArgOptions};
|
|
244
|
+
delete this.ctorArgOptions.position;
|
|
245
|
+
delete this.ctorArgOptions.rotation;
|
|
246
|
+
delete this.ctorArgOptions.scale;
|
|
239
247
|
}
|
|
240
248
|
|
|
241
249
|
/**
|
|
@@ -263,7 +271,7 @@ export class Actor<TOptions extends ActorOptions = ActorOptions> extends Playabl
|
|
|
263
271
|
}
|
|
264
272
|
|
|
265
273
|
/**
|
|
266
|
-
*
|
|
274
|
+
* @deprecated deprecated, use $$prefab, setAsPrefabInstance instead
|
|
267
275
|
* @param name The prefab name
|
|
268
276
|
* @param data The prefab data
|
|
269
277
|
* @param inheritanceChain The full prefab inheritance chain (optional)
|
|
@@ -277,7 +285,7 @@ export class Actor<TOptions extends ActorOptions = ActorOptions> extends Playabl
|
|
|
277
285
|
}
|
|
278
286
|
|
|
279
287
|
/**
|
|
280
|
-
* Clears the prefab name and data of this actor
|
|
288
|
+
* @deprecated Clears the prefab name and data of this actor. Use setAsPrefabInstance(null) instead
|
|
281
289
|
* @returns This actor instance for method chaining
|
|
282
290
|
*/
|
|
283
291
|
public clearPrefab(): this {
|