soonspacejs 2.14.30 → 2.14.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.14.30",
+  "version": "2.14.32",
   "homepage": "https://www.xwbuilders.com/soonspacejs/",
   "description": "soonspacejs 2.x",
   "module": "./dist/index.esm.js",

package/types/Interface/events.d.ts

@@ -1,5 +1,5 @@
-import { Mesh, Intersection } from 'three';
-import { Poi, Model } from '../Library';
+import { Mesh, Object3D, Intersection } from 'three';
+import { BaseObject3D, Poi, Model } from '../Library';
 import { Position, SceneEventType } from './base';
 interface ScenePoiIntersect {
     poi: Poi;
@@ -9,6 +9,13 @@ interface SceneModelIntersect {
     model: Model;
     sourceData: Intersection;
 }
+/**
+ * 通用对象交叉信息
+ */
+interface SceneObjectIntersect {
+    target: BaseObject3D;
+    sourceData: Intersection;
+}
 interface ModelEventParams {
     target: Model;
     currentTarget: Mesh;
@@ -19,6 +26,15 @@ interface PoiEventParams {
     target: Poi;
     event: MouseEvent | TouchEvent;
 }
+/**
+ * 通用对象事件参数
+ */
+interface ObjectEventParams {
+    target: BaseObject3D;
+    currentTarget: Object3D;
+    intersects: SceneObjectIntersect[];
+    event: MouseEvent | TouchEvent;
+}
 interface SceneClickParam {
     type: SceneEventType;
     event: MouseEvent | TouchEvent;
@@ -36,5 +52,6 @@ interface SceneGlobalEvents {
     poiDblClick?: (poi: PoiEventParams) => void;
     selectPosition?: (position: Position) => void;
     sceneClick?: (param: SceneClickParam) => void;
+    [key: string]: ((...args: any[]) => void) | undefined;
 }
-export { ScenePoiIntersect, SceneModelIntersect, ModelEventParams, SceneClickParam, SceneGlobalEvents, };
+export { ScenePoiIntersect, SceneModelIntersect, SceneObjectIntersect, ModelEventParams, PoiEventParams, ObjectEventParams, SceneClickParam, SceneGlobalEvents, };

package/types/Library/Link.d.ts

@@ -10,6 +10,7 @@ interface LinkInfo extends BaseObjectInfo {
     transparent?: boolean;
     imgUrl?: string;
 }
+declare function clearTextureCache(): void;
 declare class Link extends BaseMesh {
     readonly params?: LinkInfo | undefined;
     passable: number;
@@ -19,4 +20,4 @@ declare class Link extends BaseMesh {
     computeTextureRepeat(texture: Texture<HTMLImageElement>): void;
     createTexture(imgUrl?: string): Texture<HTMLImageElement> | undefined;
 }
-export { Link, LinkInfo, };
+export { Link, LinkInfo, clearTextureCache as clearLinkTextureCache, };

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

@@ -21,5 +21,6 @@ declare class SbmObjectLoader {
      * @returns
      */
     parseObject(sbmObject: SbmCache, sbmInfo: ModelInfo): Model;
+    clearCache(): void;
 }
 export { SbmObjectLoader, };

package/types/Manager/PoiManage.d.ts

@@ -9,6 +9,7 @@ declare class PoiManage extends DefaultManage {
     readonly cache: ObjectsCache;
     textures: Map<string, Texture>;
     constructor(viewport: Viewport, cache: ObjectsCache);
+    dispose(): void;
     _createIcon(info: PoiInfo): Mesh<import('three').BufferGeometry<import('three').NormalBufferAttributes, import('three').BufferGeometryEventMap>, import('three').Material | import('three').Material[], import('three').Object3DEventMap> | Icon;
     _createIconMaterial({ url, type, }: PoiInfo): MeshBasicMaterial | SpriteMaterial | undefined;
     _createText(info: PoiInfo): Mesh<import('three').BufferGeometry<import('three').NormalBufferAttributes, import('three').BufferGeometryEventMap>, import('three').Material | import('three').Material[], import('three').Object3DEventMap> | Icon;

package/types/Viewport/EventHandler.d.ts

@@ -1,9 +1,6 @@
 import { Object3D } from 'three';
 import { default as Viewport } from '.';
 import { SceneEventType } from '../Interface';
-/**
- * @todo 事件部分待重构。目前实现不来灵活，且部分对象不支持事件。
- */
 declare class EventHandler {
     readonly viewport: Viewport;
     private dblClickMaxInterval;
@@ -20,8 +17,7 @@ declare class EventHandler {
     private timer;
     private touchStartEvent;
     private touchstartTimes;
-    private selectModel;
-    private selectPoi;
+    private hoverSelectMap;
     constructor(viewport: Viewport);
     _getPoiAndModel(): Object3D<import('three').Object3DEventMap>[];
     /**

package/types/Viewport/index.d.ts

@@ -1,4 +1,4 @@
-import { Mesh, Clock, Scene, PerspectiveCamera, WebGLRenderer, PMREMGenerator, Vector3, AnimationMixer, Raycaster, Intersection, AnimationClip, Texture, Material, OrthographicCamera } from 'three';
+import { Mesh, Timer, Scene, PerspectiveCamera, WebGLRenderer, PMREMGenerator, Vector3, AnimationMixer, Raycaster, Intersection, AnimationClip, Texture, Material, OrthographicCamera } from 'three';
 import { EffectComposer } from 'postprocessing';
 import { default as Stats } from 'three/examples/jsm/libs/stats.module.js';
 import { Sky } from 'three/examples/jsm/objects/Sky.js';
@@ -23,7 +23,7 @@ declare class Viewport {
     readonly options: ViewportOptions;
     readonly signals: SignalsState;
     readonly cache: ObjectsCache;
-    clock: Clock;
+    clock: Timer;
     raycaster: Raycaster;
     scene: Scene;
     sky: Sky | null;