@vived/app 2.43.0 → 2.45.0

package/lib/Entities/ObservableEntityRepo.d.ts

@@ -1,6 +1,12 @@
 import { ObservableEntity } from "./ObservableEntity";
 export declare class ObservableEntityRepo<T extends ObservableEntity> extends ObservableEntity {
     private entityLookup;
+    private onEntityAddedObservers;
+    addEntityAddedObserver: (observer: (addedEntity: T) => void) => void;
+    removeEntityAddedObserver: (observer: (addedEntity: T) => void) => void;
+    private onEntityRemovedObservers;
+    addEntityRemovedObserver: (observer: (removedEntity: T) => void) => void;
+    removeEntityRemovedObserver: (observer: (removedEntity: T) => void) => void;
     has: (id: string) => boolean;
     add: (id: string, entity: T) => void;
     remove: (id: string) => void;

package/lib/Entities/ObservableEntityRepo.js

@@ -2,10 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObservableEntityRepo = void 0;
 const ObservableEntity_1 = require("./ObservableEntity");
+const ObserverList_1 = require("./ObserverList");
 class ObservableEntityRepo extends ObservableEntity_1.ObservableEntity {
     constructor() {
         super(...arguments);
         this.entityLookup = new Map();
+        this.onEntityAddedObservers = new ObserverList_1.ObserverList();
+        this.addEntityAddedObserver = (observer) => {
+            this.onEntityAddedObservers.add(observer);
+        };
+        this.removeEntityAddedObserver = (observer) => {
+            this.onEntityAddedObservers.remove(observer);
+        };
+        this.onEntityRemovedObservers = new ObserverList_1.ObserverList();
+        this.addEntityRemovedObserver = (observer) => {
+            this.onEntityRemovedObservers.add(observer);
+        };
+        this.removeEntityRemovedObserver = (observer) => {
+            this.onEntityRemovedObservers.remove(observer);
+        };
         this.has = (id) => {
             return this.entityLookup.has(id);
         };
@@ -17,6 +32,7 @@ class ObservableEntityRepo extends ObservableEntity_1.ObservableEntity {
             this.entityLookup.set(id, entity);
             entity.addObserver(this.notify);
             this.notify();
+            this.onEntityAddedObservers.notify(entity);
         };
         this.remove = (id) => {
             const existing = this.entityLookup.get(id);
@@ -25,12 +41,14 @@ class ObservableEntityRepo extends ObservableEntity_1.ObservableEntity {
             this.entityLookup.delete(id);
             existing.removeObserver(this.notify);
             this.notify();
+            this.onEntityRemovedObservers.notify(existing);
         };
         this.clear = () => {
             if (this.entityLookup.size === 0)
                 return;
             this.entityLookup.forEach((entity) => {
                 entity.removeObserver(this.notify);
+                this.onEntityRemovedObservers.notify(entity);
             });
             this.entityLookup.clear();
             this.notify();
@@ -47,11 +65,13 @@ class ObservableEntityRepo extends ObservableEntity_1.ObservableEntity {
             }
             this.entityLookup.forEach((entity) => {
                 entity.removeObserver(this.notify);
+                this.onEntityRemovedObservers.notify(entity);
             });
             this.entityLookup.clear();
             entities.forEach((e) => {
                 this.entityLookup.set(e.id, e.entity);
                 e.entity.addObserver(this.notify);
+                this.onEntityAddedObservers.notify(e.entity);
             });
             this.notify();
         };

package/lib/Entities/SceneObject.d.ts

@@ -6,6 +6,8 @@ export declare abstract class SceneObject extends ObservableEntity {
     abstract set label(label: string);
     abstract get shown(): boolean;
     abstract set shown(shown: boolean);
+    abstract get enabled(): boolean;
+    abstract set enabled(enabled: boolean);
     abstract get canBeStuck(): boolean;
     abstract stick(durationMS: number, easeFn: (val: number) => number, onStickComplete?: () => void): void;
     abstract transform: TransformNode;

package/lib/Entities/SceneObject.js

@@ -18,6 +18,7 @@ class SceneObjectImp extends SceneObject {
         super();
         this.memoizedLabel = new MemoizedString_1.MemoizedString("", this.notify);
         this.memoizedShown = new MemoizedBoolean_1.MemoizedBoolean(true, this.notify);
+        this.memoizedEnabled = new MemoizedBoolean_1.MemoizedBoolean(true, this.notify);
         this.transform = TransformNode_1.makeTransformNode();
         this.stick = (durationMS, easeFn, onStickComplete) => {
             if (!this.canBeStuck) {
@@ -42,6 +43,12 @@ class SceneObjectImp extends SceneObject {
     set shown(enabled) {
         this.memoizedShown.val = enabled;
     }
+    get enabled() {
+        return this.memoizedEnabled.val;
+    }
+    set enabled(enabled) {
+        this.memoizedEnabled.val = enabled;
+    }
     get canBeStuck() {
         if (ValueObjects_1.Vector3.Equal(this.transform.localPosition, ValueObjects_1.Vector3.Zero())) {
             return false;

package/lib/UseCases/SceneModel/setActiveSceneModel.js

@@ -24,7 +24,7 @@ function makeSetActiveModel(sceneModelRepo, sceneObjectRepo, sceneRoot, appDispa
                 return Promise.resolve(sceneModel);
             }
             if (sceneModel.state === Entities_1.SceneModelState.READY) {
-                sceneModelRepo.activeModelID = modelID;
+                setSceneObjectsEnabled(sceneObjectRepo, sceneModel);
                 return Promise.resolve(sceneModel);
             }
             sceneModel.error = undefined;
@@ -49,6 +49,7 @@ function makeSetActiveModel(sceneModelRepo, sceneObjectRepo, sceneRoot, appDispa
                     so.notify();
                 });
                 yield sceneModelRepo.modelLoader(modelID);
+                setSceneObjectsEnabled(sceneObjectRepo, sceneModel);
                 sceneModel.state = Entities_1.SceneModelState.READY;
                 sceneModelRepo.isLoadingSceneModel = false;
                 closeSpinner();
@@ -75,3 +76,14 @@ function makeSetActiveModel(sceneModelRepo, sceneObjectRepo, sceneRoot, appDispa
     };
 }
 exports.makeSetActiveModel = makeSetActiveModel;
+function setSceneObjectsEnabled(sceneObjectRepo, activeModel) {
+    const allSOs = sceneObjectRepo.getAll();
+    allSOs.forEach(so => {
+        if (activeModel.hasObject(so.id)) {
+            so.enabled = true;
+        }
+        else {
+            so.enabled = false;
+        }
+    });
+}

package/package.json

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