@vived/app 4.24.0 → 4.26.0

package/lib/Components/zSpace/PM/ZSpaceDisplayPM.js

@@ -1,22 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeZSpaceDisplayPM = exports.ZSpaceDisplayPM = void 0;
+exports.makeZSpaceDisplayPM = exports.ZSpaceDisplayPM = exports.defaultZSpaceDisplayVM = void 0;
+const AppObject_1 = require("../../../AppObject");
 const AppObjectPM_1 = require("../../../AppObject/AppObjectPM");
 const ValueObjects_1 = require("../../../ValueObjects");
 const ZSpaceDisplayEntity_1 = require("../Entities/ZSpaceDisplayEntity");
 const ZSpaceEntity_1 = require("../Entities/ZSpaceEntity");
+exports.defaultZSpaceDisplayVM = {
+    pixelSize: ValueObjects_1.Vector2.Zero(),
+    show: false,
+    worldSize: ValueObjects_1.Vector2.Zero(),
+};
 class ZSpaceDisplayPM extends AppObjectPM_1.AppObjectPM {
 }
 exports.ZSpaceDisplayPM = ZSpaceDisplayPM;
 ZSpaceDisplayPM.type = "ZSpaceDisplayPM";
+ZSpaceDisplayPM.get = (appObjects) => AppObject_1.getSingletonComponent(ZSpaceDisplayPM.type, appObjects);
 function makeZSpaceDisplayPM(appObject) {
     return new ZSpaceDisplayPMImp(appObject);
 }
 exports.makeZSpaceDisplayPM = makeZSpaceDisplayPM;
 class ZSpaceDisplayPMImp extends ZSpaceDisplayPM {
     constructor(appObject) {
+        var _a, _b;
         super(appObject, ZSpaceDisplayPM.type);
-        this.onEntityChange = () => {
+        this.onZSpaceChange = () => {
             var _a, _b;
             if (!this.zSpaceDisplay)
                 return;
@@ -28,29 +36,16 @@ class ZSpaceDisplayPMImp extends ZSpaceDisplayPM {
             };
             this.doUpdateView(vm);
         };
-        this.dispose = () => {
-            var _a, _b, _c, _d;
-            super.dispose();
-            (_a = this.zSpaceDisplay) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onEntityChange);
-            (_b = this.zSpaceDisplay) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
-            (_c = this.zSpaceEntity) === null || _c === void 0 ? void 0 : _c.removeChangeObserver(this.onEntityChange);
-            (_d = this.zSpaceEntity) === null || _d === void 0 ? void 0 : _d.removeOnDisposeObserver(this.dispose);
-        };
-        this.zSpaceDisplay = appObject.getComponent(ZSpaceDisplayEntity_1.ZSpaceDisplayEntity.type);
-        if (!this.zSpaceDisplay) {
-            this.warn("App Object does not have a ZSpace Display Entity");
-            return;
-        }
-        this.zSpaceEntity = ZSpaceEntity_1.ZSpaceEntity.get(appObject.appObjectRepo);
-        if (!this.zSpaceEntity) {
-            this.warn("Could not find a ZSpace Entity");
-            return;
-        }
-        this.zSpaceDisplay.addChangeObserver(this.onEntityChange);
-        this.zSpaceDisplay.addOnDisposeObserver(this.dispose);
-        this.zSpaceEntity.addChangeObserver(this.onEntityChange);
-        this.zSpaceEntity.addOnDisposeObserver(this.dispose);
-        this.onEntityChange();
+        (_a = this.zSpaceDisplay) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onZSpaceChange);
+        (_b = this.zSpaceEntity) === null || _b === void 0 ? void 0 : _b.addChangeObserver(this.onZSpaceChange);
+        this.onZSpaceChange();
+        this.appObjects.registerSingleton(this);
+    }
+    get zSpaceDisplay() {
+        return this.getCachedSingleton(ZSpaceDisplayEntity_1.ZSpaceDisplayEntity.type);
+    }
+    get zSpaceEntity() {
+        return this.getCachedSingleton(ZSpaceEntity_1.ZSpaceEntity.type);
     }
     vmsAreEqual(a, b) {
         if (a.show === b.show &&

package/lib/Components/zSpace/PM/ZSpaceIsEnabledPM.d.ts

@@ -1,6 +1,8 @@
+import { AppObjectRepo } from "../../../AppObject";
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectPM } from "../../../AppObject/AppObjectPM";
 export declare abstract class ZSpaceIsEnabledPM extends AppObjectPM<boolean> {
     static readonly type = "ZSpaceIsEnabledPM";
+    static get: (appObjects: AppObjectRepo) => ZSpaceIsEnabledPM | undefined;
 }
 export declare function makeZSpaceIsEnabledPM(appObject: AppObject): ZSpaceIsEnabledPM;

package/lib/Components/zSpace/PM/ZSpaceIsEnabledPM.js

@@ -1,39 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeZSpaceIsEnabledPM = exports.ZSpaceIsEnabledPM = void 0;
+const AppObject_1 = require("../../../AppObject");
 const AppObjectPM_1 = require("../../../AppObject/AppObjectPM");
 const ZSpaceEntity_1 = require("../Entities/ZSpaceEntity");
 class ZSpaceIsEnabledPM extends AppObjectPM_1.AppObjectPM {
 }
 exports.ZSpaceIsEnabledPM = ZSpaceIsEnabledPM;
 ZSpaceIsEnabledPM.type = "ZSpaceIsEnabledPM";
+ZSpaceIsEnabledPM.get = (appObjects) => AppObject_1.getSingletonComponent(ZSpaceIsEnabledPM.type, appObjects);
 function makeZSpaceIsEnabledPM(appObject) {
     return new ZSpaceIsEnabledPMImp(appObject);
 }
 exports.makeZSpaceIsEnabledPM = makeZSpaceIsEnabledPM;
 class ZSpaceIsEnabledPMImp extends ZSpaceIsEnabledPM {
     constructor(appObject) {
+        var _a;
         super(appObject, ZSpaceIsEnabledPM.type);
-        this.onRepoChange = () => {
+        this.onZSpaceChange = () => {
             if (!this.zSpace)
                 return;
             this.doUpdateView(this.zSpace.enabled);
         };
-        this.dispose = () => {
-            var _a, _b;
-            super.dispose();
-            (_a = this.zSpace) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onRepoChange);
-            (_b = this.zSpace) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
-        };
-        this.zSpace = appObject.getComponent(ZSpaceEntity_1.ZSpaceEntity.type);
-        if (this.zSpace) {
-            this.zSpace.addChangeObserver(this.onRepoChange);
-            this.zSpace.addOnDisposeObserver(() => this.dispose());
-            this.onRepoChange();
-        }
-        else {
-            this.warn("App Object does not have a ZSpace Entity");
-        }
+        (_a = this.zSpace) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onZSpaceChange);
+        this.onZSpaceChange();
+        this.appObjects.registerSingleton(this);
+    }
+    get zSpace() {
+        return this.getCachedSingleton(ZSpaceEntity_1.ZSpaceEntity.type);
     }
     vmsAreEqual(a, b) {
         return a === b;

package/lib/Components/zSpace/PM/ZSpaceIsSupportedPM.js

@@ -15,27 +15,19 @@ function makeZSpaceIsSupportedPM(appObject) {
 exports.makeZSpaceIsSupportedPM = makeZSpaceIsSupportedPM;
 class ZSpaceIsSupportedPMImp extends ZSpaceIsSupportedPM {
     constructor(appObject) {
+        var _a;
         super(appObject, ZSpaceIsSupportedPM.type);
-        this.onRepoChange = () => {
-            if (!this.zSpace)
+        this.onZSpaceChange = () => {
+            if (!this.zSpaceEntity)
                 return;
-            this.doUpdateView(this.zSpace.isSupported);
+            this.doUpdateView(this.zSpaceEntity.isSupported);
         };
-        this.dispose = () => {
-            var _a, _b;
-            super.dispose();
-            (_a = this.zSpace) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onRepoChange);
-            (_b = this.zSpace) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
-        };
-        this.zSpace = appObject.getComponent(ZSpaceEntity_1.ZSpaceEntity.type);
-        if (this.zSpace) {
-            this.zSpace.addChangeObserver(this.onRepoChange);
-            this.zSpace.addOnDisposeObserver(() => this.dispose());
-            this.onRepoChange();
-        }
-        else {
-            this.warn("App Object does not have a ZSpace Entity");
-        }
+        (_a = this.zSpaceEntity) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onZSpaceChange);
+        this.onZSpaceChange();
+        this.appObjects.registerSingleton(this);
+    }
+    get zSpaceEntity() {
+        return this.getCachedSingleton(ZSpaceEntity_1.ZSpaceEntity.type);
     }
     vmsAreEqual(a, b) {
         return a === b;

package/lib/Components/zSpace/PM/ZSpaceViewerScalePM.d.ts

@@ -1,5 +1,6 @@
-import { AppObject, AppObjectPM } from "../../../AppObject";
+import { AppObject, AppObjectPM, AppObjectRepo } from "../../../AppObject";
 export declare abstract class ZSpaceViewerScalePM extends AppObjectPM<number> {
     static readonly type = "ZSpaceViewerScalePM";
+    static get: (appObjects: AppObjectRepo) => ZSpaceViewerScalePM | undefined;
 }
 export declare function makeZSpaceViewerScalePM(appObject: AppObject): ZSpaceViewerScalePM;

package/lib/Components/zSpace/PM/ZSpaceViewerScalePM.js

@@ -7,33 +7,26 @@ class ZSpaceViewerScalePM extends AppObject_1.AppObjectPM {
 }
 exports.ZSpaceViewerScalePM = ZSpaceViewerScalePM;
 ZSpaceViewerScalePM.type = "ZSpaceViewerScalePM";
+ZSpaceViewerScalePM.get = (appObjects) => AppObject_1.getSingletonComponent(ZSpaceViewerScalePM.type, appObjects);
 function makeZSpaceViewerScalePM(appObject) {
     return new ZSpaceViewerScalePMImp(appObject);
 }
 exports.makeZSpaceViewerScalePM = makeZSpaceViewerScalePM;
 class ZSpaceViewerScalePMImp extends ZSpaceViewerScalePM {
     constructor(appObject) {
+        var _a;
         super(appObject, ZSpaceViewerScalePM.type);
-        this.onRepoChange = () => {
+        this.onZSpaceChange = () => {
             if (!this.zSpace)
                 return;
             this.doUpdateView(this.zSpace.viewerScale);
         };
-        this.dispose = () => {
-            var _a, _b;
-            super.dispose();
-            (_a = this.zSpace) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onRepoChange);
-            (_b = this.zSpace) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
-        };
-        this.zSpace = appObject.getComponent(ZSpaceEntity_1.ZSpaceEntity.type);
-        if (this.zSpace) {
-            this.zSpace.addChangeObserver(this.onRepoChange);
-            this.zSpace.addOnDisposeObserver(() => this.dispose());
-            this.onRepoChange();
-        }
-        else {
-            this.warn("App Object does not have a ZSpace Entity");
-        }
+        (_a = this.zSpace) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onZSpaceChange);
+        this.onZSpaceChange();
+        this.appObjects.registerSingleton(this);
+    }
+    get zSpace() {
+        return this.getCachedSingleton(ZSpaceEntity_1.ZSpaceEntity.type);
     }
     vmsAreEqual(a, b) {
         return a === b;

package/lib/Components/zSpace/index.d.ts

@@ -1,3 +1,5 @@
+export * from "./Adapters";
 export * from "./Entities";
+export * from "./Mocks";
 export * from "./PM";
 export * from "./UC";

package/lib/Components/zSpace/index.js

@@ -10,6 +10,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./Adapters"), exports);
 __exportStar(require("./Entities"), exports);
+__exportStar(require("./Mocks"), exports);
 __exportStar(require("./PM"), exports);
 __exportStar(require("./UC"), exports);

package/lib/Entities/RangedNumber.d.ts

@@ -0,0 +1,16 @@
+export interface RangedNumberProperties {
+    min: number;
+    max: number;
+    initialValue: number;
+}
+export declare class RangedNumber {
+    readonly maxValue: number;
+    readonly minValue: number;
+    private _val;
+    get val(): number;
+    set val(x: number);
+    setValQuietly(val: number): void;
+    private clamp;
+    private onChangeCallback;
+    constructor(props: RangedNumberProperties, onChangeCallback: () => void);
+}

package/lib/Entities/RangedNumber.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RangedNumber = void 0;
+class RangedNumber {
+    constructor(props, onChangeCallback) {
+        this.maxValue = props.max;
+        this.minValue = props.min;
+        this._val = this.clamp(props.initialValue);
+        this.onChangeCallback = onChangeCallback;
+    }
+    get val() {
+        return this._val;
+    }
+    set val(x) {
+        const y = this.clamp(x);
+        if (this._val === y)
+            return;
+        this._val = y;
+        this.onChangeCallback();
+    }
+    setValQuietly(val) {
+        this._val = this.clamp(val);
+    }
+    clamp(x) {
+        let rVal = x;
+        if (x > this.maxValue) {
+            rVal = this.maxValue;
+        }
+        else if (x < this.minValue) {
+            rVal = this.minValue;
+        }
+        return rVal;
+    }
+}
+exports.RangedNumber = RangedNumber;

package/lib/Entities/index.d.ts

@@ -1,6 +1,7 @@
 export * from "./MessageSystem";
 export * from "./ObservableEntity";
 export * from "./ObserverList";
+export * from "./RangedNumber";
 export * from "./TransformNode";
 export * from "./WorkPlane";
 export * from "./MemoizedAngle";

package/lib/Entities/index.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./MessageSystem"), exports);
 __exportStar(require("./ObservableEntity"), exports);
 __exportStar(require("./ObserverList"), exports);
+__exportStar(require("./RangedNumber"), exports);
 __exportStar(require("./TransformNode"), exports);
 __exportStar(require("./WorkPlane"), exports);
 __exportStar(require("./MemoizedAngle"), exports);

package/package.json

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