Merge pull request #115 from pattern-x/feature/dat.gui

Add dat.gui, and enable to update dxf elevation for bim_2_overlay_wit…

asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.352fe986.css",
-    "main.js": "./static/js/main.f7cc68be.js",
+    "main.js": "./static/js/main.abd1e4ad.js",
     "static/js/787.cf5efa72.chunk.js": "./static/js/787.cf5efa72.chunk.js",
     "demo/libs/gemini-viewer.esm.min.js": "./demo/libs/gemini-viewer.esm.min.js",
     "static/media/dwg_background.png": "./static/media/dwg_background.f630e7cda68e19172eec.png",
@@ -9,8 +9,8 @@
     "demo/libs/types/core/camera-controls/CameraControls.d.ts": "./demo/libs/types/core/camera-controls/CameraControls.d.ts",
     "demo/libs/types/core/dxf/DxfLoader.d.ts": "./demo/libs/types/core/dxf/DxfLoader.d.ts",
     "demo/libs/types/core/viewers/BimViewer.d.ts": "./demo/libs/types/core/viewers/BimViewer.d.ts",
-    "demo/libs/types/core/utils/ObjectUtils.d.ts": "./demo/libs/types/core/utils/ObjectUtils.d.ts",
     "demo/libs/types/core/Configs.d.ts": "./demo/libs/types/core/Configs.d.ts",
+    "demo/libs/types/core/utils/ObjectUtils.d.ts": "./demo/libs/types/core/utils/ObjectUtils.d.ts",
     "demo/libs/types/plugins/pdf/PdfLoader.d.ts": "./demo/libs/types/plugins/pdf/PdfLoader.d.ts",
     "demo/libs/types/core/dxf-parser/DxfParser.d.ts": "./demo/libs/types/core/dxf-parser/DxfParser.d.ts",
     "demo/libs/types/core/viewers/VRViewer.d.ts": "./demo/libs/types/core/viewers/VRViewer.d.ts",
@@ -22,8 +22,8 @@
     "demo/libs/types/core/utils/Locale.d.ts": "./demo/libs/types/core/utils/Locale.d.ts",
     "demo/libs/types/plugins/sections/BaseBoxSection.d.ts": "./demo/libs/types/plugins/sections/BaseBoxSection.d.ts",
     "demo/libs/types/core/dxf/DxfCompare.d.ts": "./demo/libs/types/core/dxf/DxfCompare.d.ts",
-    "demo/libs/types/core/utils/CommonUtils.d.ts": "./demo/libs/types/core/utils/CommonUtils.d.ts",
     "demo/libs/types/core/viewers/SimplifiedBimViewer.d.ts": "./demo/libs/types/core/viewers/SimplifiedBimViewer.d.ts",
+    "demo/libs/types/core/utils/CommonUtils.d.ts": "./demo/libs/types/core/utils/CommonUtils.d.ts",
     "demo/libs/types/core/utils/MergeUtils.d.ts": "./demo/libs/types/core/utils/MergeUtils.d.ts",
     "demo/libs/types/plugins/measure/BaseMeasurement.d.ts": "./demo/libs/types/plugins/measure/BaseMeasurement.d.ts",
     "demo/libs/types/plugins/measure/MeasurementPlugin.d.ts": "./demo/libs/types/plugins/measure/MeasurementPlugin.d.ts",
@@ -39,8 +39,8 @@
     "demo/libs/types/core/dxf-parser/entities/mleader.d.ts": "./demo/libs/types/core/dxf-parser/entities/mleader.d.ts",
     "demo/libs/types/core/dxf/DxfUtils.d.ts": "./demo/libs/types/core/dxf/DxfUtils.d.ts",
     "demo/libs/types/core/compare/DxfCompareHelper.d.ts": "./demo/libs/types/core/compare/DxfCompareHelper.d.ts",
-    "demo/libs/types/core/dxf-parser/entities/hatch.d.ts": "./demo/libs/types/core/dxf-parser/entities/hatch.d.ts",
     "demo/libs/types/plugins/toolbars/Toolbar.constants.d.ts": "./demo/libs/types/plugins/toolbars/Toolbar.constants.d.ts",
+    "demo/libs/types/core/dxf-parser/entities/hatch.d.ts": "./demo/libs/types/core/dxf-parser/entities/hatch.d.ts",
     "demo/libs/types/core/canvas/Drawable.d.ts": "./demo/libs/types/core/canvas/Drawable.d.ts",
     "demo/libs/types/core/font/FontManager.d.ts": "./demo/libs/types/core/font/FontManager.d.ts",
     "demo/libs/types/plugins/screenshot/ScreenshotPlugin.d.ts": "./demo/libs/types/plugins/screenshot/ScreenshotPlugin.d.ts",
@@ -70,6 +70,7 @@
     "demo/libs/types/plugins/measure/BaseMeasureDrawable.d.ts": "./demo/libs/types/plugins/measure/BaseMeasureDrawable.d.ts",
     "demo/libs/types/plugins/bottom-bar/BottomBarPlugin.d.ts": "./demo/libs/types/plugins/bottom-bar/BottomBarPlugin.d.ts",
     "demo/libs/types/core/utils/MaterialUtils.d.ts": "./demo/libs/types/core/utils/MaterialUtils.d.ts",
+    "demo/libs/types/plugins/overview-map/TextDrawable.d.ts": "./demo/libs/types/plugins/overview-map/TextDrawable.d.ts",
     "demo/libs/types/core/vr/BaseVRMesh.d.ts": "./demo/libs/types/core/vr/BaseVRMesh.d.ts",
     "demo/libs/types/plugins/explode/ExplodePlugin.d.ts": "./demo/libs/types/plugins/explode/ExplodePlugin.d.ts",
     "demo/libs/types/core/dxf-parser/entities/viewport.d.ts": "./demo/libs/types/core/dxf-parser/entities/viewport.d.ts",
@@ -78,19 +79,18 @@
     "demo/libs/types/core/dxf-parser/entities/geomtry.d.ts": "./demo/libs/types/core/dxf-parser/entities/geomtry.d.ts",
     "demo/libs/types/plugins/axis-gizmo/AxisGizmoPlugin.d.ts": "./demo/libs/types/plugins/axis-gizmo/AxisGizmoPlugin.d.ts",
     "demo/libs/types/core/geometry-offset/Offset.d.ts": "./demo/libs/types/core/geometry-offset/Offset.d.ts",
+    "demo/libs/types/export.doc.d.ts": "./demo/libs/types/export.doc.d.ts",
     "demo/libs/types/plugins/sections/AxisPlaneSection.d.ts": "./demo/libs/types/plugins/sections/AxisPlaneSection.d.ts",
     "demo/libs/types/core/vr/VRCube24Faces.d.ts": "./demo/libs/types/core/vr/VRCube24Faces.d.ts",
     "demo/libs/types/plugins/sections/SectionGizmo.d.ts": "./demo/libs/types/plugins/sections/SectionGizmo.d.ts",
-    "demo/libs/types/export.doc.d.ts": "./demo/libs/types/export.doc.d.ts",
+    "demo/libs/types/plugins/overview-map/ImageDrawable.d.ts": "./demo/libs/types/plugins/overview-map/ImageDrawable.d.ts",
     "demo/libs/types/plugins/sections/ObjectsBoxSection.d.ts": "./demo/libs/types/plugins/sections/ObjectsBoxSection.d.ts",
     "demo/libs/types/plugins/nav-cube/NavCubePlugin.d.ts": "./demo/libs/types/plugins/nav-cube/NavCubePlugin.d.ts",
     "demo/libs/types/plugins/ground-grass/GroundGrassPlugin.d.ts": "./demo/libs/types/plugins/ground-grass/GroundGrassPlugin.d.ts",
     "demo/libs/types/core/font/BaseFont.d.ts": "./demo/libs/types/core/font/BaseFont.d.ts",
     "demo/libs/types/plugins/ground-grid/GroundGridPlugin.d.ts": "./demo/libs/types/plugins/ground-grid/GroundGridPlugin.d.ts",
-    "demo/libs/types/plugins/overview-map/ImageDrawable.d.ts": "./demo/libs/types/plugins/overview-map/ImageDrawable.d.ts",
     "demo/libs/types/core/helpers/ControlsHelper.d.ts": "./demo/libs/types/core/helpers/ControlsHelper.d.ts",
     "demo/libs/types/core/camera-controls/EventDispatcher.d.ts": "./demo/libs/types/core/camera-controls/EventDispatcher.d.ts",
-    "demo/libs/types/plugins/overview-map/TextDrawable.d.ts": "./demo/libs/types/plugins/overview-map/TextDrawable.d.ts",
     "demo/libs/types/plugins/measure/AreaMeasurement.d.ts": "./demo/libs/types/plugins/measure/AreaMeasurement.d.ts",
     "demo/libs/types/core/font/shx/util/BitConverter.d.ts": "./demo/libs/types/core/font/shx/util/BitConverter.d.ts",
     "demo/libs/types/core/markup/BaseMarkup.d.ts": "./demo/libs/types/core/markup/BaseMarkup.d.ts",
@@ -126,8 +126,8 @@
     "demo/libs/types/core/dxf-parser/objects/layout.d.ts": "./demo/libs/types/core/dxf-parser/objects/layout.d.ts",
     "demo/libs/types/plugins/measure/AngleMeasurement.d.ts": "./demo/libs/types/plugins/measure/AngleMeasurement.d.ts",
     "demo/libs/types/plugins/sections/GlobalPlaneSection.d.ts": "./demo/libs/types/plugins/sections/GlobalPlaneSection.d.ts",
-    "demo/libs/types/plugins/measure/CoordinateMeasurement.d.ts": "./demo/libs/types/plugins/measure/CoordinateMeasurement.d.ts",
     "demo/libs/types/plugins/toolbars/BimViewerToolbarPlugin.d.ts": "./demo/libs/types/plugins/toolbars/BimViewerToolbarPlugin.d.ts",
+    "demo/libs/types/plugins/measure/CoordinateMeasurement.d.ts": "./demo/libs/types/plugins/measure/CoordinateMeasurement.d.ts",
     "demo/libs/types/core/canvas/Constants.d.ts": "./demo/libs/types/core/canvas/Constants.d.ts",
     "demo/libs/types/core/utils/Viewer3DUtils.d.ts": "./demo/libs/types/core/utils/Viewer3DUtils.d.ts",
     "demo/libs/types/core/font/shx/TextShape.d.ts": "./demo/libs/types/core/font/shx/TextShape.d.ts",
@@ -151,6 +151,7 @@
     "demo/libs/types/plugins/measure/DistanceMeasureDrawable.d.ts": "./demo/libs/types/plugins/measure/DistanceMeasureDrawable.d.ts",
     "demo/libs/types/plugins/overview-map/LineDrawable.d.ts": "./demo/libs/types/plugins/overview-map/LineDrawable.d.ts",
     "demo/libs/types/core/utils/ColorUtils.d.ts": "./demo/libs/types/core/utils/ColorUtils.d.ts",
+    "demo/libs/types/plugins/local-model-uploader/LocalDxfUploader.d.ts": "./demo/libs/types/plugins/local-model-uploader/LocalDxfUploader.d.ts",
     "demo/libs/types/plugins/pdf/PdfLoaderPlugin.d.ts": "./demo/libs/types/plugins/pdf/PdfLoaderPlugin.d.ts",
     "demo/libs/types/core/dxf-parser/entities/vertex.d.ts": "./demo/libs/types/core/dxf-parser/entities/vertex.d.ts",
     "demo/libs/types/core/font/shx/ShxParser.d.ts": "./demo/libs/types/core/font/shx/ShxParser.d.ts",
@@ -169,7 +170,6 @@
     "demo/libs/types/core/index.d.ts": "./demo/libs/types/core/index.d.ts",
     "demo/libs/types/core/utils/UnitConversionUtils.d.ts": "./demo/libs/types/core/utils/UnitConversionUtils.d.ts",
     "demo/libs/types/core/helpers/RafHelper.d.ts": "./demo/libs/types/core/helpers/RafHelper.d.ts",
-    "demo/libs/types/plugins/local-model-uploader/LocalDxfUploader.d.ts": "./demo/libs/types/plugins/local-model-uploader/LocalDxfUploader.d.ts",
     "demo/libs/types/core/font/MeshFont.d.ts": "./demo/libs/types/core/font/MeshFont.d.ts",
     "demo/libs/types/core/compare/CompareDrawable.d.ts": "./demo/libs/types/core/compare/CompareDrawable.d.ts",
     "demo/libs/types/core/utils/CSS2DObjectUtils.d.ts": "./demo/libs/types/core/utils/CSS2DObjectUtils.d.ts",
@@ -219,6 +219,7 @@
     "demo/libs/types/core/dxf-parser/AutoCadColorIndex.d.ts": "./demo/libs/types/core/dxf-parser/AutoCadColorIndex.d.ts",
     "demo/libs/types/plugins/sections/Section.constants.d.ts": "./demo/libs/types/plugins/sections/Section.constants.d.ts",
     "demo/libs/types/core/dxf-parser/entities/point.d.ts": "./demo/libs/types/core/dxf-parser/entities/point.d.ts",
+    "demo/libs/types/core/patches/shaders/shaderChunk/outine_bc_vertex.glsl.d.ts": "./demo/libs/types/core/patches/shaders/shaderChunk/outine_bc_vertex.glsl.d.ts",
     "demo/libs/types/core/dxf-parser/entities/region.d.ts": "./demo/libs/types/core/dxf-parser/entities/region.d.ts",
     "demo/libs/types/core/dxf-parser/entities/solid.d.ts": "./demo/libs/types/core/dxf-parser/entities/solid.d.ts",
     "demo/libs/types/core/dxf-parser/entities/xline.d.ts": "./demo/libs/types/core/dxf-parser/entities/xline.d.ts",
@@ -263,7 +264,6 @@
     "demo/libs/types/core/undo-redo/Command.d.ts": "./demo/libs/types/core/undo-redo/Command.d.ts",
     "demo/libs/types/core/compare/index.d.ts": "./demo/libs/types/core/compare/index.d.ts",
     "demo/libs/types/core/patches/index.d.ts": "./demo/libs/types/core/patches/index.d.ts",
-    "demo/libs/types/core/patches/shaders/shaderChunk/outine_bc_vertex.glsl.d.ts": "./demo/libs/types/core/patches/shaders/shaderChunk/outine_bc_vertex.glsl.d.ts",
     "demo/libs/types/core/canvas/index.d.ts": "./demo/libs/types/core/canvas/index.d.ts",
     "demo/libs/types/core/vr/index.d.ts": "./demo/libs/types/core/vr/index.d.ts",
     "demo/libs/types/core/utils/DecimalPrecisionUtils.d.ts": "./demo/libs/types/core/utils/DecimalPrecisionUtils.d.ts",
@@ -313,11 +313,11 @@
     "demo/libs/types/core/webcam/index.d.ts": "./demo/libs/types/core/webcam/index.d.ts",
     "demo/libs/types/core/workers/CreateMeshBvh.worker.d.ts": "./demo/libs/types/core/workers/CreateMeshBvh.worker.d.ts",
     "main.352fe986.css.map": "./static/css/main.352fe986.css.map",
-    "main.f7cc68be.js.map": "./static/js/main.f7cc68be.js.map",
+    "main.abd1e4ad.js.map": "./static/js/main.abd1e4ad.js.map",
     "787.cf5efa72.chunk.js.map": "./static/js/787.cf5efa72.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.352fe986.css",
-    "static/js/main.f7cc68be.js"
+    "static/js/main.abd1e4ad.js"
   ]
 }

demo/bim_2_overlay_with_dxf.html

@@ -24,6 +24,8 @@
             NavCubePlugin,
             SectionPlugin,
         } from "./demo/libs/gemini-viewer.esm.min.js";
+        import * as dat from "./demo/libs/dat.gui.module.js";
+        const gui = new dat.GUI();
 
         const project = {
             "id": "building1",
@@ -82,6 +84,22 @@
                 // viewer.setToOrthographicCamera(false);
             });
         });
+
+        // dat.gui controls
+        const controls = {
+            dxfElevation: 0,
+        }
+        // update dxf elevation between -2 to 30, default value is 17.
+        gui.add(controls, "dxfElevation", -2.0, 30.0, 0.1)
+            .name("Dxf elevation")
+            .setValue(17) // the origin value is 17
+            .onChange((val) => {
+                const dxf = viewer.loadedModels.find((model) => model.modelId.endsWith(".dxf"));
+                const object = dxf.object;
+                object.position.setY(val);
+                object.updateMatrix();
+                viewer.enableRender();
+            });
     </script>
 </body>
 

demo/bim_3_explode.html

@@ -31,7 +31,6 @@
         const viewerCfg = {
             containerId: "myCanvas",
             language: "en",
-            enableToolbar: false,
         }
         const viewer = new BimViewer(viewerCfg);
 

demo/libs/types/core/Configs.d.ts

@@ -347,3 +347,21 @@ export interface ScreenshotConfig {
     quality: number;
     includeOverlay: boolean;
 }
+/**
+ * Icon class.
+ * Used by toolbar and bottom bar icons, etc.
+ */
+export interface IconClass {
+    /**
+     * The default icon.
+     */
+    default: string;
+    /**
+     * The icon when item is actived.
+     */
+    active?: string;
+    /**
+     * The icon font class name.
+     */
+    iconFont?: string;
+}

demo/libs/types/core/patches/shaders/shaderChunk/outine_bc_vertex.glsl.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "\n    #if defined(USE_BC_OUTLINE)\n        vBarycentric = barycentric;\n    #endif\n";
+declare const _default: "\n    #if defined(USE_BC_OUTLINE)\n        // Restore barycentric coordinates\n        int barycentricX = int(barycentric) & 0x1;\n        int barycentricY = int(barycentric) & 0x2;\n        int barycentricZ = int(barycentric) & 0x4;\n        vBarycentric = vec3(float(barycentricX), float(barycentricY), float(barycentricZ));\n    #endif\n";
 export default _default;

demo/libs/types/core/patches/shaders/shaderChunk/outline_bc_pars_vertex.glsl.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "\n    #ifdef USE_BC_OUTLINE \n        attribute vec3 barycentric;\n        varying vec3 vBarycentric;\n    #endif\n";
+declare const _default: "\n    #ifdef USE_BC_OUTLINE \n        attribute float barycentric;\n        varying vec3 vBarycentric;\n    #endif\n";
 export default _default;

demo/libs/types/core/utils/CommonUtils.d.ts

@@ -1,4 +1,5 @@
 import * as THREE from "three";
+import { IconClass } from "../Configs";
 /**
  * @internal
  */
@@ -122,11 +123,3 @@ export declare class CommonUtils {
  * @internal
  */
 export declare const setIcon: (classList: DOMTokenList, iconClass: IconClass, active: boolean) => void;
-/**
- * @internal
- */
-export interface IconClass {
-    default: string;
-    active?: string;
-    iconFont?: string;
-}

demo/libs/types/core/viewers/DxfViewer.d.ts

@@ -310,7 +310,7 @@ export declare class DxfViewer extends BaseViewer {
      * const viewer = new DxfViewer(viewerCfg);
      * await viewer.loadModelAsync(modelCfg, (event) => {
      *     const progress = (event.loaded * 100) / event.total;
-     *     console.log(`${event.type}: ${progress}%`);
+     *     console.log(`Loading progress: ${progress}%`);
      * });
      * console.log("Loaded");
      * ```

demo/libs/types/export.doc.d.ts

@@ -1,9 +1,9 @@
-export { SectionType, Vector2, Vector3, Box2, DrawableData, ScreenshotMode } from "./core";
+export { SectionType, Vector2, Vector3, Box2, DrawableData, InputManager, Model3d, ScreenshotMode } from "./core";
 export { BaseDxfCompareHelper, DxfCompareHelper } from "./core/compare";
 export { BaseViewerConfig, BimViewerConfig, CameraConfig, DxfCompareConfig, DxfModelConfig, DxfViewerConfig, Hotpoint, ModelConfig, Panorama, VRViewerConfig, VRViewpoint, } from "./core/Configs";
-export { BaseViewer, BimViewer, DxfViewer, VRViewer, ScreenshotResult, SimplifiedBimViewer, ViewerEvent, DxfLayers, MarkupData, Plugin, PluginConfig, } from "./core/viewers";
+export { BaseViewer, BimViewer, DxfLayers, DxfViewer, MarkupData, Model2d, Plugin, PluginConfig, ScreenshotResult, SimplifiedBimViewer, ViewerEvent, VRViewer, } from "./core/viewers";
 export { DxfDetailChanges, DxfChangeType, DxfChange, DxfLayer } from "./core/dxf";
 export { ILayer } from "./core/dxf-parser";
 export { MarkupType } from "./core/markup";
 export { ProgressBar } from "./components/progress-bar";
-export { AxisGizmoPlugin, AxisGizmoPluginConfig, BaseMeasureDrawable, BaseSection, BimViewerToolbarPlugin, BimViewerToolbarPluginConfig, ContextMenuPlugin, DxfViewerToolbarPlugin, DxfViewerToolbarPluginConfig, ExplodePlugin, GroundShadowPlugin, GroundShadowConfig, HotpointPlugin, LocalDxfUploader, LocalModelUploader, LocalImageUploader, MeasurementData, MeasurementPlugin, MeasurementType, NavCubePlugin, NavCubePluginConfig, SectionPlugin, SkyboxPlugin, SkyboxPluginConfig, ToolbarMenuId, ViewCubePlugin, ViewCubePluginConfig, } from "./plugins";
+export { AxisGizmoPlugin, AxisGizmoPluginConfig, BaseMeasureDrawable, BaseSection, BimViewerToolbarPlugin, BimViewerToolbarPluginConfig, ContextMenuPlugin, DxfViewerToolbarPlugin, DxfViewerToolbarPluginConfig, ExplodePlugin, GroundShadowPlugin, GroundShadowConfig, HotpointPlugin, LocalDxfUploader, LocalModelUploader, LocalImageUploader, MeasurementData, MeasurementPlugin, MeasurementType, NavCubePlugin, NavCubePluginConfig, SectionPlugin, SkyboxPlugin, SkyboxPluginConfig, Toolbar, ToolbarConfig, ToolbarMenuConfig, ToolbarMenu, ToolbarMenuId, ViewCubePlugin, ViewCubePluginConfig, } from "./plugins";

demo/libs/types/plugins/bottom-bar/BottomBarPlugin.d.ts

@@ -1,5 +1,5 @@
 import { Tooltip } from "../../components/tool-tip";
-import { IconClass } from "../../core/utils";
+import { IconClass } from "../../core";
 import { BaseViewer } from "../../core/viewers/BaseViewer";
 import { Plugin } from "../../core/viewers/Plugin";
 declare enum BottomBarItemId {

demo/libs/types/plugins/local-model-uploader/LocalDxfUploader.d.ts

@@ -5,9 +5,11 @@ import type { DxfViewer, ModelConfig } from "../../core";
  */
 export declare class LocalDxfUploader extends IUploader {
     private viewer;
+    private pdfWorker;
     onSuccess?: (event: any) => void;
     readonly defaultModelConfig: ModelConfig;
     constructor(viewer: DxfViewer, elementId?: string);
+    setPdfWorker(pdfWorker: string): void;
     protected formats(): string[];
     protected uploadFiles(files: FileList): void;
     /**

demo/libs/types/plugins/overview-map/ImageDrawable.d.ts

@@ -5,6 +5,7 @@ export interface ImageDrawableConfig {
     image: HTMLImageElement;
     position: Vector3 | THREE.Vector3;
     radius?: number;
+    displayRadius?: number;
     enabledHover?: boolean;
     direction?: Vector3 | THREE.Vector3;
     rotation?: number;
@@ -18,6 +19,7 @@ export declare class ImageDrawable extends Drawable {
     hover: boolean;
     needsFrustumCulled: boolean;
     position: THREE.Vector3;
+    displayRadius: number;
     radius?: number;
     direction?: THREE.Vector3;
     rotation?: number;

demo/libs/types/plugins/overview-map/TextDrawable.d.ts

@@ -17,19 +17,29 @@ export interface TextDrawableConfig {
     text: string;
     position: Vector3;
     radius?: number;
+    displayRadius?: number;
     offset?: Vector2;
     textStyle?: TextStyle;
+    size?: {
+        width: number;
+        height: number;
+    };
 }
 export declare class TextDrawable extends Drawable {
     text: string;
     position: Vector3;
     offset: Vector2;
+    size: {
+        width: number;
+        height: number;
+    };
     textStyle: TextStyle;
+    displayRadius: number;
     radius?: number;
     needsFrustumCulled: boolean;
     constructor(id: string, cfg: TextDrawableConfig);
     private getFont;
-    drawRoundRect(ctx: CanvasRenderingContext2D, x: number, y: number, width: number, height: number): void;
+    drawRoundRect(ctx: CanvasRenderingContext2D, x: number, y: number, width: number, height: number, cameraPosition: THREE.Vector2, bClippable: boolean): void;
     draw(ctx: CanvasRenderingContext2D, camera: THREE.Camera): void;
     getBounds(): THREE.Box3;
     drawSelect(): void;

demo/libs/types/plugins/toolbars/BimViewerToolbarPlugin.d.ts

@@ -13,7 +13,7 @@ export interface BimViewerToolbarPluginConfig extends PluginConfig {
  */
 export declare class BimViewerToolbarPlugin extends Plugin {
     protected cfg: BimViewerToolbarPluginConfig;
-    toolbar: Toolbar;
+    protected toolbar: Toolbar;
     constructor(viewer: BaseViewer, cfg?: BimViewerToolbarPluginConfig);
     /**
      * Sets a menu item to be active or inactive.

demo/libs/types/plugins/toolbars/DxfViewerToolbarPlugin.d.ts

@@ -15,8 +15,8 @@ export interface DxfViewerToolbarPluginConfig extends PluginConfig {
  */
 export declare class DxfViewerToolbarPlugin extends Plugin {
     protected cfg: DxfViewerToolbarPluginConfig;
-    toolbar: Toolbar;
+    protected toolbar: Toolbar;
-    markupToolbar?: Toolbar;
+    protected markupToolbar?: Toolbar;
     constructor(viewer: BaseViewer, cfg?: DxfViewerToolbarPluginConfig);
     /**
      * Sets a menu item to be active or inactive.

demo/libs/types/plugins/toolbars/Toolbar.constants.d.ts

@@ -1,5 +1,5 @@
 import type { Toolbar } from "./Toolbar";
-import type { IconClass } from "../../core/utils";
+import { IconClass } from "../../core";
 import type { BaseViewer } from "../../core/viewers";
 /**
  * @type
@@ -7,7 +7,6 @@ import type { BaseViewer } from "../../core/viewers";
  * 2：show popup
  * 3：show submenu
  * 4：turn on/off
- * @internal
  */
 export declare enum MenuTypeEnums {
     ClickEvent = 1,
@@ -17,7 +16,6 @@ export declare enum MenuTypeEnums {
 }
 /**
  * Buildin toolbar ids
- * @internal
  */
 export declare enum ToolbarMenuId {
     HomeView = "HomeView",
@@ -69,8 +67,8 @@ export declare enum ToolbarMenuId {
     Screenshot = "GetScreenshot"
 }
 /**
- * ToolbarConfig
+ * Toolbar menu config.
- * @internal
+ * Used to define menu item name, icon, child items, etc.
  */
 export interface ToolbarMenuConfig {
     menuName?: string;
@@ -86,7 +84,8 @@ export interface ToolbarMenuConfig {
     onClick?: (viewer: BaseViewer, toolbar: Toolbar, event: MouseEvent | TouchEvent) => void;
 }
 /**
- * @internal
+ * Toolbar config.
+ * The key is ToolbarMenuId, and the value is a ToolbarMenuConfig.
  */
 export declare type ToolbarConfig = {
     [key in ToolbarMenuId]?: ToolbarMenuConfig;

demo/libs/types/plugins/toolbars/Toolbar.d.ts

@@ -37,7 +37,6 @@ import { type BaseViewer } from "../../core/viewers";
  *     toolbar.toolbarGroupConfig = toolbarGroupConfig;
  *     toolbar.refresh();
  * ```
- * @internal
  */
 export declare class Toolbar {
     protected viewer: BaseViewer;

index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>React App</title><script defer="defer" src="./static/js/main.f7cc68be.js"></script><link href="./static/css/main.352fe986.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>React App</title><script defer="defer" src="./static/js/main.abd1e4ad.js"></script><link href="./static/css/main.352fe986.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>