@bimdata/viewer 1.9.0-rc.53 → 1.9.0-rc.56

package/index.d.ts

@@ -14,7 +14,7 @@ declare namespace BDV {
     registerWindow(window: Object): void;
     unregisterWindow(windowName: string): void;
     setAccessToken(accessToken: string): void;
-    loadIfcs(ifcIds: number[]): StateIfc[];
+    loadIfcs(ifcIds: number[]): StateModel[];
   }
 
   enum AvailableLangs {
@@ -193,10 +193,10 @@ declare namespace BDV {
   }
 
   type ContextEvents = {
-    "3d-model-loaded": { ifc: StateIfc; model: Object; plugin: Object };
-    "3d-model-unloaded": { ifc: StateIfc; plugin: Object };
-    "2d-model-loaded": { ifc: StateIfc; plugin: Object };
-    "2d-model-unloaded": { ifc: StateIfc; plugin: Object };
+    "3d-model-loaded": { ifc: StateModel; model: Object; plugin: Object };
+    "3d-model-unloaded": { ifc: StateModel; plugin: Object };
+    "2d-model-loaded": { ifc: StateModel; plugin: Object };
+    "2d-model-unloaded": { ifc: StateModel; plugin: Object };
     "plugin-created": { pluginName: string; plugin: Plugin };
     "plugin-destroyed": { pluginName: string; plugin: Plugin };
     "plugin-menu-open": Plugin;
@@ -237,9 +237,12 @@ declare namespace BDV {
   }
 
   type StateEvents = {
+    // models events
+    "models-loaded": { models: StateModel[] };
+    "models-unloaded": { models: StateModel[] };
     // ifcs events
-    "ifcs-loaded": { ifcs: StateIfc[] };
-    "ifcs-unloaded": { ifcs: StateIfc[] };
+    "ifcs-loaded": { ifcs: StateModel[] };
+    "ifcs-unloaded": { ifcs: StateModel[] };
     // objects events
     "objects-added": { objects: StateObject[] };
     "objects-removed": { objects: StateObject[] };
@@ -264,8 +267,9 @@ declare namespace BDV {
 
     /**** getters ****/
     getObjectsByUuids(uuids: string[]): StateObject[];
-    getObject(id: string): StateObject;
-    getIfc(id): StateIfc;
+    getObject(id: number): StateObject;
+    getModel(id: number): StateModel;
+    getIfc(id: number): StateModel;
     selectedObjects: StateObject[];
     colorizedObjects: StateObject[];
     deselectedObjects: StateObject[];
@@ -276,10 +280,15 @@ declare namespace BDV {
     xrayedObjects: StateObject[];
     unxrayedObjects: StateObject[];
 
+    /**** models ****/
+    models: StateModel[];
+    modelsMap: Map<number, StateModel>;
+    loadModels(modelIds: string[]): Promise<StateModel[]>;
+    unloadModels(modelIds: string[]);
     /**** ifcs ****/
-    ifcs: StateIfc[];
-    ifcsMap: Map<number, StateIfc>;
-    loadIfcs(ifcIds: string[]): Promise<StateIfc[]>;
+    ifcs: StateModel[];
+    ifcsMap: Map<number, StateModel>;
+    loadIfcs(ifcIds: string[]): Promise<StateModel[]>;
     unloadIfcs(ifcIds: string[]);
 
     /**** objects ****/
@@ -300,7 +309,8 @@ declare namespace BDV {
 
   interface APIObject {
     children: APIObject[];
-    ifc: APIIfc;
+    model: StateModel;
+    ifc: StateModel;
     longname: string;
     name: string;
     object_type: string;
@@ -309,13 +319,32 @@ declare namespace BDV {
     uuid: string;
   }
 
-  interface APIIfc {
+  interface StateModel {
     id: number;
+    type: ModelType;
+    structure: Object;
+    objects: StateObject[];
+    uuids: Map<string, StateObject>;
+  }
+
+  enum ModelType {
+    IFC = "IFC",
+    DWG = "DWG",
+    DXF = "DXF",
+    GLTF = "GLTF",
+    PDF = "PDF",
+    JPEG = "JPEG",
+    PNG = "PNG",
+    OBJ = "OBJ",
+    DAE = "DAE",
+    BFX = "BFX",
+    METABUILDING = "METABUILDING",
   }
 
   interface StateObject extends APIObject {
     id: number;
-    ifc: StateIfc;
+    model: StateModel;
+    ifc: StateModel;
     visible: boolean;
     pickable: boolean;
     selected: boolean;
@@ -330,12 +359,6 @@ declare namespace BDV {
     space: StateObject;
   }
 
-  interface StateIfc extends APIIfc {
-    structure: Object;
-    objects: StateObject[];
-    uuids: Map<string, StateObject>;
-  }
-
   interface ProjectModel {
     id: number;
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bimdata/viewer",
-  "version": "1.9.0-rc.53",
+  "version": "1.9.0-rc.56",
   "description": "A customizable BIM viewer.",
   "keywords": [
     "bim",
@@ -43,7 +43,7 @@
     "@babel/preset-env": "^7.15.6",
     "@bimdata/2d-engine": "1.7.0",
     "@bimdata/areas": "0.5.0",
-    "@bimdata/bimdata-api-client": "7.1.0",
+    "@bimdata/bimdata-api-client": "7.4.1",
     "@bimdata/color-picker": "0.0.3",
     "@bimdata/design-system": "1.2.0-rc.30",
     "@johmun/vue-tags-input": "^2.1.0",