@bimdata/viewer 1.9.0-rc.8 → 1.9.0-rc.80

package/index.d.ts

@@ -1,3 +1,4 @@
+/* eslint-disable*/
 declare module "@bimdata/viewer" {
   export default function makeBIMDataViewer(cfg: BDV.ViewerCfg): BDV.Viewer;
 }
@@ -9,11 +10,11 @@ declare namespace BDV {
       layout: Object
     ): Object;
     setLocale(lang: AvailableLangs): void;
-    registerPlugin(plugin: Plugin, cfg: Object): void;
+    registerPlugin(plugin: PluginCfg, cfg?: Object): void;
     registerWindow(window: Object): void;
     unregisterWindow(windowName: string): void;
     setAccessToken(accessToken: string): void;
-    loadIfcs(ifcIds: number[]): StateIfc[];
+    loadIfcs(ifcIds: number[]): StateModel[];
   }
 
   enum AvailableLangs {
@@ -25,10 +26,10 @@ declare namespace BDV {
   interface ViewerCfg {
     plugins: PluginsConfig;
     api: APIConfig;
-    offlineOptions: OfflineData;
+    offlineOptions?: OfflineData;
     ui: UIConfig;
-    logger: { level: LogLevel };
-    locale: string;
+    logger?: { level: LogLevel };
+    locale?: string;
   }
 
   interface PluginsConfig {
@@ -99,7 +100,7 @@ declare namespace BDV {
     cloudId: number;
     projectId: number;
     accessToken: string;
-    apiUrl: string;
+    apiUrl?: string;
   }
 
   interface UIConfig {
@@ -192,6 +193,10 @@ declare namespace BDV {
   }
 
   type ContextEvents = {
+    "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;
@@ -203,7 +208,7 @@ declare namespace BDV {
     "window-close": Window;
   };
 
-  interface Context<T> {
+  interface Context<T extends Events> {
     loading: boolean;
     incrementSpinnerProcesses: Function;
     decrementSpinnerProcesses: Function;
@@ -232,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[] };
@@ -259,9 +267,11 @@ 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[];
     highlightedObjects: StateObject[];
     unhighlightedObjects: StateObject[];
@@ -270,16 +280,22 @@ 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 ****/
     objects: StateObject[];
     objectsMap: Map<number, StateObject>;
     selectObjects(ids: number[]): void;
+    colorizeObjects(ids: number[], color?: string): void;
     deselectObjects(ids: number[]): void;
     highlightObjects(ids: number[]): void;
     unhighlightObjects(ids: number[]): void;
@@ -287,11 +303,14 @@ declare namespace BDV {
     hideObjects(ids: number[]): void;
     xrayObjects(ids: number[]): void;
     unxrayObjects(ids: number[]): void;
+    isolateObjects(ids: number[]): void;
+    reintegrateObjects(): void;
   }
 
   interface APIObject {
     children: APIObject[];
-    ifc: APIIfc;
+    model: StateModel;
+    ifc: StateModel;
     longname: string;
     name: string;
     object_type: string;
@@ -300,18 +319,39 @@ 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;
     highlighted: boolean;
     xrayed: boolean;
+    color: string;
     // advanced getters
     descendants;
     ancestors: StateObject[];
@@ -320,11 +360,7 @@ declare namespace BDV {
     space: StateObject;
   }
 
-  interface StateIfc extends APIIfc {
-    structure: Object;
-    objects: StateObject[];
-    uuids: Map<string, StateObject>;
-  }
+  type ModelStatus = "C" | "E" | "P" | "I";
 
   interface VueInstance {
     $t(message: string): string;
@@ -352,13 +388,28 @@ declare namespace BDV {
     plugins: string[];
   }
 
-  interface Plugin {
-    $viewer: $viewer;
-    methods: {
-      $viewer: $viewer;
-    };
-    computed: {
-      $viewer: $viewer;
-    };
+  interface PluginCfg {
+    name: string;
+    component?: Object;
+    button?: Object;
+    addToWindows?: string[];
+    startupScript?: ($viewer: $viewer) => void;
   }
+
+  type Plugin<T> = VueComponent<{ $viewer: $viewer } | T>;
+
+  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-rc.8",
+  "version": "1.9.0-rc.80",
   "description": "A customizable BIM viewer.",
   "keywords": [
     "bim",
@@ -25,10 +25,8 @@
   "scripts": {
     "test": "jest",
     "build": "rollup -c --environment BUILD:production",
-    "build:dev": "rollup -c --environment BUILD:development",
     "prebuild": "rm -rf dist",
-    "prebuild:dev": "rm -rf dist",
-    "dev": "npm run build:dev -- --watch",
+    "dev": "vite",
     "prepublishOnly": "npm run build",
     "semantic-release": "semantic-release",
     "version": "echo $npm_package_version"
@@ -43,23 +41,30 @@
   ],
   "devDependencies": {
     "@babel/preset-env": "^7.15.6",
-    "@bimdata/2d-engine": "1.6.0-beta.1",
-    "@bimdata/areas": "0.4.11",
-    "@bimdata/bimdata-api-client": "^6.17.3",
+    "@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.0.1",
+    "@bimdata/design-system": "1.2.0-rc.40",
     "@johmun/vue-tags-input": "^2.1.0",
     "@rollup/plugin-alias": "3.1.5",
     "@rollup/plugin-babel": "^5.3.0",
+    "@rollup/plugin-commonjs": "^21.0.1",
     "@rollup/plugin-image": "^2.1.1",
+    "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-node-resolve": "^13.1.3",
+    "@rollup/plugin-replace": "^3.0.1",
     "@semantic-release/changelog": "^6.0.0",
     "@semantic-release/commit-analyzer": "^9.0.1",
     "@semantic-release/git": "^10.0.0",
     "@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#9a012280f6253a2a719f93dba6f90de53fee8413",
+    "@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",
     "conventional-changelog-eslint": "^3.0.9",
@@ -68,25 +73,25 @@
     "eslint-plugin-jest": "^24.5.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-vue": "^7.18.0",
+    "form-data": "^4.0.0",
     "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",
     "prettier": "^2.4.1",
     "querystring": "^0.2.0",
     "rollup": "2.57.0",
-    "rollup-plugin-commonjs": "^10.0.1",
-    "rollup-plugin-json": "^4.0.0",
-    "rollup-plugin-livereload": "^2.0.5",
-    "rollup-plugin-node-resolve": "^5.2.0",
+    "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-replace": "^2.2.0",
-    "rollup-plugin-serve": "^1.1.0",
-    "rollup-plugin-svg": "^2.0.0",
     "rollup-plugin-terser": "7.0.2",
     "rollup-plugin-vue": "^5.0.1",
     "rollup-plugin-web-worker-loader": "^1.6.1",
     "semantic-release": "^18.0.0",
     "sinon": "^11.1.2",
+    "vite": "2.7.13",
     "vue": "^2.6.14",
     "vue-i18n": "^8.26.2",
     "vue-jest": "^3.0.7",