@vived/app 4.37.1 → 4.39.0

package/lib/Components/Callouts/UC/CreateCalloutUC.js

@@ -47,7 +47,7 @@ class CreateCalloutUCImp extends CreateCalloutUC {
         callout.labelTransform.worldPosition = ValueObjects_1.Vector3.Add(labelBump, pickHit);
         callout.labelTransform.worldRotation = ValueObjects_1.Quaternion.FromYawPitchRoll(ValueObjects_1.Angle.FromDegrees(180), ValueObjects_1.Angle.FromDegrees(0), ValueObjects_1.Angle.FromDegrees(0));
         if (this.repoLabel) {
-            callout.label.default = this.repoLabel.default;
+            callout.label.default = this.repoLabel.display;
         }
         if (this.calloutGlobals) {
             callout.size = this.calloutGlobals.lastSize;

package/lib/Components/Hideable/Entities/Hideable.d.ts

@@ -3,6 +3,7 @@ export declare class Hideable extends AppObjectEntity {
     static readonly type = "HIDEABLE";
     static addIfMissing(appObj: AppObject): Hideable;
     static get(appObjID: string, appObjects: AppObjectRepo): Hideable | undefined;
+    ignoreSerialization: boolean;
     private memoizedIsHidden;
     get isHidden(): boolean;
     set isHidden(val: boolean);

package/lib/Components/Hideable/Entities/Hideable.js

@@ -6,6 +6,7 @@ const Entities_1 = require("../../../Entities");
 class Hideable extends AppObject_1.AppObjectEntity {
     constructor(appObject) {
         super(appObject, Hideable.type);
+        this.ignoreSerialization = false;
         this.memoizedIsHidden = new Entities_1.MemoizedBoolean(false, this.notifyOnChange);
     }
     static addIfMissing(appObj) {

package/lib/Components/Hideable/UCs/SerializeHideableObjects.js

@@ -35,7 +35,7 @@ class SerializeHideableObjectsImp extends SerializeHideableObjects {
         const hiddenObjects = [];
         const allHideables = this.appObjects.getAllComponents(Hideable_1.Hideable.type);
         allHideables.forEach((hideable) => {
-            if (hideable.isHidden)
+            if (hideable.isHidden && !hideable.ignoreSerialization)
                 hiddenObjects.push(hideable.appObject.id);
         });
         const state = {

package/lib/Components/Landmarks/Factories/setupLandmarks.js

@@ -28,11 +28,18 @@ function setupLandmarks(appObjects) {
     OverlayColor_1.makeOverlayColorPM(previewAO);
     Selection_1.makeSelectableStatePM(previewAO);
     Hideable_1.makeIsHiddenPM(previewAO);
+    const previewHidable = Hideable_1.Hideable.get(previewAO.id, appObjects);
+    if (previewHidable) {
+        previewHidable.ignoreSerialization = true;
+    }
+    else {
+        appObjects.submitError("setupLandmarks", "Unable to find Hideable on preview landmark");
+    }
     globals.previewLandmark = preview;
     // Setup Tool
     const toolRepo = Tools_1.ToolRepository.get(appObjects);
     if (!toolRepo) {
-        appObjects.submitWarning("setupLandmarks", "Unable to find tool repo");
+        appObjects.submitError("setupLandmarks", "Unable to find tool repo");
         return landmarksAO;
     }
     toolRepo.makeToolFromData({

package/lib/Components/Selection/UC/SelectAppObjectUC.js

@@ -5,6 +5,7 @@ const AppObject_1 = require("../../../AppObject");
 const AppObjectUC_1 = require("../../../AppObject/AppObjectUC");
 const Babylon_1 = require("../../Babylon");
 const BaseApp_1 = require("../../BaseApp");
+const Tools_1 = require("../../Tools");
 const Selectable_1 = require("../Entities/Selectable");
 const Selection_1 = require("../Entities/Selection");
 class SelectAppObjectUC extends AppObjectUC_1.AppObjectUC {
@@ -28,9 +29,16 @@ class SelectAppObjectUCImp extends SelectAppObjectUC {
             return this.baseApp.isAuthoring;
         };
         this.allowTrySelect = () => {
+            var _a, _b, _c, _d;
             if (!this.baseApp) {
                 return false;
             }
+            if (((_b = (_a = this.toolRepo) === null || _a === void 0 ? void 0 : _a.activeTool) === null || _b === void 0 ? void 0 : _b.toolType) === "CALLOUT") {
+                return false;
+            }
+            if (((_d = (_c = this.toolRepo) === null || _c === void 0 ? void 0 : _c.activeTool) === null || _d === void 0 ? void 0 : _d.toolType) === "LANDMARK") {
+                return false;
+            }
             return this.baseApp.isAuthoring;
         };
         this.trySelectAppObject = (ray) => {
@@ -70,4 +78,7 @@ class SelectAppObjectUCImp extends SelectAppObjectUC {
     get baseApp() {
         return this.getCachedSingleton(BaseApp_1.BaseAppState.type);
     }
+    get toolRepo() {
+        return this.getCachedSingleton(Tools_1.ToolRepository.type);
+    }
 }

package/lib/Components/Stylus/Entity/StylusEntity.d.ts

@@ -13,6 +13,7 @@ export declare abstract class StylusEntity extends AppObjectEntity {
     static clickTimeThresholdMS: number;
     abstract registerController: (controller: StylusController) => void;
     abstract updateButtonState: (button: number, isPressed: boolean) => void;
+    abstract getButtonState(button: number): boolean;
     abstract readonly transform: Transform3D;
     abstract get isInUse(): boolean;
     abstract get pickRay(): ParametricLine;

package/lib/Components/Stylus/Entity/StylusEntity.js

@@ -52,6 +52,14 @@ class StylusImp extends StylusEntity {
             this.buttonStates[button] = isPressed;
             this.notifyOnChange();
         };
+        this.getButtonState = (button) => {
+            if (button < 0 || button >= this.buttonStates.length) {
+                return false;
+            }
+            else {
+                return this.buttonStates[button];
+            }
+        };
         this.isClick = (button) => {
             const buttonIsCorrect = button === this.lassPressedButton;
             const movement = ValueObjects_1.Vector3.Subtract(this.transform.localPosition, this.pressPosition).magnitude;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vived/app",
-  "version": "4.37.1",
+  "version": "4.39.0",
   "description": "Public package for the VIVED Learning App system",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/lib/Utilities/LerpNumberX.d.ts

@@ -1,56 +0,0 @@
-import { EaseFn } from "../Types";
-/**
- * Configuration object for performing a linear interpolation (lerp) operation.
- * @interface LerpNumberDTO
- */
-export interface LerpNumberDTO {
-    /** Starting value of the lerp */
-    start: number;
-    /** Target/ending value of the lerp */
-    end: number;
-    /** Callback function that receives the interpolated value on each update */
-    update: (value: number) => void;
-    /** Duration of the lerp in milliseconds. Defaults to LerpNumber.defaultDurationMS */
-    durationMS?: number;
-    /** Easing function to modify the interpolation curve. Defaults to LerpNumber.defaultEase */
-    ease?: EaseFn;
-    /** Optional callback function called when lerp completes naturally */
-    onComplete?: () => void;
-    /** Optional callback function called when lerp is cancelled */
-    onCancel?: () => void;
-}
-/**
- * Utility class for smoothly interpolating between two numbers over time.
- * Uses requestAnimationFrame for smooth animation and supports custom easing functions.
- *
- * @example
- * const lerper = new LerpNumber();
- * // Animate from 0 to 100 over 2 seconds
- * await lerper.lerp({
- *   start: 0,
- *   end: 100,
- *   durationMS: 2000,
- *   update: (value) => console.log(value)
- * });
- */
-export declare class LerpNumber {
-    defaultDurationMS: number;
-    defaultEase: EaseFn;
-    get isLerping(): boolean;
-    private _isLerping;
-    /**
-     * Cancels the current lerp operation if one is in progress.
-     * Triggers the onCancel callback if provided in the original lerp configuration.
-     */
-    cancel(): void;
-    private _cancelLerp;
-    /**
-     * Initiates a lerp (linear interpolation) operation.
-     * If a lerp is already in progress, it will be cancelled before starting the new one.
-     *
-     * @param data - Configuration object for the lerp operation
-     * @returns Promise that resolves when the lerp completes or is cancelled
-     * @throws Never throws, but may reject if the update function throws
-     */
-    lerp: (data: LerpNumberDTO) => Promise<void>;
-}

package/lib/Utilities/LerpNumberX.js

@@ -1,85 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LerpNumber = void 0;
-const easeFunctions_1 = require("./easeFunctions");
-/**
- * Utility class for smoothly interpolating between two numbers over time.
- * Uses requestAnimationFrame for smooth animation and supports custom easing functions.
- *
- * @example
- * const lerper = new LerpNumber();
- * // Animate from 0 to 100 over 2 seconds
- * await lerper.lerp({
- *   start: 0,
- *   end: 100,
- *   durationMS: 2000,
- *   update: (value) => console.log(value)
- * });
- */
-class LerpNumber {
-    constructor() {
-        this.defaultDurationMS = 1000;
-        this.defaultEase = easeFunctions_1.quintInOut;
-        this._isLerping = false;
-        this._cancelLerp = false;
-        /**
-         * Initiates a lerp (linear interpolation) operation.
-         * If a lerp is already in progress, it will be cancelled before starting the new one.
-         *
-         * @param data - Configuration object for the lerp operation
-         * @returns Promise that resolves when the lerp completes or is cancelled
-         * @throws Never throws, but may reject if the update function throws
-         */
-        this.lerp = (data) => {
-            if (this._isLerping) {
-                this.cancel();
-            }
-            const { start, end, durationMS, ease, onComplete, update, onCancel } = data;
-            const durationToUse = durationMS !== null && durationMS !== void 0 ? durationMS : this.defaultDurationMS;
-            const easeToUse = ease !== null && ease !== void 0 ? ease : this.defaultEase;
-            return new Promise((resolve) => {
-                const startTime = performance.now();
-                this._isLerping = true;
-                update(start);
-                const doLerp = (currentTime) => {
-                    if (this._cancelLerp) {
-                        this._isLerping = false;
-                        this._cancelLerp = false;
-                        if (onCancel)
-                            onCancel();
-                        return resolve();
-                    }
-                    const elapsedTime = currentTime - startTime;
-                    const progress = Math.min(elapsedTime / durationToUse, 1);
-                    const easedProgress = easeToUse(progress);
-                    const value = start + (end - start) * easedProgress;
-                    update(value);
-                    if (progress < 1) {
-                        requestAnimationFrame(doLerp);
-                    }
-                    else {
-                        this._isLerping = false;
-                        update(end);
-                        if (onComplete)
-                            onComplete();
-                        resolve();
-                    }
-                };
-                requestAnimationFrame(doLerp);
-            });
-        };
-    }
-    get isLerping() {
-        return this._isLerping;
-    }
-    /**
-     * Cancels the current lerp operation if one is in progress.
-     * Triggers the onCancel callback if provided in the original lerp configuration.
-     */
-    cancel() {
-        if (!this._isLerping)
-            return;
-        this._cancelLerp = true;
-    }
-}
-exports.LerpNumber = LerpNumber;