soonspacejs 2.6.13 → 2.6.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.6.13",
+  "version": "2.6.16",
   "homepage": "http://www.xwbuilders.com:8800/",
   "description": "soonspacejs 2.x",
   "module": "./dist/index.esm.js",
@@ -26,7 +26,7 @@
     "three-mesh-bvh": "0.5.23"
   },
   "peerDependencies": {
-    "three": ">=0.150.1"
+    "three": ">=0.151.3"
   },
-  "gitHead": "e3ad4e1e7ffe4edc06c9f3094d624a4fc21fd7d8"
+  "gitHead": "cefaa55c88bbbee734c4be0eafb154225adb20fc"
 }

package/types/Controls/OrbitControls.d.ts

@@ -1,4 +1,4 @@
-import { EventDispatcher, OrthographicCamera, PerspectiveCamera, Vector3 } from 'three';
+import { EventDispatcher, MOUSE, OrthographicCamera, PerspectiveCamera, Vector3 } from 'three';
 import { OrbitControlsProperties } from '../Interface';
 declare class OrbitControls extends EventDispatcher implements OrbitControlsProperties {
     object: PerspectiveCamera | OrthographicCamera;
@@ -40,9 +40,9 @@ declare class OrbitControls extends EventDispatcher implements OrbitControlsProp
         BOTTOM: string;
     };
     mouseButtons: {
-        LEFT: 0;
-        MIDDLE: 1;
-        RIGHT: 2;
+        LEFT: MOUSE;
+        MIDDLE: MOUSE;
+        RIGHT: MOUSE;
     };
     touches: {
         ONE: 0 | 1;

package/types/Interface/sbmCache.d.ts

@@ -10,6 +10,7 @@ export interface MeshsCache {
         materialId: string;
         position: ArrayBuffer;
         uv: ArrayBuffer;
+        normal?: ArrayBuffer;
     };
 }
 export interface SbmCache {

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

@@ -1,46 +1,15 @@
-import { Model, ModelInfo } from '../../Library';
-import { ModelLoadingProgress, ModelLoadingProgressCallback } from '../../Interface';
-import { SbmCache } from '../../Interface/sbmCache';
+import { ModelInfo } from '../../Library';
 declare class SbmLoader {
-    materials: Map<string, any>;
-    sbmInfo: ModelInfo | null;
-    isLE: boolean;
-    constructor();
     /**
-     * 解析模型
-     * @param buffer 模型二进制原数据
-     * @param sbmInfo 模型信息
-     * @param onProgress 模型加载进度回填函数
+     * @todo onProgress
      */
-    parseBuffer(buffer: ArrayBuffer, sbmInfo: ModelInfo, onProgress?: ModelLoadingProgressCallback): Promise<{
-        model: Model;
-        caches: SbmCache;
-    }>;
-    /**
-     * @param dataView
-     * @param offset
-     * @param onProgress
-     */
-    _parseV2(dataView: DataView, offset: number, onProgress?: ModelLoadingProgressCallback): Promise<{
-        model: Model;
-        caches: SbmCache;
-    }>;
     /**
-     * @param dataView
-     * @param offset
-     * @param onProgress
+     * @param buffer
+     * @param sbmInfo
      */
-    _parseV3(dataView: DataView, offset: number, onProgress?: ModelLoadingProgressCallback): Promise<{
-        model: Model;
-        caches: SbmCache;
+    parseBuffer(buffer: ArrayBuffer, sbmInfo: ModelInfo): Promise<{
+        model: import("../../Library/Model").Model;
+        caches: import("../..").SbmCache;
     }>;
-    /**
-     * 获取材质贴图路径
-     * @param modelUrl 模型资源路径
-     * @param name     贴图名称
-     * @param isPlatform 是否是平台资源
-     */
-    getTextureUrl(url: string, textureName: string, isPlatform?: boolean): string;
 }
-export { ModelLoadingProgress, ModelLoadingProgressCallback, };
-export default SbmLoader;
+export { SbmLoader, };

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

@@ -22,4 +22,4 @@ declare class SbmObjectLoader {
      */
     parseObject(sbmObject: SbmCache, sbmInfo: ModelInfo): Model;
 }
-export default SbmObjectLoader;
+export { SbmObjectLoader, };

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

@@ -0,0 +1,46 @@
+import { Model, ModelInfo } from '../../Library';
+import { ModelLoadingProgress, ModelLoadingProgressCallback } from '../../Interface';
+import { SbmCache } from '../../Interface/sbmCache';
+declare class SbmPrivateLoader {
+    materials: Map<string, any>;
+    sbmInfo: ModelInfo | null;
+    isLE: boolean;
+    constructor();
+    /**
+     * 解析模型
+     * @param buffer 模型二进制原数据
+     * @param sbmInfo 模型信息
+     * @param onProgress 模型加载进度回填函数
+     */
+    parseBuffer(buffer: ArrayBuffer, sbmInfo: ModelInfo, onProgress?: ModelLoadingProgressCallback): Promise<{
+        model: Model;
+        caches: SbmCache;
+    }>;
+    /**
+     * @param dataView
+     * @param offset
+     * @param onProgress
+     */
+    _parseV2(dataView: DataView, offset: number, onProgress?: ModelLoadingProgressCallback): Promise<{
+        model: Model;
+        caches: SbmCache;
+    }>;
+    /**
+     * @param dataView
+     * @param offset
+     * @param onProgress
+     */
+    _parseV3(dataView: DataView, offset: number, onProgress?: ModelLoadingProgressCallback): Promise<{
+        model: Model;
+        caches: SbmCache;
+    }>;
+    /**
+     * 获取材质贴图路径
+     * @param modelUrl 模型资源路径
+     * @param name     贴图名称
+     * @param isPlatform 是否是平台资源
+     */
+    getTextureUrl(url: string, textureName: string, isPlatform?: boolean): string;
+}
+export { ModelLoadingProgress, ModelLoadingProgressCallback, };
+export { SbmPrivateLoader, };

package/types/Loader/SbmLoader/{SbkLoader.d.ts → SbmPublicLoader.d.ts}

@@ -2,7 +2,7 @@ import { Model, ModelInfo } from '../../Library';
 import { ModelLoadingProgressCallback } from '../../Interface';
 import { SbmCache } from '../../Interface/sbmCache';
 import SDataView from './SDataView';
-declare class SbkLoader {
+declare class SbmPublicLoader {
     materials: Map<string, any>;
     sbmInfo: ModelInfo | null;
     constructor();
@@ -42,4 +42,4 @@ declare class SbkLoader {
      */
     getTextureUrl(url: string, textureName: string, isPlatform?: boolean): string;
 }
-export default SbkLoader;
+export { SbmPublicLoader, };

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

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

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

@@ -9,11 +9,11 @@ export declare const isPNG: (textureUrl?: string) => boolean;
  * 生成 sbm 纹理
  * @param url
  */
-export declare const generateSbmTexture: (textureUrl: string) => Texture;
+export declare const generateSbmTexture: (material: MeshStandardMaterial, textureUrl: string) => Texture | undefined;
 /**
  * 生成 sbm 材质
  * @param materialId
  * @param arr
  * @param texture
  */
-export declare const generateSbmMaterial: (materialId: string, arr: number[], texture: Texture | null, transprent: boolean) => MeshStandardMaterial;
+export declare const generateSbmMaterial: (materialId: string, arr: number[], transprent: boolean) => MeshStandardMaterial;

package/types/Manager/ModelManage.d.ts

@@ -15,6 +15,7 @@ declare class ModelManage extends DefaultManage {
     isDisposed: boolean;
     modelsPromiseMap: Map<string, Promise<Model | null>>;
     modelsMap: Map<string, Model>;
+    _dbReady: boolean;
     /**
      * workaround for types
      */
@@ -53,6 +54,7 @@ declare class ModelManage extends DefaultManage {
      */
     clearIdb(): Promise<void>;
     dispose(): void;
+    _checkDbReady(): Promise<void>;
     /**
      * private methods
      */

package/types/Viewport/index.d.ts

@@ -3,6 +3,7 @@ import { Mesh, Clock, Scene, PerspectiveCamera, WebGLRenderer, PMREMGenerator, V
 import { EffectComposer } from 'postprocessing';
 import Stats from 'three/examples/jsm/libs/stats.module.js';
 import { Sky } from 'three/examples/jsm/objects/Sky.js';
+import { AnimationOperate } from '@three3d/animation';
 import Scener from './Scener';
 import { CSS2DRenderer, CSS3DRenderer } from '../Renderer';
 import RendererManager from './RendererManager';
@@ -16,7 +17,6 @@ import { License } from '../License';
 import Info from './Info';
 import { ViewHelper } from './ViewHelper';
 import { WaterMark } from './WaterMark';
-import { AnimationOperate } from '@three3d/animation';
 export declare const innerRenderState: {
     needsUpdate: boolean;
 };

package/types/index.d.ts

@@ -33,6 +33,7 @@ export * from './Interface';
 export * from './tools';
 import type { AnimationOperate } from '@three3d/animation';
 export * from '@three3d/animation';
+import { Azimuth } from '@three3d/tools';
 export declare class SoonSpace {
     static readonly THREE: typeof THREE;
     readonly THREE: typeof THREE;
@@ -205,6 +206,10 @@ export declare class SoonSpace {
     readonly viewport: Viewport;
     readonly manager: Manager;
     readonly plugins: Record<string, any>;
+    /**
+     * 方位判断
+     */
+    readonly azimuth: Azimuth;
     constructor(param: SoonSpaceConstructor);
     /******/
     /******/

package/types/three-patches.d.ts

@@ -1,9 +1 @@
-import { Box3, Sphere } from 'three';
-declare module 'three/src/objects/InstancedMesh' {
-    interface InstancedMesh {
-        boundingBox: Box3 | null;
-        boundingSphere: Sphere | null;
-        computeBoundingBox: () => void;
-        computeBoundingSphere: () => void;
-    }
-}
+export {};