feat: release edit api

Author: agviegas

index.html

@@ -28,8 +28,15 @@ <h3>Choose an example</h3>
 <a style="width: fit-content;" href="./packages\fragments\src\Importers\IfcImporter\examples\HelloWorldSchema\example.html">fragments/HelloWorldSchema</a>
 <a style="width: fit-content;" href="./packages\fragments\src\FragmentsModels\example.html">fragments/FragmentsModels</a>
 <a style="width: fit-content;" href="./packages\fragments\src\FragmentsModels\examples\VisibilityOperations\example.html">fragments/VisibilityOperations</a>
+<a style="width: fit-content;" href="./packages\fragments\src\FragmentsModels\examples\SteelDetailing\example.html">fragments/SteelDetailing</a>
+<a style="width: fit-content;" href="./packages\fragments\src\FragmentsModels\examples\Rebars\example.html">fragments/Rebars</a>
 <a style="width: fit-content;" href="./packages\fragments\src\FragmentsModels\examples\Raycasting\example.html">fragments/Raycasting</a>
 <a style="width: fit-content;" href="./packages\fragments\src\FragmentsModels\examples\ModelInformation\example.html">fragments/ModelInformation</a>
+<a style="width: fit-content;" href="./packages\fragments\src\FragmentsModels\examples\Materials\example.html">fragments/Materials</a>
+<a style="width: fit-content;" href="./packages\fragments\src\FragmentsModels\examples\EditProperties\example.html">fragments/EditProperties</a>
+<a style="width: fit-content;" href="./packages\fragments\src\FragmentsModels\examples\EditElements\example.html">fragments/EditElements</a>
+<a style="width: fit-content;" href="./packages\fragments\src\FragmentsModels\examples\EditApi\example.html">fragments/EditApi</a>
+<a style="width: fit-content;" href="./packages\fragments\src\FragmentsModels\examples\BuildingConfigurator\example.html">fragments/BuildingConfigurator</a>
 
     </div>
   </body>

package.json

@@ -5,6 +5,7 @@
     "Antonio Gonzalez Viegas (https://github.com/agviegas)",
     "Juan Hoyos (https://github.com/HoyosJuan)"
   ],
+  "private": true,
   "scripts": {
     "dev": "vite --host",
     "build-core": "yarn workspace @thatopen/fragments build",

packages/fragments/flatbuffers/index.fbs

@@ -122,6 +122,7 @@ table Shell {
     big_profiles: [BigShellProfile] (required); // Exterior profiles of the shell (if the shell has more than 65535 points)
     big_holes: [BigShellHole] (required); // Holes of the shell (if the shell has more than 65535 points)
     type: ShellType; // Type of the shell (less than 65535 points or more than 65535 points)
+    profiles_face_ids: [ushort] (required); // An array of face ids for the profiles
 }
 
 table CircleExtrusion {
@@ -139,6 +140,11 @@ table Meshes {
     shells: [Shell] (required); // The list of geometries defined as faces and holes (breps).
     local_transforms: [Transform] (required); // Local transforms of the samples
     global_transforms: [Transform] (required); // A set of local transformations for geometry samples. Each global transformation is assigned to a local id by meshes_items.
+    material_ids: [uint]; // An array of local ids for the materials
+    representation_ids: [uint]; // An array of local ids for the representations
+    sample_ids: [uint]; // An array of local ids for the samples
+    local_transform_ids: [uint]; // An array of local ids for the local transforms
+    global_transform_ids: [uint]; // An array of local ids for the global transforms
 }
 
 table Attribute {
@@ -155,64 +161,6 @@ table SpatialStructure {
     children: [SpatialStructure]; // Child spatial nodes of the current spatial node
 }
 
-table Alignment {
-    absolute: [uint]; // Geometry representation ids for the absolute respresentation of this alignment
-    horizontal: [uint]; // Geometry representation ids for the horizontal respresentation of this alignment
-    vertical: [uint]; // Geometry representation ids for the vertical respresentation of this alignment
-}
-
-// IMPLICIT GEOMETRIES
-// Implicit geometries' only goal is to create mesh representations
-// Implicit geometries main object are samples. Samples are made of:
-// - A representation (a common interface for all implicit geometries)
-// - A transform that defines the geometry's transformation
-// Not all samples are used to create mesh representations. For example, a wall
-// with some holes might be made using multiple samples, but in the end only the
-// end sample will be used to create the mesh representation.
-
-enum GeometryClass:byte {
-    NONE = 0, // No geometry class
-    LINES = 1, // Simple lines geometry class
-    ELLIPSE_ARC = 2, // Ellipse arc geometry class
-    CLOTHOID = 3, // Clothoid geometry class
-    PARABOLA = 4, // Parabola geometry class
-    WALLS = 5, // Walls geometry class
-}
-
-struct GeometrySample {
-    id: uint; // The index of the geometry in the representations array
-    transform: uint; // The index of the transform in transforms
-}
-
-struct GeometryRepresentation {
-    id: uint; // The index of the geometry in its corresponding array
-    geometry_class: GeometryClass; // The class of the geometry
-}
-
-table GeometryLines {
-    points: [float] (required); // Points of the line
-}
-
-struct GeometryWall {
-    start: FloatVector; // Start point of the wall
-    end: FloatVector; // End point of the wall
-    height: float; // Height of the wall
-    width: float; // Width of the wall
-    offset: float; // Offset of the wall
-}
-
-table Geometries {
-    samples: [GeometrySample] (required); // An array of implicit geometry samples
-    sample_ids: [uint]; // An array of ids for the implicit geometry samples
-    representations: [GeometryRepresentation] (required); // An array of implicit geometry representations
-    representation_ids: [uint]; // An array of ids for the implicit geometry representations
-    transforms: [Transform] (required); // An array of implicit geometry transforms
-    transform_ids: [uint]; // An array of ids for the implicit geometry transforms
-    representations_samples: [uint]; // An array of id pairs that work as an indexation matching mesh representations ids with implicit samples ids
-    lines: [GeometryLines] (required); // An array of implicit geometry lines
-    walls: [GeometryWall]; // An array of implicit geometry walls
-}
-
 // MODELS
 
 // The main object and the entry point of all Fragment files. Each Fragments file has just one model, and it contains all the information of the file.
@@ -238,10 +186,6 @@ table Model {
 
     spatial_structure: SpatialStructure; // A tree representing the spatial relation between elements.
 
-    alignments: [Alignment]; // A set of civil alignments for this model
-
-    geometries: Geometries; // The object containing all implicit geometries of the model.
-    
     unique_attributes: [string]; // An array of unique item attributes in this model.
     relation_names: [string]; // An array of unique relation names in this model.
 }

packages/fragments/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@thatopen/fragments",
   "description": "Simple geometric system built on top of Three.js to display 3D BIM data efficiently.",
-  "version": "3.1.7",
+  "version": "3.2.0",
   "author": "That Open Company",
   "contributors": [
     "Antonio Gonzalez Viegas (https://github.com/agviegas)",
@@ -68,10 +68,10 @@
     "ts-node": "^10.0.0",
     "tsx": "^4.19.2",
     "typescript": "5.4.2",
-    "web-ifc": "0.0.71"
+    "web-ifc": "0.0.72"
   },
   "peerDependencies": {
     "three": ">=0.175",
-    "web-ifc": ">=0.0.71"
+    "web-ifc": ">=0.0.72"
   }
 }

packages/fragments/src/FragmentsModels/example.ts

@@ -57,14 +57,7 @@ grids.create(world);
 // You have to copy `/node_modules/@thatopen/fragments/dist/Worker/worker.mjs` to your project directory
 // and provide the relative path in `workerUrl`
 // We use here the internal route of the worker in the library for simplicity purposes
-const githubUrl =
-  "https://thatopen.github.io/engine_fragment/resources/worker.mjs";
-const fetchedUrl = await fetch(githubUrl);
-const workerBlob = await fetchedUrl.blob();
-const workerFile = new File([workerBlob], "worker.mjs", {
-  type: "text/javascript",
-});
-const workerUrl = URL.createObjectURL(workerFile);
+const workerUrl = "../FragmentsModels/src/multithreading/fragments-thread.ts";
 const fragments = new FRAGS.FragmentsModels(workerUrl);
 world.camera.controls.addEventListener("rest", () => fragments.update(true));
 
@@ -153,10 +146,7 @@ const [panel, updatePanel] = BUI.Component.create<BUI.PanelSection, any>(
       if (ids.includes(id)) {
         await disposeModels([id]);
       } else {
-        await loadFragmentFile(
-          `https://thatopen.github.io/engine_fragment/resources/frags/${id}.frag`,
-          id,
-        );
+        await loadFragmentFile(`/resources/frags/${id}.frag`, id);
       }
       target.loading = false;
     };
@@ -183,11 +173,9 @@ const [panel, updatePanel] = BUI.Component.create<BUI.PanelSection, any>(
 
     const arqLoaded = ids.some((id) => id.includes("arq"));
     const strLoaded = ids.some((id) => id.includes("str"));
-    const mepLoaded = ids.some((id) => id.includes("mep"));
 
     const arqLabel = arqLoaded ? "Remove Architecture" : "Load Architecture";
     const strLabel = strLoaded ? "Remove Structure" : "Load Structure";
-    const mepLabel = mepLoaded ? "Remove Systems" : "Load Systems";
 
     return BUI.html`
     <bim-panel id="controls-panel" active label="Fragments Models" class="options-menu">
@@ -200,10 +188,6 @@ const [panel, updatePanel] = BUI.Component.create<BUI.PanelSection, any>(
           <bim-button data-name="str" label=${strLabel} @click=${onLoadModel}></bim-button>
           ${strLoaded ? BUI.html`<bim-button data-name="str" label="Download" @click=${onDownloadModel}></bim-button>` : null}
         </div>
-        <div style="display: flex; gap: 0.25rem">
-          <bim-button data-name="mep" label=${mepLabel} @click=${onLoadModel}></bim-button>
-          ${mepLoaded ? BUI.html`<bim-button data-name="mep" label="Download" @click=${onDownloadModel}></bim-button>` : null}
-        </div>
         <bim-button ?disabled=${ids.length === 0} label="Remove All" @click=${onDisposeModels}></bim-button>
       </bim-panel-section>
     </bim-panel>

packages/fragments/src/FragmentsModels/examples/BuildingConfigurator/example.html

@@ -0,0 +1,68 @@
+<!doctype html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport"
+    content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+
+  <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
+  <link rel="icon" type="image/x-icon" href="https://thatopen.github.io/engine_components/resources/favicon.ico">
+  <title>Create Elements</title>
+  <style>
+    body {
+      margin: 0;
+      padding: 0;
+      font-family: "Plus Jakarta Sans", sans-serif;
+      overflow: hidden;
+    }
+
+    .full-screen {
+      width: 100vw;
+      height: 100vh;
+      position: relative;
+      overflow: hidden;
+    }
+
+    .options-menu {
+      position: fixed;
+      min-width: unset;
+      top: 5px;
+      right: 5px;
+      max-height: calc(100vh - 10px);
+      max-width: 15rem;
+    }
+
+    .phone-menu-toggler {
+      visibility: hidden;
+    }
+
+    @media (max-width: 480px) {
+      .options-menu {
+        visibility: hidden;
+        bottom: 5px;
+        left: 5px;
+        max-width: none;
+      }
+
+      .options-menu-visible {
+        visibility: visible;
+      }
+
+      .phone-menu-toggler {
+        visibility: visible;
+        position: fixed;
+        top: 5px;
+        right: 5px;
+      }
+    }
+  </style>
+</head>
+
+<body>
+  <div class="full-screen" id="container"></div>
+  <script type="module" src="./example.ts"></script>
+</body>
+
+</html>