Merge branch 'main' of https://github.com/thatopen/engine_components

ThatOpen · Jul 27, 2024 · 8d643c2 · 8d643c2
2 parents 0b8e98f + 939fa66
commit 8d643c2
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 5 deletions.
diff --git a/examples/assets/ifcStreamer.js b/examples/assets/ifcStreamer.js
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@thatopen/components",
   "description": "Collection of core functionalities to author BIM apps.",
-  "version": "2.1.13",
+  "version": "2.1.14",
   "author": "That Open Company",
   "contributors": [
     "Antonio Gonzalez Viegas (https://github.com/agviegas)",

diff --git a/packages/core/src/core/Components/index.ts b/packages/core/src/core/Components/index.ts
@@ -14,7 +14,7 @@ export class Components implements Disposable {
   /**
    * The version of the @thatopen/components library.
    */
-  static readonly release = "2.1.13";
+  static readonly release = "2.1.14";
 
   /** {@link Disposable.onDisposed} */
   readonly onDisposed = new Event<void>();

diff --git a/packages/core/src/core/Cullers/index.ts b/packages/core/src/core/Cullers/index.ts
@@ -1,3 +1,4 @@
+import * as THREE from "three";
 import { Components } from "../Components";
 import { MeshCullerRenderer, CullerRendererSettings } from "./src";
 import { Component, Event, Disposable, World } from "../Types";
@@ -91,4 +92,17 @@ export class Cullers extends Component implements Disposable {
     }
     this.list.clear();
   }
+
+  /**
+   * Updates the given instanced meshes inside the all the cullers. You should use this if you change the count property, e.g. when changing the visibility of fragments.
+   *
+   * @param meshes - The meshes to update.
+   *
+   * @returns {void}
+   */
+  updateInstanced(meshes: Iterable<THREE.InstancedMesh>) {
+    for (const [, culler] of this.list) {
+      culler.updateInstanced(meshes);
+    }
+  }
 }
diff --git a/packages/core/src/core/Cullers/src/mesh-culler-renderer.ts b/packages/core/src/core/Cullers/src/mesh-culler-renderer.ts
@@ -215,6 +215,23 @@ export class MeshCullerRenderer extends CullerRenderer implements Disposable {
     this.isProcessing = false;
   }
 
+  /**
+   * Updates the given instanced meshes inside the culler. You should use this if you change the count property, e.g. when changing the visibility of fragments.
+   *
+   * @param meshes - The meshes to update.
+   *
+   * @returns {void}
+   */
+  updateInstanced(meshes: Iterable<THREE.InstancedMesh>) {
+    for (const mesh of meshes) {
+      const colorMesh = this.colorMeshes.get(mesh.uuid);
+      if (!colorMesh) {
+        continue;
+      }
+      colorMesh.count = mesh.count;
+    }
+  }
+
   private handleWorkerMessage = async (event: MessageEvent) => {
     if (this.isProcessing) {
       return;

diff --git a/packages/front/package.json b/packages/front/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@thatopen/components-front",
   "description": "Collection of frontend tools to author BIM apps.",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "author": "That Open Company",
   "contributors": [
     "Antonio Gonzalez Viegas (https://github.com/agviegas)",

diff --git a/packages/front/src/core/PostproductionRenderer/index.ts b/packages/front/src/core/PostproductionRenderer/index.ts
@@ -84,7 +84,9 @@ export class PostproductionRenderer extends RendererWith2D {
   }
 
   private setPostproductionSize(size?: THREE.Vector2) {
-    if (!this.container) return;
+    if (!this.container) {
+      return;
+    }
     const width = size ? size.x : this.container.clientWidth;
     const height = size ? size.y : this.container.clientHeight;
     this.postproduction.setSize(width, height);

diff --git a/packages/front/src/core/PostproductionRenderer/src/postproduction.ts b/packages/front/src/core/PostproductionRenderer/src/postproduction.ts
@@ -206,6 +206,9 @@ export class Postproduction {
    * @returns {void}
    */
   setSize(width: number, height: number) {
+    if (width === 0 || height === 0) {
+      return;
+    }
     if (this._initialized) {
       const customEnabled = this._settings.custom;
       if (customEnabled) {