soonspacejs 2.5.11 → 2.5.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.5.11",
+  "version": "2.5.13",
   "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": "4ed737d4d3b9eeb1df9fabb56c72aa43441ccfd5"
+  "gitHead": "f68d6ee5e44df3d2c8e2d33519628e6716ca7d5a"
 }

package/types/Interface/base.d.ts

@@ -1,4 +1,7 @@
 import { Color } from 'three';
+interface Interpolate {
+    t: number;
+}
 interface IVector2 {
     x: number;
     y: number;
@@ -33,16 +36,23 @@ interface BaseSelectOptions {
     color?: IColor;
     opacity?: number;
 }
-interface ObjectEvents<ObjectType> {
+interface BaseObjectInfo<ObjectType> extends BaseObjectEvents<ObjectType> {
+    id: string | number;
+    name?: string;
+    level?: Level;
+    visible?: boolean;
+    position?: Position;
+    rotation?: Rotation;
+    scale?: Scale;
+    userData?: any;
+}
+interface BaseObjectEvents<ObjectType> {
     onLoad?: ((object: ObjectType) => void) | null;
     onClick?: ((object: ObjectType) => void) | null;
     onDblClick?: ((object: ObjectType) => void) | null;
     onRightClick?: ((object: ObjectType) => void) | null;
 }
-export interface ObjectEventsListener {
-    type: 'click' | 'rightClick' | 'dblClick';
-}
-export interface Interpolate {
-    t: number;
+interface BaseObjectEventsListener {
+    type: 'click' | 'rightClick' | 'dblClick' | string;
 }
-export { IVector2, IVector3, Position, Rotation, Scale, IColor, PlaneIVector2, Level, OffsetPoint, FlyToViewpoint, AxisType, SceneEventType, PoiNodeType, BaseSelectOptions, ObjectEvents, };
+export { Interpolate, IVector2, IVector3, Position, Rotation, Scale, IColor, PlaneIVector2, Level, OffsetPoint, FlyToViewpoint, AxisType, SceneEventType, PoiNodeType, BaseSelectOptions, BaseObjectEvents, BaseObjectInfo, BaseObjectEventsListener, };

package/types/Library/BaseMesh.d.ts

@@ -1,8 +1,7 @@
 import { Box3, Vector3, Euler, Mesh, BufferGeometry, Material } from 'three';
 import { Tween } from '@tweenjs/tween.js';
-import { Position, Rotation, Scale, Level, AnimationOptions, Interpolate } from '../Interface';
-import { BaseObject3DInfo } from './BaseObject3D';
-declare type BaseMeshInfo = BaseObject3DInfo;
+import { Position, Rotation, Scale, Level, BaseObjectInfo, AnimationOptions, Interpolate } from '../Interface';
+declare type BaseMeshInfo = BaseObjectInfo<BaseMesh>;
 declare class BaseMesh extends Mesh {
     sid: string | number;
     stype: string;

package/types/Library/BaseObject3D.d.ts

@@ -1,23 +1,20 @@
-import { Object3D, Vector3, Euler, BaseEvent, Event, Box3 } from 'three';
+import { Object3D, Vector3, Euler, BaseEvent, Box3 } from 'three';
 import { Tween } from '@tweenjs/tween.js';
-import { Position, Rotation, Scale, Level, AnimationOptions, Interpolate } from '../Interface';
-interface BaseObject3DInfo {
-    id: string | number;
-    name?: string;
-    level?: Level;
-    visible?: boolean;
-    position?: Position;
-    rotation?: Rotation;
-    scale?: Scale;
-    userData?: any;
-}
-declare class BaseObject3D<E extends BaseEvent = Event> extends Object3D<E> {
+import { Position, Rotation, Scale, Level, BaseObjectEvents, BaseObjectInfo, BaseObjectEventsListener, AnimationOptions, Interpolate } from '../Interface';
+declare type BaseObject3DInfo = BaseObjectInfo<BaseObject3D>;
+declare class BaseObject3D<Event extends BaseEvent = BaseObjectEventsListener> extends Object3D<Event> implements BaseObjectEvents<BaseObject3D> {
     sid: string | number;
     stype: string;
-    handleHide: boolean;
     level: Level;
+    handleHide: boolean;
+    isEventPropagation: boolean;
     autoUpdate: boolean;
+    onLoad: ((object: any) => void) | null;
+    onClick: ((object: any) => void) | null;
+    onDblClick: ((object: any) => void) | null;
+    onRightClick: ((object: any) => void) | null;
     constructor(param: BaseObject3DInfo, type?: string);
+    eventPropagation(): void;
     show(): void;
     hide(): void;
     setMove(position: Position | Vector3, options?: AnimationOptions, onUpdate?: (source: Position, tween: Tween<Position>) => void, onStart?: (tween: Tween<Position>) => void): Promise<void>;

package/types/Library/Model.d.ts

@@ -1,21 +1,14 @@
 import { BaseObject3D, BaseObject3DInfo } from './BaseObject3D';
-import { ObjectEvents, ObjectEventsListener } from '../Interface';
-interface ModelInfo extends BaseObject3DInfo, ObjectEvents<Model> {
+interface ModelInfo extends BaseObject3DInfo {
     url: string;
     isPlatform?: boolean;
 }
 interface ModelInnerInfo extends ModelInfo {
     format: string;
 }
-declare class Model extends BaseObject3D<ObjectEventsListener> implements ObjectEvents<Model> {
+declare class Model extends BaseObject3D {
     readonly formatType: string;
-    isEventPropagation: boolean;
-    onLoad: ((object: Model) => void) | null;
-    onClick: ((object: Model) => void) | null;
-    onDblClick: ((object: Model) => void) | null;
-    onRightClick: ((object: Model) => void) | null;
     constructor(param: ModelInnerInfo);
-    eventPropagation(): void;
     setEnvMap(dirPath: string, fileNames?: string[], options?: {
         reflectivity?: number;
     }): void;

package/types/Library/Poi.d.ts

@@ -1,8 +1,8 @@
 import { BaseObject3D, BaseObject3DInfo } from './BaseObject3D';
 import { Icon, IconInfo } from './Icon';
 import { SpriteMaterial, Box3 } from 'three';
-import { ObjectEvents, ObjectEventsListener, Scale } from '../Interface';
-interface PoiInfo extends BaseObject3DInfo, ObjectEvents<Poi> {
+import { Scale } from '../Interface';
+interface PoiInfo extends BaseObject3DInfo {
     url: string;
     nameScale?: Scale;
 }
@@ -13,16 +13,11 @@ interface CanvasTextInfo {
     textAlign?: CanvasTextAlign;
     textBaseline?: CanvasTextBaseline;
 }
-declare class Poi extends BaseObject3D<ObjectEventsListener> implements ObjectEvents<Poi> {
+declare class Poi extends BaseObject3D {
     icon: Icon;
     text: Icon | null;
-    isEventPropagation: boolean;
-    onClick: ((object: Poi) => void) | null;
-    onDblClick: ((object: Poi) => void) | null;
-    onRightClick: ((object: Poi) => void) | null;
     constructor(material: SpriteMaterial, param: PoiInfo);
     getBoundingBox(padding?: number): Box3;
-    eventPropagation(): void;
     sClone<T extends BaseObject3D>(recursive?: boolean): T;
     _createIcon(material: SpriteMaterial): Icon;
     _createText(info: IconInfo): void;