soonspacejs 2.5.51 → 2.5.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.5.51",
+  "version": "2.5.53",
   "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": "935d10e09cab915e36057f12b0754296b93a8673"
+  "gitHead": "788700798f632f90aa51e10bf52b0cdd85b84a7c"
 }

package/types/index.d.ts

@@ -6,10 +6,11 @@
  |____/ \___/ \___/|_| |_|____/| .__/ \__,_|\___\___(_)/ |___/
                                |_|                   |__/
 */
+import * as THREE from 'three';
 import { TransformControls } from 'three/examples/jsm/controls/TransformControls.js';
 import { Reflector } from 'three/examples/jsm/objects/Reflector.js';
 import { mergeBufferGeometries } from 'three/examples/jsm/utils/BufferGeometryUtils.js';
-import { Object3D, Vector3, Euler, Box3, AnimationClip, AnimationAction, Light, AmbientLight, DirectionalLight, HemisphereLight, SpotLight, PointLight, RectAreaLight, Texture, Mesh } from 'three';
+import { Object3D, Vector3, Euler, Box3, AnimationClip, AnimationAction, Light, Texture, Mesh } from 'three';
 import * as shared from './Shared';
 import Animation from './Animation';
 import * as library from './Library';
@@ -17,6 +18,7 @@ import { BaseObject3D, BaseObject3DInfo, Model, ModelInfo, Poi, PoiInfo, PoiNode
 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 } from './Interface';
+import { BoxSpace, FindObjectsNearPosition, FindNearbyObjects, CreatePoiMeshOptions, CreatePolygonPoiMeshOptions, SetTextureOptions } from './tools';
 export declare type InitOptions = ViewportOptions;
 export declare type InitEvents = SceneGlobalEvents;
 export interface SoonSpaceConstructor {
@@ -24,29 +26,9 @@ export interface SoonSpaceConstructor {
     options?: InitOptions;
     events?: InitEvents;
 }
-import * as THREE from 'three';
 export * from 'three';
 export * from './Interface';
-import { BoxSpace, FindObjectsNearPosition, FindNearbyObjects } from './tools/find-objects';
-import { CreatePoiMeshOptions, CreatePolygonPoiMeshOptions } from './tools/poi-mesh';
-export * from './tools/units';
-declare global {
-    interface Window {
-        THREE: typeof THREE;
-    }
-}
-export interface SetTextureOptions {
-    /**
-     * 是否使用缓存中的材质
-     */
-    cache?: boolean | null;
-    /**
-     * 是否只更新当前 Mesh 的贴图
-     * @remarks
-     * 当 Mesh 与 其它 Mesh 共享 材质时，更新纹理会拿所有共享该 材质的 Mesh 都更新，将 independ 设置为 true 可以禁止这种行为，使得只会更新传入的 Mesh 的贴图。
-     */
-    independ?: boolean | null;
-}
+export * from './tools';
 export declare class SoonSpace {
     static readonly THREE: typeof THREE;
     readonly THREE: typeof THREE;
@@ -302,6 +284,10 @@ export declare class SoonSpace {
      * @param colorSpace
      */
     setColorSpace(colorSpace: IColorSpace): void;
+    /**
+     * 设置场景色调
+     * @param options
+     */
     setToneMapping(options?: ToneMappingOptions): void;
     /**
      * 设置开启鼠标悬浮
@@ -333,7 +319,7 @@ export declare class SoonSpace {
      * 设置场景环境
      * @returns
      */
-    setEnvironment(): Texture;
+    setEnvironment(): THREE.Texture;
     /**
      * 播放模型动画
      * @param model
@@ -558,7 +544,7 @@ export declare class SoonSpace {
      * 创建环境关
      * @param options
      */
-    createAmbientLight(options: AmbientLightOptions): AmbientLight;
+    createAmbientLight(options: AmbientLightOptions): THREE.AmbientLight;
     /**
      * 设置环境关
      * @param options
@@ -568,7 +554,7 @@ export declare class SoonSpace {
      * 创建平行光
      * @param options
      */
-    createDirectionalLight(options: DirectionalLightOptions): DirectionalLight;
+    createDirectionalLight(options: DirectionalLightOptions): THREE.DirectionalLight;
     /**
      * 设置平行光
      * @param options
@@ -578,7 +564,7 @@ export declare class SoonSpace {
      * 创建半球光
      * @param options
      */
-    createHemisphereLight(options: HemisphereLightOptions): HemisphereLight;
+    createHemisphereLight(options: HemisphereLightOptions): THREE.HemisphereLight;
     /**
      * 设置半球光
      * @param options
@@ -588,7 +574,7 @@ export declare class SoonSpace {
      * 创建聚光灯
      * @param options
      */
-    createSpotLight(options: SpotLightOptions): SpotLight;
+    createSpotLight(options: SpotLightOptions): THREE.SpotLight;
     /**
      * 设置聚光灯
      * @param options
@@ -598,7 +584,7 @@ export declare class SoonSpace {
      * 创建点光源
      * @param options
      */
-    createPointLight(options: PointLightOptions): PointLight;
+    createPointLight(options: PointLightOptions): THREE.PointLight;
     /**
      * 设置点光源
      * @param options
@@ -609,7 +595,7 @@ export declare class SoonSpace {
      * @param options
      * @returns
      */
-    createRectAreaLight(options: RectAreaLightOptions): RectAreaLight;
+    createRectAreaLight(options: RectAreaLightOptions): THREE.RectAreaLight;
     /**
      * 设置矩形区域光源
      * @param options
@@ -988,10 +974,10 @@ export declare class SoonSpace {
      * 给 mesh 设置纹理贴图
      * @param mesh - 需要设置的 Mesh 对象
      * @param image - 图片 url ，或 图片元素、Canvas元素、Video 元素
-     * @param cache - 是丰使用缓存中的材质
+     * @param cache - 是否使用缓存中的材质
      * @returns 返回设置的纹理对象
      */
-    setTexture(mesh: Mesh, image: string | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, options?: SetTextureOptions): Texture | THREE.CanvasTexture | THREE.VideoTexture;
+    setTexture(mesh: Mesh, image: string | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, options?: SetTextureOptions): THREE.Texture | THREE.CanvasTexture | THREE.VideoTexture;
     /******/
     /******/
     /******* Canvas3D methods */

package/types/tools/index.d.ts

@@ -0,0 +1,3 @@
+export * from './find-objects';
+export * from './poi-mesh';
+export * from './units';

package/types/tools/units.d.ts

@@ -29,6 +29,18 @@ export declare function boundingIsIntersected(target: Box3 | Sphere, obj: Object
  */
 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 {
+    /**
+     * 是否使用缓存中的材质
+     */
+    cache?: boolean | null;
+    /**
+     * 是否只更新当前 Mesh 的贴图
+     * @remarks
+     * 当 Mesh 与 其它 Mesh 共享 材质时，更新纹理会拿所有共享该 材质的 Mesh 都更新，将 independ 设置为 true 可以禁止这种行为，使得只会更新传入的 Mesh 的贴图。
+     */
+    independ?: boolean | null;
+}
 /**
  * 设置贴图
  * @param material