feat(event-display): better handling of labels object

HSF · Feb 6, 2021 · e10a68d · e10a68d
1 parent db261a6
commit e10a68d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/phoenix-event-display/src/loaders/phoenix-loader.ts b/packages/phoenix-event-display/src/loaders/phoenix-loader.ts
@@ -22,7 +22,7 @@ export class PhoenixLoader implements EventDataLoader {
   /** Loading manager for loadable resources */
   protected loadingManager: LoadingManager;
   /** Object containing event object labels. */
-  protected labelsObject: { [key: string]: string } = {};
+  protected labelsObject: { [key: string]: any } = {};
 
   /**
    * Create the Phoenix loader.
@@ -395,7 +395,7 @@ export class PhoenixLoader implements EventDataLoader {
       }
     }
 
-    this.labelsObject[`${objectType}/${collection}/${indexInCollection}`] = label;
+    this.labelsObject[objectType][collection][indexInCollection] = label;
     console.log(this.labelsObject);
   }
 

diff --git a/packages/phoenix-event-display/src/three/scene-manager.ts b/packages/phoenix-event-display/src/three/scene-manager.ts
@@ -428,6 +428,7 @@ export class SceneManager {
    * @param uuid UUID of the three.js object.
    */
   public addLabelToObject(label: string, uuid: string) {
-    this.scene.getObjectByProperty('uuid', uuid);
+    const object = this.scene.getObjectByProperty('uuid', uuid);
+    object.userData.label = label;
   }
 }