soonspacejs 2.2.39 → 2.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.2.39",
+  "version": "2.3.3",
   "description": "soonspacejs 2.x",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
@@ -17,8 +17,9 @@
     "@robotlegsjs/signals": "1.1.0",
     "@soonspacejs/xml2json": "0.0.2",
     "@tweenjs/tween.js": "18.6.4",
+    "@types/three": "^0.135.0",
     "localforage": "1.9.0",
-    "three": "0.124.x"
+    "three": "^0.136.0"
   },
-  "gitHead": "adf00f043cdde8a3c69ddff7b7901e08f5888479"
+  "gitHead": "0271a7689dd40a9e706a54b7d374eb4c16cc3c44"
 }

package/types/Interface/animation.d.ts

@@ -5,5 +5,6 @@ interface AnimationOptions {
     delay?: number;
     repeat?: number | boolean;
     mode?: AnimationMode;
+    yoyo?: boolean;
 }
 export { AnimationMode, AnimationModeEnum, AnimationOptions };

package/types/Interface/sbmCache.d.ts

@@ -0,0 +1,17 @@
+export interface MaterialsCache {
+    [key: string]: {
+        materialInfo: number[];
+        textureUrl?: string;
+    };
+}
+export interface MeshsCache {
+    [key: string]: {
+        materialId: string;
+        position: ArrayBuffer;
+        uv: ArrayBuffer;
+    };
+}
+export interface SbmCache {
+    materialsCache: MaterialsCache;
+    meshsCache: MeshsCache;
+}

package/types/Interface/signals.d.ts

@@ -7,7 +7,7 @@ interface SignalsState {
     beforeRender: Signal;
     afterRender: Signal;
     sceneRendered: Signal;
-    lodRendered: Signal;
+    loadRendered: Signal;
     tweenUpdate: Signal;
     hover: Signal;
     click: Signal;

package/types/Library/BaseMesh.d.ts

@@ -1,4 +1,4 @@
-import { Box3, Vector3, Euler, Mesh, Geometry, BufferGeometry, Material } from 'three';
+import { Box3, Vector3, Euler, Mesh, BufferGeometry, Material } from 'three';
 import { Position, Rotation, Scale, Level, AnimationOptions } from '../Interface';
 import { BaseObject3DInfo } from './BaseObject3D';
 interface BaseMeshInfo extends BaseObject3DInfo {
@@ -10,7 +10,7 @@ declare class BaseMesh extends Mesh {
     level: Level;
     isEventPropagation: boolean;
     autoUpdate: boolean;
-    constructor(geometry: Geometry | BufferGeometry, material: Material | Material[], param: BaseMeshInfo, type?: string);
+    constructor(geometry: BufferGeometry, material: Material | Material[], param: BaseMeshInfo, type?: string);
     show(): void;
     hide(): void;
     setMove(position: Position | Vector3, options?: AnimationOptions): Promise<void>;

package/types/Library/Ground.d.ts

@@ -1,8 +1,8 @@
 import { BaseMesh, BaseMeshInfo } from './BaseMesh';
-import { Geometry, BufferGeometry, Material } from 'three';
+import { BufferGeometry, Material } from 'three';
 interface GroundInfo extends BaseMeshInfo {
 }
 declare class Ground extends BaseMesh {
-    constructor(geometry: Geometry | BufferGeometry, material: Material, param: GroundInfo);
+    constructor(geometry: BufferGeometry, material: Material, param: GroundInfo);
 }
 export { Ground, GroundInfo };

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

@@ -1,7 +1,7 @@
 declare class SDataView extends DataView {
     appKeys: number[];
     isLE: boolean;
-    constructor(buffer: ArrayBuffer, appKeys: number[], isLE: boolean);
+    constructor(buffer: ArrayBuffer, appKeys: number[]);
     byteRevers(byte: number, offset: number): number;
     getSoonUint8(byteOffset: number): number;
     getSoonUint16(byteOffset: number): number;

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

@@ -1,36 +1,48 @@
 import { Sbm, SbmInfo } 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;
-    isLE: boolean;
     constructor();
     /**
      * 加载模型
      * @param sbmInfo 模型信息
      * @param onProgress 模型加载进度回填函数
      */
-    load(sbmInfo: SbmInfo, onProgress?: ModelLoadingProgressCallback): Promise<Sbm>;
+    load(sbmInfo: SbmInfo, onProgress?: ModelLoadingProgressCallback): Promise<Sbm | {
+        sbm: Sbm;
+        caches: SbmCache;
+    }>;
     /**
      * 解析模型
      * @param buffer 模型二进制原数据
      * @param sbmInfo 模型信息
      * @param onProgress 模型加载进度回填函数
      */
-    parse(buffer: ArrayBuffer, sbmInfo: SbmInfo, onProgress?: ModelLoadingProgressCallback): Promise<Sbm>;
+    parseBuffer(buffer: ArrayBuffer, sbmInfo: SbmInfo, onProgress?: ModelLoadingProgressCallback): Promise<Sbm | {
+        sbm: Sbm;
+        caches: SbmCache;
+    }>;
     /**
      * @param dataView
      * @param offset
      * @param onProgress
      */
-    _parseV2(dataView: SDataView, offset: number, onProgress?: ModelLoadingProgressCallback): Promise<Sbm>;
+    _parseV2(dataView: SDataView, onProgress?: ModelLoadingProgressCallback): Promise<{
+        sbm: Sbm;
+        caches: SbmCache;
+    }>;
     /**
      * @param dataView
      * @param offset
      * @param onProgress
      */
-    _parseV3(dataView: SDataView, offset: number, onProgress?: ModelLoadingProgressCallback): Promise<Sbm>;
+    _parseV3(dataView: SDataView, onProgress?: ModelLoadingProgressCallback): Promise<{
+        sbm: Sbm;
+        caches: SbmCache;
+    }>;
     /**
      * 获取材质贴图路径
      * @param modelUrl 模型资源路径

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

@@ -17,7 +17,7 @@ declare class SbmLoader {
      * @param sbmInfo 模型信息
      * @param onProgress 模型加载进度回填函数
      */
-    parse(buffer: ArrayBuffer, sbmInfo: SbmInfo, onProgress?: ModelLoadingProgressCallback): Promise<Sbm>;
+    parseBuffer(buffer: ArrayBuffer, sbmInfo: SbmInfo, onProgress?: ModelLoadingProgressCallback): Promise<Sbm>;
     /**
      * @param dataView
      * @param offset

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

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

package/types/Loader/SbmObjectLoader.d.ts

@@ -0,0 +1,25 @@
+import { Material } from "three";
+import { Sbm, SbmInfo } from "../Library";
+import { SbmCache } from "../Interface/sbmCache";
+declare class SbmObjectLoader {
+    materials: Map<string, Material>;
+    constructor();
+    /**
+     * @example
+     * {
+     *  materialsCache: {
+     *   0: {textureUrl:'xxx.png', materialInfo: [0,0,0,...]}
+     *  },
+     * meshsCache: {
+     *  materialId: 0,
+      * position: [0,0,0,...],
+      * uv: [0,0,0,...],
+      * }
+     * }
+     * @param sbmObject
+     * @param sbmInfo
+     * @returns
+     */
+    parseObject(sbmObject: SbmCache, sbmInfo: SbmInfo): Sbm;
+}
+export default SbmObjectLoader;

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

@@ -0,0 +1,13 @@
+import { Texture, MeshPhongMaterial } from "three";
+/**
+ * 生成 sbm 纹理
+ * @param url
+ */
+export declare const generateSbmTexture: (textureUrl: string) => Texture;
+/**
+ * 生成 sbm 材质
+ * @param materialId
+ * @param arr
+ * @param texture
+ */
+export declare const generateSbmMaterial: (materialId: string, arr: number[], texture: Texture | null) => MeshPhongMaterial;

package/types/Manager/SbmManage.d.ts

@@ -3,13 +3,14 @@ import DefaultManage from './DefaultManage';
 import Viewport from '../Viewport';
 import { BaseObject3D, Group, GroupInfo, Sbm, SbmInfo } 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);
     load(sbmInfo: SbmInfo, onProgress?: ModelLoadingProgressCallback): Promise<Sbm>;
-    parse(data: ArrayBuffer, 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(groupId: GroupInfo['id'], sbmInfoList: SbmInfo[], onProgress?: GroupProgressCallback): Promise<Group | null>;

package/types/Renderer/CSS2DHalfRenderer.d.ts

@@ -11,6 +11,13 @@ declare class CSS2DHalfObject extends Object3D {
 declare class CSS2DHalfRenderer {
     domElement: HTMLElement;
     cameraElement: HTMLElement;
+    cache: {
+        camera: {
+            fov: number;
+            style: string;
+        };
+        objects: WeakMap<object, any>;
+    };
     constructor(domElement?: HTMLElement, cameraElement?: HTMLElement);
     setSize(width: number, height: number): void;
     renderObject(object: Object3D, scene: Scene, camera: PerspectiveCamera | OrthographicCamera, cameraCSSMatrix: string): void;

package/types/Renderer/CSS3DRenderer.d.ts

@@ -11,6 +11,13 @@ declare class CSS3DObject extends Object3D {
 declare class CSS3DRenderer {
     domElement: HTMLElement;
     cameraElement: HTMLElement;
+    cache: {
+        camera: {
+            fov: number;
+            style: string;
+        };
+        objects: WeakMap<object, any>;
+    };
     constructor(domElement?: HTMLElement, cameraElement?: HTMLElement);
     setSize(width: number, height: number): void;
     renderObject(object: Object3D, scene: Scene, camera: PerspectiveCamera | OrthographicCamera, cameraCSSMatrix: string): void;

package/types/Viewport/index.d.ts

@@ -65,12 +65,12 @@ declare class Viewport {
         top: number;
     };
     getPositionByOffset(offset: OffsetPoint, z?: number): Vector3;
-    getIntersects(event: MouseEvent | TouchEvent | OffsetPoint, objects?: Object3D[]): Intersection[];
-    rayClash(startPoint?: Vector3, dir?: Vector3, objects?: Object3D[]): Intersection[];
+    getIntersects(event: MouseEvent | TouchEvent | OffsetPoint, objects?: Object3D<import("three").Event>[]): Intersection<Object3D<import("three").Event>>[];
+    rayClash(startPoint?: Vector3, dir?: Vector3, objects?: Object3D<import("three").Event>[]): Intersection<Object3D<import("three").Event>>[];
     setHoverEnabled(enabled: boolean): void;
     clearSignals(): void;
     dispose(): Promise<void>;
-    _signalsEventListen(): void;
+    _signalsEventListenr(): void;
     _containerAddEventListener(container: HTMLElement): void;
     /**
      * 触发场景交互事件