@x-viewer/core 0.21.9 → 0.21.11

package/dist/types/core/camera-controls/CameraControls.d.ts

@@ -310,7 +310,7 @@ export declare class CameraControls extends EventDispatcher {
      * @category Properties
      */
     get enabled(): boolean;
-    set enabled(enabled: boolean);
+    set enabled(enable: boolean);
     /**
      * Returns `true` if the controls are active updating.
      * readonly value.

package/dist/types/core/controls/OrbitControls.d.ts

@@ -6,7 +6,17 @@ import type { CameraManager } from "../../core/camera/CameraManager";
  */
 export declare class OrbitControls implements BaseControls {
     readonly mode = ControlsMode.Orbit;
+    private static readonly MIN_SCENE_SCALE;
+    private static readonly MAX_SCENE_SCALE;
+    private static readonly MIN_DOLLY_SPEED;
+    private static readonly MAX_DOLLY_SPEED;
+    private static readonly MIN_TRUCK_SPEED;
+    private static readonly MAX_TRUCK_SPEED;
+    private static readonly MIN_DISTANCE_FLOOR;
     constructor(cameraManager: CameraManager);
     setupControl(): void;
     adjustCameraByBBox(box: THREE.Box3): void;
+    private applyAdaptiveNavigationSensitivity;
+    private computeScaleRatio;
+    private computeMinDistance;
 }

package/dist/types/core/dxf/DxfLoader.d.ts

@@ -262,19 +262,6 @@ export declare class DxfLoader extends THREE.Loader {
      * Sets font.
      */
     setFont(font: FontManager): void;
-    /**
-     * Loads a dxf file by given url.
-     * If dxfDataId is specified and local cache is enabled, it firstly tries to load from cache.
-     * @param url url of the dxf file
-     * @param dxfDataId target dxf data id, used to get dxf data from cache if local cache is enabled.
-     * @param onProgress on progress callback
-     * @returns DxfData
-     */
-    loadAsyncEx(url: string, dxfDataId?: string, onProgress?: (event: ProgressEvent) => void): Promise<DxfData>;
-    /**
-     * Like {@link loadAsyncEx} but parses from in-memory bytes (DWG/DXF) instead of fetching a URL.
-     */
-    loadAsyncExFromBuffer(data: ArrayBuffer | Uint8Array, dxfDataId?: string, onProgress?: (event: ProgressEvent) => void): Promise<DxfData>;
     /**
      * Loads dxf asynchronously. It mainly contains 2 steps:
      * 1. Parses file content
@@ -282,11 +269,11 @@ export declare class DxfLoader extends THREE.Loader {
      * @param url url of the dxf file
      * @param onProgress on progress callback
      */
-    loadAsync(url: string, onProgress?: (event: ProgressEvent) => void): Promise<DxfData>;
+    loadAsync(url: string, onProgress?: (event: ProgressEvent) => void, dxfDataId?: string): Promise<DxfData>;
     /**
      * Same as {@link loadAsync} but reads DWG/DXF from memory (no network).
      */
-    loadAsyncFromBuffer(data: ArrayBuffer | Uint8Array, onProgress?: (event: ProgressEvent) => void): Promise<DxfData>;
+    loadAsyncFromBuffer(data: ArrayBuffer | Uint8Array, onProgress?: (event: ProgressEvent) => void, dxfDataId?: string): Promise<DxfData>;
     /**
      * Parses dxf contents from given url.
      */

package/dist/types/core/helpers/OSnapHelper.d.ts

@@ -82,7 +82,7 @@ export declare class OSnapHelper {
     /**
      * Enables a specific OSnapType.
      */
-    setOSnapTypeEnabled(type: OSnapType, enabled: boolean): void;
+    setOSnapTypeEnabled(type: OSnapType, enable: boolean): void;
     /**
      * Sets snap tolerance in world coordinate.
      */

package/dist/types/core/loaders/DaeLoader.d.ts

@@ -1,6 +1,6 @@
 import * as THREE from "three";
-import type { ModelLoadContext, ModelLoadFromBufferContext } from "./ModelLoader";
-import { BaseModelLoader } from "./ModelLoader";
+import type { ModelLoadContext, ModelLoadFromBufferContext } from "./BaseModelLoader";
+import { BaseModelLoader } from "./BaseModelLoader";
 export declare class DaeLoader extends BaseModelLoader {
     private readonly manager?;
     readonly id = "loader.builtin.dae";

package/dist/types/core/loaders/DwgModelLoader.d.ts

@@ -0,0 +1,45 @@
+import type * as THREE from "three";
+import { BaseModelLoader } from "./BaseModelLoader";
+import type { ModelLoadContext, ModelLoadFromBufferContext } from "./BaseModelLoader";
+import type { DxfData, DxfLoaderConfig } from "../../core/dxf";
+import type { FontManager } from "../../core/font";
+export interface DwgLoadContext extends ModelLoadContext {
+    readonly dxfDataId?: string;
+    readonly onLoad?: () => void;
+    readonly cfg?: DxfLoaderConfig;
+}
+export interface DwgLoadFromBufferContext extends ModelLoadFromBufferContext {
+    readonly dxfDataId?: string;
+    readonly onLoad?: () => void;
+    readonly cfg?: DxfLoaderConfig;
+}
+export declare class DwgModelLoader extends BaseModelLoader {
+    private readonly manager?;
+    readonly id = "loader.builtin.dwg";
+    readonly priority = 0;
+    readonly formats: readonly ["dxf", "dwg"];
+    private font?;
+    constructor(manager?: THREE.LoadingManager | undefined);
+    setFont(font?: FontManager): void;
+    /**
+     * This method returns a THREE.Object3D object.
+     * It can be used to load a dwg/dxf to Viewer3d (usually without paper space entities).
+     */
+    load(ctx: ModelLoadContext): Promise<THREE.Object3D>;
+    /**
+     * This method returns a THREE.Object3D object.
+     * It can be used to load a dwg/dxf to Viewer3d (usually without paper space entities).
+     */
+    loadFromBuffer(ctx: ModelLoadFromBufferContext): Promise<THREE.Object3D>;
+    /**
+     * This method returns a DxfData object.
+     * It can be used to load a dwg/dxf to Viewer2d, with paper space entities, layouts, layers, etc.
+     */
+    loadEx(ctx: DwgLoadContext): Promise<DxfData>;
+    /**
+     * This method returns a DxfData object.
+     * It can be used to load a dwg/dxf to Viewer2d, with paper space entities, layouts, layers, etc.
+     */
+    loadFromBufferEx(ctx: DwgLoadFromBufferContext): Promise<DxfData>;
+    private applyRequestHeader;
+}

package/dist/types/core/loaders/FbxLoader.d.ts

@@ -1,6 +1,6 @@
 import * as THREE from "three";
-import type { ModelLoadContext, ModelLoadFromBufferContext } from "./ModelLoader";
-import { BaseModelLoader } from "./ModelLoader";
+import type { ModelLoadContext, ModelLoadFromBufferContext } from "./BaseModelLoader";
+import { BaseModelLoader } from "./BaseModelLoader";
 export declare class FbxLoader extends BaseModelLoader {
     private readonly manager?;
     readonly id = "loader.builtin.fbx";

package/dist/types/core/loaders/GltfLoader.d.ts

@@ -1,6 +1,6 @@
 import * as THREE from "three";
-import type { ModelLoadContext, ModelLoadFromBufferContext } from "./ModelLoader";
-import { BaseModelLoader } from "./ModelLoader";
+import type { ModelLoadContext, ModelLoadFromBufferContext } from "./BaseModelLoader";
+import { BaseModelLoader } from "./BaseModelLoader";
 /**
  * glTF / GLB model loader wrapping GLTFLoader, DRACO path, and progress handling.
  */

package/dist/types/core/loaders/ModelLoaderManager.d.ts

@@ -1,25 +1,29 @@
 import * as THREE from "three";
-import type { BaseModelLoader } from "./ModelLoader";
+import type { BaseModelLoader } from "./BaseModelLoader";
 import type { FontManager } from "../../core/font";
 export declare class ModelLoaderManager {
-    private font?;
     private manager?;
-    /** Built-in loaders; rebuilt when {@link setLoadManager} / {@link setFont} runs. */
-    private readonly builtinLoaders;
-    /** Extension loaders (e.g. from plugins); preserved across builtin rebuilds. */
-    private readonly extensionLoaders;
+    private font?;
+    /** Single loader registry (includes built-ins and plugin loaders). */
+    private readonly loaders;
     constructor(manager?: THREE.LoadingManager);
     register(loader: BaseModelLoader): void;
     unregister(id: string): void;
     private unregisterFromList;
-    private rebuildBuiltinLoaders;
-    private allLoaders;
     /**
      * Unique extension tokens from all registered loaders (extensions first, then built-ins), sorted.
      */
     getSupportedModelFormats(): string[];
-    private createBuiltinModelLoaders;
-    private resolveModelLoader;
+    register2dBuiltinLoaders(): void;
+    register3dBuiltinLoaders(): void;
+    /**
+     * Gets the resolved loader for a format token (e.g. `dxf`, `dwg`, `glb`).
+     */
+    private getLoaderByFormat;
+    /**
+     * Gets the loader with the given id.
+     */
+    getLoaderById(id: string): BaseModelLoader | undefined;
     private computeUrlModelFormat;
     private loadModelInternal;
     private loadModelFromBufferInternal;
@@ -29,5 +33,8 @@ export declare class ModelLoaderManager {
         [header: string]: string;
     }): Promise<THREE.Object3D | void>;
     loadModelFromBuffer(data: ArrayBuffer | Uint8Array, fileFormat: string, onProgress?: (event: ProgressEvent) => void): Promise<THREE.Object3D | void>;
+    /**
+     * For dwg/dxf, we need to set font first.
+     */
     setFont(font: FontManager): void;
 }

package/dist/types/core/loaders/ObjLoader.d.ts

@@ -1,6 +1,6 @@
 import * as THREE from "three";
-import type { ModelLoadFromBufferContext, ObjLoadContext } from "./ModelLoader";
-import { BaseModelLoader } from "./ModelLoader";
+import type { ModelLoadFromBufferContext, ObjLoadContext } from "./BaseModelLoader";
+import { BaseModelLoader } from "./BaseModelLoader";
 export declare class ObjLoader extends BaseModelLoader {
     private readonly manager?;
     readonly id = "loader.builtin.obj";

package/dist/types/core/loaders/PlyLoader.d.ts

@@ -1,6 +1,6 @@
 import * as THREE from "three";
-import type { ModelLoadContext, ModelLoadFromBufferContext } from "./ModelLoader";
-import { BaseModelLoader } from "./ModelLoader";
+import type { ModelLoadContext, ModelLoadFromBufferContext } from "./BaseModelLoader";
+import { BaseModelLoader } from "./BaseModelLoader";
 export declare class PlyLoader extends BaseModelLoader {
     private readonly manager?;
     readonly id = "loader.builtin.ply";

package/dist/types/core/loaders/RasterLoader.d.ts

@@ -1,6 +1,6 @@
 import * as THREE from "three";
-import type { ModelLoadContext, ModelLoadFromBufferContext } from "./ModelLoader";
-import { BaseModelLoader } from "./ModelLoader";
+import type { ModelLoadContext, ModelLoadFromBufferContext } from "./BaseModelLoader";
+import { BaseModelLoader } from "./BaseModelLoader";
 export declare class RasterLoader extends BaseModelLoader {
     private readonly manager?;
     readonly id = "loader.builtin.raster";

package/dist/types/core/loaders/StlLoader.d.ts

@@ -1,6 +1,6 @@
 import * as THREE from "three";
-import type { ModelLoadContext, ModelLoadFromBufferContext } from "./ModelLoader";
-import { BaseModelLoader } from "./ModelLoader";
+import type { ModelLoadContext, ModelLoadFromBufferContext } from "./BaseModelLoader";
+import { BaseModelLoader } from "./BaseModelLoader";
 export declare class StlLoader extends BaseModelLoader {
     private readonly manager?;
     readonly id = "loader.builtin.stl";

package/dist/types/core/loaders/index.d.ts

@@ -1,8 +1,8 @@
-export { BaseModelLoader } from "./ModelLoader";
-export type { ModelLoadContext, ModelLoadFromBufferContext, ObjLoadContext } from "./ModelLoader";
+export { BaseModelLoader } from "./BaseModelLoader";
+export type { ModelLoadContext, ModelLoadFromBufferContext, ObjLoadContext } from "./BaseModelLoader";
 export { ModelLoaderManager } from "./ModelLoaderManager";
 export { DaeLoader } from "./DaeLoader";
-export { DxfModelLoader } from "./DxfModelLoader";
+export { DwgModelLoader } from "./DwgModelLoader";
 export { FbxLoader } from "./FbxLoader";
 export { GltfLoader } from "./GltfLoader";
 export { ObjLoader } from "./ObjLoader";

package/dist/types/core/viewers/Viewer2d.d.ts

@@ -200,7 +200,6 @@ export declare class Viewer2d extends BaseViewer {
      */
     parseFile(modelCfg: Model2dConfig, onProgress?: ((event: ProgressEvent<EventTarget>) => void) | undefined): Promise<DxfData>;
     addModel(model: Model2d): void;
-    private createDxfModelLoader;
     setObjectHighlight(object: THREE.Object3D): void;
     setObjectUnHighlight(object: THREE.Object3D): void;
     clearHighlight(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@x-viewer/core",
-    "version": "0.21.9",
+    "version": "0.21.11",
     "homepage": "https://dwg.thingraph.site/",
     "description": "WebGL-based 2D/3D viewer engine built on Three.js. View DWG/DXF/PDF files in the browser with no server required. Supports glTF, OBJ, FBX, IFC, STL and BimTiles formats.",
     "author": "thingraph",