@bimdata/viewer 1.9.0-alpha.buildingmaker → 1.9.0-alpha.synchroplan.0

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,33 @@ declare namespace BDV {
     uuid: string;
   }
 
-  interface APIIfc {
+  interface StateModel {
     id: number;
+    type: ModelType;
+    status: ModelStatus;
+    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,22 +360,7 @@ declare namespace BDV {
     space: StateObject;
   }
 
-  interface StateIfc extends APIIfc {
-    structure: Object;
-    objects: StateObject[];
-    uuids: Map<string, StateObject>;
-  }
-
-  interface ProjectModel {
-    id: number;
-    name: string;
-    status: ProjectModelStatus;
-    preview: string;
-    loading: boolean;
-    loaded: boolean;
-  }
-
-  type ProjectModelStatus = "C" | "E" | "P" | "I";
+  type ModelStatus = "C" | "E" | "P" | "I";
 
   interface VueInstance {
     $t(message: string): string;
@@ -381,21 +396,20 @@ declare namespace BDV {
     startupScript?: ($viewer: $viewer) => void;
   }
 
-  interface Plugin {
-    $viewer?: $viewer;
-    methods?: {
-      $viewer: $viewer;
-    };
-    computed?: {
-      $viewer: $viewer;
-    };
-  }
+  type Plugin<T> = VueComponent<{ $viewer: $viewer } | T>;
 
-  interface Viewer3dPlugin extends Plugin {
+  type VueComponent<T> =
+    | {
+        methods: T;
+        computed: T;
+      }
+    | T;
+
+  type Viewer3dPlugin = Plugin<{
     fitViewObjects(uuids: string[]): void;
     getCameraPosition(): Object;
     getProjection(): string;
     getViewpoint(snapshot?: boolean): Object;
     setCameraPosition(cameraPosition?: Object): void;
-  }
+  }>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bimdata/viewer",
-  "version": "1.9.0-alpha.buildingmaker",
+  "version": "1.9.0-alpha.synchroplan.0",
   "description": "A customizable BIM viewer.",
   "keywords": [
     "bim",
@@ -24,7 +24,7 @@
   "unpkg": "dist/bimdata-viewer.min.js",
   "scripts": {
     "test": "jest",
-    "build": "rollup -c",
+    "build": "rollup -c --environment BUILD:production",
     "prebuild": "rm -rf dist",
     "dev": "vite",
     "prepublishOnly": "npm run build",
@@ -41,11 +41,11 @@
   ],
   "devDependencies": {
     "@babel/preset-env": "^7.15.6",
-    "@bimdata/2d-engine": "1.7.0",
-    "@bimdata/areas": "0.5.0",
-    "@bimdata/bimdata-api-client": "7.0.0",
+    "@bimdata/2d-engine": "1.8.0",
+    "@bimdata/areas": "0.5.1",
+    "@bimdata/bimdata-api-client": "7.4.1",
     "@bimdata/color-picker": "0.0.3",
-    "@bimdata/design-system": "1.2.0-rc.22",
+    "@bimdata/design-system": "1.2.0-rc.42",
     "@johmun/vue-tags-input": "^2.1.0",
     "@rollup/plugin-alias": "3.1.5",
     "@rollup/plugin-babel": "^5.3.0",
@@ -60,8 +60,10 @@
     "@semantic-release/github": "^8.0.1",
     "@semantic-release/npm": "^8.0.0",
     "@semantic-release/release-notes-generator": "^10.0.2",
+    "@vue/composition-api": "^1.4.9",
     "@vue/test-utils": "1.2.2",
     "@xeokit/xeokit-sdk": "git+https://git@github.com/Amoki/xeokit-sdk.git#b0e7759c68625da822ff81d8ca859f17998071b4",
+    "async": "^3.2.3",
     "autoprefixer": "^10.4.2",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^27.2.4",
@@ -75,6 +77,7 @@
     "html2canvas": "1.3.2",
     "jest": "^27.2.4",
     "jest-extended": "^0.11.5",
+    "lodash": "^4.17.21",
     "node-fetch": "^2.6.6",
     "pdfjs-dist": "^2.9.359",
     "postcss": "^8.4.5",