soonspacejs 2.4.13 → 2.5.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.4.13",
+  "version": "2.5.0-alpha.0",
   "homepage": "http://www.xwbuilders.com:8800/",
   "description": "soonspacejs 2.x",
   "module": "./dist/index.esm.js",
@@ -25,5 +25,5 @@
     "@tweenjs/tween.js": "^18.6.4",
     "@types/three": "0.141.0"
   },
-  "gitHead": "2bf40c05acea4b0b8df5edd11bafa0cc3dfd89d5"
+  "gitHead": "b8187989f9105b6b235cc22a8e093b4ecab698fb"
 }

package/types/Interface/events.d.ts

@@ -1,16 +1,16 @@
 import { Mesh, Intersection } from 'three';
-import { Poi, Sbm, Model } from '../Library';
+import { Poi, Model } from '../Library';
 import { Position, SceneEventType } from './base';
 interface ScenePoiIntersect {
     poi: Poi;
     sourceData: Intersection;
 }
 interface SceneModelIntersect {
-    model: Sbm | Model;
+    model: Model;
     sourceData: Intersection;
 }
 interface ModelEventParams {
-    target: Sbm | Model;
+    target: Model;
     currentTarget: Mesh;
     intersects: SceneModelIntersect[];
     event: MouseEvent | TouchEvent;
@@ -25,7 +25,7 @@ interface SceneClickParam {
 }
 interface SceneGlobalEvents {
     modelHover?: (param: ModelEventParams) => void;
-    modelUnHover?: (model: Sbm | Model) => void;
+    modelUnHover?: (model: Model) => void;
     modelClick?: (param: ModelEventParams) => void;
     modelRightClick?: (param: ModelEventParams) => void;
     modelDblClick?: (param: ModelEventParams) => void;

package/types/Interface/index.d.ts

@@ -7,3 +7,6 @@ export * from './plugin';
 export * from './signals';
 export * from './viewport';
 export * from './controls';
+export * from './sbmCache';
+export * from './sbmXmlToJson';
+export * from './gmlToJson';

package/types/Interface/manager.d.ts

@@ -1,5 +1,5 @@
 import { IColor, IVector2, Position, Rotation, Scale } from './base';
-import { BaseObject3D, BaseObject3DInfo, LinkInfo, SbmInfo, ModelInfo, PoiInfo } from '../Library';
+import { BaseObject3D, BaseObject3DInfo, LinkInfo, ModelInfo, PoiInfo } from '../Library';
 import { Box3, DirectionalLight, HemisphereLight, SpotLight, PointLight, RectAreaLight } from 'three';
 interface UserDataPropertyFindFunc<T = BaseObject3D['userData']> {
     (userData: T): T;
@@ -39,7 +39,6 @@ interface RectAreaLightOptions extends BaseLightInfo {
     width?: number;
     height?: number;
 }
-declare type CloneSbmInfo = Omit<SbmInfo, 'url'>;
 interface ModelLoadingProgress {
     total: number;
     loaded: number;
@@ -175,4 +174,4 @@ interface RectAreaLightHelperOptions extends BaseHelperOptions {
     light: RectAreaLight;
     color?: IColor;
 }
-export { UserDataPropertyFindFunc, BaseLightInfo, AmbientLightOptions, DirectionalLightOptions, HemisphereLightOptions, SpotLightOptions, PointLightOptions, RectAreaLightOptions, CloneSbmInfo, ModelLoadingProgress, ModelLoadingProgressCallback, GroupProgress, GroupProgressCallback, CloneModelInfo, ClonePoiInfo, TopologyInfoForGml, TopologyEffectInfo, ShortestPathInfo, ShortestPathByMultipleStartPoints, ShortestPathByMultipleEndPoints, TwoWaysLink, TopologyNodeGraph, TopologyNodeInfo, TopologyInnerNodeInfo, GridHelperOptions, AxesHelperOptions, BoxHelperOptions, PlaneHelperOptions, GroundHelperOptions, DirectionalLightHelperOptions, HemisphereLightHelperOptions, SpotLightHelperOptions, PointLightHelperOptions, RectAreaLightHelperOptions, };
+export { UserDataPropertyFindFunc, BaseLightInfo, AmbientLightOptions, DirectionalLightOptions, HemisphereLightOptions, SpotLightOptions, PointLightOptions, RectAreaLightOptions, CloneModelInfo, ModelLoadingProgress, ModelLoadingProgressCallback, GroupProgress, GroupProgressCallback, ClonePoiInfo, TopologyInfoForGml, TopologyEffectInfo, ShortestPathInfo, ShortestPathByMultipleStartPoints, ShortestPathByMultipleEndPoints, TwoWaysLink, TopologyNodeGraph, TopologyNodeInfo, TopologyInnerNodeInfo, GridHelperOptions, AxesHelperOptions, BoxHelperOptions, PlaneHelperOptions, GroundHelperOptions, DirectionalLightHelperOptions, HemisphereLightHelperOptions, SpotLightHelperOptions, PointLightHelperOptions, RectAreaLightHelperOptions, };

package/types/Library/Model.d.ts

@@ -2,6 +2,7 @@ import { BaseObject3D, BaseObject3DInfo } from './BaseObject3D';
 import { ObjectEvents, ObjectEventsListener } from '../Interface';
 interface ModelInfo extends BaseObject3DInfo, ObjectEvents<Model> {
     url: string;
+    isPlatform?: boolean;
 }
 interface ModelInnerInfo extends ModelInfo {
     format: string;

package/types/Library/index.d.ts

@@ -4,7 +4,6 @@ export * from './SceneManage';
 export * from './Group';
 export * from './PluginObject';
 export * from './PoiNode';
-export * from './Sbm';
 export * from './Model';
 export * from './Poi';
 export * from './Icon';

package/types/Loader/DatLoader/index.d.ts

@@ -1,4 +1,4 @@
-import { BufferGeometry, Loader, Mesh } from 'three';
+import { BufferGeometry, Loader, Mesh, MeshStandardMaterial } from 'three';
 import { Material } from 'three';
 import localforage from 'localforage';
 export interface SubMesh {
@@ -35,15 +35,17 @@ export interface TexturesIndexes {
     alphamode: number;
     use_list: string[];
 }
+export declare type TexturesIndexesJson = Record<string, TexturesIndexes>;
 export interface MaterialsMapValue {
     material: Material;
     materialIndex: number;
 }
 declare class DatLoader extends Loader {
     readonly store: typeof localforage;
-    loadedTextures: Map<string, Promise<any>>;
+    loadedTextures: Map<string, Promise<TexturesIndexesJson>>;
     loadedMaterialsMap: Map<string, MaterialsMapValue>;
-    loadedMaterials: Material[];
+    defaultMaterial: MeshStandardMaterial;
+    loadedMaterials: MeshStandardMaterial[];
     dracoDecoderPath: string | null;
     workerPool: any;
     workerSourceURL: string;
@@ -53,7 +55,7 @@ declare class DatLoader extends Loader {
      * @param buffer
      * @param url
      */
-    parseAsync(buffer: ArrayBuffer, url: string): Promise<Mesh<BufferGeometry, Material[]> | undefined>;
+    parseAsync(buffer: ArrayBuffer, url: string): Promise<Mesh<BufferGeometry, MeshStandardMaterial[]> | undefined>;
     private _decodeBuffer;
     private _initWorkerCreator;
     private _createMesh;

package/types/Loader/DatLoader/parse-chunk/dracoCompress.worker.d.ts

@@ -4,10 +4,10 @@ declare global {
     }
 }
 export declare const dracoCompress: (compressBuffer: ArrayBuffer) => Promise<{
-    position: Uint8Array | Uint32Array | Float32Array | Int8Array | Int16Array | Int32Array | Uint16Array;
-    normal: Uint8Array | Uint32Array | Float32Array | Int8Array | Int16Array | Int32Array | Uint16Array;
-    color: Uint8Array | Uint32Array | Float32Array | Int8Array | Int16Array | Int32Array | Uint16Array;
-    texcoord: Uint8Array | Uint32Array | Float32Array | Int8Array | Int16Array | Int32Array | Uint16Array;
+    position: Uint8Array | Float32Array | Int8Array | Int16Array | Int32Array | Uint16Array | Uint32Array;
+    normal: Uint8Array | Float32Array | Int8Array | Int16Array | Int32Array | Uint16Array | Uint32Array;
+    color: Uint8Array | Float32Array | Int8Array | Int16Array | Int32Array | Uint16Array | Uint32Array;
+    texcoord: Uint8Array | Float32Array | Int8Array | Int16Array | Int32Array | Uint16Array | Uint32Array;
     indice: Uint32Array;
     sub_mesh: {
         start: number;

package/types/Loader/SbmLoader/SbkLoader.d.ts

@@ -1,10 +1,10 @@
-import { Sbm, SbmInfo } from '../../Library';
+import { Model, ModelInfo } from '../../Library';
 import SDataView from './SDataView';
 import { ModelLoadingProgressCallback } from '../../Interface';
 import { SbmCache } from '../../Interface/sbmCache';
 declare class SbkLoader {
     materials: Map<string, any>;
-    sbmInfo: SbmInfo | null;
+    sbmInfo: ModelInfo | null;
     constructor();
     /**
      * 解析模型
@@ -12,8 +12,8 @@ declare class SbkLoader {
      * @param sbmInfo 模型信息
      * @param onProgress 模型加载进度回填函数
      */
-    parseBuffer(buffer: ArrayBuffer, sbmInfo: SbmInfo, onProgress?: ModelLoadingProgressCallback): Promise<{
-        sbm: Sbm;
+    parseBuffer(buffer: ArrayBuffer, sbmInfo: ModelInfo, onProgress?: ModelLoadingProgressCallback): Promise<{
+        model: Model;
         caches: SbmCache;
     }>;
     /**
@@ -22,7 +22,7 @@ declare class SbkLoader {
      * @param onProgress
      */
     _parseV2(dataView: SDataView, onProgress?: ModelLoadingProgressCallback): Promise<{
-        sbm: Sbm;
+        model: Model;
         caches: SbmCache;
     }>;
     /**
@@ -31,7 +31,7 @@ declare class SbkLoader {
      * @param onProgress
      */
     _parseV3(dataView: SDataView, onProgress?: ModelLoadingProgressCallback): Promise<{
-        sbm: Sbm;
+        model: Model;
         caches: SbmCache;
     }>;
     /**

package/types/Loader/SbmLoader/SbmLoader.d.ts

@@ -1,9 +1,9 @@
-import { Sbm, SbmInfo } from '../../Library';
+import { Model, ModelInfo } from '../../Library';
 import { ModelLoadingProgress, ModelLoadingProgressCallback } from '../../Interface';
 import { SbmCache } from '../../Interface/sbmCache';
 declare class SbmLoader {
     materials: Map<string, any>;
-    sbmInfo: SbmInfo | null;
+    sbmInfo: ModelInfo | null;
     isLE: boolean;
     constructor();
     /**
@@ -12,8 +12,8 @@ declare class SbmLoader {
      * @param sbmInfo 模型信息
      * @param onProgress 模型加载进度回填函数
      */
-    parseBuffer(buffer: ArrayBuffer, sbmInfo: SbmInfo, onProgress?: ModelLoadingProgressCallback): Promise<{
-        sbm: Sbm;
+    parseBuffer(buffer: ArrayBuffer, sbmInfo: ModelInfo, onProgress?: ModelLoadingProgressCallback): Promise<{
+        model: Model;
         caches: SbmCache;
     }>;
     /**
@@ -22,7 +22,7 @@ declare class SbmLoader {
      * @param onProgress
      */
     _parseV2(dataView: DataView, offset: number, onProgress?: ModelLoadingProgressCallback): Promise<{
-        sbm: Sbm;
+        model: Model;
         caches: SbmCache;
     }>;
     /**
@@ -31,7 +31,7 @@ declare class SbmLoader {
      * @param onProgress
      */
     _parseV3(dataView: DataView, offset: number, onProgress?: ModelLoadingProgressCallback): Promise<{
-        sbm: Sbm;
+        model: Model;
         caches: SbmCache;
     }>;
     /**

package/types/Loader/SbmLoader/SbmObjectLoader.d.ts

@@ -1,5 +1,5 @@
 import { Material } from 'three';
-import { Sbm, SbmInfo } from '../../Library';
+import { Model, ModelInfo } from '../../Library';
 import { SbmCache } from '../../Interface/sbmCache';
 declare class SbmObjectLoader {
     materials: Map<string, Material>;
@@ -20,6 +20,6 @@ declare class SbmObjectLoader {
      * @param sbmInfo
      * @returns
      */
-    parseObject(sbmObject: SbmCache, sbmInfo: SbmInfo): Sbm;
+    parseObject(sbmObject: SbmCache, sbmInfo: ModelInfo): Model;
 }
 export default SbmObjectLoader;

package/types/Loader/SbmLoader/index.d.ts

@@ -1,4 +1,5 @@
 import sbk from './SbkLoader';
 import sbm from './SbmLoader';
+export { default as SbmObjectLoader, } from './SbmObjectLoader';
 declare const _default: typeof sbm | typeof sbk;
 export default _default;

package/types/Manager/ModelManage.d.ts

@@ -3,44 +3,44 @@ import { FBXLoader } from 'three/examples/jsm/loaders/FBXLoader.js';
 import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import localforage from 'localforage';
 import { DatLoader } from '../Loader/DatLoader';
-import DefaultManage from './DefaultManage';
+import Viewport from '../Viewport';
 import { BaseObject3D, Group, GroupInfo, Model, ModelInfo, SceneManage } from '../Library';
 import { CloneModelInfo } from '../Interface';
-import Viewport from '../Viewport';
+import DefaultManage from './DefaultManage';
 declare class ModelManage extends DefaultManage {
     readonly viewport: Viewport;
+    modelsPromiseMap: Map<string, Promise<Model | null>>;
     modelMaps: Map<string, Model>;
     /**
      * workaround for types
      */
     store: typeof localforage;
+    cacheStore: typeof localforage;
     loadingManager: LoadingManager;
     datLoader: DatLoader;
     gltfLoader: GLTFLoader;
     fbxLoader: FBXLoader;
     dracoDecoderPath: string | null;
     constructor(viewport: Viewport, scene: SceneManage);
-    private _initLoadingManager;
-    private _setModelMpas;
-    private _parseSbmx;
-    private _parseDat;
-    private _parseGltf;
-    private _parseFbx;
     /**
      * 设置 draco path
      * @param path
      */
     setDracoDecoderPath(path: string): void;
-    load(modelInfo: ModelInfo): Promise<Model>;
-    _loadItem(modelInfo: ModelInfo, parent?: BaseObject3D | null): Promise<Model>;
     /**
-     * model 解析
+     * 加载模型
+     * @param modelInfo
+     * @returns
+     */
+    load(modelInfo: ModelInfo, parent?: BaseObject3D | null): Promise<Model | null>;
+    /**
+     * 模型解析
      * @param format
      * @param buffer
      * @param modelInfo
      * @returns
      */
-    parse(format: string, buffer: ArrayBuffer, modelInfo: ModelInfo): Promise<Model>;
+    parse(modelInfo: ModelInfo): Promise<Model | null>;
     clone(model: Model, info: CloneModelInfo, parent?: BaseObject3D | null): Promise<Model>;
     loadToGroup(groupInfo: GroupInfo, modelInfo: ModelInfo[]): Promise<Group>;
     addForGroup(group: Group | null, modelInfo: ModelInfo[]): Promise<Group | null>;
@@ -50,10 +50,17 @@ declare class ModelManage extends DefaultManage {
     clearIdb(): Promise<void>;
     dispose(): void;
     /**
-     * 远程请求 model
-     * @param modelInfo
-     * @returns
+     * private methods
      */
-    _fetchBuffer(modelInfo: ModelInfo): Promise<ArrayBuffer>;
+    private _initLoadingManager;
+    private _setModelMpas;
+    private _parseSbm;
+    private _parseSbmx;
+    private _parseDat;
+    private _parseGltf;
+    private _parseFbx;
+    private _innerLoad;
+    private _fetchBuffer;
+    private _getBuffer;
 }
 export default ModelManage;

package/types/Manager/index.d.ts

@@ -2,7 +2,6 @@ import { Object3D } from 'three';
 import Viewport from '../Viewport';
 import { BaseObject3D, SceneManage } from '../Library';
 import LightManage from './LightManage';
-import SbmManage from './SbmManage';
 import ModelManage from './ModelManage';
 import PoiManage from './PoiManage';
 import PoiNodeManage from './PoiNodeManage';
@@ -15,7 +14,6 @@ import { UserDataPropertyFindFunc } from '../Interface';
 interface ManagerStore {
     groupManager: GroupManage;
     lightManager: LightManage;
-    sbmManager: SbmManage;
     modelManager: ModelManage;
     poiManager: PoiManage;
     poiNodeManager: PoiNodeManage;

package/types/Shared/index.d.ts

@@ -26,3 +26,4 @@ export { hasOwn, };
 export { isString, isBoolean, isNumber, isNull, isUndefined, isSymbol, };
 export { isDate, isArray, isObject, isFunction, isPromise, };
 export { getValueType, sleep, getAsciiString, };
+export { exportGltf, } from '../exporters';

package/types/Shared/log.d.ts

@@ -1 +1,3 @@
 export declare const log: (text: string, style?: any) => void;
+export declare const warn: (text: string) => void;
+export declare const error: (text: string) => void;

package/types/exporters/index.d.ts

@@ -1,3 +1,6 @@
 import { Object3D } from 'three';
-declare function exportGltf(object: Object3D): Promise<string>;
+import { GLTFExporterOptions } from 'three/examples/jsm/exporters/GLTFExporter.js';
+declare function exportGltf(object: Object3D, options?: GLTFExporterOptions): Promise<ArrayBuffer | {
+    [key: string]: any;
+}>;
 export { exportGltf, };

package/types/index.d.ts

@@ -13,10 +13,10 @@ import { Object3D, Vector3, Euler, Box3, AnimationClip, AnimationAction, Light }
 import * as shared from './Shared';
 import Animation from './Animation';
 import * as library from './Library';
-import { BaseObject3D, BaseObject3DInfo, Sbm, SbmInfo, Model, ModelInfo, Poi, PoiInfo, PoiNode, PoiNodeInfo, Topology, TopologyInfo, Group, GroupInfo, Canvas3D, Canvas3DInfo, PluginObject, PluginObjectInfo } from './Library';
+import { BaseObject3D, BaseObject3DInfo, Model, ModelInfo, Poi, PoiInfo, PoiNode, PoiNodeInfo, Topology, TopologyInfo, Group, GroupInfo, Canvas3D, Canvas3DInfo, PluginObject, PluginObjectInfo } from './Library';
 import Viewport from './Viewport';
 import Manager from './Manager';
-import { ViewportOptions, SceneGlobalEvents, PluginsConstructor, IColor, Position, Rotation, OffsetPoint, AnimationOptions, ModelAnimationFindFunc, TopologyNodeInfo, CameraViewpointData, FlyToViewpoint, FlyToObjOptions, SurroundOptions, LabelOptions, EdgeSelectOptions, StrokeSelectOptions, OpacitySelectOptions, HighlightSelectOptions, EmissiveSelectOptions, FogOptions, UserDataPropertyFindFunc, AmbientLightOptions, DirectionalLightOptions, HemisphereLightOptions, SpotLightOptions, PointLightOptions, CloneSbmInfo, ModelLoadingProgressCallback, GroupProgressCallback, CloneModelInfo, ClonePoiInfo, ShortestPathInfo, ShortestPathByMultipleStartPoints, ShortestPathByMultipleEndPoints, TopologyInfoForGml, GridHelperOptions, AxesHelperOptions, BoxHelperOptions, PlaneHelperOptions, GroundHelperOptions, DirectionalLightHelperOptions, HemisphereLightHelperOptions, SpotLightHelperOptions, PointLightHelperOptions, SignalsState, ControlsOptions, RectAreaLightOptions, RectAreaLightHelperOptions, SkyOptions, ColorSpace, ToneMappingOptions, SSAOOptions } from './Interface';
+import { ViewportOptions, SceneGlobalEvents, PluginsConstructor, IColor, Position, Rotation, OffsetPoint, AnimationOptions, ModelAnimationFindFunc, TopologyNodeInfo, CameraViewpointData, FlyToViewpoint, FlyToObjOptions, SurroundOptions, LabelOptions, EdgeSelectOptions, StrokeSelectOptions, OpacitySelectOptions, HighlightSelectOptions, EmissiveSelectOptions, FogOptions, UserDataPropertyFindFunc, AmbientLightOptions, DirectionalLightOptions, HemisphereLightOptions, SpotLightOptions, PointLightOptions, CloneModelInfo, ClonePoiInfo, ShortestPathInfo, ShortestPathByMultipleStartPoints, ShortestPathByMultipleEndPoints, TopologyInfoForGml, GridHelperOptions, AxesHelperOptions, BoxHelperOptions, PlaneHelperOptions, GroundHelperOptions, DirectionalLightHelperOptions, HemisphereLightHelperOptions, SpotLightHelperOptions, PointLightHelperOptions, SignalsState, ControlsOptions, RectAreaLightOptions, RectAreaLightHelperOptions, SkyOptions, ColorSpace, ToneMappingOptions, SSAOOptions } from './Interface';
 export declare type InitOptions = ViewportOptions;
 export declare type InitEvents = SceneGlobalEvents;
 export interface SoonSpaceConstructor {
@@ -111,6 +111,7 @@ export default class SoonSpace {
         remove: (tween: import("@tweenjs/tween.js").Tween<Record<string, any>>) => void;
         update: (time?: number | undefined, preserve?: boolean | undefined) => boolean;
     };
+    static readonly utils: typeof shared;
     readonly THREE: typeof THREE;
     readonly THREE_PLUGINS: {
         TransformControls: typeof TransformControls;
@@ -552,125 +553,35 @@ export default class SoonSpace {
     getGroupById(id: GroupInfo['id']): Group | null;
     getGroupByName(name: string): Group[];
     getAllGroup(): Group[];
+    showAllGroup(): void;
+    hideAllGroup(): void;
     removeGroupById(id: GroupInfo['id']): boolean;
     /******/
-    /******/
+    /******* deprecated  */
     /******* Sbm methods */
     /******/
     /******/
-    /**
-     * 加载 Sbm 模型
-     * @param sbmInfo
-     * @param parent
-     * @param onProgress
-     */
-    loadSbm(sbmInfo: SbmInfo, onProgress?: ModelLoadingProgressCallback): Promise<Sbm>;
-    /**
-     * 解析 Sbm 模型
-     * @param data
-     * @param sbmInfo
-     * @param onProgress
-     */
-    parseSbm(data: ArrayBuffer, sbmInfo: SbmInfo, onProgress?: ModelLoadingProgressCallback): Promise<Sbm>;
-    /**
-     * 克隆 Sbm 模型
-     * @param model
-     * @param sbmInfo
-     * @param parent
-     */
-    cloneSbm(model: Sbm, sbmInfo: CloneSbmInfo, parent?: BaseObject3D | null): Promise<Sbm>;
-    /**
-     * 根据 id 查询 Sbm 模型
-     * @param id
-     */
-    getSbmById(id: SbmInfo['id']): Sbm | null;
-    /**
-     * 根据 name 查询 Sbm 模型
-     * @param name
-     */
-    getSbmByName(name: string): Sbm[];
-    /**
-     * 根据用户数据查询 Sbm 模型
-     * @param name
-     */
-    getSbmByUserDataProperty(propNameOrFindFunc: string | UserDataPropertyFindFunc, propValue?: any): Sbm[];
-    /**
-     * 根据 id 删除 Sbm 模型
-     * @param id
-     */
-    removeSbmById(id: SbmInfo['id']): boolean;
-    /**
-     * 为 Sbm 创建组
-     * @param groupInfo
-     */
+    loadSbm(sbmInfo: ModelInfo): Promise<Model | null>;
+    parseSbm(): void;
+    cloneSbm(model: Model, sbmInfo: CloneModelInfo, parent?: BaseObject3D | null): Promise<Model>;
+    getSbmById(id: ModelInfo['id']): Model | null;
+    getSbmByName(name: string): Model[];
+    getSbmByUserDataProperty(propNameOrFindFunc: string | UserDataPropertyFindFunc, propValue?: any): Model[];
+    removeSbmById(id: ModelInfo['id']): boolean;
     createGroupForSbm(groupInfo: GroupInfo): Group;
-    /**
-     * 加载 Sbm 模型到组内
-     * @param groupInfo
-     * @param sbmInfoList
-     * @param onProgress
-     */
-    loadSbmToGroup(groupInfo: GroupInfo, sbmInfoList: SbmInfo[], onProgress?: GroupProgressCallback): Promise<Group>;
-    /**
-     * 为已有的组添加 Sbm 模型
-     * @param groupId
-     * @param sbmInfoList
-     * @param onProgress
-     */
-    addSbmForGroup(groupId: GroupInfo['id'], sbmInfoList: SbmInfo[], onProgress?: GroupProgressCallback): Promise<Group | null>;
-    /**
-     * 创建 SSbm 组，从 xml 文件资源
-     * @param groupInfo
-     * @param url
-     */
-    createSbmGroupFromXml(groupInfo: GroupInfo, url: string): Promise<Group>;
-    /**
-     * 根据 id 查询 Sbm 模型组
-     * @param id
-     */
+    loadSbmToGroup(groupInfo: GroupInfo, sbmInfoList: ModelInfo[]): Promise<Group>;
+    addSbmForGroup(groupId: GroupInfo['id'], sbmInfoList: ModelInfo[]): Promise<Group | null>;
+    createSbmGroupFromXml(): void;
     getSbmGroupById(id: GroupInfo['id']): Group | null;
-    /**
-     * 根据 name 查询 Sbm 模型组
-     * @param name
-     */
     getSbmGroupByName(name: string): Group[];
-    /**
-     * 获取所有 Sbm 模型组
-     */
     getAllSbmGroup(): Group[];
-    /**
-     * 根据 id 删除 Sbm 模型组
-     * @param id
-     */
     removeSbmGroupById(id: GroupInfo['id']): boolean;
-    /**
-     * 清空 Sbm 模型
-     */
     clearSbm(): void;
-    /**
-     * 获取所有 Sbm 模型
-     */
-    getAllSbm(): Sbm[];
-    /**
-     * 显示所有 Sbm 模型
-     */
+    getAllSbm(): Model[];
     showAllSbm(): void;
-    /**
-     * 隐藏所有 Sbm 模型
-     */
     hideAllSbm(): void;
-    /**
-     * 获取 Sbm 模型缓冲
-     */
-    getSbmModelMaps(): Map<string, library.Sbm>;
-    /**
-     * 设置 Sbm 模型缓冲
-     */
-    setSbmModelMaps(maps: Map<string, Sbm>): void;
-    /**
-     * 清空本地模型缓存数据
-     */
-    clearIdb(): Promise<void[]>;
+    getSbmModelMaps(): Map<string, library.Model>;
+    setSbmModelMaps(maps: Map<string, Model>): void;
     /******/
     /******/
     /******* Model methods */
@@ -686,9 +597,8 @@ export default class SoonSpace {
      * 加载 Model 模型
      * @param modelInfo
      * @param parent
-     * @param onProgress
      */
-    loadModel(modelInfo: ModelInfo): Promise<Model>;
+    loadModel(modelInfo: ModelInfo): Promise<Model | null>;
     /**
      * 克隆 Model 模型
      * @param model
@@ -725,14 +635,12 @@ export default class SoonSpace {
      * 加载 Model 模型到组内
      * @param groupInfo
      * @param modelInfo
-     * @param onProgress
      */
     loadModelToGroup(groupInfo: GroupInfo, modelInfo: ModelInfo[]): Promise<Group>;
     /**
      * 为已有的组添加 Model 模型
      * @param groupId
      * @param modelInfo
-     * @param onProgress
      */
     addModelForGroup(groupId: GroupInfo['id'], modelInfo: ModelInfo[]): Promise<Group | null>;
     /**
@@ -770,6 +678,18 @@ export default class SoonSpace {
      * 隐藏所有 Model 模型
      */
     hideAllModel(): void;
+    /**
+     * 清空本地模型缓存数据
+     */
+    clearIdb(): Promise<void>;
+    /**
+     * 获取 Model 模型缓冲
+     */
+    getModelMaps(): Map<string, library.Model>;
+    /**
+     * 设置 Model 模型缓冲
+     */
+    setModelMaps(maps: Map<string, Model>): void;
     /******/
     /******/
     /******* Poi methods */

package/types/Library/Sbm.d.ts

@@ -1,20 +0,0 @@
-import { BaseObject3D, BaseObject3DInfo } from './BaseObject3D';
-import { ObjectEvents, ObjectEventsListener } from '../Interface';
-interface SbmInfo extends BaseObject3DInfo, ObjectEvents<Sbm> {
-    url: string;
-    isPlatform?: boolean;
-}
-declare class Sbm extends BaseObject3D<ObjectEventsListener> implements ObjectEvents<Sbm> {
-    isEventPropagation: boolean;
-    onLoad: ((object: Sbm) => void) | null;
-    onClick: ((object: Sbm) => void) | null;
-    onDblClick: ((object: Sbm) => void) | null;
-    onRightClick: ((object: Sbm) => void) | null;
-    constructor(param: SbmInfo);
-    eventPropagation(): void;
-    setEnvMap(dirPath: string, fileNames?: string[], options?: {
-        reflectivity?: number;
-    }): void;
-    sClone<T extends BaseObject3D>(recursive?: boolean): T;
-}
-export { Sbm, SbmInfo, };

package/types/Manager/SbmManage.d.ts

@@ -1,31 +0,0 @@
-import * as localforage from 'localforage';
-import DefaultManage from './DefaultManage';
-import Viewport from '../Viewport';
-import { BaseObject3D, Group, GroupInfo, Sbm, SbmInfo, SceneManage } from '../Library';
-import { CloneSbmInfo, ModelLoadingProgressCallback, GroupProgressCallback } from '../Interface';
-import { SbmCache } from '../Interface/sbmCache';
-declare class SbmManage extends DefaultManage {
-    readonly viewport: Viewport;
-    modelMaps: Map<string, Sbm>;
-    store: typeof localforage;
-    constructor(viewport: Viewport, scene: SceneManage);
-    load(sbmInfo: SbmInfo, onProgress?: ModelLoadingProgressCallback): Promise<Sbm>;
-    parse(data: ArrayBuffer | SbmCache, sbmInfo: SbmInfo, onProgress?: ModelLoadingProgressCallback): Promise<Sbm>;
-    clone(model: Sbm, sbmInfo: CloneSbmInfo, parent?: BaseObject3D | null): Promise<Sbm>;
-    loadToGroup(groupInfo: GroupInfo, sbmInfoList: SbmInfo[], onProgress?: GroupProgressCallback): Promise<Group>;
-    addForGroup(group: Group | null, sbmInfoList: SbmInfo[], onProgress?: GroupProgressCallback): Promise<Group | null>;
-    createGroupFromXml(groupInfo: GroupInfo, url: string): Promise<Group>;
-    /**
-     * 清空本地模型缓存数据
-     */
-    clearIdb(): Promise<void>;
-    dispose(): void;
-    _loadItem(sbmInfo: SbmInfo, onProgress?: ModelLoadingProgressCallback, parent?: BaseObject3D | null): Promise<Sbm>;
-    /**
-     * 远程请求 sbm
-     * @param sbmInfo
-     * @returns
-     */
-    _fetchBuffer(sbmInfo: SbmInfo): Promise<ArrayBuffer>;
-}
-export default SbmManage;