@preference-sl/pref-viewer 2.11.0-beta.12 → 2.11.0-beta.14

package/src/babylonjs-animation-opening.js

@@ -1,4 +1,3 @@
-import { AdvancedDynamicTexture } from "@babylonjs/gui";
 import OpeningAnimationMenu from "./babylonjs-animation-opening-menu.js";
 
 /**
@@ -19,7 +18,7 @@ import OpeningAnimationMenu from "./babylonjs-animation-opening-menu.js";
  *  - pause(): Pauses the current animation.
  *  - goToOpened(): Moves animation to the fully opened state.
  *  - goToClosed(): Moves animation to the fully closed state.
- *  - showControls(advancedDynamicTexture): Displays the animation control menu.
+ *  - showControls(canvas): Displays the animation control menu.
  *  - hideControls(): Hides the animation control menu.
  *  - isControlsVisible(): Returns true if the control menu is visible for this animation.
  *
@@ -39,14 +38,6 @@ import OpeningAnimationMenu from "./babylonjs-animation-opening-menu.js";
  *  - #checkProgress(progress): Applies threshold logic to progress.
  *  - #updateControlsSlider(): Updates the slider in the control menu.
  *  - #updateControls(): Updates all controls in the menu.
- *
- * Usage Example:
- *  const anim = new OpeningAnimation("door", openGroup, closeGroup);
- *  anim.playOpen();
- *  anim.pause();
- *  anim.goToClosed();
- *  anim.showControls(adt);
- *  anim.hideControls();
  */
 export default class OpeningAnimation {
     static states = {
@@ -68,7 +59,6 @@ export default class OpeningAnimation {
     #speedRatio = 1.0;
     #loop = false;
 
-    #advancedDynamicTexture = null;
     #menu = null;
     #progressThreshold = 0.025;
 
@@ -138,13 +128,18 @@ export default class OpeningAnimation {
     #goToOpened(useLoop = false) {
         this.#lastPausedFrame = this.#endFrame;
 
-        if (this.#openAnimation._isStarted && !this.#openAnimation._isPaused) {
+        if (this.#openAnimation._isStarted && !this.#openAnimation._isPaused){
             this.#openAnimation.pause();
         }
-        this.#openAnimation.goToFrame(this.#endFrame);
+         this.#openAnimation.goToFrame(this.#endFrame);
 
-        this.#closeAnimation.pause();
-        this.#closeAnimation.goToFrame(this.#startFrame);
+        if (this.#closeAnimation._isStarted && this.#closeAnimation._isPaused) {
+            this.#closeAnimation.goToFrame(this.#startFrame);
+        } else {
+            this.#closeAnimation.start();
+            this.#closeAnimation.pause();
+            this.#closeAnimation.goToFrame(this.#startFrame);
+        }
 
         this.#state = OpeningAnimation.states.opened;
         this.#updateControls();
@@ -167,8 +162,13 @@ export default class OpeningAnimation {
         }
         this.#closeAnimation.goToFrame(this.#endFrame - this.#startFrame);
 
-        this.#openAnimation.pause();
-        this.#openAnimation.goToFrame(this.#startFrame);
+        if (this.#openAnimation._isStarted && this.#openAnimation._isPaused) {
+            this.#openAnimation.goToFrame(this.#startFrame);
+        } else {
+            this.#openAnimation.start();
+            this.#openAnimation.pause();
+            this.#openAnimation.goToFrame(this.#startFrame);
+        }
 
         this.#state = OpeningAnimation.states.closed;
         this.#updateControls();
@@ -320,6 +320,7 @@ export default class OpeningAnimation {
         if (this.#state === OpeningAnimation.states.opening || this.#state === OpeningAnimation.states.opened) {
             return;
         }
+
         if (this.#state === OpeningAnimation.states.closing) {
             this.#lastPausedFrame = this.#endFrame - this.#closeAnimation.getCurrentFrame();
             this.#closeAnimation.pause();
@@ -344,6 +345,7 @@ export default class OpeningAnimation {
         if (this.#state === OpeningAnimation.states.closing || this.#state === OpeningAnimation.states.closed) {
             return;
         }
+
         if (this.#state === OpeningAnimation.states.opening) {
             this.#lastPausedFrame = this.#openAnimation.getCurrentFrame();
             this.#openAnimation.pause();
@@ -397,11 +399,9 @@ export default class OpeningAnimation {
      * Displays the animation control menu and sets up callbacks.
      * Synchronizes slider and button states with animation.
      * @public
-     * @param {AdvancedDynamicTexture} advancedDynamicTexture - Babylon.js GUI texture.
+     * @param {HTMLCanvasElement} canvas - The canvas element for rendering.
      */
-    showControls(advancedDynamicTexture) {
-        this.#advancedDynamicTexture = advancedDynamicTexture;
-        this.#advancedDynamicTexture.metadata = { animationName: this.name };
+    showControls(canvas) {
         const controlCallbacks = {
             onGoToOpened: () => {
                 if (this.#state === OpeningAnimation.states.opened) {
@@ -449,7 +449,7 @@ export default class OpeningAnimation {
                 this.#menu.animationLoop = this.#loop;
             },
         };
-        this.#menu = new OpeningAnimationMenu(this.#advancedDynamicTexture, this.#state, this.#getProgress(), this.#loop, controlCallbacks);
+        this.#menu = new OpeningAnimationMenu(this.name, canvas, this.#state, this.#getProgress(), this.#loop, controlCallbacks);
 
         // Attach to Babylon.js scene render loop for real-time updates
         this.#openAnimation._scene.onBeforeRenderObservable.add(this.#updateControlsSlider.bind(this));
@@ -463,10 +463,9 @@ export default class OpeningAnimation {
         if (!this.isControlsVisible()) {
             return;
         }
-        // Remove the observer when controls are hidden
         this.#openAnimation._scene.onBeforeRenderObservable.removeCallback(this.#updateControlsSlider.bind(this));
-        this.#advancedDynamicTexture.dispose();
-        this.#advancedDynamicTexture = null;
+        this.#menu.dispose();
+        this.#menu = null;
     }
 
     /**
@@ -475,7 +474,7 @@ export default class OpeningAnimation {
      * @returns {boolean} True if controls are visible for this animation; otherwise, false.
      */
     isControlsVisible() {
-        return !!(this.#advancedDynamicTexture && this.#advancedDynamicTexture.metadata?.animationName === this.name && this.#menu);
+        return !!(this.#menu?.isVisible);
     }
 
     /**
@@ -489,7 +488,6 @@ export default class OpeningAnimation {
      * @public
      * @returns {number}
      */
-
     get state() {
         return this.#state;
     }

package/src/babylonjs-controller.js

@@ -1,7 +1,7 @@
-import { ArcRotateCamera, AssetContainer, Camera, Color4, DirectionalLight, Engine, HDRCubeTexture, HemisphericLight, IblShadowsRenderPipeline, LoadAssetContainerAsync, MeshBuilder, PointLight, Scene, ShadowGenerator, Tools, Vector3, WebXRDefaultExperience, WebXRFeatureName, WebXRSessionManager } from "@babylonjs/core";
-import { DracoCompression } from "@babylonjs/core/Meshes/Compression/dracoCompression";
+import { ArcRotateCamera, AssetContainer, Camera, Color4, DirectionalLight, Engine, HDRCubeTexture, HemisphericLight, IblShadowsRenderPipeline, LoadAssetContainerAsync, MeshBuilder, PointerEventTypes, PointLight, Scene, ShadowGenerator, Tools, Vector3, WebXRDefaultExperience, WebXRFeatureName, WebXRSessionManager } from "@babylonjs/core";
+import { DracoCompression } from "@babylonjs/core/Meshes/Compression/dracoCompression.js";
 import "@babylonjs/loaders";
-import "@babylonjs/loaders/glTF/2.0/Extensions/KHR_draco_mesh_compression";
+import "@babylonjs/loaders/glTF/2.0/Extensions/KHR_draco_mesh_compression.js";
 import { USDZExportAsync, GLTF2Export } from "@babylonjs/serializers";
 
 import GLTFResolver from "./gltf-resolver.js";
@@ -45,19 +45,37 @@ import BabylonJSAnimationController from "./babylonjs-animation-controller.js";
  *  - #renderLoop(): Babylon.js render loop callback.
  *  - #addStylesToARButton(): Styles AR button.
  *  - #createXRExperience(): Initializes WebXR AR experience.
- *  - #createCamera(), #createLights(), #initializeEnvironmentTexture(), #initializeIBLShadows(), #initializeShadows(): Scene setup.
- *  - #setMaxSimultaneousLights(): Updates max simultaneous lights for materials.
- *  - #enableInteraction(), #disableInteraction(): Canvas interaction handlers.
- *  - #disposeEngine(): Disposes engine and resources.
- *  - #onMouseWheel(event), #onKeyUp(event): Canvas event handlers.
- *  - #setOptionsMaterial(), #setOptions_Materials(), #setOptions_Camera(): Applies material/camera options.
- *  - #findContainerByName(), #addContainer(), #removeContainer(), #replaceContainer(): Container management.
- *  - #getPrefViewer3DComponent(), #getPrefViewerComponent(): Custom element references.
- *  - #updateVisibilityAttributeInComponents(): Updates parent visibility attributes.
- *  - #setVisibilityOfWallAndFloorInModel(): Controls wall/floor mesh visibility.
- *  - #stopRender(), #startRender(): Render loop control.
- *  - #loadAssetContainer(), #loadContainers(): Asset loading.
- *  - #downloadZip(): Generates and downloads a ZIP file.
+ *  - #createCamera(): Creates and configures the main camera.
+ *  - #createLights(): Creates and configures scene lights and shadows.
+ *  - #initializeEnvironmentTexture(): Loads and sets the HDR environment texture.
+ *  - #initializeIBLShadows(): Sets up IBL shadow pipeline and assigns meshes/materials.
+ *  - #initializeShadows(): Sets up standard or IBL shadows for meshes.
+ *  - #setMaxSimultaneousLights(): Updates max simultaneous lights for all materials.
+ *  - #onPointerObservable(info): Handles pointer events and dispatches to pointer/mouse handlers.
+ *  - #onPointerUp(event, pickInfo): Handles pointer up events (e.g., right-click for animation menu).
+ *  - #onPointerMove(event, pickInfo): Handles pointer move events (e.g., mesh highlighting).
+ *  - #onMouseWheel(event, pickInfo): Handles mouse wheel events for camera zoom.
+ *  - #onKeyUp(event): Handles keyup events for download dialog and shortcuts.
+ *  - #enableInteraction(): Adds canvas and scene interaction event listeners.
+ *  - #disableInteraction(): Removes canvas and scene interaction event listeners.
+ *  - #disposeEngine(): Disposes engine and releases all resources.
+ *  - #setOptionsMaterial(optionMaterial): Applies a material option to relevant meshes.
+ *  - #setOptions_Materials(): Applies all material options from configuration.
+ *  - #setOptions_Camera(): Applies camera options from configuration.
+ *  - #findContainerByName(name): Finds a container by its name.
+ *  - #addContainer(container, updateVisibility): Adds a container to the scene and updates visibility.
+ *  - #removeContainer(container, updateVisibility): Removes a container from the scene and updates visibility.
+ *  - #replaceContainer(container, newAssetContainer): Replaces a container in the scene.
+ *  - #getPrefViewer3DComponent(): Caches and retrieves the parent PREF-VIEWER-3D element.
+ *  - #getPrefViewerComponent(): Caches and retrieves the parent PREF-VIEWER element.
+ *  - #updateVisibilityAttributeInComponents(name, isVisible): Updates parent visibility attributes.
+ *  - #setVisibilityOfWallAndFloorInModel(show): Controls wall/floor mesh visibility.
+ *  - #stopRender(): Stops the Babylon.js render loop.
+ *  - #startRender(): Starts the Babylon.js render loop.
+ *  - #loadAssetContainer(container): Loads an asset container asynchronously.
+ *  - #loadContainers(): Loads all asset containers and adds them to the scene.
+ *  - #addDateToName(name): Appends the current date/time to a name string.
+ *  - #downloadZip(files, name, comment, addDateInName): Generates and downloads a ZIP file.
  *  - #openDownloadDialog(): Opens the modal download dialog.
  *
  * Notes:
@@ -401,13 +419,34 @@ export default class BabylonJSController {
     }
 
     /**
-     * Sets up interaction handlers for the Babylon.js canvas.
+     * Handles pointer events observed on the Babylon.js scene.
+     * @private
+     * @param {PointerInfo} info - The pointer event information from Babylon.js.
+     * @returns {void}
+     */
+    #onPointerObservable(info) {
+        const pickInfo = this.#scene.pick(this.#scene.pointerX, this.#scene.pointerY);
+        if (info.type === PointerEventTypes.POINTERUP) {
+            this.#onPointerUp(info.event, pickInfo);
+        } else if (info.type === PointerEventTypes.POINTERMOVE) {
+            this.#onPointerMove(info.event, pickInfo);
+        } else if (info.type === PointerEventTypes.POINTERWHEEL) {
+            this.#onMouseWheel(info.event, pickInfo);
+        }
+    }
+
+    /**
+     * Sets up interaction handlers for the Babylon.js canvas and scene.
      * @private
      * @returns {void}
      */
     #enableInteraction() {
-        this.#canvas.addEventListener("wheel", this.#onMouseWheel.bind(this));
-        this.#canvas.addEventListener("keyup", this.#onKeyUp.bind(this));
+        if (this.#canvas) {
+            this.#canvas.addEventListener("keyup", this.#onKeyUp.bind(this));
+        }
+        if (this.#scene) {
+            this.#scene.onPointerObservable.add(this.#onPointerObservable.bind(this));
+        }
     }
 
     /**
@@ -416,8 +455,12 @@ export default class BabylonJSController {
      * @returns {void}
      */
     #disableInteraction() {
-        this.#canvas.removeEventListener("wheel", this.#onMouseWheel.bind(this));
-        this.#canvas.removeEventListener("keyup", this.#onKeyUp.bind(this));
+        if (this.#canvas) {
+            this.#canvas.removeEventListener("keyup", this.#onKeyUp.bind(this));
+        }
+        if (this.#scene !== null) {
+            this.#scene.onPointerObservable.removeCallback(this.#onPointerObservable.bind(this));
+        }
     }
 
     /**
@@ -436,18 +479,37 @@ export default class BabylonJSController {
         this.#XRExperience = null;
     }
 
+    /**
+     * Handles keyup events on the Babylon.js canvas for triggering model and scene downloads.
+     * @private
+     * @param {KeyboardEvent} event - The keyup event.
+     * @returns {void}
+     */
+    #onKeyUp(event) {
+        // CTRL + ALT + letter
+        if (event.ctrlKey && event.altKey && event.key !== undefined) {
+            switch (event.key.toLowerCase()) {
+                case "d":
+                    this.#openDownloadDialog();
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+
     /**
      * Handles mouse wheel events on the Babylon.js canvas for zooming the camera.
      * @private
      * @param {WheelEvent} event - The mouse wheel event.
-     * @returns {void|false}
+     * @param {Object} pickInfo - The result of the scene pick operation (not used in this method).
+     * @returns {void|false} Returns false if there is no active camera; otherwise, void.
      */
-    #onMouseWheel(event) {
-        if (!this.#scene || !this.#camera) {
+    #onMouseWheel(event, pickInfo) {
+        if (!this.#scene?.activeCamera) {
             return false;
         }
-        //const pick = this.#scene.pick(this.#scene.pointerX, this.#scene.pointerY);
-        //this.#camera.target = pick.hit ? pick.pickedPoint.clone() : this.#camera.target;
+        //this.#scene.activeCamera.target = pickInfo.hit ? pickInfo.pickedPoint.clone() : this.#scene.activeCamera.target;
         if (!this.#scene.activeCamera.metadata?.locked) {
             this.#scene.activeCamera.inertialRadiusOffset -= event.deltaY * this.#scene.activeCamera.wheelPrecision * 0.001;
         }
@@ -455,24 +517,35 @@ export default class BabylonJSController {
     }
 
     /**
-     * Handles keyup events on the Babylon.js canvas for triggering model and scene downloads.
+     * Handles pointer up events on the Babylon.js scene.
      * @private
-     * @param {KeyboardEvent} event - The keyup event.
+     * @param {PointerEvent} event - The pointer up event.
+     * @param {PickInfo} pickInfo - The result of the scene pick operation.
      * @returns {void}
      */
-    #onKeyUp(event) {
-        // CTRL + ALT + letter
-        if (event.ctrlKey && event.altKey && event.key !== undefined) {
-            switch (event.key.toLowerCase()) {
-                case "d":
-                    this.#openDownloadDialog();
-                    break;
-                default:
-                    break;
+    #onPointerUp(event, pickInfo) {
+        if (this.#babylonJSAnimationController) {
+            this.#babylonJSAnimationController.hideMenu();
+            // Right click for showing animation menu
+            if (event.button === 2) {
+                this.#babylonJSAnimationController.showMenu(pickInfo);
             }
         }
     }
 
+    /**
+     * Handles pointer move events on the Babylon.js scene.
+     * @private
+     * @param {PointerEvent} event - The pointer move event.
+     * @param {PickInfo} pickInfo - The result of the scene pick operation.
+     * @returns {void}
+     */
+    #onPointerMove(event, pickInfo) {
+        if (this.#babylonJSAnimationController) {
+            this.#babylonJSAnimationController.hightlightMeshes(pickInfo);
+        }
+    }
+
     /**
      * Applies material options from the configuration to the relevant meshes.
      * @private