@vived/app 4.9.0 → 4.9.2

package/lib/Components/HoverLabel/Controllers/HoverLabelMouse.d.ts

@@ -2,14 +2,15 @@ import { AppObject, AppObjectController } from "../../../AppObject";
 import { MouseController, MouseInputEvent } from "../../MouseInput";
 export declare abstract class HoverLabelMouse extends AppObjectController implements MouseController {
     static type: string;
-    pressed: boolean;
+    abstract readonly hoverLabelDelay: number;
     abstract onMove: (e: MouseInputEvent) => void;
+    abstract allow: (e: MouseInputEvent) => boolean;
 }
-export declare function makeHoverLabelMouse(appObject: AppObject): HoverLabelMouseImp;
+export declare function makeHoverLabelMouse(appObject: AppObject): HoverLabelMouse;
 export declare class HoverLabelMouseImp extends HoverLabelMouse {
     readonly hoverLabelDelay = 500;
     private currentTimeout;
-    private hoverLabel?;
+    private hoverLabelEntity?;
     private tryShowHoverLabel?;
     allow: (e: MouseInputEvent) => boolean;
     onMove: (e: MouseInputEvent) => void;

package/lib/Components/HoverLabel/Controllers/HoverLabelMouse.js

@@ -6,10 +6,6 @@ const HoverLabel_1 = require("../Entities/HoverLabel");
 const AppObject_1 = require("../../../AppObject");
 const MouseInput_1 = require("../../MouseInput");
 class HoverLabelMouse extends AppObject_1.AppObjectController {
-    constructor() {
-        super(...arguments);
-        this.pressed = false;
-    }
 }
 exports.HoverLabelMouse = HoverLabelMouse;
 HoverLabelMouse.type = "Mouse_HoverLabel_Controller";
@@ -27,11 +23,11 @@ class HoverLabelMouseImp extends HoverLabelMouse {
         this.onMove = (e) => {
             if (!this.allow(e))
                 return;
-            if (!this.hoverLabel)
+            if (!this.hoverLabelEntity)
                 return;
             if (!this.tryShowHoverLabel)
                 return;
-            this.hoverLabel.hideHoverLabel();
+            this.hoverLabelEntity.hideHoverLabel();
             if (this.currentTimeout) {
                 clearTimeout(this.currentTimeout);
             }
@@ -41,9 +37,9 @@ class HoverLabelMouseImp extends HoverLabelMouse {
                 this.currentTimeout = undefined;
             }, this.hoverLabelDelay);
         };
-        this.hoverLabel = HoverLabel_1.HoverLabel.get(appObject);
-        if (!this.hoverLabel) {
-            this.warn("Unable to find HoverLabel Entity");
+        this.hoverLabelEntity = this.appObject.getComponent(HoverLabel_1.HoverLabelEntity.type);
+        if (!this.hoverLabelEntity) {
+            this.warn("Serializer has been added to an App Object that does not have a HoverLabelEntity. Add the Entity first");
             return;
         }
         this.tryShowHoverLabel = TryShowHoverLabel_1.TryShowHoverLabel.get(this.appObjects);

package/lib/Components/HoverLabel/Controllers/HoverLabelTouch.d.ts

@@ -2,17 +2,19 @@ import { AppObject, AppObjectController } from "../../../AppObject";
 import { TouchController, TouchInputEvent } from "../../TouchController";
 export declare abstract class HoverLabelTouch extends AppObjectController implements TouchController {
     static type: string;
+    abstract readonly touchLabelDragThreshold: number;
+    abstract allow: (e: TouchInputEvent) => boolean;
     abstract onTouchStart(e: TouchInputEvent): void;
     abstract onTouchMove(e: TouchInputEvent): void;
-    abstract onTouchEnd(e: TouchInputEvent): void;
+    abstract onTouchEnd(): void;
 }
-export declare function makeHoverLabelTouch(appObject: AppObject): HoverLabelTouchImp;
+export declare function makeHoverLabelTouch(appObject: AppObject): HoverLabelTouch;
 export declare class HoverLabelTouchImp extends HoverLabelTouch {
     readonly touchLabelDragThreshold = 15;
     private lastPosition;
     private startPosition;
     private touchStarted;
-    private hoverLabel?;
+    private hoverLabelEntity?;
     private tryShowHoverLabel?;
     allow: (e: TouchInputEvent) => boolean;
     onTouchStart: (e: TouchInputEvent) => void;

package/lib/Components/HoverLabel/Controllers/HoverLabelTouch.js

@@ -27,9 +27,9 @@ class HoverLabelTouchImp extends HoverLabelTouch {
         this.onTouchStart = (e) => {
             if (!this.allow(e))
                 return;
-            if (!this.hoverLabel)
+            if (!this.hoverLabelEntity)
                 return;
-            this.hoverLabel.hideHoverLabel();
+            this.hoverLabelEntity.hideHoverLabel();
             this.touchStarted = false;
             if (e.touchCount !== 1)
                 return;
@@ -56,9 +56,9 @@ class HoverLabelTouchImp extends HoverLabelTouch {
                 this.tryShowHoverLabel.tryShowHoverLabel(this.lastPosition);
             }
         };
-        this.hoverLabel = HoverLabel_1.HoverLabel.get(appObject);
-        if (!this.hoverLabel) {
-            this.warn("Unable to find HoverLabel Entity");
+        this.hoverLabelEntity = this.appObject.getComponent(HoverLabel_1.HoverLabelEntity.type);
+        if (!this.hoverLabelEntity) {
+            this.warn("Serializer has been added to an App Object that does not have a HoverLabelEntity. Add the Entity first");
             return;
         }
         this.tryShowHoverLabel = TryShowHoverLabel_1.TryShowHoverLabel.get(this.appObjects);

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

@@ -1,9 +1,7 @@
-import { AppObject, AppObjectEntity, AppObjectRepo } from "../../../AppObject";
+import { AppObject, AppObjectEntity } from "../../../AppObject";
 import { Vector2 } from "../../../ValueObjects";
-import { Transform3D } from "../../Transform3D";
-export declare abstract class HoverLabel extends AppObjectEntity {
-    static readonly type = "HoverLabel";
-    abstract readonly transform?: Transform3D;
+export declare abstract class HoverLabelEntity extends AppObjectEntity {
+    static readonly type = "HoverLabelEntity";
     abstract get show(): boolean;
     abstract get position(): Vector2;
     abstract get label(): string;
@@ -11,23 +9,5 @@ export declare abstract class HoverLabel extends AppObjectEntity {
     abstract set allowHoverLabel(allow: boolean);
     abstract showHoverLabel: (label: string, position: Vector2) => void;
     abstract hideHoverLabel: () => void;
-    static get(appObj: AppObject): HoverLabel | undefined;
-    static getFromRepo(appObjects: AppObjectRepo): HoverLabel | undefined;
 }
-export declare function makeHoverLabel(appObject: AppObject): HoverLabelImp;
-declare class HoverLabelImp extends HoverLabel {
-    readonly transform?: Transform3D;
-    constructor(appObject: AppObject);
-    private _position;
-    get position(): Vector2;
-    private _show;
-    get show(): boolean;
-    private _label;
-    get label(): string;
-    private memoizedAllow;
-    get allowHoverLabel(): boolean;
-    set allowHoverLabel(allow: boolean);
-    showHoverLabel: (label: string, position: Vector2) => void;
-    hideHoverLabel: () => void;
-}
-export {};
+export declare function makeHoverLabel(appObject: AppObject): HoverLabelEntity;

package/lib/Components/HoverLabel/Entities/HoverLabel.js

@@ -1,36 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeHoverLabel = exports.HoverLabel = void 0;
+exports.makeHoverLabel = exports.HoverLabelEntity = void 0;
 const AppObject_1 = require("../../../AppObject");
 const Entities_1 = require("../../../Entities");
 const ValueObjects_1 = require("../../../ValueObjects");
 const Transform3D_1 = require("../../Transform3D");
-class HoverLabel extends AppObject_1.AppObjectEntity {
-    static get(appObj) {
-        return appObj.getComponent(this.type);
-    }
-    static getFromRepo(appObjects) {
-        const ucs = appObjects.getAllComponents(HoverLabel.type);
-        if (ucs.length === 0) {
-            console.warn("Unable to find a HoverLabel. Add one on Mount");
-            return undefined;
-        }
-        else if (ucs.length > 1) {
-            console.warn("Multiple HoverLabels have been found. There should only be one. Using the first one");
-        }
-        return ucs[0];
-    }
+class HoverLabelEntity extends AppObject_1.AppObjectEntity {
 }
-exports.HoverLabel = HoverLabel;
-HoverLabel.type = "HoverLabel";
+exports.HoverLabelEntity = HoverLabelEntity;
+HoverLabelEntity.type = "HoverLabelEntity";
 function makeHoverLabel(appObject) {
     Transform3D_1.Transform3D.addIfMissing(appObject);
     return new HoverLabelImp(appObject);
 }
 exports.makeHoverLabel = makeHoverLabel;
-class HoverLabelImp extends HoverLabel {
+class HoverLabelImp extends HoverLabelEntity {
     constructor(appObject) {
-        super(appObject, HoverLabel.type);
+        super(appObject, HoverLabelEntity.type);
         this._position = ValueObjects_1.Vector2.Zero();
         this._show = false;
         this._label = "";
@@ -57,10 +43,6 @@ class HoverLabelImp extends HoverLabel {
             this._position = ValueObjects_1.Vector2.Zero();
             this.notifyOnChange();
         };
-        this.transform = Transform3D_1.Transform3D.get(appObject);
-        if (!this.transform) {
-            throw Error("HoverLabel does not have a transform component");
-        }
     }
     get position() {
         return this._position;

package/lib/Components/HoverLabel/PM/AllowHoverLabelPM.d.ts

@@ -2,9 +2,9 @@ import { AppObject, AppObjectPM } from "../../../AppObject";
 export declare class AllowHoverLabelPM extends AppObjectPM<boolean> {
     static readonly type = "AllowHoverLabelPM";
     static addIfMissing(appObj: AppObject): AllowHoverLabelPM;
-    private hoverLabel?;
+    private hoverLabelEntity?;
     vmsAreEqual(a: boolean, b: boolean): boolean;
-    onEnityChange: () => void;
+    onEntityChange: () => void;
     dispose: () => void;
     constructor(appObject: AppObject);
 }

package/lib/Components/HoverLabel/PM/AllowHoverLabelPM.js

@@ -6,26 +6,25 @@ const HoverLabel_1 = require("../Entities/HoverLabel");
 class AllowHoverLabelPM extends AppObject_1.AppObjectPM {
     constructor(appObject) {
         super(appObject, AllowHoverLabelPM.type);
-        this.onEnityChange = () => {
-            if (!this.hoverLabel)
+        this.onEntityChange = () => {
+            if (!this.hoverLabelEntity)
                 return;
-            this.doUpdateView(this.hoverLabel.allowHoverLabel);
+            this.doUpdateView(this.hoverLabelEntity.allowHoverLabel);
         };
         this.dispose = () => {
             var _a, _b;
             super.dispose();
-            (_a = this.hoverLabel) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onEnityChange);
-            (_b = this.hoverLabel) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
+            (_a = this.hoverLabelEntity) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onEntityChange);
+            (_b = this.hoverLabelEntity) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
         };
-        this.hoverLabel = HoverLabel_1.HoverLabel.get(appObject);
-        if (this.hoverLabel) {
-            this.hoverLabel.addChangeObserver(this.onEnityChange);
-            this.hoverLabel.addOnDisposeObserver(() => this.dispose());
-            this.onEnityChange();
-        }
-        else {
-            this.warn("App Object does not have a HoverLabel Entity");
+        this.hoverLabelEntity = this.appObject.getComponent(HoverLabel_1.HoverLabelEntity.type);
+        if (!this.hoverLabelEntity) {
+            this.warn("Serializer has been added to an App Object that does not have a HoverLabelEntity. Add the Entity first");
+            return;
         }
+        this.hoverLabelEntity.addChangeObserver(this.onEntityChange);
+        this.hoverLabelEntity.addOnDisposeObserver(() => this.dispose());
+        this.onEntityChange();
     }
     static addIfMissing(appObj) {
         const existing = appObj.getComponent(AllowHoverLabelPM.type);

package/lib/Components/HoverLabel/PM/HoverLabelPM.d.ts

@@ -10,9 +10,9 @@ export interface HoverLabelVM {
 export declare class HoverLabelPM extends AppObjectPM<HoverLabelVM> {
     static readonly type = "HoverLabelPM";
     static addIfMissing(appObj: AppObject): HoverLabelPM;
-    private hoverLabel?;
+    private hoverLabelEntity?;
     vmsAreEqual(a: HoverLabelVM, b: HoverLabelVM): boolean;
-    onEnityChange: () => void;
+    onEntityChange: () => void;
     dispose: () => void;
     constructor(appObject: AppObject);
 }

package/lib/Components/HoverLabel/PM/HoverLabelPM.js

@@ -6,37 +6,36 @@ const HoverLabel_1 = require("../Entities/HoverLabel");
 class HoverLabelPM extends AppObject_1.AppObjectPM {
     constructor(appObject) {
         super(appObject, HoverLabelPM.type);
-        this.onEnityChange = () => {
-            if (!this.hoverLabel)
+        this.onEntityChange = () => {
+            if (!this.hoverLabelEntity)
                 return;
             const vm = {
                 show: false,
                 text: "",
                 position: { x: 0, y: 0 },
             };
-            if (this.hoverLabel.show) {
+            if (this.hoverLabelEntity.show) {
                 vm.show = true;
-                vm.text = this.hoverLabel.label;
-                vm.position.x = this.hoverLabel.position.x;
-                vm.position.y = this.hoverLabel.position.y;
+                vm.text = this.hoverLabelEntity.label;
+                vm.position.x = this.hoverLabelEntity.position.x;
+                vm.position.y = this.hoverLabelEntity.position.y;
             }
             this.doUpdateView(vm);
         };
         this.dispose = () => {
             var _a, _b;
             super.dispose();
-            (_a = this.hoverLabel) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onEnityChange);
-            (_b = this.hoverLabel) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
+            (_a = this.hoverLabelEntity) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onEntityChange);
+            (_b = this.hoverLabelEntity) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
         };
-        this.hoverLabel = HoverLabel_1.HoverLabel.get(appObject);
-        if (this.hoverLabel) {
-            this.hoverLabel.addChangeObserver(this.onEnityChange);
-            this.hoverLabel.addOnDisposeObserver(() => this.dispose());
-            this.onEnityChange();
-        }
-        else {
-            this.warn("App Object does not have a HoverLabel Entity");
+        this.hoverLabelEntity = this.appObject.getComponent(HoverLabel_1.HoverLabelEntity.type);
+        if (!this.hoverLabelEntity) {
+            this.warn("Serializer has been added to an App Object that does not have a HoverLabelEntity. Add the Entity first");
+            return;
         }
+        this.hoverLabelEntity.addChangeObserver(this.onEntityChange);
+        this.hoverLabelEntity.addOnDisposeObserver(() => this.dispose());
+        this.onEntityChange();
     }
     static addIfMissing(appObj) {
         const existing = appObj.getComponent(HoverLabelPM.type);

package/lib/Components/HoverLabel/UseCases/SerializeAllowHoverLabel.d.ts

@@ -2,6 +2,7 @@ import { AppObject, AppObjectUC } from "../../../AppObject";
 import { SerializedSystem } from "../../StateMachine";
 export declare class SerializeAllowHoverLabel extends AppObjectUC implements SerializedSystem {
     static readonly type = "SerializeAllowHoverLabel";
+    private hoverLabelEntity?;
     name: string;
     seriliziationVersion: number;
     getSystemState(): object;

package/lib/Components/HoverLabel/UseCases/SerializeAllowHoverLabel.js

@@ -9,6 +9,11 @@ class SerializeAllowHoverLabel extends AppObject_1.AppObjectUC {
         super(appObj, SerializeAllowHoverLabel.type);
         this.name = "allowHoverLabel";
         this.seriliziationVersion = 1;
+        this.hoverLabelEntity = this.appObject.getComponent(HoverLabel_1.HoverLabelEntity.type);
+        if (!this.hoverLabelEntity) {
+            this.warn("Serializer has been added to an App Object that does not have a HoverLabelEntity. Add the Entity first");
+            return;
+        }
         const stateMachine = this.appObjects.getSingleton(StateMachine_1.StateMachineEntity.type);
         if (stateMachine) {
             stateMachine.registerSerializedSystem(this);
@@ -18,14 +23,13 @@ class SerializeAllowHoverLabel extends AppObject_1.AppObjectUC {
         }
     }
     getSystemState() {
-        const hoverLabel = HoverLabel_1.HoverLabel.get(this.appObject);
-        if (!hoverLabel) {
+        if (!this.hoverLabelEntity) {
             return {
                 allow: false,
             };
         }
         const state = {
-            allow: hoverLabel.allowHoverLabel,
+            allow: this.hoverLabelEntity.allowHoverLabel,
         };
         return state;
     }
@@ -41,16 +45,14 @@ class SerializeAllowHoverLabel extends AppObject_1.AppObjectUC {
         }
     }
     applyDefaultState() {
-        const hoverLabel = HoverLabel_1.HoverLabel.get(this.appObject);
-        if (!hoverLabel)
+        if (!this.hoverLabelEntity)
             return;
-        hoverLabel.allowHoverLabel = true;
+        this.hoverLabelEntity.allowHoverLabel = true;
     }
     handleStateVersion1(data) {
-        const hoverLabel = HoverLabel_1.HoverLabel.get(this.appObject);
-        if (!hoverLabel)
+        if (!this.hoverLabelEntity)
             return;
-        hoverLabel.allowHoverLabel = data.allow;
+        this.hoverLabelEntity.allowHoverLabel = data.allow;
     }
 }
 exports.SerializeAllowHoverLabel = SerializeAllowHoverLabel;

package/lib/Components/HoverLabel/UseCases/ToggleAllowHoverLabel.d.ts

@@ -4,10 +4,4 @@ export declare abstract class ToggleAllowHoverLabelUC extends AppObjectUC {
     abstract toggleAllowHoverLabel(): void;
     static get(appObjects: AppObjectRepo): ToggleAllowHoverLabelUC | undefined;
 }
-export declare function makeToggleAllowHoverLabel(appObject: AppObject): ToggleAllowHoverLabelIMP;
-declare class ToggleAllowHoverLabelIMP extends ToggleAllowHoverLabelUC {
-    private hoverLabel?;
-    toggleAllowHoverLabel: () => void;
-    constructor(appObject: AppObject);
-}
-export {};
+export declare function makeToggleAllowHoverLabel(appObject: AppObject): ToggleAllowHoverLabelUC;

package/lib/Components/HoverLabel/UseCases/ToggleAllowHoverLabel.js

@@ -27,14 +27,14 @@ class ToggleAllowHoverLabelIMP extends ToggleAllowHoverLabelUC {
     constructor(appObject) {
         super(appObject, ToggleAllowHoverLabelUC.type);
         this.toggleAllowHoverLabel = () => {
-            if (!this.hoverLabel)
+            if (!this.hoverLabelEntity)
                 return;
-            this.hoverLabel.allowHoverLabel = !this.hoverLabel.allowHoverLabel;
+            this.hoverLabelEntity.allowHoverLabel = !this.hoverLabelEntity.allowHoverLabel;
             Dispatcher_1.dispatchStateChange(this.appObjects);
         };
-        this.hoverLabel = HoverLabel_1.HoverLabel.get(this.appObject);
-        if (!this.hoverLabel) {
-            this.warn("Hover Label App Object was not found.");
+        this.hoverLabelEntity = this.appObject.getComponent(HoverLabel_1.HoverLabelEntity.type);
+        if (!this.hoverLabelEntity) {
+            this.warn("PM has been added to an App Object that does not have a HoverLabelEntity. Add the Entity first");
         }
     }
 }

package/lib/Components/HoverLabel/UseCases/TryShowHoverLabel.d.ts

@@ -5,10 +5,4 @@ export declare abstract class TryShowHoverLabel extends AppObjectUC {
     abstract tryShowHoverLabel(position: Vector2): void;
     static get(appObjects: AppObjectRepo): TryShowHoverLabel | undefined;
 }
-export declare function makeTryShowHoverLabel(appObject: AppObject): TryShowHoverLabelIMP;
-declare class TryShowHoverLabelIMP extends TryShowHoverLabel {
-    private hoverLabel?;
-    constructor(appObject: AppObject);
-    tryShowHoverLabel: (position: Vector2) => void;
-}
-export {};
+export declare function makeTryShowHoverLabel(appObject: AppObject): TryShowHoverLabel;

package/lib/Components/HoverLabel/UseCases/TryShowHoverLabel.js

@@ -28,10 +28,10 @@ class TryShowHoverLabelIMP extends TryShowHoverLabel {
     constructor(appObject) {
         super(appObject, TryShowHoverLabel.type);
         this.tryShowHoverLabel = (position) => {
-            if (!this.hoverLabel)
+            if (!this.hoverLabelEntity)
                 return;
-            if (!this.hoverLabel.allowHoverLabel) {
-                this.hoverLabel.hideHoverLabel();
+            if (!this.hoverLabelEntity.allowHoverLabel) {
+                this.hoverLabelEntity.hideHoverLabel();
                 return;
             }
             const scenePick = Babylon_1.scenePixelPick(position, this.appObjects);
@@ -47,15 +47,15 @@ class TryShowHoverLabelIMP extends TryShowHoverLabel {
                 return;
             }
             if (label.display) {
-                this.hoverLabel.showHoverLabel(label.display, position);
+                this.hoverLabelEntity.showHoverLabel(label.display, position);
             }
             else {
-                this.hoverLabel.hideHoverLabel();
+                this.hoverLabelEntity.hideHoverLabel();
             }
         };
-        this.hoverLabel = HoverLabel_1.HoverLabel.get(this.appObject);
-        if (!this.hoverLabel) {
-            this.warn("Hover Label App Object was not found.");
+        this.hoverLabelEntity = this.appObject.getComponent(HoverLabel_1.HoverLabelEntity.type);
+        if (!this.hoverLabelEntity) {
+            this.warn("PM has been added to an App Object that does not have a HoverLabelEntity. Add the Entity first");
         }
     }
 }

package/package.json

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