Decouple property fetching

Author: agviegas

viewer/src/components/raycaster.ts

@@ -18,6 +18,6 @@ export class IFCRaycaster {
   castRay(event: any, onHit: (event: any, item: THREE.Intersection) => any ) {
     this.raycaster.setFromCamera(this.mouse, this.camera);
     const result = this.raycaster.intersectObjects(this.ifcModels);
-    if(result.length > 0) onHit(event, result[0]);
+    if(result.length > 0) return onHit(event, result[0]);
   }
 }

viewer/src/core/IFC/ifc-manager.ts

@@ -54,11 +54,26 @@ export class IfcManager {
     }
   }
 
+  getSpatialStructure(modelID: number, recursive = false) {
+    return this.loader.getSpatialStructure(modelID, recursive);
+  }
+
+  getProperties(modelID: number, id: number, indirect = false) {
+    const props = this.loader.getItemProperties(modelID, id);
+    if(indirect){
+      props.psets = this.loader.getPropertySets(modelID, id, true);
+      props.type = this.loader.getTypeProperties(modelID, id);
+    }
+    console.log(props);
+    return props;
+  }
+
   preselect(event: any) {
-    this.caster.castRay(event, this.preselection.select);
+    const { modelID, id } = this.caster.castRay(event, this.preselection.select);
   }
 
   select(event: any) {
-    this.caster.castRay(event, this.selection.selectProps);
+    const { modelID, id } = this.caster.castRay(event, this.selection.select);
+    return this.getProperties(modelID, id, true);
   }
 }

viewer/src/core/IFC/selection.ts

@@ -26,22 +26,8 @@ export class IfcSelection {
     this.removePreviousSelection(mesh);
     this.modelID = mesh.modelID;
     this.newSelection(id);
-    return id;
-  }
-
-  selectProps = (event: any, item: THREE.Intersection) => {
-    const id = this.select(event, item);
-    if(id) return this.getProperties(id);
-    return null;
-  }
-  
-  getProperties(id: number){
-    const props = this.ifcLoader.getItemProperties(this.modelID, id);
-    props.psets = this.ifcLoader.getPropertySets(this.modelID, id, true);
-    props.type = this.ifcLoader.getTypeProperties(this.modelID, id);
-    console.log(props);
-    return props;
-  }
+    return { modelID: this.modelID, id };
+  };
 
   newSelection = (id: number) => {
     this.ifcLoader.createSubset({
@@ -51,7 +37,7 @@ export class IfcSelection {
       removePrevious: true,
       material: this.material
     });
-  }
+  };
 
   removePreviousSelection(mesh: IfcMesh) {
     if (this.modelID != undefined && this.modelID != mesh.modelID) {