feat: improve coordination logic

ThatOpen · Mar 6, 2024 · ec14e54 · ec14e54
1 parent 699ce7d
commit ec14e54
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openbim-components",
-  "version": "1.4.13",
+  "version": "1.4.14",
   "main": "src/index.js",
   "author": "harry collin, antonio gonzalez viegas",
   "license": "MIT",

diff --git a/resources/openbim-components.js b/resources/openbim-components.js
@@ -101482,7 +101482,6 @@ class FragmentIfcLoader extends Component {
         this.onDisposed = new Event();
         this.settings = new IfcFragmentSettings();
         this.enabled = true;
-        this.autoCoordinate = true;
         this.uiElement = new UIElement();
         this._material = new THREE$1.MeshLambertMaterial();
         this._spatialTree = new SpatialStructure();
@@ -101519,7 +101518,7 @@ class FragmentIfcLoader extends Component {
         }
         await this.onSetup.trigger();
     }
-    async load(data) {
+    async load(data, coordinate = true) {
         const before = performance.now();
         await this.onIfcStartedLoading.trigger();
         await this.readIfcFile(data);
@@ -101536,8 +101535,10 @@ class FragmentIfcLoader extends Component {
             frag.group = group;
             this.components.meshes.add(frag.mesh);
         }
+        if (coordinate) {
+            fragments.coordinate([group]);
+        }
         await this.onIfcLoaded.trigger(group);
-        fragments.coordinate();
         return group;
     }
     setupUI() {

diff --git a/src/fragments/FragmentIfcLoader/index.html b/src/fragments/FragmentIfcLoader/index.html
@@ -280,7 +280,6 @@
     fragmentIfcLoader.onIfcLoaded.add((model) => {
 
         console.log(model);
-        fragments.coordinate([model]);
 
         // let sorted = [];
         // for(const frag of model.fragments) {

diff --git a/src/fragments/FragmentIfcLoader/index.ts b/src/fragments/FragmentIfcLoader/index.ts
@@ -28,8 +28,6 @@ export class FragmentIfcLoader
 
   enabled: boolean = true;
 
-  autoCoordinate = true;
-
   uiElement = new UIElement<{ main: Button; toast: ToastNotification }>();
 
   private _material = new THREE.MeshLambertMaterial();
@@ -81,7 +79,7 @@ export class FragmentIfcLoader
     await this.onSetup.trigger();
   }
 
-  async load(data: Uint8Array) {
+  async load(data: Uint8Array, coordinate = true) {
     const before = performance.now();
     await this.onIfcStartedLoading.trigger();
     await this.readIfcFile(data);
@@ -103,9 +101,11 @@ export class FragmentIfcLoader
       this.components.meshes.add(frag.mesh);
     }
 
-    await this.onIfcLoaded.trigger(group);
+    if (coordinate) {
+      fragments.coordinate([group]);
+    }
 
-    fragments.coordinate()
+    await this.onIfcLoaded.trigger(group);
 
     return group;
   }