viral-viewer-2 0.4.5 → 0.4.7
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.
|
@@ -4,6 +4,8 @@ export declare class ViralAnimation {
|
|
|
4
4
|
viralViewerApi: ViralViewerApi;
|
|
5
5
|
mainClock: Clock;
|
|
6
6
|
cubeClock: Clock;
|
|
7
|
+
isUpdatingCubeFromMain: boolean;
|
|
8
|
+
isUpdatingMainFromCube: boolean;
|
|
7
9
|
constructor(viralViewerApi: ViralViewerApi);
|
|
8
10
|
mainAnimation(): void;
|
|
9
11
|
cubeAnimation(): void;
|
|
@@ -7,6 +7,8 @@ class ViralAnimation {
|
|
|
7
7
|
this.viralViewerApi = viralViewerApi;
|
|
8
8
|
this.mainClock = new three_1.Clock();
|
|
9
9
|
this.cubeClock = new three_1.Clock();
|
|
10
|
+
this.isUpdatingCubeFromMain = false;
|
|
11
|
+
this.isUpdatingMainFromCube = false;
|
|
10
12
|
}
|
|
11
13
|
mainAnimation() {
|
|
12
14
|
var _a;
|
|
@@ -16,11 +18,13 @@ class ViralAnimation {
|
|
|
16
18
|
if (this.viralViewerApi.pointCloudLoader.pointClouds.length > 0 && this.viralViewerApi.viralCamera.camera) {
|
|
17
19
|
this.viralViewerApi.pointCloudLoader.potree.updatePointClouds(this.viralViewerApi.pointCloudLoader.pointClouds, this.viralViewerApi.viralCamera.camera, this.viralViewerApi.viralRenderer.renderer);
|
|
18
20
|
}
|
|
19
|
-
requestAnimationFrame(() => { this.mainAnimation
|
|
21
|
+
requestAnimationFrame(() => { this.mainAnimation; });
|
|
20
22
|
if (updated) {
|
|
21
23
|
this.viralViewerApi.viralRenderer.render();
|
|
22
|
-
if (this.viralViewerApi.viralNavigationCube.cubeCamera) {
|
|
24
|
+
if (this.viralViewerApi.viralNavigationCube.cubeCamera && !this.isUpdatingMainFromCube) {
|
|
25
|
+
this.isUpdatingCubeFromMain = true;
|
|
23
26
|
this.viralViewerApi.viralNavigationCube.cubeCamera.updateCubeCamera();
|
|
27
|
+
this.isUpdatingCubeFromMain = false;
|
|
24
28
|
}
|
|
25
29
|
}
|
|
26
30
|
}
|
|
@@ -30,12 +34,15 @@ class ViralAnimation {
|
|
|
30
34
|
const delta = this.cubeClock.getDelta();
|
|
31
35
|
const elapsed = this.cubeClock.getElapsedTime();
|
|
32
36
|
const updated = (_a = this.viralViewerApi.viralNavigationCube.cubeCamera.cameraControls) === null || _a === void 0 ? void 0 : _a.update(delta);
|
|
33
|
-
requestAnimationFrame(() => { this.cubeAnimation
|
|
37
|
+
requestAnimationFrame(() => { this.cubeAnimation; });
|
|
34
38
|
if (updated) {
|
|
35
39
|
(_b = this.viralViewerApi.viralNavigationCube.cubeRenderer) === null || _b === void 0 ? void 0 : _b.render();
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
40
|
+
console.log(this.isUpdatingCubeFromMain);
|
|
41
|
+
if (this.viralViewerApi.viralCamera && !this.isUpdatingCubeFromMain) {
|
|
42
|
+
this.isUpdatingMainFromCube = true;
|
|
43
|
+
this.viralViewerApi.viralCamera.updateMainCamera();
|
|
44
|
+
this.isUpdatingMainFromCube = false;
|
|
45
|
+
}
|
|
39
46
|
}
|
|
40
47
|
}
|
|
41
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viral-animation.js","sourceRoot":"","sources":["../../../src/components/animation/viral-animation.ts"],"names":[],"mappings":";;;AAAA,iCAA8B;AAG9B,MAAa,cAAc;
|
|
1
|
+
{"version":3,"file":"viral-animation.js","sourceRoot":"","sources":["../../../src/components/animation/viral-animation.ts"],"names":[],"mappings":";;;AAAA,iCAA8B;AAG9B,MAAa,cAAc;IAKvB,YAAmB,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAJjD,cAAS,GAAU,IAAI,aAAK,EAAE,CAAC;QAC/B,cAAS,GAAU,IAAI,aAAK,EAAE,CAAC;QAC/B,2BAAsB,GAAG,KAAK,CAAC;QAC/B,2BAAsB,GAAG,KAAK,CAAC;IAG/B,CAAC;IACM,aAAa;;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;QAChD,MAAM,OAAO,GAAG,MAAA,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,cAAc,0CAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9E,IAAI,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,MAAM,EAAE;YACvG,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;SAEvM;QAED,qBAAqB,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,aAAa,CAAA,CAAC,CAAC,CAAC,CAAC;QAEpD,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;YAC3C,IAAI,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE;gBACpF,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC;gBACnC,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC;gBACtE,IAAI,CAAC,sBAAsB,GAAG,KAAK,CAAC;aACvC;SACJ;IAEL,CAAC;IACM,aAAa;;QAChB,IAAI,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,UAAU,IAAI,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,UAAU,CAAC,cAAc,EAAE;YACzH,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YACxC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;YAChD,MAAM,OAAO,GAAG,MAAA,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,UAAU,CAAC,cAAc,0CAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YAEjG,qBAAqB,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,aAAa,CAAA,CAAC,CAAC,CAAC,CAAC;YAEpD,IAAI,OAAO,EAAE;gBACT,MAAA,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,YAAY,0CAAE,MAAM,EAAE,CAAC;gBAC/D,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;gBACxC,IAAI,IAAI,CAAC,cAAc,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE;oBACjE,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC;oBAEnC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC;oBACnD,IAAI,CAAC,sBAAsB,GAAG,KAAK,CAAC;iBAEvC;aACJ;SACJ;IAEL,CAAC;CACJ;AAnDD,wCAmDC"}
|