@buerli.io/headless 0.0.34 → 0.0.35-beta.3

package/build/history.d.ts

@@ -53,6 +53,18 @@ export declare type ApiHistory = {
      * @image /doc/assets/history/addNode.jpg
      */
     addNode: (productId: VID, ownerId: VID, transformation: Transform, name?: string) => ID;
+    /**
+     * Adds multiple products as nodes to an existing assembly at once
+     * @param nodes array of node parameter objects. See also addNode().
+     * @example // tbd
+     * @image // tbd
+     */
+    addNodes: (...nodes: {
+        productId: number;
+        ownerId: number;
+        transformation: Transform;
+        name?: string;
+    }[]) => IDs;
     /**
      * Creates a boolean operation.
      * @param partId id of the part where the operation will be created on
@@ -326,10 +338,15 @@ export declare type ApiHistory = {
     /**
      * Creates ThreeJS scene from current product
      * @param productId id of the product to create scene from
+     * @param options optional object to define different settings.
+     * @param meshPerFace boolean flag to define if a part/solid will have a mesh for each face
+     * or if the faces will be combined to one mesh
      * @example // tbd
      * @image // tbd
      */
-    createScene: (productId: VID) => Promise<Scene>;
+    createScene: (productId: VID, options?: {
+        meshPerFace?: boolean;
+    }) => Promise<Scene>;
     /**
      * Creates one or more expressions.
      * @param partId id of part where to create the expression
@@ -660,7 +677,7 @@ export declare type ApiHistory = {
      * @example // tbd
      * @image // tbd
      */
-    load: (content: ArrayBuffer, type: DataTypes) => Promise<number | null>;
+    load: (content: ArrayBuffer, type: DataTypes) => Promise<number[] | null>;
     /**
      * Loads a product into the current drawing.
      * @param content data as arraybuffer
@@ -672,7 +689,7 @@ export declare type ApiHistory = {
      * return geoms.map(geom => new THREE.Mesh(geom, new THREE.MeshStandardMaterial()))
      * @image // tbd
      */
-    loadProduct: (content: ArrayBuffer, type: DataTypes) => Promise<number | null>;
+    loadProduct: (content: ArrayBuffer, type: DataTypes) => Promise<number[] | null>;
     /**
      * Creates a new feature and appends geometry to it. This method can be used to import specific geometry
      * which can be used for further operations like boolean, translations and so on.
@@ -692,6 +709,16 @@ export declare type ApiHistory = {
      * @image // tbd
      */
     removeNode: (referenceId: ObjectID, ownerId: ObjectID) => Promise<void>;
+    /**
+     * Removes multiple nodes from an assembly node at once
+     * @param nodes array of node parameter objects. See also removeNode().
+     * @example // tbd
+     * @image // tbd
+     */
+    removeNodes: (...nodes: {
+        referenceId: number;
+        ownerId: number;
+    }[]) => Promise<void>;
     /**
      * Translates a feature along a given axis.
      * @param partId id ot the part where features will be translated
@@ -763,7 +790,7 @@ declare type Point = {
     y: number;
     z: number;
 };
-declare type Transform = [Point, Point, Point];
+export declare type Transform = [Point, Point, Point];
 declare type BooleanTypes = 'Union' | 'Subtraction' | 'Intersection';
 declare type WCSTypes = 'XYAxisOrigin' | 'Custom';
 declare type WATypes = 'Custom' | 'WorkPoints' | 'PointAndDirection' | 'SketchLine' | 'Curve' | '2Points' | '2Planes';

package/build/history.js

@@ -184,7 +184,7 @@ const createRecursiveBufferGeometry = async (object, drawingId, bufferGeomArray)
         }
     }
 };
-const createRecursiveScene = async (object, drawingId, root) => {
+const createRecursiveScene = async (object, drawingId, root, options) => {
     let cDrawing = getDrawing(drawingId);
     const tree = cDrawing.structure.tree;
     if (object.link || object.solids) {
@@ -204,15 +204,27 @@ const createRecursiveScene = async (object, drawingId, root) => {
                     meshes = [...meshes, ...cachedSolid.meshes.map(m => m)];
             }
             if (meshes.length > 0) {
-                const part = new Group();
-                part.matrix = MathUtils.convertToMatrix4(object.coordinateSystem);
-                part.matrixAutoUpdate = false;
-                part.userData = { id: object.id };
-                part.name = object.name;
-                for (const mesh of meshes) {
-                    part.add(new Mesh(mesh.geometry, new MeshStandardMaterial({ color: mesh.color, transparent: mesh.opacity < 1, opacity: mesh.opacity })));
+                if (options === null || options === void 0 ? void 0 : options.meshPerFace) {
+                    const part = new Group();
+                    part.matrix = MathUtils.convertToMatrix4(object.coordinateSystem);
+                    part.matrixAutoUpdate = false;
+                    part.userData = { id: object.id };
+                    part.name = object.name;
+                    for (const mesh of meshes) {
+                        part.add(new Mesh(mesh.geometry, new MeshStandardMaterial({ color: mesh.color, transparent: mesh.opacity < 1, opacity: mesh.opacity })));
+                    }
+                    root.add(part);
+                }
+                else {
+                    const mesh = new Mesh();
+                    mesh.matrix = MathUtils.convertToMatrix4(object.coordinateSystem);
+                    mesh.matrixAutoUpdate = false;
+                    mesh.userData = { id: object.id };
+                    mesh.name = object.name;
+                    mesh.geometry = BufferGeometryUtils.mergeBufferGeometries(meshes.map(m => m.geometry));
+                    mesh.material = new MeshStandardMaterial();
+                    root.add(mesh);
                 }
-                root.add(part);
             }
         }
     }
@@ -226,7 +238,7 @@ const createRecursiveScene = async (object, drawingId, root) => {
         root.add(assembly);
         for (const child of object.children) {
             if (tree[child].class === CCClasses.CCProductReference || tree[child].class === CCClasses.CCProductReferenceET) {
-                await createRecursiveScene(tree[child], drawingId, assembly);
+                await createRecursiveScene(tree[child], drawingId, assembly, options);
             }
         }
     }
@@ -251,10 +263,18 @@ export default class CAD {
             const publicApi = {
                 addNode: (productId, ownerId, transformation, name) => {
                     return this.resolve(async ([rProductId, rOwnerId]) => {
-                        ccAPI.assemblyBuilder.setCurrentNode(drawingId, rOwnerId);
                         return ccAPI.assemblyBuilder.addNode(drawingId, rProductId, rOwnerId, transformation, name);
                     }, productId, ownerId);
                 },
+                addNodes: (...nodes) => {
+                    return this.resolve(async ([]) => {
+                        const nodesToAdd = [];
+                        nodes.forEach(node => {
+                            nodesToAdd.push([node.productId, node.ownerId, node.transformation, node.name]);
+                        });
+                        return ccAPI.assemblyBuilder.addNodes(drawingId, nodesToAdd);
+                    });
+                },
                 boolean: (partId, type, entities) => {
                     return this.resolve(async ([rPartId, ...rEntities]) => {
                         const cDrawing = await getDrawing(drawingId);
@@ -418,7 +438,7 @@ export default class CAD {
                     }
                     return undefined;
                 },
-                createScene: async (objectId) => {
+                createScene: async (objectId, options) => {
                     await this.queue;
                     this.queue = Promise.resolve(0);
                     const rObjectId = await objectId;
@@ -427,7 +447,7 @@ export default class CAD {
                     const scene = new Scene();
                     if (rObjectId != null) {
                         const rootObj = structureTree[rObjectId];
-                        await createRecursiveScene(rootObj, drawingId, scene);
+                        await createRecursiveScene(rootObj, drawingId, scene, options);
                     }
                     return scene;
                 },
@@ -653,6 +673,15 @@ export default class CAD {
                         await ccAPI.assemblyBuilder.removeNode(drawingId, rReferenceId, rOwnerId);
                     }, referenceId, ownerId);
                 },
+                removeNodes: (...nodes) => {
+                    return this.resolve(async ([]) => {
+                        const nodesToRemove = [];
+                        nodes.forEach(node => {
+                            nodesToRemove.push([node.referenceId, node.ownerId]);
+                        });
+                        return ccAPI.assemblyBuilder.removeNodes(drawingId, nodesToRemove);
+                    });
+                },
                 importFeature: (partId, content, format, name) => {
                     return this.resolve(async ([rPartId]) => {
                         const featureName = name ? name : 'Import';

package/build/index.d.ts

@@ -7,9 +7,10 @@ export { solid, history, createPolyline };
  *
  * Please have a look at https://github.com/awv-informatik/buerli/pull/129 for more information.
  */
-import { ApiHistory as ApiHistory1, ConstraintType as ConstraintType1 } from './history';
+import { ApiHistory as ApiHistory1, ConstraintType as ConstraintType1, Transform as Transform1 } from './history';
 export declare type ApiHistory = ApiHistory1;
 export declare type ConstraintType = ConstraintType1;
+export declare type Transform = Transform1;
 import { ApiNoHistory as ApiNoHistory1, FilletPoint as FilletPoint1, Polyline as Polyline1 } from './solid';
 export declare type ApiNoHistory = ApiNoHistory1;
 export declare type Polyline = Polyline1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buerli.io/headless",
-  "version": "0.0.34",
+  "version": "0.0.35-beta.3",
   "description": "A non-manifold CAD workflow for the web",
   "author": "AWV Informatik AG <info@awv-informatik.ch>",
   "repository": {},
@@ -51,6 +51,6 @@
     "three": ">=0.128"
   },
   "dependencies": {
-    "@buerli.io/classcad": "0.0.34"
+    "@buerli.io/classcad": "0.0.35-beta.3"
   }
 }