@thatopen/components 2.4.0-alpha.7 → 2.4.0-alpha.8

package/dist/core/Viewpoints/src/viewpoint.d.ts

@@ -35,7 +35,7 @@ export declare class Viewpoint implements BCFViewpoint {
      * A map of colors and components GUIDs that should be colorized when displaying a viewpoint.
      * For this to work, call viewpoint.colorize()
      */
-    readonly componentColors: DataMap<string, string[]>;
+    readonly componentColors: DataMap<THREE.Color, string[]>;
     /**
      * Boolean flags to allow fine control over the visibility of spaces.
      * A typical use of these flags is when DefaultVisibility=true but spaces should remain hidden.
@@ -163,6 +163,7 @@ export declare class Viewpoint implements BCFViewpoint {
      * @throws An error if the world's renderer is not available.
      */
     updateCamera(): void;
+    applyVisibility(): void;
     /**
      * Applies color to the components in the viewpoint based on their GUIDs.
      *
@@ -173,14 +174,13 @@ export declare class Viewpoint implements BCFViewpoint {
      * The color is applied using the `Classifier.setColor` method, which sets the color of the specified fragments.
      * The color is provided as a hexadecimal string, prefixed with a '#'.
      */
-    colorize(): void;
+    applyColors(): void;
     /**
      * Resets the colors of all components in the viewpoint to their original color.
-     * This method iterates through the `componentColors` map, retrieves the fragment IDs
-     * corresponding to each color, and then uses the `Classifier` to reset the color of those fragments.
      */
     resetColors(): void;
     private createComponentTags;
+    private createColorTags;
     /**
      * Serializes the viewpoint into a buildingSMART compliant XML string for export.
      *

package/dist/index.cjs

@@ -24443,6 +24443,7 @@ const _IfcGeometryTiler = class _IfcGeometryTiler extends Component {
       this.webIfc.SetLogLevel(logLevel);
     }
     this.webIfc.OpenModelFromCallback(loadCallback, this.settings.webIfc);
+    this._nextAvailableID = this.webIfc.GetMaxExpressID(0);
   }
   async streamAllGeometries() {
     console.log("Converting geometries to tiles...");
@@ -24552,7 +24553,7 @@ const _IfcGeometryTiler = class _IfcGeometryTiler extends Component {
       const factor = isOpaque ? 1 : -1;
       const transpGeometryID = geometryID * factor;
       if (!this._visitedGeometries.has(transpGeometryID)) {
-        this.getGeometry(webIfc, geometryID, transpGeometryID);
+        this.getGeometry(webIfc, geometryID, isOpaque);
       }
       this.registerGeometryData(
         group,
@@ -24571,7 +24572,7 @@ const _IfcGeometryTiler = class _IfcGeometryTiler extends Component {
     }
     this._assets.push(asset);
   }
-  getGeometry(webIfc, id, transpGeometryID) {
+  getGeometry(webIfc, id, isOpaque) {
     const geometry = webIfc.GetGeometry(0, id);
     const index = webIfc.GetIndexArray(
       geometry.GetIndexData(),
@@ -24591,6 +24592,7 @@ const _IfcGeometryTiler = class _IfcGeometryTiler extends Component {
       normal[i / 2 + 1] = vertexData[i + 4];
       normal[i / 2 + 2] = vertexData[i + 5];
     }
+    const factor = isOpaque ? 1 : -1;
     if (index.length === 0) {
       const boundingBox2 = new Float32Array([
         0,
@@ -24619,6 +24621,7 @@ const _IfcGeometryTiler = class _IfcGeometryTiler extends Component {
       });
       const geomIndex = this._visitedGeometries.size;
       const uuid = THREE__namespace.MathUtils.generateUUID();
+      const transpGeometryID = id * factor;
       this._visitedGeometries.set(transpGeometryID, { uuid, index: geomIndex });
       this._geometryCount++;
       geometry.delete();
@@ -24668,6 +24671,7 @@ const _IfcGeometryTiler = class _IfcGeometryTiler extends Component {
       }
       const geomIndex = this._visitedGeometries.size;
       const uuid = THREE__namespace.MathUtils.generateUUID();
+      const transpGeometryID = geometryID * factor;
       this._visitedGeometries.set(transpGeometryID, { uuid, index: geomIndex });
       this._geometryCount++;
       firstSplit = false;
@@ -24887,9 +24891,9 @@ class Viewpoint {
      */
     __publicField(this, "clippingPlanes", new DataSet());
     __publicField(this, "camera", {
-      aspectRatio: 0,
-      fov: 0,
-      direction: { x: 0, y: 0, z: 80 },
+      aspectRatio: 1,
+      fov: 60,
+      direction: { x: 0, y: 0, z: 0 },
       position: { x: 0, y: 0, z: 0 }
     });
     /**
@@ -25129,6 +25133,19 @@ class Viewpoint {
     if (camera instanceof OrthoPerspectiveCamera) {
       camera.projection.set(this.projection);
     }
+    const basePosition = new THREE__namespace.Vector3(
+      this.camera.position.x,
+      this.camera.position.y,
+      this.camera.position.z
+    );
+    const baseTarget = new THREE__namespace.Vector3(
+      this.camera.direction.x,
+      this.camera.direction.y,
+      this.camera.direction.z
+    );
+    if (basePosition.equals(new THREE__namespace.Vector3()) && baseTarget.equals(new THREE__namespace.Vector3())) {
+      return;
+    }
     const position = this.position;
     const direction = this.direction;
     let target = {
@@ -25150,10 +25167,6 @@ class Viewpoint {
       target = bb.getSphere().center;
       bb.reset();
     }
-    const hider = this._components.get(Hider);
-    hider.set(this.defaultVisibility);
-    hider.set(!this.defaultVisibility, this.exception);
-    hider.set(true, selection);
     await camera.controls.setLookAt(
       position.x,
       position.y,
@@ -25214,6 +25227,12 @@ class Viewpoint {
     const manager = this._components.get(Viewpoints);
     manager.list.set(this.guid, this);
   }
+  applyVisibility() {
+    const hider = this._components.get(Hider);
+    hider.set(this.defaultVisibility);
+    hider.set(!this.defaultVisibility, this.exception);
+    hider.set(true, this.selection);
+  }
   /**
    * Applies color to the components in the viewpoint based on their GUIDs.
    *
@@ -25224,24 +25243,17 @@ class Viewpoint {
    * The color is applied using the `Classifier.setColor` method, which sets the color of the specified fragments.
    * The color is provided as a hexadecimal string, prefixed with a '#'.
    */
-  colorize() {
+  applyColors() {
     const manager = this._components.get(Viewpoints);
     const fragments = this._components.get(FragmentsManager);
     const classifier = this._components.get(Classifier);
     for (const [color, guids] of this.componentColors) {
       const fragmentIdMap = fragments.guidToFragmentIdMap(guids);
-      const threeColor = new THREE__namespace.Color(`#${color}`);
-      classifier.setColor(
-        fragmentIdMap,
-        threeColor,
-        manager.config.overwriteColors
-      );
+      classifier.setColor(fragmentIdMap, color, manager.config.overwriteColors);
     }
   }
   /**
    * Resets the colors of all components in the viewpoint to their original color.
-   * This method iterates through the `componentColors` map, retrieves the fragment IDs
-   * corresponding to each color, and then uses the `Classifier` to reset the color of those fragments.
    */
   resetColors() {
     const fragments = this._components.get(FragmentsManager);
@@ -25284,6 +25296,23 @@ class Viewpoint {
     }
     return tags;
   }
+  createColorTags() {
+    let colorTags = "";
+    for (const [color, components] of this.componentColors.entries()) {
+      const hex = `#${color.getHexString()}`;
+      const tags = components.map((globalId) => `
+<Component IfcGuid="${globalId}" />`).join("\n");
+      colorTags += `<Color Color="${hex}">
+${tags}
+</Color>`;
+    }
+    if (colorTags.length !== 0) {
+      return `<Coloring>
+${colorTags}
+</Coloring>`;
+    }
+    return `<Coloring />`;
+  }
   /**
    * Serializes the viewpoint into a buildingSMART compliant XML string for export.
    *
@@ -25342,6 +25371,7 @@ class Viewpoint {
     const viewSetupHints = `<ViewSetupHints SpacesVisible="${this.spacesVisible ?? false}" SpaceBoundariesVisible="${this.spaceBoundariesVisible ?? false}" OpeningsVisible="${this.openingsVisible ?? false}" />`;
     const selectionTags = (await this.createComponentTags("selection")).trim();
     const exceptionTags = (await this.createComponentTags("exception")).trim();
+    const colorTags = this.createColorTags();
     return `<?xml version="1.0" encoding="UTF-8"?>
     <VisualizationInfo Guid="${this.guid}">
       <Components>
@@ -25351,6 +25381,7 @@ class Viewpoint {
           ${version === "3" ? viewSetupHints : ""}
           ${exceptionTags.length !== 0 ? `<Exceptions>${exceptionTags}</Exceptions>` : ""}
         </Visibility>
+        ${colorTags}
       </Components>
       ${cameraXML}
     </VisualizationInfo>`;
@@ -27303,6 +27334,7 @@ const createEntityFacets = (components, elements) => {
     if (element.cardinality)
       facet.cardinality = element.cardinality;
     facet.predefinedType = getParameterValue(element.predefinedType);
+    facet.instructions = element.instructions;
     facets.push(facet);
   }
   return facets;
@@ -27318,6 +27350,7 @@ const createAttributeFacets = (components, elements) => {
     if (element.cardinality)
       facet.cardinality = element.cardinality;
     facet.value = getParameterValue(element.value);
+    facet.instructions = element.instructions;
     facets.push(facet);
   }
   return facets;
@@ -27341,6 +27374,7 @@ const createClassificationFacets = (components, elements) => {
     }
     facet.value = value;
     facet.uri = element.uri;
+    facet.instructions = element.instructions;
     facets.push(facet);
   }
   return facets;
@@ -27364,6 +27398,7 @@ const createPropertyFacets = (components, elements) => {
     facet.value = value;
     facet.dataType = element.dataType;
     facet.uri = element.uri;
+    facet.instructions = element.instructions;
     facets.push(facet);
   }
   return facets;
@@ -27403,12 +27438,14 @@ const _IDSSpecifications = class _IDSSpecifications extends Component {
    *
    * @returns The newly created IDSSpecification instance.
    */
-  create(name, ifcVersion) {
+  create(name, ifcVersion, identifier) {
     const specification = new IDSSpecification(
       this.components,
       name,
       ifcVersion
     );
+    if (identifier)
+      specification.identifier = identifier;
     this.list.set(specification.identifier, specification);
     return specification;
   }
@@ -27428,7 +27465,7 @@ const _IDSSpecifications = class _IDSSpecifications extends Component {
     if (specifications && specifications.specification) {
       const specs = Array.isArray(specifications.specification) ? specifications.specification : [specifications.specification];
       for (const spec of specs) {
-        const { name, ifcVersion } = spec;
+        const { name, ifcVersion, description, instructions, identifier } = spec;
         if (!(name && ifcVersion))
           continue;
         const applicabilities = [];
@@ -27447,8 +27484,10 @@ const _IDSSpecifications = class _IDSSpecifications extends Component {
             }
           }
         }
+        let requirementsDescription;
         if (requirements) {
           const { maxOccurs, ...rest } = requirements;
+          requirementsDescription = requirements.description;
           const facets = Array.isArray(rest) ? rest : [rest];
           for (const facet of facets) {
             for (const facetName in facet) {
@@ -27476,7 +27515,14 @@ const _IDSSpecifications = class _IDSSpecifications extends Component {
           }
         }
         if (applicabilities.length > 0 && reqs.length > 0) {
-          const specification = this.create(name, ifcVersion.split(/\s+/));
+          const specification = this.create(
+            name,
+            ifcVersion.split(/\s+/),
+            identifier
+          );
+          specification.description = description;
+          specification.instructions = instructions;
+          specification.requirementsDescription = requirementsDescription;
           specification.applicability.add(...applicabilities);
           specification.requirements.add(...reqs);
           result.push(specification);