viral-viewer-2 0.4.4 → 0.4.6

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.
@@ -2,7 +2,11 @@ import { Clock } from "three";
2
2
  import { ViralViewerApi } from "../../viral-viewer-api";
3
3
  export declare class ViralAnimation {
4
4
  viralViewerApi: ViralViewerApi;
5
- clock: Clock;
5
+ mainClock: Clock;
6
+ cubeClock: Clock;
7
+ isUpdatingCubeFromMain: boolean;
8
+ isUpdatingMainFromCube: boolean;
6
9
  constructor(viralViewerApi: ViralViewerApi);
7
- anim(): void;
10
+ mainAnimation(): void;
11
+ cubeAnimation(): void;
8
12
  }
@@ -5,23 +5,44 @@ const three_1 = require("three");
5
5
  class ViralAnimation {
6
6
  constructor(viralViewerApi) {
7
7
  this.viralViewerApi = viralViewerApi;
8
- this.clock = new three_1.Clock();
8
+ this.mainClock = new three_1.Clock();
9
+ this.cubeClock = new three_1.Clock();
10
+ this.isUpdatingCubeFromMain = false;
11
+ this.isUpdatingMainFromCube = false;
9
12
  }
10
- anim() {
11
- var _a, _b, _c, _d;
12
- const delta = this.clock.getDelta();
13
- const elapsed = this.clock.getElapsedTime();
14
- const updated = ((_a = this.viralViewerApi.viralCamera.cameraControls) === null || _a === void 0 ? void 0 : _a.update(delta)) || ((_c = (_b = this.viralViewerApi.viralNavigationCube.cubeCamera) === null || _b === void 0 ? void 0 : _b.cameraControls) === null || _c === void 0 ? void 0 : _c.update(delta));
13
+ mainAnimation() {
14
+ var _a;
15
+ const delta = this.mainClock.getDelta();
16
+ const elapsed = this.mainClock.getElapsedTime();
17
+ const updated = (_a = this.viralViewerApi.viralCamera.cameraControls) === null || _a === void 0 ? void 0 : _a.update(delta);
15
18
  if (this.viralViewerApi.pointCloudLoader.pointClouds.length > 0 && this.viralViewerApi.viralCamera.camera) {
16
19
  this.viralViewerApi.pointCloudLoader.potree.updatePointClouds(this.viralViewerApi.pointCloudLoader.pointClouds, this.viralViewerApi.viralCamera.camera, this.viralViewerApi.viralRenderer.renderer);
17
20
  }
18
- requestAnimationFrame(() => { this.anim(); });
21
+ requestAnimationFrame(() => { this.mainAnimation; });
19
22
  if (updated) {
20
23
  this.viralViewerApi.viralRenderer.render();
21
- (_d = this.viralViewerApi.viralNavigationCube.cubeRenderer) === null || _d === void 0 ? void 0 : _d.render();
22
- // if (this.viralViewerApi.viralNavigationCube.cubeCamera) {
23
- // this.viralViewerApi.viralNavigationCube.cubeCamera.updateCubeCamera();
24
- // }
24
+ if (this.viralViewerApi.viralNavigationCube.cubeCamera && !this.isUpdatingMainFromCube) {
25
+ this.isUpdatingCubeFromMain = true;
26
+ this.viralViewerApi.viralNavigationCube.cubeCamera.updateCubeCamera();
27
+ this.isUpdatingCubeFromMain = false;
28
+ }
29
+ }
30
+ }
31
+ cubeAnimation() {
32
+ var _a, _b;
33
+ if (this.viralViewerApi.viralNavigationCube.cubeCamera && this.viralViewerApi.viralNavigationCube.cubeCamera.cameraControls) {
34
+ const delta = this.cubeClock.getDelta();
35
+ const elapsed = this.cubeClock.getElapsedTime();
36
+ const updated = (_a = this.viralViewerApi.viralNavigationCube.cubeCamera.cameraControls) === null || _a === void 0 ? void 0 : _a.update(delta);
37
+ requestAnimationFrame(() => { this.cubeAnimation; });
38
+ if (updated) {
39
+ (_b = this.viralViewerApi.viralNavigationCube.cubeRenderer) === null || _b === void 0 ? void 0 : _b.render();
40
+ if (this.viralViewerApi.viralCamera && !this.isUpdatingCubeFromMain) {
41
+ this.isUpdatingMainFromCube = true;
42
+ this.viralViewerApi.viralCamera.updateMainCamera();
43
+ this.isUpdatingMainFromCube = false;
44
+ }
45
+ }
25
46
  }
26
47
  }
27
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;IAGvB,YAAmB,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAFjD,UAAK,GAAU,IAAI,aAAK,EAAE,CAAC;IAI3B,CAAC;IACM,IAAI;;QACP,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;QAC5C,MAAM,OAAO,GAAG,CAAA,MAAA,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,cAAc,0CAAE,MAAM,CAAC,KAAK,CAAC,MAAI,MAAA,MAAA,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,UAAU,0CAAE,cAAc,0CAAE,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC;QACnK,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,IAAI,EAAE,CAAA,CAAC,CAAC,CAAC,CAAC;QAE7C,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;YAC3C,MAAA,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,YAAY,0CAAE,MAAM,EAAE,CAAC;YAC/D,4DAA4D;YAC5D,6EAA6E;YAC7E,IAAI;SACP;IAEL,CAAC;CACJ;AA1BD,wCA0BC"}
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,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;AAlDD,wCAkDC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "viral-viewer-2",
3
- "version": "0.4.4",
3
+ "version": "0.4.6",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",