soonspacejs 2.6.7 → 2.6.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.6.7",
+  "version": "2.6.9",
   "homepage": "http://www.xwbuilders.com:8800/",
   "description": "soonspacejs 2.x",
   "module": "./dist/index.esm.js",
@@ -26,7 +26,7 @@
     "three-mesh-bvh": "0.5.23"
   },
   "peerDependencies": {
-    "three": ">=0.150.0"
+    "three": ">=0.150.1"
   },
-  "gitHead": "1367858f0722a9695212d5f4da58df5e6d0714bb"
+  "gitHead": "e88a2bd8a1ed89d6cbf041ba88e4bb9ac8d5c047"
 }

package/types/Interface/viewport.d.ts

@@ -102,6 +102,13 @@ interface ViewportState {
 interface IntersectsOptions {
     isFilterHideObject?: boolean;
 }
+export interface GetTextureOptions {
+    path?: string;
+    file: string | string[];
+}
+export interface EnvironmentOptions extends GetTextureOptions {
+    background?: boolean;
+}
 export interface BloomOptions {
     enabled?: boolean;
     mipmapBlur?: boolean;
@@ -135,6 +142,30 @@ export interface SSAOOptions {
     color?: IColor;
     resolutionScale?: number;
 }
+export interface SSGIOptions {
+    enabled?: boolean;
+    distance?: number;
+    thickness?: number;
+    autoThickness?: boolean;
+    maxRoughness?: number;
+    blend?: number;
+    denoiseIterations?: number;
+    denoiseKernel?: number;
+    denoiseDiffuse?: number;
+    denoiseSpecular?: number;
+    depthPhi?: number;
+    normalPhi?: number;
+    roughnessPhi?: number;
+    envBlur?: number;
+    importanceSampling?: boolean;
+    directLightMultiplier?: number;
+    maxEnvLuminance?: number;
+    steps?: number;
+    refineSteps?: number;
+    spp?: number;
+    resolutionScale?: number;
+    missedRays?: boolean;
+}
 export interface SSROptions {
     enabled?: boolean;
     intensity?: number;

package/types/Shared/map.d.ts

@@ -1,7 +1,7 @@
-import { CubeTexture, Texture } from 'three';
-import { IColor } from '../Interface';
-declare function getCubeTexture(dirPath: string, fileNames?: string[]): Promise<CubeTexture>;
-export { getCubeTexture, };
+import { Texture } from 'three';
+import { GetTextureOptions, IColor } from '../Interface';
+declare function getTexture({ path, file, }: GetTextureOptions): Promise<Texture>;
+export { getTexture, };
 interface GradientTextureOptions {
     colors: IColor[];
     stops?: number[];

package/types/Shared/viewport.d.ts

@@ -2,6 +2,11 @@ import { Vector3, Euler, Box3, Object3D } from 'three';
 import { IVector3, AxisType } from '../Interface';
 declare function IVector3ToVector3(val: IVector3 | Vector3): Vector3;
 declare function IVector3ToEuler(val: IVector3 | Euler): Euler;
+/**
+ * 获取 object box
+ * @param object
+ * @returns
+ */
 declare function getBoundingBox(object: Object3D): Box3;
 declare function rotationAxisFix(axis: AxisType, source: Euler, target: Euler): Euler;
 declare function rotationAFix(source: Euler, target: Euler): Euler;

package/types/Viewport/Bvh/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import Viewport from '..';
 export type ModelsBoundsTreeOptions = {
     type?: 'block' | 'slice' | 'worker';
@@ -9,7 +8,7 @@ export type ModelsBoundsTreeOptions = {
 declare class Bvh {
     readonly viewport: Viewport;
     cameraChanging: boolean;
-    timer: NodeJS.Timeout | null;
+    timer: number | null;
     computedGeometriesUuid: Map<string, string>;
     generateMeshBVHWorker: import("./GenerateMeshBVHWorker").GenerateMeshBVHWorker;
     constructor(viewport: Viewport);

package/types/Viewport/EffectManager.d.ts

@@ -11,8 +11,10 @@ declare class EffectManager {
     static CONSTANTS: {
         renderPass: string;
         normalPass: string;
+        velocityDepthNormalPass: string;
         effectPass: string;
         smaaEffect: string;
+        ssgiEffect: string;
         ssaoEffect: string;
         outlineEffect: string;
         ssrEffect: string;

package/types/Viewport/index.d.ts

@@ -1,4 +1,4 @@
-import { Mesh, BufferGeometry, Clock, Scene, PerspectiveCamera, WebGLRenderer, PMREMGenerator, Vector3, AnimationMixer, Raycaster, Intersection, Object3D, AnimationAction, AnimationClip, Texture } from 'three';
+import { Mesh, Clock, Scene, PerspectiveCamera, WebGLRenderer, PMREMGenerator, Vector3, AnimationMixer, Raycaster, Intersection, Object3D, AnimationAction, AnimationClip, Texture } from 'three';
 import { EffectComposer } from 'postprocessing';
 import Stats from 'three/examples/jsm/libs/stats.module.js';
 import { Sky } from 'three/examples/jsm/objects/Sky.js';
@@ -10,7 +10,7 @@ import EffectManager from './EffectManager';
 import Bvh from './Bvh';
 import { Controls } from '../Controls';
 import { Model } from '../Library';
-import { IColorSpace, SkyOptions, IColor, OffsetPoint, SceneEventType, Position, ViewportOptions, ViewportState, ModelAnimationFindFunc, SignalsState, ToneMappingOptions, SSAOOptions, SSROptions, BloomOptions, IntersectsOptions } from '../Interface';
+import { IColorSpace, SkyOptions, IColor, OffsetPoint, SceneEventType, Position, ViewportOptions, ViewportState, ModelAnimationFindFunc, SignalsState, ToneMappingOptions, SSAOOptions, SSROptions, BloomOptions, IntersectsOptions, EnvironmentOptions } from '../Interface';
 import { License } from '../License';
 import Info from './Info';
 import { ViewHelper } from './ViewHelper';
@@ -86,7 +86,7 @@ declare class Viewport {
     /**
      ***************************** environment ***************************
      */
-    setEnvironment(): Texture;
+    setEnvironment(options?: EnvironmentOptions): Promise<Texture>;
     /**
      ***************************** modelAnimation ***************************
      */
@@ -123,7 +123,7 @@ declare class Viewport {
     };
     getPositionByOffset(offset: OffsetPoint, z?: number): Vector3;
     getIntersects(event: MouseEvent | TouchEvent | OffsetPoint, objects?: Object3D<import("three").Event>[], options?: IntersectsOptions): Intersection<Object3D<import("three").Event>>[];
-    rayClash(startPoint?: Vector3, dir?: Vector3, objects?: Mesh<BufferGeometry, import("three").Material | import("three").Material[]>[]): Intersection<Object3D<import("three").Event>>[];
+    rayClash(startPoint?: Vector3, dir?: Vector3, objects?: Mesh<import("three").BufferGeometry, import("three").Material | import("three").Material[]>[]): Intersection<Object3D<import("three").Event>>[];
     setHoverEnabled(enabled: boolean): void;
     clearSignals(): void;
     dispose(): void;

package/types/index.d.ts

@@ -15,9 +15,10 @@ import * as library from './Library';
 import { BaseObject3D, BaseObject3DInfo, 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, CameraTargetViewData, FlyToViewpoint, FlyToObjOptions, SurroundOptions, LabelOptions, EdgeSelectOptions, StrokeSelectOptions, OpacitySelectOptions, HighlightSelectOptions, EmissiveSelectOptions, FogOptions, UserDataPropertyFindFunc, AmbientLightOptions, DirectionalLightOptions, HemisphereLightOptions, SpotLightOptions, PointLightOptions, CloneModelInfo, ClonePoiInfo, ShortestPathInfo, ShortestPathByMultipleStartPoints, ShortestPathByMultipleEndPoints, TopologyInfoForGml, GridHelperOptions, AxesHelperOptions, BoxHelperOptions, PlaneHelperOptions, GroundHelperOptions, DirectionalLightHelperOptions, HemisphereLightHelperOptions, SpotLightHelperOptions, PointLightHelperOptions, SignalsState, ControlsOptions, RectAreaLightOptions, RectAreaLightHelperOptions, SkyOptions, IColorSpace, ToneMappingOptions, SSROptions, SSAOOptions, BloomOptions, IVector3 } from './Interface';
+import { ViewportOptions, SceneGlobalEvents, PluginsConstructor, IColor, Position, Rotation, OffsetPoint, AnimationOptions, ModelAnimationFindFunc, TopologyNodeInfo, CameraViewpointData, CameraTargetViewData, FlyToViewpoint, FlyToObjOptions, SurroundOptions, LabelOptions, EdgeSelectOptions, StrokeSelectOptions, OpacitySelectOptions, HighlightSelectOptions, EmissiveSelectOptions, FogOptions, UserDataPropertyFindFunc, AmbientLightOptions, DirectionalLightOptions, HemisphereLightOptions, SpotLightOptions, PointLightOptions, CloneModelInfo, ClonePoiInfo, ShortestPathInfo, ShortestPathByMultipleStartPoints, ShortestPathByMultipleEndPoints, TopologyInfoForGml, GridHelperOptions, AxesHelperOptions, BoxHelperOptions, PlaneHelperOptions, GroundHelperOptions, DirectionalLightHelperOptions, HemisphereLightHelperOptions, SpotLightHelperOptions, PointLightHelperOptions, SignalsState, ControlsOptions, RectAreaLightOptions, RectAreaLightHelperOptions, SkyOptions, IColorSpace, ToneMappingOptions, SSROptions, SSAOOptions, BloomOptions, IVector3, EnvironmentOptions } from './Interface';
 import { BoxSpace, FindObjectsNearPosition, FindNearbyObjects, CreatePoiMeshOptions, CreatePolygonPoiMeshOptions, SetTextureOptions } from './tools';
 import { ModelsBoundsTreeOptions } from './Viewport/Bvh';
+import './three-patches';
 export type InitOptions = ViewportOptions;
 export type InitEvents = SceneGlobalEvents;
 export interface SoonSpaceConstructor {
@@ -314,12 +315,12 @@ export declare class SoonSpace {
      * @param dirPath
      * @param fileNames
      */
-    setSkyBackground(dirPath: string, fileNames: string[]): Promise<void>;
+    setSkyBackground(dirPath: string, fileNames?: string[]): Promise<void>;
     /**
      * 设置场景环境
      * @returns
      */
-    setEnvironment(): THREE.Texture;
+    setEnvironment(options?: EnvironmentOptions): Promise<THREE.Texture>;
     /**
      * 播放模型动画
      * @param model

package/types/three-patches.d.ts

@@ -0,0 +1,9 @@
+import { Box3, Sphere } from 'three';
+declare module 'three/src/objects/InstancedMesh' {
+    interface InstancedMesh {
+        boundingBox: Box3 | null;
+        boundingSphere: Sphere | null;
+        computeBoundingBox: () => void;
+        computeBoundingSphere: () => void;
+    }
+}

package/types/tools/units.d.ts

@@ -24,10 +24,6 @@ export declare function createUVMatrix(box: Box2): Matrix3;
  * 判断包围合 与 对象的包围盒是否相交
  */
 export declare function boundingIsIntersected(target: Box3 | Sphere, obj: Object3D): boolean;
-/**
- * 获取对象的包围合
- */
-export declare function getBoundingBox(obj: Object3D): Box3;
 export declare function createTexture(image: string | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, cache?: boolean, textureCache?: Map<string, Texture>): Texture | CanvasTexture | VideoTexture;
 export interface SetTextureOptions {
     /**