@shopware-ag/dive 1.6.3 → 1.6.5

package/build/dive.cjs

@@ -705,7 +705,7 @@ var _DIVECommunication = class _DIVECommunication {
     this.registered = /* @__PURE__ */ new Map();
     // private listeners: { [key: string]: EventListener[] } = {};
     this.listeners = /* @__PURE__ */ new Map();
-    this.id = (0, import_MathUtils.generateUUID)();
+    this._id = (0, import_MathUtils.generateUUID)();
     this.renderer = renderer;
     this.scene = scene;
     this.controller = controls;
@@ -714,8 +714,13 @@ var _DIVECommunication = class _DIVECommunication {
     _DIVECommunication.__instances.push(this);
   }
   static get(id) {
+    const fromComID = this.__instances.find((instance) => instance.id === id);
+    if (fromComID) return fromComID;
     return this.__instances.find((instance) => Array.from(instance.registered.values()).find((object) => object.id === id));
   }
+  get id() {
+    return this._id;
+  }
   get mediaGenerator() {
     if (!this._mediaGenerator) {
       const DIVEMediaCreator2 = (init_MediaCreator(), __toCommonJS(MediaCreator_exports)).DIVEMediaCreator;
@@ -1577,7 +1582,7 @@ var DIVEOrbitControlsDefaultSettings = {
   dampingFactor: 0.04
 };
 var _DIVEOrbitControls = class _DIVEOrbitControls extends import_Addons3.OrbitControls {
-  constructor(camera, renderer, settings = DIVEOrbitControlsDefaultSettings) {
+  constructor(camera, renderer, animationSystem, settings = DIVEOrbitControlsDefaultSettings) {
     super(camera, renderer.domElement);
     this.last = null;
     this.animating = false;
@@ -1586,18 +1591,28 @@ var _DIVEOrbitControls = class _DIVEOrbitControls extends import_Addons3.OrbitCo
     };
     this.stopRevertLast = () => {
     };
+    this._removePreRenderCallback = () => {
+    };
     this.preRenderCallback = () => {
       if (this.locked) return;
       this.update();
     };
+    this._animationSystem = animationSystem;
     this.domElement = renderer.domElement;
     this.object = camera;
-    renderer.AddPreRenderCallback(() => {
+    const id = renderer.AddPreRenderCallback(() => {
       this.preRenderCallback();
     });
+    this._removePreRenderCallback = () => {
+      renderer.RemovePreRenderCallback(id);
+    };
     this.enableDamping = settings.enableDamping;
     this.dampingFactor = settings.dampingFactor;
   }
+  Dispose() {
+    this._removePreRenderCallback();
+    this.dispose();
+  }
   ComputeEncompassingView(bb) {
     const center = bb.getCenter(new import_three14.Vector3());
     const size = bb.getSize(new import_three14.Vector3());
@@ -1633,8 +1648,8 @@ var _DIVEOrbitControls = class _DIVEOrbitControls extends import_Addons3.OrbitCo
     this.animating = duration > 0;
     this.locked = lock;
     this.enabled = false;
-    const tweenPos = new import_tween.Tween(this.object.position).to(toPosition, duration).easing(import_tween.Easing.Quadratic.Out).start();
-    const tweenQuat = new import_tween.Tween(this.target).to(toTarget, duration).easing(import_tween.Easing.Quadratic.Out).onUpdate(() => {
+    const tweenPos = this._animationSystem.Animate(this.object.position).to(toPosition, duration).easing(import_tween.Easing.Quadratic.Out).start();
+    const tweenQuat = this._animationSystem.Animate(this.target).to(toTarget, duration).easing(import_tween.Easing.Quadratic.Out).onUpdate(() => {
       this.object.lookAt(this.target);
     }).onComplete(() => {
       this.animating = false;
@@ -1651,8 +1666,8 @@ var _DIVEOrbitControls = class _DIVEOrbitControls extends import_Addons3.OrbitCo
     this.animating = duration > 0;
     this.enabled = false;
     const { pos, target } = this.last;
-    const tweenPos = new import_tween.Tween(this.object.position).to(pos, duration).easing(import_tween.Easing.Quadratic.Out).start();
-    const tweenQuat = new import_tween.Tween(this.target).to(target, duration).easing(import_tween.Easing.Quadratic.Out).onUpdate(() => {
+    const tweenPos = this._animationSystem.Animate(this.object.position).to(pos, duration).easing(import_tween.Easing.Quadratic.Out).start();
+    const tweenQuat = this._animationSystem.Animate(this.target).to(target, duration).easing(import_tween.Easing.Quadratic.Out).onUpdate(() => {
       this.object.lookAt(this.target);
     }).onComplete(() => {
       this.animating = false;
@@ -1746,6 +1761,26 @@ var DIVEToolbox = class {
 };
 DIVEToolbox.DefaultTool = "select";
 
+// src/animation/AnimationSystem.ts
+var import_tween2 = require("@tweenjs/tween.js");
+var DIVEAnimationSystem = class {
+  constructor(renderer) {
+    this._renderer = renderer;
+    this._rendererCallbackId = this._renderer.AddPreRenderCallback(() => {
+      this.Update();
+    });
+  }
+  Dispose() {
+    this._renderer.RemovePreRenderCallback(this._rendererCallbackId);
+  }
+  Update() {
+    (0, import_tween2.update)();
+  }
+  Animate(object) {
+    return new import_tween2.Tween(object);
+  }
+};
+
 // src/axiscamera/AxisCamera.ts
 var import_three15 = require("three");
 var import_three_spritetext = __toESM(require("three-spritetext"), 1);
@@ -2027,10 +2062,10 @@ var DIVE = class _DIVE {
     this.renderer = new DIVERenderer(this._settings.renderer);
     this.scene = new DIVEScene();
     this.perspectiveCamera = new DIVEPerspectiveCamera(this._settings.perspectiveCamera);
-    this.orbitControls = new DIVEOrbitControls(this.perspectiveCamera, this.renderer, this._settings.orbitControls);
+    this.animationSystem = new DIVEAnimationSystem(this.renderer);
+    this.orbitControls = new DIVEOrbitControls(this.perspectiveCamera, this.renderer, this.animationSystem, this._settings.orbitControls);
     this.toolbox = new DIVEToolbox(this.scene, this.orbitControls);
     this.communication = new DIVECommunication(this.renderer, this.scene, this.orbitControls, this.toolbox);
-    this.animationSystem = null;
     if (this._settings.displayAxes) {
       this.axisCamera = new DIVEAxisCamera(this.renderer, this.scene, this.orbitControls);
     } else {
@@ -2050,7 +2085,9 @@ var DIVE = class _DIVE {
     var _a;
     this.removeResizeObserver();
     this.renderer.Dispose();
+    this.orbitControls.Dispose();
     (_a = this.axisCamera) == null ? void 0 : _a.Dispose();
+    this.animationSystem.Dispose();
     this.toolbox.Dispose();
     this.communication.DestroyInstance();
   }