@shopware-ag/dive 1.6.3 → 1.6.4

package/build/dive.d.cts

@@ -1,5 +1,6 @@
 import { ShadowMapType, ToneMapping, WebGLRenderer, Scene, Camera, PerspectiveCamera, Box3, Vector3Like, Mesh, ColorRepresentation, Object3D, Intersection, Vector2, Raycaster, Vector3 } from 'three';
 import { OrbitControls } from 'three/examples/jsm/Addons.js';
+import { Tween } from '@tweenjs/tween.js';
 import { TransformControls } from 'three/examples/jsm/Addons';
 
 type DIVERendererSettings = {
@@ -87,6 +88,21 @@ declare class DIVEPerspectiveCamera extends PerspectiveCamera {
     SetCameraLayer(layer: 'LIVE' | 'EDITOR'): void;
 }
 
+/**
+ * Updates all animations.
+ * DIVE uses Tween.js to handle animations.
+ *
+ * @module
+ */
+declare class DIVEAnimationSystem {
+    private _renderer;
+    private _rendererCallbackId;
+    constructor(renderer: DIVERenderer);
+    Dispose(): void;
+    Update(): void;
+    Animate<T extends object>(object: T): Tween<T>;
+}
+
 type DIVEOrbitControlsSettings = {
     enableDamping: boolean;
     dampingFactor: number;
@@ -98,6 +114,7 @@ type DIVEOrbitControlsSettings = {
  */
 declare class DIVEOrbitControls extends OrbitControls {
     static readonly DEFAULT_ZOOM_FACTOR = 1;
+    private _animationSystem;
     private last;
     private animating;
     private locked;
@@ -105,7 +122,7 @@ declare class DIVEOrbitControls extends OrbitControls {
     private stopRevertLast;
     object: DIVEPerspectiveCamera;
     domElement: HTMLCanvasElement;
-    constructor(camera: DIVEPerspectiveCamera, renderer: DIVERenderer, settings?: DIVEOrbitControlsSettings);
+    constructor(camera: DIVEPerspectiveCamera, renderer: DIVERenderer, animationSystem: DIVEAnimationSystem, settings?: DIVEOrbitControlsSettings);
     ComputeEncompassingView(bb: Box3): {
         position: Vector3Like;
         target: Vector3Like;

package/build/dive.d.ts

@@ -1,5 +1,6 @@
 import { ShadowMapType, ToneMapping, WebGLRenderer, Scene, Camera, PerspectiveCamera, Box3, Vector3Like, Mesh, ColorRepresentation, Object3D, Intersection, Vector2, Raycaster, Vector3 } from 'three';
 import { OrbitControls } from 'three/examples/jsm/Addons.js';
+import { Tween } from '@tweenjs/tween.js';
 import { TransformControls } from 'three/examples/jsm/Addons';
 
 type DIVERendererSettings = {
@@ -87,6 +88,21 @@ declare class DIVEPerspectiveCamera extends PerspectiveCamera {
     SetCameraLayer(layer: 'LIVE' | 'EDITOR'): void;
 }
 
+/**
+ * Updates all animations.
+ * DIVE uses Tween.js to handle animations.
+ *
+ * @module
+ */
+declare class DIVEAnimationSystem {
+    private _renderer;
+    private _rendererCallbackId;
+    constructor(renderer: DIVERenderer);
+    Dispose(): void;
+    Update(): void;
+    Animate<T extends object>(object: T): Tween<T>;
+}
+
 type DIVEOrbitControlsSettings = {
     enableDamping: boolean;
     dampingFactor: number;
@@ -98,6 +114,7 @@ type DIVEOrbitControlsSettings = {
  */
 declare class DIVEOrbitControls extends OrbitControls {
     static readonly DEFAULT_ZOOM_FACTOR = 1;
+    private _animationSystem;
     private last;
     private animating;
     private locked;
@@ -105,7 +122,7 @@ declare class DIVEOrbitControls extends OrbitControls {
     private stopRevertLast;
     object: DIVEPerspectiveCamera;
     domElement: HTMLCanvasElement;
-    constructor(camera: DIVEPerspectiveCamera, renderer: DIVERenderer, settings?: DIVEOrbitControlsSettings);
+    constructor(camera: DIVEPerspectiveCamera, renderer: DIVERenderer, animationSystem: DIVEAnimationSystem, settings?: DIVEOrbitControlsSettings);
     ComputeEncompassingView(bb: Box3): {
         position: Vector3Like;
         target: Vector3Like;

package/build/dive.js

@@ -1549,13 +1549,13 @@ init_PerspectiveCamera();
 // src/controls/OrbitControls.ts
 import { OrbitControls } from "three/examples/jsm/Addons.js";
 import { MathUtils as MathUtils2, Vector3 as Vector33 } from "three";
-import { Easing, Tween } from "@tweenjs/tween.js";
+import { Easing } from "@tweenjs/tween.js";
 var DIVEOrbitControlsDefaultSettings = {
   enableDamping: true,
   dampingFactor: 0.04
 };
 var _DIVEOrbitControls = class _DIVEOrbitControls extends OrbitControls {
-  constructor(camera, renderer, settings = DIVEOrbitControlsDefaultSettings) {
+  constructor(camera, renderer, animationSystem, settings = DIVEOrbitControlsDefaultSettings) {
     super(camera, renderer.domElement);
     this.last = null;
     this.animating = false;
@@ -1568,6 +1568,7 @@ var _DIVEOrbitControls = class _DIVEOrbitControls extends OrbitControls {
       if (this.locked) return;
       this.update();
     };
+    this._animationSystem = animationSystem;
     this.domElement = renderer.domElement;
     this.object = camera;
     renderer.AddPreRenderCallback(() => {
@@ -1611,8 +1612,8 @@ var _DIVEOrbitControls = class _DIVEOrbitControls extends OrbitControls {
     this.animating = duration > 0;
     this.locked = lock;
     this.enabled = false;
-    const tweenPos = new Tween(this.object.position).to(toPosition, duration).easing(Easing.Quadratic.Out).start();
-    const tweenQuat = new Tween(this.target).to(toTarget, duration).easing(Easing.Quadratic.Out).onUpdate(() => {
+    const tweenPos = this._animationSystem.Animate(this.object.position).to(toPosition, duration).easing(Easing.Quadratic.Out).start();
+    const tweenQuat = this._animationSystem.Animate(this.target).to(toTarget, duration).easing(Easing.Quadratic.Out).onUpdate(() => {
       this.object.lookAt(this.target);
     }).onComplete(() => {
       this.animating = false;
@@ -1629,8 +1630,8 @@ var _DIVEOrbitControls = class _DIVEOrbitControls extends OrbitControls {
     this.animating = duration > 0;
     this.enabled = false;
     const { pos, target } = this.last;
-    const tweenPos = new Tween(this.object.position).to(pos, duration).easing(Easing.Quadratic.Out).start();
-    const tweenQuat = new Tween(this.target).to(target, duration).easing(Easing.Quadratic.Out).onUpdate(() => {
+    const tweenPos = this._animationSystem.Animate(this.object.position).to(pos, duration).easing(Easing.Quadratic.Out).start();
+    const tweenQuat = this._animationSystem.Animate(this.target).to(target, duration).easing(Easing.Quadratic.Out).onUpdate(() => {
       this.object.lookAt(this.target);
     }).onComplete(() => {
       this.animating = false;
@@ -1724,6 +1725,26 @@ var DIVEToolbox = class {
 };
 DIVEToolbox.DefaultTool = "select";
 
+// src/animation/AnimationSystem.ts
+import { Tween, update as updateTween } from "@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() {
+    updateTween();
+  }
+  Animate(object) {
+    return new Tween(object);
+  }
+};
+
 // src/axiscamera/AxisCamera.ts
 init_VisibilityLayerMask();
 import { AxesHelper, Color as Color7, Matrix4, OrthographicCamera, Vector4 } from "three";
@@ -2005,10 +2026,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 {
@@ -2029,6 +2050,7 @@ var DIVE = class _DIVE {
     this.removeResizeObserver();
     this.renderer.Dispose();
     (_a = this.axisCamera) == null ? void 0 : _a.Dispose();
+    this.animationSystem.Dispose();
     this.toolbox.Dispose();
     this.communication.DestroyInstance();
   }