soonspacejs 2.3.13 → 2.3.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.3.13",
+  "version": "2.3.14",
   "description": "soonspacejs 2.x",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
@@ -17,9 +17,7 @@
     "@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.136.0"
+    "localforage": "1.9.0"
   },
-  "gitHead": "8e8640a5baee74a8a0df5a0b386a6acae77f328a"
+  "gitHead": "f9b1a052ef325608ab69e27efee8bcd625496dd4"
 }

package/types/Interface/manager.d.ts

@@ -11,24 +11,26 @@ interface BaseLightInfo {
     intensity?: number;
 }
 declare type AmbientLightOptions = BaseLightInfo;
-interface DirectionalLightOptions extends BaseLightInfo {
-    position?: Position;
-    target?: Position;
+export interface ShadowOptions {
     openShadow?: boolean;
+    shadowAutoUpdate?: boolean;
     mapSize?: number;
 }
+interface DirectionalLightOptions extends BaseLightInfo, ShadowOptions {
+    position?: Position;
+    target?: Position;
+}
 interface HemisphereLightOptions extends BaseLightInfo {
     position?: Position;
     skyColor?: IColor;
     groundColor?: IColor;
 }
-interface SpotLightOptions extends BaseLightInfo {
+interface SpotLightOptions extends BaseLightInfo, ShadowOptions {
     position?: Position;
     angle?: number;
     target?: Position;
-    openShadow?: boolean;
 }
-interface PointLightOptions extends BaseLightInfo {
+interface PointLightOptions extends BaseLightInfo, ShadowOptions {
     position?: Position;
     distance?: number;
 }

package/types/Interface/viewport.d.ts

@@ -1,8 +1,9 @@
+import { Object3D } from 'three';
 import { IColor, Position, Rotation, BaseSelectOptions } from './base';
 import { AnimationOptions } from './animation';
-import { BaseObject3D } from '../Library';
 import { GridHelperOptions } from './manager';
 import { ControlsOptions } from './controls';
+export declare type ColorSpace = 'Linear' | 'sRGB';
 interface CameraViewpointData {
     position: Position;
     rotation: Rotation;
@@ -23,10 +24,10 @@ interface InternalOptions {
     enableRenderCss2D: boolean;
     enableRenderCss2DHalf: boolean;
     enableRenderCss3D: boolean;
-    [x: string]: boolean;
+    enableReflection: boolean;
 }
 interface SelectModelOptions<TOptions> {
-    objects: BaseObject3D[];
+    objects: Object3D[];
     options?: TOptions;
 }
 interface EdgeSelectOptions {
@@ -53,6 +54,19 @@ interface FogOptions {
     near?: number;
     far?: number;
 }
+export interface ReflectionOptions {
+    enable: boolean;
+}
+interface SkyOptions {
+    enable?: boolean;
+    position?: Position;
+    scalar?: number;
+    turbidity?: number;
+    rayleigh?: number;
+    elevation?: number;
+    azimuth?: number;
+    exposure?: number;
+}
 interface ViewportOptions {
     showInfo?: boolean;
     showGrid?: boolean | GridHelperOptions;
@@ -77,4 +91,4 @@ interface ViewportState {
     useFreq: number;
     animationTotal: number;
 }
-export { CameraViewpointData, FlyToObjOptions, SurroundOptions, LabelOptions, InternalOptions, SelectModelOptions, EdgeSelectOptions, StrokeSelectOptions, OpacitySelectOptions, HighlightSelectOptions, EmissiveSelectOptions, FogOptions, ViewportOptions, ViewportState, };
+export { CameraViewpointData, FlyToObjOptions, SurroundOptions, LabelOptions, InternalOptions, SelectModelOptions, EdgeSelectOptions, StrokeSelectOptions, OpacitySelectOptions, HighlightSelectOptions, EmissiveSelectOptions, FogOptions, SkyOptions, ViewportOptions, ViewportState, };

package/types/Manager/HelperManage.d.ts

@@ -1,7 +1,7 @@
 import Viewport from '../Viewport';
 import DefaultManage from './DefaultManage';
 import { GridHelper, AxesHelper, Box3Helper, DirectionalLightHelper, HemisphereLightHelper, SpotLightHelper, PointLightHelper } from 'three';
-import { RectAreaLightHelper } from 'three/examples/jsm/helpers/RectAreaLightHelper';
+import { RectAreaLightHelper } from 'three/examples/jsm/helpers/RectAreaLightHelper.js';
 import { GridHelperOptions, AxesHelperOptions, BoxHelperOptions, PlaneHelperOptions, GroundHelperOptions, DirectionalLightHelperOptions, HemisphereLightHelperOptions, SpotLightHelperOptions, PointLightHelperOptions, RectAreaLightHelperOptions } from '../Interface';
 import { BaseMesh, Ground } from '../Library';
 declare class HelperManage extends DefaultManage {

package/types/Manager/LightManage.d.ts

@@ -16,5 +16,6 @@ declare class LightManage extends DefaultManage {
     setPointLight(options: PointLightOptions): boolean;
     createRectAreaLight(options: RectAreaLightOptions): RectAreaLight;
     setRectAreaLight(options: RectAreaLightOptions): boolean;
+    updateAllShadow(): void;
 }
 export default LightManage;

package/types/Manager/ModelManage.d.ts

@@ -1,5 +1,5 @@
-import { FBXLoader } from 'three/examples/jsm/loaders/FBXLoader';
-import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader';
+import { FBXLoader } from 'three/examples/jsm/loaders/FBXLoader.js';
+import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import * as localforage from 'localforage';
 import DefaultManage from './DefaultManage';
 import { BaseObject3D, Group, GroupInfo, Model, ModelInfo } from '../Library';

package/types/Viewport/RendererManager.d.ts

@@ -1,13 +1,18 @@
 import { Scene, WebGLRenderer, Camera, Vector2 } from 'three';
-import { Pass } from 'three/examples/jsm/postprocessing/Pass';
-import { SAOPass } from 'three/examples/jsm/postprocessing/SAOPass';
-import { ShaderPass } from 'three/examples/jsm/postprocessing/ShaderPass';
-import { OutlinePass } from 'three/examples/jsm/postprocessing/OutlinePass';
-import { SSAARenderPass } from 'three/examples/jsm/postprocessing/SSAARenderPass';
-import { UnrealBloomPass } from 'three/examples/jsm/postprocessing/UnrealBloomPass';
-import { EffectComposer } from 'three/examples/jsm/postprocessing/EffectComposer';
+import { EffectComposer } from 'three/examples/jsm/postprocessing/EffectComposer.js';
+import { Pass } from 'three/examples/jsm/postprocessing/Pass.js';
+import { RenderPass } from 'three/examples/jsm/postprocessing/RenderPass.js';
+import { OutlinePass } from 'three/examples/jsm/postprocessing/OutlinePass.js';
+import { SSRPass } from 'three/examples/jsm/postprocessing/SSRPass.js';
+import { ShaderPass } from 'three/examples/jsm/postprocessing/ShaderPass.js';
 import { CSS2DRenderer, CSS2DHalfRenderer, CSS3DRenderer } from '../Renderer';
 import { InternalOptions, ViewportOptions } from '../Interface';
+export interface PassObj {
+    renderPass: RenderPass;
+    outlinePass: OutlinePass;
+    ssrPass: SSRPass;
+    gammaCorrectionPass: ShaderPass;
+}
 declare class RendererManager {
     scene: Scene;
     options: ViewportOptions;
@@ -20,10 +25,11 @@ declare class RendererManager {
     rendererCSS3D: CSS3DRenderer;
     rendererCSS2DHalf: CSS2DHalfRenderer;
     constructor(scene: Scene, options: ViewportOptions);
-    initEffectComposer(camera: Camera): EffectComposer;
-    initAllPass(camera: Camera): Record<string, Pass>;
+    initEffectComposer(): EffectComposer;
+    initAllPass(camera: Camera): PassObj;
     addPass(effectPass: Pass): void;
-    setInternalState(name: string, state: boolean): void;
+    isIncludesPass(effectPass: Pass): boolean;
+    setInternalState(name: keyof InternalOptions, state: boolean): void;
     getWidth(): number;
     getHeight(): number;
     getMouseRelativeConRatio(clientPoint: MouseEvent): number[];
@@ -34,11 +40,9 @@ declare class RendererManager {
     _initRenderCSS3D(): CSS3DRenderer;
     _initRenderCSS2DHalf(): CSS2DHalfRenderer;
     _initInteractiveContainer(): HTMLElement;
-    _initFxaaPass(): ShaderPass;
-    _initSsaaPass(camera: Camera): SSAARenderPass;
+    _initRenderPass(camera: Camera): RenderPass;
     _initOutlinePass(camera: Camera): OutlinePass;
-    _initSweepingLightShaderPass(): ShaderPass;
-    _initUnrealBloomPass(): UnrealBloomPass;
-    _initSAOPass(camera: Camera): SAOPass;
+    _initSSRPass(camera: Camera): SSRPass;
+    _initGammaCorrectionPass(): ShaderPass;
 }
 export default RendererManager;

package/types/Viewport/Scener.d.ts

@@ -1,15 +1,14 @@
 import { Scene, Object3D } from 'three';
-import { BaseObject3D } from '../Library';
 import { EdgeSelectOptions, StrokeSelectOptions, OpacitySelectOptions, HighlightSelectOptions, EmissiveSelectOptions, FogOptions, SignalsState } from '../Interface';
 declare class Scener {
     readonly signals: SignalsState;
     scene: Scene;
     selectedObjects: {
-        edge: BaseObject3D[];
-        stroke: BaseObject3D[];
-        opacity: BaseObject3D[];
-        highlight: BaseObject3D[];
-        emissive: BaseObject3D[];
+        edge: Object3D[];
+        stroke: Object3D[];
+        opacity: Object3D[];
+        highlight: Object3D[];
+        emissive: Object3D[];
     };
     intersectsList: {
         meshOfModelList: Object3D[];
@@ -22,16 +21,16 @@ declare class Scener {
     removeObject(object: Object3D): void;
     openSceneFog(options?: FogOptions): void;
     closeSceneFog(): void;
-    edgeShow(object: BaseObject3D | BaseObject3D[], options?: EdgeSelectOptions): Promise<void>;
-    unEdgeShow(objects?: BaseObject3D | BaseObject3D[]): Promise<void | void[]>;
-    strokeShow(object: BaseObject3D | BaseObject3D[], options?: StrokeSelectOptions): Promise<void | void[]>;
-    unStrokeShow(objects?: BaseObject3D | BaseObject3D[]): Promise<void | void[]>;
-    opacityShow(object: BaseObject3D | BaseObject3D[], options?: OpacitySelectOptions): Promise<void | void[]>;
-    unOpacityShow(objects?: BaseObject3D | BaseObject3D[]): Promise<void | void[]>;
-    highlightShow(object: BaseObject3D | BaseObject3D[], options?: HighlightSelectOptions): Promise<void | void[]>;
-    unHighlightShow(objects?: BaseObject3D | BaseObject3D[]): Promise<void | void[]>;
-    emissiveShow(object: BaseObject3D | BaseObject3D[], options?: EmissiveSelectOptions): Promise<void | void[]>;
-    unEmissiveShow(objects?: BaseObject3D | BaseObject3D[]): Promise<void | void[]>;
+    edgeShow(object: Object3D | Object3D[], options?: EdgeSelectOptions): Promise<void>;
+    unEdgeShow(objects?: Object3D | Object3D[]): Promise<void | void[]>;
+    strokeShow(object: Object3D | Object3D[], options?: StrokeSelectOptions): Promise<void | void[]>;
+    unStrokeShow(objects?: Object3D | Object3D[]): Promise<void | void[]>;
+    opacityShow(object: Object3D | Object3D[], options?: OpacitySelectOptions): Promise<void | void[]>;
+    unOpacityShow(objects?: Object3D | Object3D[]): Promise<void | void[]>;
+    highlightShow(object: Object3D | Object3D[], options?: HighlightSelectOptions): Promise<void | void[]>;
+    unHighlightShow(objects?: Object3D | Object3D[]): Promise<void | void[]>;
+    emissiveShow(object: Object3D | Object3D[], options?: EmissiveSelectOptions): Promise<void | void[]>;
+    unEmissiveShow(objects?: Object3D | Object3D[]): Promise<void | void[]>;
     _triggerObjectAdded(object: Object3D): void;
 }
 export default Scener;

package/types/Viewport/index.d.ts

@@ -1,12 +1,13 @@
 import { Scene, PerspectiveCamera, WebGLRenderer, PMREMGenerator, Vector3, AnimationMixer, Intersection, Object3D, AnimationAction, AnimationClip } from 'three';
+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';
-import RendererManager from './RendererManager';
+import { EffectComposer } from 'three/examples/jsm/postprocessing/EffectComposer.js';
+import RendererManager, { PassObj } from './RendererManager';
 import CameraManager from './CameraManager';
 import { FullFreeControls } from '../Controls';
 import { Model } from '../Library';
-import { IColor, OffsetPoint, SceneEventType, Position, ViewportOptions, ViewportState, ModelAnimationFindFunc, SignalsState } from '../Interface';
+import { ColorSpace, SkyOptions, IColor, OffsetPoint, SceneEventType, Position, ViewportOptions, ViewportState, ModelAnimationFindFunc, SignalsState, ReflectionOptions } from '../Interface';
 import Info from './Info';
 export declare const innerRenderState: Record<string, boolean>;
 declare class Viewport {
@@ -15,6 +16,7 @@ declare class Viewport {
     signals: SignalsState;
     scener: Scener;
     scene: Scene;
+    sky: Sky | null;
     rendererManager: RendererManager;
     container: HTMLElement;
     interactiveContainer: HTMLElement;
@@ -28,7 +30,7 @@ declare class Viewport {
     camera: PerspectiveCamera;
     controls: FullFreeControls;
     effectComposer: EffectComposer;
-    pass: any;
+    passObj: PassObj;
     mixer: AnimationMixer;
     /**
      * render 前回调
@@ -43,6 +45,14 @@ declare class Viewport {
     private _loop;
     constructor(options: ViewportOptions);
     initInfo(): void;
+    /**
+     ***************************** reflection ***************************
+     */
+    setReflection(options: ReflectionOptions): void;
+    /**
+     ***************************** renderer ***************************
+     */
+    setColorSpace(colorSpace: ColorSpace): void;
     /**
      ***************************** background ***************************
      */
@@ -50,6 +60,8 @@ declare class Viewport {
     setSkyBackground(dirPath: string, fileNames?: string[]): void;
     setBackgroundColor(color: IColor): void;
     setBackgroundImage(imgUrl: string): void;
+    setSky(options?: SkyOptions): Sky | undefined;
+    closeSky(): boolean;
     /**
      ***************************** environment ***************************
      */
@@ -64,6 +76,7 @@ declare class Viewport {
      */
     render(fn?: () => void): Promise<void>;
     trigerRender(count?: number): void;
+    _passesObserver(): void;
     /**
      * 每帧都会被执行
      * @param time

package/types/index.d.ts

@@ -7,7 +7,7 @@
                                |_|                   |__/
 */
 import * as THREE from 'three';
-import { TransformControls } from 'three/examples/jsm/controls/TransformControls';
+import { TransformControls } from 'three/examples/jsm/controls/TransformControls.js';
 import { Object3D, Vector3, Euler, Box3, AnimationClip, AnimationAction, Light } from 'three';
 import * as shared from './Shared';
 import Animation from './Animation';
@@ -15,7 +15,7 @@ import * as library from './Library';
 import { BaseObject3D, BaseObject3DInfo, Sbm, SbmInfo, Model, ModelInfo, Poi, PoiInfo, PoiNode, PoiNodeInfo, Topology, TopologyInfo, Group, GroupInfo, Canvas3D, Canvas3DInfo, PluginObject, PluginObjectInfo } from './Library';
 import Viewport from './Viewport';
 import Manager from './Manager';
-import { ViewportOptions, SceneGlobalEvents, PluginsConstructor, IColor, Position, Rotation, OffsetPoint, AnimationOptions, ModelAnimationFindFunc, TopologyNodeInfo, CameraViewpointData, FlyToViewpoint, FlyToObjOptions, SurroundOptions, LabelOptions, EdgeSelectOptions, StrokeSelectOptions, OpacitySelectOptions, HighlightSelectOptions, EmissiveSelectOptions, FogOptions, UserDataPropertyFindFunc, AmbientLightOptions, DirectionalLightOptions, HemisphereLightOptions, SpotLightOptions, PointLightOptions, CloneSbmInfo, ModelLoadingProgressCallback, GroupProgressCallback, CloneModelInfo, ClonePoiInfo, ShortestPathInfo, ShortestPathByMultipleStartPoints, ShortestPathByMultipleEndPoints, TopologyInfoForGml, GridHelperOptions, AxesHelperOptions, BoxHelperOptions, PlaneHelperOptions, GroundHelperOptions, DirectionalLightHelperOptions, HemisphereLightHelperOptions, SpotLightHelperOptions, PointLightHelperOptions, SignalsState, ControlsOptions, RectAreaLightOptions, RectAreaLightHelperOptions } from './Interface';
+import { ViewportOptions, SceneGlobalEvents, PluginsConstructor, IColor, Position, Rotation, OffsetPoint, AnimationOptions, ModelAnimationFindFunc, TopologyNodeInfo, CameraViewpointData, FlyToViewpoint, FlyToObjOptions, SurroundOptions, LabelOptions, EdgeSelectOptions, StrokeSelectOptions, OpacitySelectOptions, HighlightSelectOptions, EmissiveSelectOptions, FogOptions, UserDataPropertyFindFunc, AmbientLightOptions, DirectionalLightOptions, HemisphereLightOptions, SpotLightOptions, PointLightOptions, CloneSbmInfo, ModelLoadingProgressCallback, GroupProgressCallback, CloneModelInfo, ClonePoiInfo, ShortestPathInfo, ShortestPathByMultipleStartPoints, ShortestPathByMultipleEndPoints, TopologyInfoForGml, GridHelperOptions, AxesHelperOptions, BoxHelperOptions, PlaneHelperOptions, GroundHelperOptions, DirectionalLightHelperOptions, HemisphereLightHelperOptions, SpotLightHelperOptions, PointLightHelperOptions, SignalsState, ControlsOptions, RectAreaLightOptions, RectAreaLightHelperOptions, SkyOptions, ColorSpace } from './Interface';
 export declare type InitOptions = ViewportOptions;
 export declare type InitEvents = SceneGlobalEvents;
 export interface SoonSpaceConstructor {
@@ -102,6 +102,11 @@ export default class SoonSpace {
     /******* Viewport methods */
     /******/
     /******/
+    /**
+     * 设置场景的颜色空间
+     * @param colorSpace
+     */
+    setColorSpace(colorSpace: ColorSpace): void;
     /**
      * 设置开启鼠标悬浮
      * @param enabled
@@ -265,6 +270,7 @@ export default class SoonSpace {
      * 关闭场景雾化
      */
     closeSceneFog(): void;
+    setSky(options: SkyOptions): import("three/examples/jsm/objects/Sky").Sky | undefined;
     /**
      * 轮廓显示模型
      * @deprecated
@@ -428,6 +434,11 @@ export default class SoonSpace {
      * 隐藏所有光
      */
     hideAllLight(): void;
+    /**
+     * 更新所有灯光阴影
+     * @returns
+     */
+    updateAllShadow(): void;
     /******/
     /******/
     /******* Sbm methods */