soonspacejs 2.3.17 → 2.3.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.3.17",
+  "version": "2.3.18",
   "description": "soonspacejs 2.x",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
@@ -17,9 +17,9 @@
     "@robotlegsjs/signals": "1.1.0",
     "@soonspacejs/xml2json": "0.0.2",
     "@tweenjs/tween.js": "18.6.4",
-    "@types/three": "^0.138.0",
+    "@types/three": "0.139.0",
     "localforage": "1.9.0",
-    "three": "^0.138.3"
+    "three": "0.139.0"
   },
-  "gitHead": "615a37b746fc1f12beab499a49807a4fdd667688"
+  "gitHead": "7d5d1b7b9ff6b61df850c92b1f65c921437138ea"
 }

package/types/Interface/base.d.ts

@@ -38,4 +38,10 @@ interface ObjectEvents<ObjectType> {
     onDblClick?: ((object: ObjectType) => void) | null;
     onRightClick?: ((object: ObjectType) => void) | null;
 }
+export interface ObjectEventsListener {
+    type: 'click' | 'rightClick' | 'dblClick';
+}
+export interface Interpolate {
+    t: number;
+}
 export { IVector2, IVector3, Position, Rotation, Scale, IColor, PlaneIVector2, Level, OffsetPoint, FlyToViewpoint, AxisType, SceneEventType, PoiNodeType, BaseSelectOptions, ObjectEvents, };

package/types/Library/BaseMesh.d.ts

@@ -1,5 +1,6 @@
 import { Box3, Vector3, Euler, Mesh, BufferGeometry, Material } from 'three';
-import { Position, Rotation, Scale, Level, AnimationOptions } from '../Interface';
+import { Tween } from '@tweenjs/tween.js';
+import { Position, Rotation, Scale, Level, AnimationOptions, Interpolate } from '../Interface';
 import { BaseObject3DInfo } from './BaseObject3D';
 declare type BaseMeshInfo = BaseObject3DInfo;
 declare class BaseMesh extends Mesh {
@@ -12,9 +13,9 @@ declare class BaseMesh extends Mesh {
     constructor(geometry: BufferGeometry, material: Material | Material[], param: BaseMeshInfo, type?: string);
     show(): void;
     hide(): void;
-    setMove(position: Position | Vector3, options?: AnimationOptions): Promise<void>;
-    setRotate(rotation: Rotation | Euler, options?: AnimationOptions): Promise<void>;
-    setScale(scale: Scale | Vector3, options?: AnimationOptions): Promise<void>;
+    setMove(position: Position | Vector3, options?: AnimationOptions, onUpdate?: (source: Position, tween: Tween<Position>) => void, onStart?: (tween: Tween<Position>) => void): Promise<void>;
+    setRotate(rotation: Rotation | Euler, options?: AnimationOptions, onUpdate?: (source: Rotation, tween: Tween<Interpolate>) => void, onStart?: (tween: Tween<Interpolate>) => void): Promise<void>;
+    setScale(scale: Scale | Vector3, options?: AnimationOptions, onUpdate?: (source: Scale, tween: Tween<Scale>) => void, onStart?: (tween: Tween<Scale>) => void): Promise<void>;
     getBoundingBox(): Box3;
     eventPropagation(): void;
     sClone(recursive?: boolean): BaseMesh;

package/types/Library/BaseObject3D.d.ts

@@ -1,6 +1,6 @@
-import { Object3D, Vector3, Euler } from 'three';
+import { Object3D, Vector3, Euler, BaseEvent, Event } from 'three';
 import { Tween } from '@tweenjs/tween.js';
-import { Position, Rotation, Scale, Level, AnimationOptions } from '../Interface';
+import { Position, Rotation, Scale, Level, AnimationOptions, Interpolate } from '../Interface';
 interface BaseObject3DInfo {
     id: string | number;
     name?: string;
@@ -11,7 +11,7 @@ interface BaseObject3DInfo {
     scale?: Scale;
     userData?: any;
 }
-declare class BaseObject3D extends Object3D {
+declare class BaseObject3D<E extends BaseEvent = Event> extends Object3D<E> {
     sid: string | number;
     stype: string;
     handleHide: boolean;
@@ -21,7 +21,7 @@ declare class BaseObject3D extends Object3D {
     show(): void;
     hide(): void;
     setMove(position: Position | Vector3, options?: AnimationOptions, onUpdate?: (source: Position, tween: Tween<Position>) => void, onStart?: (tween: Tween<Position>) => void): Promise<void>;
-    setRotate(rotation: Rotation | Euler, options?: AnimationOptions, onUpdate?: (source: Rotation, tween: Tween<Rotation>) => void, onStart?: (tween: Tween<Rotation>) => void): Promise<void>;
+    setRotate(rotation: Rotation | Euler, options?: AnimationOptions, onUpdate?: (source: Rotation, tween: Tween<Interpolate>) => void, onStart?: (tween: Tween<Interpolate>) => void): Promise<void>;
     setScale(scale: Scale | Vector3, options?: AnimationOptions, onUpdate?: (source: Scale, tween: Tween<Scale>) => void, onStart?: (tween: Tween<Scale>) => void): Promise<void>;
     sClone<T extends BaseObject3D>(recursive?: boolean): T;
     sCopy<T extends BaseObject3D>(source: BaseObject3D, recursive?: boolean): T;

package/types/Library/Model.d.ts

@@ -1,13 +1,13 @@
 import { Box3 } from 'three';
 import { BaseObject3D, BaseObject3DInfo } from './BaseObject3D';
-import { ObjectEvents } from '../Interface';
+import { ObjectEvents, ObjectEventsListener } from '../Interface';
 interface ModelInfo extends BaseObject3DInfo, ObjectEvents<Model> {
     url: string;
 }
 interface ModelInnerInfo extends ModelInfo {
     format: string;
 }
-declare class Model extends BaseObject3D implements ObjectEvents<Model> {
+declare class Model extends BaseObject3D<ObjectEventsListener> implements ObjectEvents<Model> {
     readonly formatType: string;
     isEventPropagation: boolean;
     onLoad: ((object: Model) => void) | null;

package/types/Library/Poi.d.ts

@@ -1,7 +1,7 @@
 import { BaseObject3D, BaseObject3DInfo } from './BaseObject3D';
 import { Icon, IconInfo } from './Icon';
 import { SpriteMaterial, Box3 } from 'three';
-import { ObjectEvents, Scale } from '../Interface';
+import { ObjectEvents, ObjectEventsListener, Scale } from '../Interface';
 interface PoiInfo extends BaseObject3DInfo, ObjectEvents<Poi> {
     url: string;
     nameScale?: Scale;
@@ -13,7 +13,7 @@ interface CanvasTextInfo {
     textAlign?: CanvasTextAlign;
     textBaseline?: CanvasTextBaseline;
 }
-declare class Poi extends BaseObject3D implements ObjectEvents<Poi> {
+declare class Poi extends BaseObject3D<ObjectEventsListener> implements ObjectEvents<Poi> {
     icon: Icon;
     text: Icon | null;
     isEventPropagation: boolean;

package/types/Library/Sbm.d.ts

@@ -1,11 +1,11 @@
 import { Box3 } from 'three';
 import { BaseObject3D, BaseObject3DInfo } from './BaseObject3D';
-import { ObjectEvents } from '../Interface';
+import { ObjectEvents, ObjectEventsListener } from '../Interface';
 interface SbmInfo extends BaseObject3DInfo, ObjectEvents<Sbm> {
     url: string;
     isPlatform?: boolean;
 }
-declare class Sbm extends BaseObject3D implements ObjectEvents<Sbm> {
+declare class Sbm extends BaseObject3D<ObjectEventsListener> implements ObjectEvents<Sbm> {
     isEventPropagation: boolean;
     onLoad: ((object: Sbm) => void) | null;
     onClick: ((object: Sbm) => void) | null;

package/types/Viewport/CameraManager.d.ts

@@ -16,7 +16,7 @@ declare class cameraManager {
     getMainCamera(): PerspectiveCamera;
     getCameraViewpoint(): CameraViewpointData;
     setCameraViewpoint(data: CameraViewpointData): void;
-    rotateTo(rotation: Rotation, options?: AnimationOptions): Promise<void>;
+    rotateTo(rotation: Euler, options?: AnimationOptions): Promise<void>;
     moveTo(position: Position, options?: AnimationOptions): Promise<void>;
     flyTo(position: Position, rotation?: FlyToViewpoint | Rotation | Euler, options?: AnimationOptions): Promise<void>;
     flyToBoundingBox(bbox: Box3, rotation?: FlyToViewpoint | Rotation | Euler, options?: AnimationOptions): Promise<void>;

package/types/Viewport/index.d.ts

@@ -1,9 +1,9 @@
 import { Scene, PerspectiveCamera, WebGLRenderer, PMREMGenerator, Vector3, AnimationMixer, Intersection, Object3D, AnimationAction, AnimationClip } from 'three';
+import { EffectComposer } from 'three/examples/jsm/postprocessing/EffectComposer.js';
 import Stats from 'three/examples/jsm/libs/stats.module.js';
 import { Sky } from 'three/examples/jsm/objects/Sky.js';
 import Scener from './Scener';
 import { CSS2DRenderer, CSS2DHalfRenderer, CSS3DRenderer } from '../Renderer';
-import { EffectComposer } from 'three/examples/jsm/postprocessing/EffectComposer.js';
 import RendererManager, { PassObj } from './RendererManager';
 import CameraManager from './CameraManager';
 import { FullFreeControls } from '../Controls';

package/types/index.d.ts

@@ -31,14 +31,15 @@ declare global {
     }
 }
 export default class SoonSpace {
-    readonly THREE: typeof THREE;
-    readonly THREE_PLUGINS: {
+    static readonly THREE: typeof THREE;
+    static readonly THREE_PLUGINS: {
         TransformControls: typeof TransformControls;
         Lensflare: {
             Lensflare: typeof Lensflare;
             LensflareElement: typeof LensflareElement;
         };
     };
+    readonly THREE: typeof THREE;
     readonly version: string;
     readonly options: InitOptions;
     readonly domElement: HTMLElement | null;

package/types/environments/RoomEnvironment.d.ts

@@ -1,8 +0,0 @@
-/**
- * https://github.com/google/model-viewer/blob/master/packages/model-viewer/src/three-components/EnvironmentScene.ts
- */
-import { Scene } from 'three';
-declare class RoomEnvironment extends Scene {
-    constructor();
-}
-export { RoomEnvironment, };

package/types/environments/index.d.ts

@@ -1 +0,0 @@
-export { RoomEnvironment, } from './RoomEnvironment';