@pretty-chitty/core 1.2.16 → 1.2.17
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/components/Gallery/GalleryViewer.d.ts.map +1 -1
- package/dist/components/Gallery/GalleryViewer.js +7 -2
- package/dist/components/Gallery/GalleryViewer.js.map +1 -1
- package/dist/components/SparkLineChart.d.ts.map +1 -1
- package/dist/components/SparkLineChart.js +37 -64
- package/dist/components/SparkLineChart.js.map +1 -1
- package/dist/components/Viewer.d.ts.map +1 -1
- package/dist/components/Viewer.js +12 -2
- package/dist/components/Viewer.js.map +1 -1
- package/dist/game/Chit.js +1 -1
- package/dist/game/Chit.js.map +1 -1
- package/dist/hooks/useWebGlRenderer.d.ts.map +1 -1
- package/dist/hooks/useWebGlRenderer.js +11 -1
- package/dist/hooks/useWebGlRenderer.js.map +1 -1
- package/dist/rendering/CameraWrapperPerspective.d.ts.map +1 -1
- package/dist/rendering/CameraWrapperPerspective.js +10 -5
- package/dist/rendering/CameraWrapperPerspective.js.map +1 -1
- package/dist/rendering/LightWrapper.d.ts.map +1 -1
- package/dist/rendering/LightWrapper.js +14 -1
- package/dist/rendering/LightWrapper.js.map +1 -1
- package/dist/rendering/outline/EffectComposer.js +9 -5
- package/dist/rendering/outline/EffectComposer.js.map +1 -1
- package/package.json +1 -1
- package/src/library/components/Gallery/GalleryViewer.tsx +7 -2
- package/src/library/components/SparkLineChart.tsx +65 -104
- package/src/library/components/Viewer.tsx +11 -2
- package/src/library/game/Chit.ts +1 -1
- package/src/library/hooks/useWebGlRenderer.tsx +12 -1
- package/src/library/rendering/CameraWrapperPerspective.ts +10 -5
- package/src/library/rendering/LightWrapper.ts +20 -1
- package/src/library/rendering/outline/EffectComposer.ts +4 -4
|
@@ -444,7 +444,13 @@ export class CameraWrapperPerspective {
|
|
|
444
444
|
this.offsetTween = this.chit.createTween({ x: currentPosition.x, y: currentPosition.y, z: currentPosition.z }, (tween) => tween
|
|
445
445
|
.to(newPosition, duration)
|
|
446
446
|
.easing(Easing.Quadratic.InOut)
|
|
447
|
-
.onUpdate((obj) =>
|
|
447
|
+
.onUpdate((obj) => {
|
|
448
|
+
this.camera.position.set(obj.x, obj.y, obj.z);
|
|
449
|
+
const planes = this.calculateOptimalNearFar(this.bbox, this.camera.position);
|
|
450
|
+
this.camera.near = planes.near;
|
|
451
|
+
this.camera.far = planes.far;
|
|
452
|
+
this.camera.updateProjectionMatrix();
|
|
453
|
+
}));
|
|
448
454
|
}
|
|
449
455
|
if (rotationDistance > 0) {
|
|
450
456
|
this.rotationTween = this.chit.createTween({ x: currentRotation.x, y: currentRotation.y, z: currentRotation.z }, (tween) => tween
|
|
@@ -452,8 +458,8 @@ export class CameraWrapperPerspective {
|
|
|
452
458
|
.easing(Easing.Quadratic.InOut)
|
|
453
459
|
.onUpdate((obj) => this.camera.rotation.set(obj.x, obj.y, obj.z)));
|
|
454
460
|
}
|
|
455
|
-
//
|
|
456
|
-
if (nearFarDistance > 0.001) {
|
|
461
|
+
// Only tween near/far independently when camera position isn't changing
|
|
462
|
+
if (positionDistance === 0 && nearFarDistance > 0.001) {
|
|
457
463
|
this.nearFarTween = this.chit.createTween({ near: currentNear, far: currentFar }, (tween) => tween
|
|
458
464
|
.to({ near: optimalPlanes.near, far: optimalPlanes.far }, duration)
|
|
459
465
|
.easing(Easing.Quadratic.InOut)
|
|
@@ -463,8 +469,7 @@ export class CameraWrapperPerspective {
|
|
|
463
469
|
this.camera.updateProjectionMatrix();
|
|
464
470
|
}));
|
|
465
471
|
}
|
|
466
|
-
else if (nearFarDistance > 0) {
|
|
467
|
-
// If difference is tiny, just set immediately
|
|
472
|
+
else if (positionDistance === 0 && nearFarDistance > 0) {
|
|
468
473
|
this.camera.near = optimalPlanes.near;
|
|
469
474
|
this.camera.far = optimalPlanes.far;
|
|
470
475
|
this.camera.updateProjectionMatrix();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CameraWrapperPerspective.js","sourceRoot":"","sources":["../../src/library/rendering/CameraWrapperPerspective.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEzD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAQ1C,MAAM,OAAO,wBAAwB;IAoBnC,YAAoB,IAA4B;QAA5B,SAAI,GAAJ,IAAI,CAAwB;QAnBzC,eAAU,GAAG,IAAI,UAAU,EAAE,CAAC;QAC9B,WAAM,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,WAAW,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QAE5G,0BAAqB,aAAU;QAC/B,YAAO,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QAC/B,SAAI,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QAC5B,UAAK,GAAW,CAAC,CAAC;QAClB,WAAM,GAAW,CAAC,CAAC;QACnB,gBAAW,GAAW,CAAC,CAAC;QACxB,gBAAW,GAAW,CAAC,CAAC;QACzB,qBAAgB,GAAW,CAAC,CAAC;QAC7B,sBAAiB,GAAW,CAAC,CAAC;QAE3B,gBAAW,GAAG,IAAI,KAAK,CAAU,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACvD,kBAAa,GAAG,IAAI,KAAK,CAAU,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACzD,iBAAY,GAAG,IAAI,KAAK,CAAgC,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QAEpF,SAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAGxB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC;IACvC,CAAC;IAED,SAAS;QACP,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,KAAI,CAAC;IAEJ,cAAc,CAAC,IAAU;QAC/B,2CAA2C;QAC3C,OAAO;YACL,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,iBAAiB;YAClE,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,iBAAiB;YAClE,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,iBAAiB;YAClE,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,iBAAiB;YAClE,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,iBAAiB;YAClE,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,iBAAiB;YAClE,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,iBAAiB;YAClE,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,iBAAiB;SACnE,CAAC;IACJ,CAAC;IAEO,uBAAuB,CAAC,IAAU,EAAE,cAAuB;QACjE,gFAAgF;QAChF,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAE1C,yEAAyE;QACzE,IAAI,sBAAsB,GAAG,QAAQ,CAAC;QACtC,IAAI,uBAAuB,GAAG,CAAC,CAAC;QAEhC,2CAA2C;QAC3C,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,GAAW,EAAE,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;QAEtG,gDAAgD;QAChD,MAAM,YAAY,GAAG,IAAI,OAAO,CAC9B,YAAY,CAAC,cAAc,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EACtD,YAAY,CAAC,cAAc,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EACtD,YAAY,CAAC,cAAc,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CACvD,CAAC;QAEF,sBAAsB,GAAG,cAAc,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAExE,iDAAiD;QACjD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,eAAe,GAAG,cAAc,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACjE,uBAAuB,GAAG,IAAI,CAAC,GAAG,CAAC,uBAAuB,EAAE,eAAe,CAAC,CAAC;QAC/E,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAC1D,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAE5D,mEAAmE;QACnE,0DAA0D;QAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,eAAe,GAAG,GAAG,CAAC,CAAC;QACpD,MAAM,GAAG,GAAG,gBAAgB,GAAG,GAAG,CAAC;QAEnC,oDAAoD;QACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,GAAG,GAAG,CAAC,CAAC;QAE3C,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC;IACjC,CAAC;IAEM,aAAa,CAAC,UAAuB;QAC1C,IAAI,CAAC,UAAU,GAAG,UAAU,IAAI,IAAI,UAAU,EAAE,CAAC;QACjD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAEM,OAAO,CAAC,KAAa,EAAE,MAAc;QAC1C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,KAAK,GAAG,MAAM,CAAC;QAEpC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;QAC9C,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACxB,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;QAC1B,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;QACzB,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC;QACrC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IACxB,CAAC;IAEM,SAAS,CAAC,EAAU,EAAE,EAAU;QACrC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;QACrB,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;QACrB,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;IAEM,UAAU,CAAC,CAAS,EAAE,CAAS,EAAE,EAAU,EAAE,OAAgB;QAClE,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;QAEjF,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACjC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QACnC,CAAC,IAAI,SAAS,CAAC;QACf,CAAC,IAAI,UAAU,CAAC;QAEhB,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACnE,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAEnE,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC;QACzB,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC;QACzB,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAEO,QAAQ;QACd,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;QACxC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;YACnB,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;YACnB,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC;aAAM,CAAC;YACN,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC;gBAC7B,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC;YAC3B,CAAC;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;YACjC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;YAEnC,wEAAwE;YACxE,gFAAgF;YAChF,+DAA+D;YAC/D,MAAM,IAAI,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YACjE,MAAM,IAAI,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YAElE,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,SAAS,GAAG,IAAI;gBAAE,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;YACzE,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,SAAS,GAAG,CAAC,IAAI;gBAAE,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,GAAG,SAAS,CAAC;YAC3E,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,UAAU,GAAG,IAAI;gBAAE,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI,GAAG,UAAU,CAAC;YAC3E,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,UAAU,GAAG,CAAC,IAAI;gBAAE,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,GAAG,UAAU,CAAC;YAE7E,MAAM,aAAa,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YACxE,MAAM,YAAY,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YACtE,IAAI,aAAa,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;YACD,IAAI,YAAY,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;gBAC9B,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;QACH,CAAC;IACH,CAAC;IAEM,MAAM,CAAC,IAAU,EAAE,SAAS,GAAG,KAAK;QACzC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACjC,OAAO;QACT,CAAC;QAED,wFAAwF;QACxF,iGAAiG;QACjG,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAE3C,IAAI,eAAe,GAAG,CAAC,IAAI,UAAU,GAAG,eAAe,EAAE,CAAC;YACxD,MAAM,YAAY,GAAG,UAAU,GAAG,eAAe,CAAC;YAClD,IAAI,YAAY,GAAG,IAAI,EAAE,CAAC;gBACxB,IAAI,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;gBACpB,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,eAAe,CAAC;YAC5C,CAAC;QACH,CAAC;QAED,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACxB,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;QAC1B,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;QAEzB,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC;QACnD,MAAM,QAAQ,GAAG,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAE/C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;QAEpC,8BAA8B;QAC9B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACvD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACxD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACvD,MAAM,aAAa,GAAG,YAAY,GAAG,CAAC,CAAC;QACvC,MAAM,cAAc,GAAG,aAAa,GAAG,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,aAAa,CAAC;QAClD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,cAAc,CAAC;QAEnD,+CAA+C;QAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;QAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC;QAC9E,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;QAElD,MAAM,eAAe,GAAG,SAAS,GAAG,CAAC,IAAI,UAAU,GAAG,CAAC,CAAC;QACxD,MAAM,aAAa,GAAG,QAAQ,GAAG,CAAC,IAAI,WAAW,GAAG,CAAC,CAAC;QAEtD,yFAAyF;QACzF,wFAAwF;QACxF,qDAAqD;QACrD,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,IAAI,QAAgB,CAAC;QAErB,gFAAgF;QAChF,CAAC;YACC,IAAI,SAAiB,CAAC;YACtB,IAAI,eAAe,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;gBACtC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC,CAAC;gBACvD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ;gBACrE,SAAS,GAAG,aAAa,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC;YACtD,CAAC;iBAAM,CAAC;gBACN,SAAS,GAAG,aAAa,GAAG,IAAI,CAAC;YACnC,CAAC;YAED,IAAI,SAAiB,CAAC;YACtB,IAAI,aAAa,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC,CAAC;gBACvD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC7D,SAAS,GAAG,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC;YACvD,CAAC;iBAAM,CAAC;gBACN,SAAS,GAAG,cAAc,GAAG,IAAI,CAAC;YACpC,CAAC;YAED,wDAAwD;YACxD,iEAAiE;YACjE,MAAM,eAAe,GAAG,YAAY,GAAG,GAAG,CAAC;YAC3C,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG,eAAe,CAAC,CAAC;QAC3G,CAAC;QAED,qGAAqG;QACrG,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACpG,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACpG,MAAM,4BAA4B,GAAG,qBAAqB,GAAG,GAAG,IAAI,mBAAmB,GAAG,GAAG,CAAC;QAE9F,IAAI,4BAA4B,EAAE,CAAC;YACjC,gGAAgG;YAChG,YAAY,GAAG,CAAC,CAAC;YACjB,YAAY,GAAG,CAAC,CAAC;YACjB,MAAM,eAAe,GAAG,YAAY,GAAG,GAAG,CAAC;YAC3C,QAAQ;gBACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,aAAa,GAAG,IAAI,EAAE,cAAc,GAAG,IAAI,CAAC,GAAG,eAAe,CAAC;YAE7G,MAAM,uBAAuB,GAAG,aAAa,CAAC;YAC9C,MAAM,wBAAwB,GAAG,cAAc,CAAC;YAEhD,qDAAqD;YACrD,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YACrG,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;YAEvG,0CAA0C;YAC1C,IAAI,CAAC,gBAAgB,GAAG,IAAI,GAAG,QAAQ,GAAG,CAAC,CAAC;YAC5C,IAAI,CAAC,iBAAiB,GAAG,IAAI,GAAG,QAAQ,GAAG,CAAC,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,qGAAqG;YACrG,MAAM,oBAAoB,GAAG,CAC3B,CAAU,EACV,eAAuB,EACvB,eAAuB,EACvB,WAAmB,EACnB,EAAE;gBACF,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAAC,CAAC;gBACjE,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;gBAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAAC,CAAC;gBACjE,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;gBAE/D,MAAM,IAAI,GAAG,eAAe,GAAG,WAAW,GAAG,IAAI,CAAC;gBAClD,MAAM,IAAI,GAAG,eAAe,GAAG,WAAW,GAAG,IAAI,CAAC;gBAClD,MAAM,IAAI,GAAG,WAAW,GAAG,IAAI,GAAG,IAAI,CAAC;gBACvC,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBAE7C,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,eAAe,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;gBAChE,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,SAAS,EAAE,CAAC;gBAErE,yCAAyC;gBACzC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gBACrC,MAAM,KAAK,GAAG,IAAI,OAAO,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC;gBACvE,MAAM,EAAE,GAAG,IAAI,OAAO,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC;gBAElE,MAAM,CAAC,GAAG,IAAI,OAAO,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;gBAC9C,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC3B,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACxB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;gBAE/C,aAAa;gBACb,MAAM,IAAI,GAAG,KAAK,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;gBACpC,MAAM,IAAI,GAAG,KAAK,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;gBAEpC,MAAM,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC;gBACzC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,kBAAkB;gBAE7D,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;YAC5C,CAAC,CAAC;YAEF,qGAAqG;YACrG,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC;gBACrC,MAAM,eAAe,GAAG,SAAS,GAAG,YAAY,CAAC;gBACjD,MAAM,eAAe,GAAG,SAAS,GAAG,YAAY,CAAC;gBAEjD,oCAAoC;gBACpC,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC/C,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC9C,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,QAAQ,CAAC,CACzE,CAAC;gBAEF,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC/D,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC7D,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAEhE,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,CAAC;gBACrD,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC,CAAC;gBAEtD,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC;gBACrF,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC;gBAEvF,+DAA+D;gBAC/D,MAAM,OAAO,GAAG,cAAc,GAAG,cAAc,CAAC;gBAChD,MAAM,OAAO,GAAG,eAAe,GAAG,eAAe,CAAC;gBAClD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;gBAE5C,oEAAoE;gBACpE,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,cAAc,GAAG,CAAC,CAAC;gBACrE,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,eAAe,GAAG,CAAC,CAAC;gBACrE,MAAM,gBAAgB,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;gBAChD,MAAM,gBAAgB,GAAG,CAAC,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAChD,MAAM,WAAW,GAAG,gBAAgB,GAAG,gBAAgB,CAAC;gBACxD,MAAM,WAAW,GAAG,gBAAgB,GAAG,gBAAgB,CAAC;gBAExD,yGAAyG;gBACzG,QAAQ;gBACR,2CAA2C;gBAC3C,gDAAgD;gBAChD,iBAAiB;gBACjB,kDAAkD;gBAClD,kDAAkD;gBAClD,kDAAkD;gBAClD,kDAAkD;gBAClD,SAAS;gBACT,oDAAoD;gBACpD,qEAAqE;gBACrE,mHAAmH;gBACnH,aAAa;gBACb,sDAAsD;gBACtD,4FAA4F;gBAC5F,QAAQ;gBACR,gBAAgB;gBAChB,+BAA+B;gBAC/B,IAAI;gBAEJ,yEAAyE;gBACzE,MAAM,UAAU,GAAG,oBAAoB,CACrC,IAAI,OAAO,CAAC,SAAS,GAAG,YAAY,EAAE,SAAS,GAAG,YAAY,EAAE,CAAC,CAAC,EAClE,eAAe,EACf,eAAe,EACf,QAAQ,CACT,CAAC;gBACF,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;gBACvD,MAAM,oBAAoB,GAAG,CAAC,CAAC,GAAG,IAAI,GAAG,WAAW,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;gBACnE,MAAM,oBAAoB,GAAG,CAAC,CAAC,GAAG,IAAI,GAAG,WAAW,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;gBAEpE,6EAA6E;gBAC7E,YAAY,IAAI,WAAW,GAAG,oBAAoB,CAAC;gBACnD,qGAAqG;gBACrG,YAAY,IAAI,WAAW,GAAG,oBAAoB,CAAC;gBAEnD,wFAAwF;gBACxF,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;gBAElG,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;gBAElE,QAAQ,GAAG,WAAW,CAAC;gBAEvB,yBAAyB;gBACzB,IAAI,KAAK,IAAI,CAAC,GAAG,IAAI,IAAI,WAAW,GAAG,GAAG,EAAE,CAAC;oBAC3C,MAAM;gBACR,CAAC;YACH,CAAC;YAED,gFAAgF;YAChF,mCAAmC;YACnC,QAAQ;YACR,2CAA2C;YAC3C,2CAA2C;YAC3C,gBAAgB;YAChB,yDAAyD;YACzD,4DAA4D;YAC5D,6FAA6F;YAC7F,QAAQ;YACR,gBAAgB;YAChB,+BAA+B;YAC/B,IAAI;YAEJ,yDAAyD;YACzD,oDAAoD;YACpD,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,GAAG,WAAW,CAAC,CAAC;YACrD,MAAM,qBAAqB,GAAG,CAAC,CAAC,GAAG,IAAI,GAAG,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC/D,MAAM,qBAAqB,GAAG,CAAC,CAAC,GAAG,IAAI,GAAG,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;YAEhE,MAAM,mBAAmB,GAAG,aAAa,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;YAC9G,MAAM,oBAAoB,GAAG,cAAc,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;YAEhH,0CAA0C;YAC1C,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC/F,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;YAEjG,+BAA+B;YAC/B,IAAI,CAAC,gBAAgB,GAAG,IAAI,GAAG,MAAM,GAAG,CAAC,CAAC;YAC1C,IAAI,CAAC,iBAAiB,GAAG,IAAI,GAAG,MAAM,GAAG,CAAC,CAAC;QAC7C,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,EAClD,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAEjD,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;YACnB,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7B,CAAC;QAED,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5C,QAAQ,GAAG,GAAG,CAAC;QACjB,CAAC;QAED,0EAA0E;QAC1E,+EAA+E;QAE/E,MAAM,eAAe,GAAG,SAAS,GAAG,YAAY,CAAC;QACjD,MAAM,eAAe,GAAG,SAAS,GAAG,YAAY,CAAC;QAEjD,8FAA8F;QAC9F,MAAM,mBAAmB,GAAG,IAAI,OAAO,CACrC,eAAe,GAAG,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAAC,EAChF,eAAe,GAAG,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,EAC9E,QAAQ;YACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAAC;YACnD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,CACpD,CAAC;QAEF,MAAM,aAAa,GAAG,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;QAEnF,0FAA0F;QAC1F,sHAAsH;QACtH,CAAC;YACC,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAAC,CAAC;YACjE,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;YAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAAC,CAAC;YACjE,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;YAE/D,kEAAkE;YAClE,IAAI,IAAI,GAAG,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC;YAClC,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;gBACd,IAAI,QAAQ,GAAG,CAAC,CAAC;gBACjB,OAAO,IAAI,IAAI,CAAC,IAAI,QAAQ,GAAG,EAAE,EAAE,CAAC;oBAClC,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,QAAQ,GAAG,IAAI,CAAC,CAAC;oBACxE,IAAI,GAAG,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC;oBAC9B,QAAQ,EAAE,CAAC;gBACb,CAAC;YACH,CAAC;YAED,8CAA8C;YAC9C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,eAAe,GAAG,QAAQ,GAAG,IAAI,CAAC;YAC3D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,eAAe,GAAG,QAAQ,GAAG,IAAI,CAAC;YAC3D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC;YAChD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;YAExD,kEAAkE;YAClE,QAAQ;YACR,2CAA2C;YAC3C,iDAAiD;YACjD,2CAA2C;YAC3C,qDAAqD;YACrD,8BAA8B;YAC9B,4BAA4B;YAC5B,gBAAgB;YAChB,YAAY;YACZ,kBAAkB;YAClB,sEAAsE;YACtE,kEAAkE;YAClE,SAAS;YACT,QAAQ;YACR,gBAAgB;YAChB,+BAA+B;YAC/B,IAAI;QACN,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;YACnB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC;YACjG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACrG,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,qBAAqB,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,GAAG,EAAE,CAAC;YAC3F,IAAI,CAAC,qBAAqB,KAA1B,IAAI,CAAC,qBAAqB,GAAK,IAAI,CAAC,GAAG,EAAE,EAAC;YAC1C,iDAAiD;YACjD,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,aAAa,CAAC,GAAG,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC;YACrC,OAAO;QACT,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,EAC9C,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAE7C,MAAM,gBAAgB,GAAG,eAAe,CAAC,UAAU,CAAC,WAAW,CAAC,EAC9D,gBAAgB,GAAG,IAAI,OAAO,EAAE;aAC7B,YAAY,CAAC,eAAe,CAAC;aAC7B,UAAU,CAAC,IAAI,OAAO,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC;QAEzD,gCAAgC;QAChC,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QACrC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;QACnC,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,GAAG,WAAW,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,GAAG,UAAU,CAAC,CAAC;QAE9G,8GAA8G;QAC9G,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;QAClF,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;QAElF,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CACvB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,EACrF,IAAI,CAAC,UAAU,CAAC,8BAA8B,CAC/C,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,IAAI,gBAAgB,GAAG,CAAC,EAAE,CAAC;gBACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CACtC,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC,EAAE,EACpE,CAAC,KAAK,EAAE,EAAE,CACR,KAAK;qBACF,EAAE,CAAC,WAAW,EAAE,QAAQ,CAAC;qBACzB,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC;qBAC9B,QAAQ,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CACtE,CAAC;YACJ,CAAC;YAED,IAAI,gBAAgB,GAAG,CAAC,EAAE,CAAC;gBACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CACxC,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC,EAAE,EACpE,CAAC,KAAK,EAAE,EAAE,CACR,KAAK;qBACF,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,EAAE,QAAQ,CAAC;qBACtE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC;qBAC9B,QAAQ,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CACtE,CAAC;YACJ,CAAC;YAED,sDAAsD;YACtD,IAAI,eAAe,GAAG,KAAK,EAAE,CAAC;gBAC5B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE,CAC1F,KAAK;qBACF,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC;qBAClE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC;qBAC9B,QAAQ,CAAC,CAAC,GAAG,EAAE,EAAE;oBAChB,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;oBAC5B,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;oBAC1B,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC;gBACvC,CAAC,CAAC,CACL,CAAC;YACJ,CAAC;iBAAM,IAAI,eAAe,GAAG,CAAC,EAAE,CAAC;gBAC/B,8CAA8C;gBAC9C,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC;gBACtC,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,aAAa,CAAC,GAAG,CAAC;gBACpC,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC;YACvC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;YACtE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;YACtE,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,aAAa,CAAC,GAAG,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC;QACvC,CAAC;IACH,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"CameraWrapperPerspective.js","sourceRoot":"","sources":["../../src/library/rendering/CameraWrapperPerspective.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LightWrapper.d.ts","sourceRoot":"","sources":["../../src/library/rendering/LightWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,IAAI,EACJ,gBAAgB,EAChB,KAAK,EAMN,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,qBAAa,YAAY;IACvB,OAAO,CAAC,IAAI,CAAc;IAC1B,OAAO,CAAC,SAAS,CAAmB;IAC7B,KAAK,0CAAe;IAC3B,OAAO,CAAC,KAAK,CAAa;IAC1B,OAAO,CAAC,MAAM,CAAa;IAE3B,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,iBAAiB,CAA0B;IACnD,OAAO,CAAC,UAAU,CAKhB;;IAaF,YAAY,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,IAAI;IAMzC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAM5C,OAAO;IAKP,MAAM,CAAC,IAAI,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"LightWrapper.d.ts","sourceRoot":"","sources":["../../src/library/rendering/LightWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,IAAI,EACJ,gBAAgB,EAChB,KAAK,EAMN,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,qBAAa,YAAY;IACvB,OAAO,CAAC,IAAI,CAAc;IAC1B,OAAO,CAAC,SAAS,CAAmB;IAC7B,KAAK,0CAAe;IAC3B,OAAO,CAAC,KAAK,CAAa;IAC1B,OAAO,CAAC,MAAM,CAAa;IAE3B,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,iBAAiB,CAA0B;IACnD,OAAO,CAAC,UAAU,CAKhB;;IAaF,YAAY,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,IAAI;IAMzC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAM5C,OAAO;IAKP,MAAM,CAAC,IAAI,EAAE,IAAI;IA+CjB,mBAAmB,CAAC,KAAK,EAAE,gBAAgB;CAiE5C"}
|
|
@@ -48,7 +48,6 @@ export class LightWrapper {
|
|
|
48
48
|
l.shadow.camera.right = 0.1;
|
|
49
49
|
l.shadow.camera.top = 0.1;
|
|
50
50
|
l.shadow.camera.bottom = -0.1;
|
|
51
|
-
l.shadow.camera.near = 0.000001;
|
|
52
51
|
this.group.add(l);
|
|
53
52
|
}
|
|
54
53
|
l.visible = true;
|
|
@@ -108,6 +107,20 @@ export class LightWrapper {
|
|
|
108
107
|
camera.right = Math.max(right, b.max.x);
|
|
109
108
|
camera.bottom = Math.min(bottom, b.min.y);
|
|
110
109
|
camera.top = Math.max(top, b.max.y);
|
|
110
|
+
const lDist = light.position.length();
|
|
111
|
+
if (lDist > 0) {
|
|
112
|
+
const lightDir = light.position.clone().normalize();
|
|
113
|
+
let minDepth = Infinity;
|
|
114
|
+
let maxDepth = -Infinity;
|
|
115
|
+
[this.bbox.min.x, this.bbox.max.x].forEach((x) => [this.bbox.min.y, this.bbox.max.y].forEach((y) => [this.bbox.min.z, this.bbox.max.z].forEach((z) => {
|
|
116
|
+
const depth = lDist - (x * lightDir.x + y * lightDir.y + z * lightDir.z);
|
|
117
|
+
minDepth = Math.min(minDepth, depth);
|
|
118
|
+
maxDepth = Math.max(maxDepth, depth);
|
|
119
|
+
})));
|
|
120
|
+
const margin = Math.max(1, (maxDepth - minDepth) * 0.1);
|
|
121
|
+
camera.near = Math.max(0.1, minDepth - margin);
|
|
122
|
+
camera.far = maxDepth + margin;
|
|
123
|
+
}
|
|
111
124
|
camera.updateProjectionMatrix();
|
|
112
125
|
}
|
|
113
126
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LightWrapper.js","sourceRoot":"","sources":["../../src/library/rendering/LightWrapper.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"LightWrapper.js","sourceRoot":"","sources":["../../src/library/rendering/LightWrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { WebGLRenderTarget, LinearFilter, RGBAFormat, Clock, Color, DepthTexture, } from "three";
|
|
1
|
+
import { WebGLRenderTarget, LinearFilter, RGBAFormat, Clock, Color, DepthTexture, FloatType, } from "three";
|
|
2
2
|
import { ShaderPass } from "./ShaderPass";
|
|
3
3
|
import { CopyShader } from "./shaders";
|
|
4
4
|
let COUNTER = 0;
|
|
@@ -34,7 +34,8 @@ export class EffectComposer {
|
|
|
34
34
|
renderTarget.texture.generateMipmaps = false;
|
|
35
35
|
// Create and attach depth texture for outline pass access
|
|
36
36
|
renderTarget.depthTexture = new DepthTexture(Math.max(1, Math.floor(this._width * this._pixelRatio)), Math.max(1, Math.floor(this._height * this._pixelRatio)));
|
|
37
|
-
|
|
37
|
+
if (renderer.capabilities.isWebGL2)
|
|
38
|
+
renderTarget.depthTexture.type = FloatType;
|
|
38
39
|
this.renderTarget = renderTarget;
|
|
39
40
|
// Create second render target for ping-pong rendering
|
|
40
41
|
this.renderTarget2 = renderTarget.clone();
|
|
@@ -42,7 +43,8 @@ export class EffectComposer {
|
|
|
42
43
|
this.renderTarget2.texture.generateMipmaps = false;
|
|
43
44
|
// Create depth texture for second render target too
|
|
44
45
|
this.renderTarget2.depthTexture = new DepthTexture(Math.max(1, Math.floor(this._width * this._pixelRatio)), Math.max(1, Math.floor(this._height * this._pixelRatio)));
|
|
45
|
-
|
|
46
|
+
if (renderer.capabilities.isWebGL2)
|
|
47
|
+
this.renderTarget2.depthTexture.type = FloatType;
|
|
46
48
|
this.copyPass = new ShaderPass(CopyShader, this.textureId);
|
|
47
49
|
}
|
|
48
50
|
addPass(pass) {
|
|
@@ -108,12 +110,14 @@ export class EffectComposer {
|
|
|
108
110
|
if (this.renderTarget.depthTexture) {
|
|
109
111
|
this.renderTarget.depthTexture.dispose();
|
|
110
112
|
this.renderTarget.depthTexture = new DepthTexture(effectiveWidth, effectiveHeight);
|
|
111
|
-
|
|
113
|
+
if (this.renderer.capabilities.isWebGL2)
|
|
114
|
+
this.renderTarget.depthTexture.type = FloatType;
|
|
112
115
|
}
|
|
113
116
|
if (this.renderTarget2.depthTexture) {
|
|
114
117
|
this.renderTarget2.depthTexture.dispose();
|
|
115
118
|
this.renderTarget2.depthTexture = new DepthTexture(effectiveWidth, effectiveHeight);
|
|
116
|
-
|
|
119
|
+
if (this.renderer.capabilities.isWebGL2)
|
|
120
|
+
this.renderTarget2.depthTexture.type = FloatType;
|
|
117
121
|
}
|
|
118
122
|
for (let i = 0; i < this.passes.length; i++) {
|
|
119
123
|
this.passes[i].setSize(effectiveWidth, effectiveHeight);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EffectComposer.js","sourceRoot":"","sources":["../../../src/library/rendering/outline/EffectComposer.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EACjB,YAAY,EACZ,UAAU,EAEV,KAAK,EACL,KAAK,EACL,YAAY,
|
|
1
|
+
{"version":3,"file":"EffectComposer.js","sourceRoot":"","sources":["../../../src/library/rendering/outline/EffectComposer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -102,6 +102,7 @@ export function GalleryViewer({
|
|
|
102
102
|
if (!ctx) return;
|
|
103
103
|
|
|
104
104
|
let cancelled = false;
|
|
105
|
+
let needsRedraw = false;
|
|
105
106
|
|
|
106
107
|
const animate = () => {
|
|
107
108
|
if (cancelled) return;
|
|
@@ -109,11 +110,15 @@ export function GalleryViewer({
|
|
|
109
110
|
|
|
110
111
|
const isAnimating = galleryController.render();
|
|
111
112
|
|
|
112
|
-
if (isAnimating) {
|
|
113
|
+
if (isAnimating || needsRedraw) {
|
|
113
114
|
ctx.canvas.width = w * rendererWrapper.pixelRatio;
|
|
114
115
|
ctx.canvas.height = h * rendererWrapper.pixelRatio;
|
|
115
116
|
ctx.clearRect(0, 0, w * rendererWrapper.pixelRatio, h * rendererWrapper.pixelRatio);
|
|
116
|
-
rendererWrapper.render(galleryController.sceneWrapper, galleryController.camera, ctx, theme);
|
|
117
|
+
const drew = rendererWrapper.render(galleryController.sceneWrapper, galleryController.camera, ctx, theme);
|
|
118
|
+
// If render bailed (e.g. WebGL context lost), retry next frame even if
|
|
119
|
+
// the controller has settled — otherwise the last frame of an animation
|
|
120
|
+
// gets stuck on a stale snapshot.
|
|
121
|
+
needsRedraw = !drew;
|
|
117
122
|
}
|
|
118
123
|
};
|
|
119
124
|
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import React, { useMemo } from "react";
|
|
2
2
|
import { Box, Typography } from "@mui/material";
|
|
3
|
+
import Color from "color";
|
|
3
4
|
import { SparkChit } from "../game/SparkChit";
|
|
4
5
|
import { PlayerChit } from "../game/PlayerChit";
|
|
5
6
|
|
|
@@ -29,65 +30,30 @@ interface SparkLineChartProps {
|
|
|
29
30
|
|
|
30
31
|
const HALO_OPACITY = 0.35;
|
|
31
32
|
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
return {
|
|
39
|
-
r: toLin(parseInt(hex.slice(0, 2), 16)),
|
|
40
|
-
g: toLin(parseInt(hex.slice(2, 4), 16)),
|
|
41
|
-
b: toLin(parseInt(hex.slice(4, 6), 16)),
|
|
42
|
-
};
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
function getColorLuminance(color: string): number {
|
|
46
|
-
const { r, g, b } = hexToLinearRgb(color);
|
|
47
|
-
return 0.2126 * r + 0.7152 * g + 0.0722 * b;
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
// Convert sRGB hex → CIE Lab (D65), so we can measure perceptual distance.
|
|
51
|
-
function hexToLab(color: string): { L: number; a: number; b: number } {
|
|
52
|
-
const { r, g, b } = hexToLinearRgb(color);
|
|
53
|
-
const X = (r * 0.4124564 + g * 0.3575761 + b * 0.1804375) / 0.95047;
|
|
54
|
-
const Y = r * 0.2126729 + g * 0.7151522 + b * 0.072175;
|
|
55
|
-
const Z = (r * 0.0193339 + g * 0.119192 + b * 0.9503041) / 1.08883;
|
|
56
|
-
const f = (t: number) => (t > 0.008856 ? Math.cbrt(t) : 7.787 * t + 16 / 116);
|
|
57
|
-
const fx = f(X);
|
|
58
|
-
const fy = f(Y);
|
|
59
|
-
const fz = f(Z);
|
|
60
|
-
return { L: 116 * fy - 16, a: 500 * (fx - fy), b: 200 * (fy - fz) };
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
// Perceptual contrast: a stroke is only needed if both luminance AND hue/chroma
|
|
64
|
-
// are too close to distinguish. Pure red vs pure green have similar luminance
|
|
65
|
-
// but enormous Lab distance, so they should pass without an outline.
|
|
66
|
-
function hasGoodContrast(color1: string, color2: string): boolean {
|
|
67
|
-
const lum1 = getColorLuminance(color1);
|
|
68
|
-
const lum2 = getColorLuminance(color2);
|
|
69
|
-
const lumRatio = (Math.max(lum1, lum2) + 0.05) / (Math.min(lum1, lum2) + 0.05);
|
|
70
|
-
if (lumRatio >= 3) return true;
|
|
71
|
-
|
|
72
|
-
const lab1 = hexToLab(color1);
|
|
73
|
-
const lab2 = hexToLab(color2);
|
|
74
|
-
const dL = lab1.L - lab2.L;
|
|
75
|
-
const da = lab1.a - lab2.a;
|
|
76
|
-
const db = lab1.b - lab2.b;
|
|
77
|
-
const deltaE = Math.sqrt(dL * dL + da * da + db * db);
|
|
78
|
-
return deltaE >= 35;
|
|
33
|
+
// One halo color for every line in the chart, picked as the extreme furthest
|
|
34
|
+
// from the bg — so the halo is always visible against the bg and provides the
|
|
35
|
+
// edge that separates each line from the bg. Per-line halos flipping between
|
|
36
|
+
// black and white read as arbitrary noise.
|
|
37
|
+
function getUnifiedHaloColor(backgroundColor: string): string {
|
|
38
|
+
return Color(backgroundColor).isLight() ? "#000000" : "#ffffff";
|
|
79
39
|
}
|
|
80
40
|
|
|
81
|
-
// The halo
|
|
82
|
-
//
|
|
83
|
-
//
|
|
84
|
-
//
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
const
|
|
89
|
-
const
|
|
90
|
-
|
|
41
|
+
// The halo only does its job when every line clearly contrasts against it —
|
|
42
|
+
// otherwise a dark line drowns into the dark halo and you get fuzz instead of
|
|
43
|
+
// a crisp edge. Push any too-close line toward the halo's opposite (which is
|
|
44
|
+
// also the bg side) in 5% steps until WCAG luminance contrast clears the
|
|
45
|
+
// threshold. This is the "lighten the dark line until it's distinguishable"
|
|
46
|
+
// step — only the dark-red-burger gets touched in a sea of light pastels.
|
|
47
|
+
function adjustLineForHalo(lineColor: string, haloColor: string, minRatio = 7): string {
|
|
48
|
+
const halo = Color(haloColor);
|
|
49
|
+
const line = Color(lineColor);
|
|
50
|
+
if (line.contrast(halo) >= minRatio) return line.hex();
|
|
51
|
+
const target = halo.isDark() ? Color("#ffffff") : Color("#000000");
|
|
52
|
+
for (let t = 0.05; t <= 1; t += 0.05) {
|
|
53
|
+
const candidate = line.mix(target, t);
|
|
54
|
+
if (candidate.contrast(halo) >= minRatio) return candidate.hex();
|
|
55
|
+
}
|
|
56
|
+
return target.hex();
|
|
91
57
|
}
|
|
92
58
|
|
|
93
59
|
export function SparkLineChart({
|
|
@@ -202,9 +168,15 @@ export function SparkLineChart({
|
|
|
202
168
|
const getY = (value: number) => chartHeight - ((value - chartMinValue) / chartValueRange) * chartHeight;
|
|
203
169
|
const chartEndX = chartWidth;
|
|
204
170
|
|
|
205
|
-
//
|
|
206
|
-
//
|
|
207
|
-
|
|
171
|
+
// The chart always gets one unified halo (opposite of bg). Each line is then
|
|
172
|
+
// shifted only if it sits too close to the halo's luminance — so on a light
|
|
173
|
+
// bg the halo is dark, all the light pastels keep their hue, and the lone
|
|
174
|
+
// dark line gets lightened until the dark halo can actually frame it.
|
|
175
|
+
const haloColor = getUnifiedHaloColor(backgroundColor);
|
|
176
|
+
const displayLines = lines.map((line) => ({
|
|
177
|
+
...line,
|
|
178
|
+
color: adjustLineForHalo(line.color, haloColor),
|
|
179
|
+
}));
|
|
208
180
|
|
|
209
181
|
return (
|
|
210
182
|
<Box sx={{ display: "flex", flexDirection: "column", alignItems: "center", my: 4 }}>
|
|
@@ -237,7 +209,7 @@ export function SparkLineChart({
|
|
|
237
209
|
</g>
|
|
238
210
|
|
|
239
211
|
{/* Draw each line */}
|
|
240
|
-
{
|
|
212
|
+
{displayLines.map((line) => {
|
|
241
213
|
// Step interpolation: values change instantaneously in the game (e.g. $0 → $50
|
|
242
214
|
// at t=100), so hold the previous value until the new clock, then jump vertically.
|
|
243
215
|
const pathData = line.points
|
|
@@ -255,28 +227,21 @@ export function SparkLineChart({
|
|
|
255
227
|
const lastY = getY(lastPoint.value);
|
|
256
228
|
const extendedPathData = `${pathData} L ${chartEndX} ${lastY}`;
|
|
257
229
|
|
|
258
|
-
// All lines get the same halo treatment if any line needs one — picked
|
|
259
|
-
// per line so each gets the right black/white for its own color.
|
|
260
|
-
const needsStroke = anyNeedsStroke;
|
|
261
|
-
const strokeColor = needsStroke ? getStrokeColor(line.color, backgroundColor) : undefined;
|
|
262
|
-
|
|
263
230
|
const adjustedLabelY = labelPositions[line.id];
|
|
264
231
|
|
|
265
232
|
return (
|
|
266
233
|
<g key={line.id}>
|
|
267
|
-
{/*
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
/>
|
|
279
|
-
)}
|
|
234
|
+
{/* Unified halo behind every line — soft glow opposite the bg. */}
|
|
235
|
+
<path
|
|
236
|
+
d={extendedPathData}
|
|
237
|
+
fill="none"
|
|
238
|
+
stroke={haloColor}
|
|
239
|
+
strokeWidth={6}
|
|
240
|
+
strokeLinecap="round"
|
|
241
|
+
strokeLinejoin="round"
|
|
242
|
+
filter="url(#sparkline-soften)"
|
|
243
|
+
opacity={HALO_OPACITY}
|
|
244
|
+
/>
|
|
280
245
|
<path
|
|
281
246
|
d={extendedPathData}
|
|
282
247
|
fill="none"
|
|
@@ -320,36 +285,32 @@ export function SparkLineChart({
|
|
|
320
285
|
|
|
321
286
|
{/* Final value label at the adjusted position */}
|
|
322
287
|
<g transform={`translate(${chartEndX + (line.icon ? 30 : 10)}, ${adjustedLabelY})`}>
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
</text>
|
|
336
|
-
)}
|
|
288
|
+
<text
|
|
289
|
+
fontSize={20}
|
|
290
|
+
fontWeight="bold"
|
|
291
|
+
dominantBaseline="middle"
|
|
292
|
+
fill={haloColor}
|
|
293
|
+
stroke={haloColor}
|
|
294
|
+
strokeWidth={5}
|
|
295
|
+
filter="url(#sparkline-soften)"
|
|
296
|
+
opacity={HALO_OPACITY}
|
|
297
|
+
>
|
|
298
|
+
{line.finalValue}
|
|
299
|
+
</text>
|
|
337
300
|
<text fill={line.color} fontSize={20} fontWeight="bold" dominantBaseline="middle">
|
|
338
301
|
{line.finalValue}
|
|
339
302
|
</text>
|
|
340
303
|
</g>
|
|
341
304
|
|
|
342
|
-
{/* End point marker */}
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
/>
|
|
352
|
-
)}
|
|
305
|
+
{/* End point marker halo + dot */}
|
|
306
|
+
<circle
|
|
307
|
+
cx={chartEndX}
|
|
308
|
+
cy={lastY}
|
|
309
|
+
r={6}
|
|
310
|
+
fill={haloColor}
|
|
311
|
+
filter="url(#sparkline-soften)"
|
|
312
|
+
opacity={HALO_OPACITY}
|
|
313
|
+
/>
|
|
353
314
|
<circle cx={chartEndX} cy={lastY} r={3} fill={line.color} />
|
|
354
315
|
</g>
|
|
355
316
|
);
|
|
@@ -170,9 +170,10 @@ export default function Viewer({
|
|
|
170
170
|
rendererWrapper &&
|
|
171
171
|
(paused || prevRenderNextFrame === undefined || prevRenderNextFrame || chitRenderInstance.dirty)
|
|
172
172
|
) {
|
|
173
|
+
let drew: boolean | undefined;
|
|
173
174
|
if (!hardPaused) {
|
|
174
175
|
// Clear canvas and render
|
|
175
|
-
|
|
176
|
+
drew = rendererWrapper.render(chitRenderInstance.sceneWrapper, chitRenderInstance.camera, context, theme, id);
|
|
176
177
|
|
|
177
178
|
loadingState.setLoading(id, false);
|
|
178
179
|
|
|
@@ -189,7 +190,15 @@ export default function Viewer({
|
|
|
189
190
|
loadingState.setLoading(id, false);
|
|
190
191
|
}
|
|
191
192
|
|
|
192
|
-
|
|
193
|
+
// If render bailed, keep dirty=true so the next iteration retries.
|
|
194
|
+
// When paused, no rAF is queued, so schedule one explicitly.
|
|
195
|
+
if (drew === false) {
|
|
196
|
+
if (paused) {
|
|
197
|
+
requestSharedAnimationFrame(animate);
|
|
198
|
+
}
|
|
199
|
+
} else {
|
|
200
|
+
chitRenderInstance.resetDirty();
|
|
201
|
+
}
|
|
193
202
|
if (!hardPaused) {
|
|
194
203
|
timeState.setAnimationState(id, !paused);
|
|
195
204
|
}
|
package/src/library/game/Chit.ts
CHANGED
|
@@ -44,7 +44,7 @@ function wrapWithDirtyProxy(value: any, chit: Chit): any {
|
|
|
44
44
|
},
|
|
45
45
|
get(target, prop) {
|
|
46
46
|
const val = target[prop];
|
|
47
|
-
if (typeof val === "function") return val.bind(
|
|
47
|
+
if (typeof val === "function") return val.bind(proxy);
|
|
48
48
|
if (typeof val === "object" && val !== null && !(val instanceof Chit) && !(val instanceof OrderedOutlet)) {
|
|
49
49
|
return wrapWithDirtyProxy(val, chit);
|
|
50
50
|
}
|
|
@@ -332,7 +332,7 @@ class WebGLRendererWrapper {
|
|
|
332
332
|
// happily call composer.render() on a dead context, produce no pixels, and
|
|
333
333
|
// strip the snapshot overlay → blank canvas until the user switches panels.
|
|
334
334
|
const gl = this.renderer.getContext();
|
|
335
|
-
if (gl
|
|
335
|
+
if (!gl || gl.isContextLost()) {
|
|
336
336
|
this.handleContextLost("silent");
|
|
337
337
|
return false;
|
|
338
338
|
}
|
|
@@ -372,6 +372,17 @@ class WebGLRendererWrapper {
|
|
|
372
372
|
// Render using the composer
|
|
373
373
|
entry.composer.render(sceneWrapper, camera);
|
|
374
374
|
|
|
375
|
+
// Re-check for context loss after the render. The webglcontextlost event
|
|
376
|
+
// is dispatched asynchronously, so a loss that happened during composer.render
|
|
377
|
+
// wouldn't have been caught by the pre-render check above. If we proceeded to
|
|
378
|
+
// drawImage anyway, we'd copy stale pixels from the WebGL backbuffer (which
|
|
379
|
+
// is preserved across frames) and report success.
|
|
380
|
+
const glAfter = this.renderer.getContext();
|
|
381
|
+
if (!glAfter || glAfter.isContextLost()) {
|
|
382
|
+
this.handleContextLost("silent");
|
|
383
|
+
return false;
|
|
384
|
+
}
|
|
385
|
+
|
|
375
386
|
// Copy the rendered result to the 2D canvas
|
|
376
387
|
const webglCanvas = this.renderer.domElement;
|
|
377
388
|
context2d.drawImage(
|