soonspacejs 2.5.1 → 2.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.5.1",
+  "version": "2.5.3",
   "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": "49430ab52ae6ad1f3e6c4aab55a14e2564d775ac"
+  "gitHead": "2a5623644a00cc610219341317a92a0427d850b0"
 }

package/types/Interface/manager.d.ts

@@ -104,12 +104,9 @@ interface TopologyNodeInfo {
     position: Position;
     graphs?: TopologyNodeGraph[];
 }
-interface TopologyInnerNodeInfo {
-    id: BaseObject3DInfo['id'];
-    name?: BaseObject3DInfo['name'];
-    position: Position;
+declare type TopologyInnerNodeInfo = Omit<TopologyNodeInfo, 'graphs'> & {
     graphs: TopologyNodeGraph[];
-}
+};
 interface TwoWaysLink {
     pointAIndex: number;
     pointBIndex: number;

package/types/Interface/viewport.d.ts

@@ -3,7 +3,7 @@ import { IColor, Position, Rotation, BaseSelectOptions } from './base';
 import { AnimationOptions } from './animation';
 import { GridHelperOptions } from './manager';
 import { ControlsOptions } from './controls';
-export declare type ColorSpace = 'Linear' | 'sRGB';
+export declare type IColorSpace = 'Linear' | 'sRGB';
 interface CameraViewpointData {
     position: Position;
     rotation: Rotation;

package/types/Library/Topology.d.ts

@@ -23,5 +23,6 @@ declare class Topology extends BaseObject3D {
     createCircle(param: CircleInfo): Circle;
     createLink(param: LinkInfo): Link;
     resetNodes(newNodes: TopologyInnerNodeInfo[]): void;
+    getLength(): number;
 }
 export { Topology, TopologyInfo, TopologyInnerInfo, };

package/types/Shared/viewport.d.ts

@@ -25,5 +25,5 @@ declare function getSpaceAttributeFromObject(object: Object3D, isFromWorld?: boo
  * @param isFromWorld
  */
 declare function syncSpaceAttributeToObject(target: Object3D, source: Object3D, isFromWorld?: boolean): void;
-declare function isHideObject(object: Object3D): boolean;
-export { IVector3ToVector3, IVector3ToEuler, getBoundingBox, rotationAxisFix, rotationAFix, deg2Euler, euler2Deg, getSpaceAttributeFromObject, syncSpaceAttributeToObject, isHideObject, };
+declare function isObjectVisible(object: Object3D): boolean;
+export { IVector3ToVector3, IVector3ToEuler, getBoundingBox, rotationAxisFix, rotationAFix, deg2Euler, euler2Deg, getSpaceAttributeFromObject, syncSpaceAttributeToObject, isObjectVisible, };

package/types/Viewport/index.d.ts

@@ -9,7 +9,7 @@ import CameraManager from './CameraManager';
 import EffectManager from './EffectManager';
 import { Controls } from '../Controls';
 import { Model } from '../Library';
-import { ColorSpace, SkyOptions, IColor, OffsetPoint, SceneEventType, Position, ViewportOptions, ViewportState, ModelAnimationFindFunc, SignalsState, ToneMappingOptions, SSAOOptions, IntersectsOptions } from '../Interface';
+import { IColorSpace, SkyOptions, IColor, OffsetPoint, SceneEventType, Position, ViewportOptions, ViewportState, ModelAnimationFindFunc, SignalsState, ToneMappingOptions, SSAOOptions, IntersectsOptions } from '../Interface';
 import Info from './Info';
 import { ViewHelper } from './ViewHelper';
 export declare const innerRenderState: {
@@ -54,7 +54,6 @@ declare class Viewport {
     constructor(options: ViewportOptions);
     _initInfo(): void;
     _initStats(): void;
-    _initViewHelper(): void;
     /**
      ***************************** post-processing ***************************
      */
@@ -64,7 +63,7 @@ declare class Viewport {
     /**
      ***************************** renderer ***************************
      */
-    setColorSpace(colorSpace: ColorSpace): void;
+    setColorSpace(colorSpace: IColorSpace): void;
     setToneMapping(options?: ToneMappingOptions): void;
     /**
      ***************************** background ***************************

package/types/index.d.ts

@@ -6,17 +6,15 @@
  |____/ \___/ \___/|_| |_|____/| .__/ \__,_|\___\___(_)/ |___/
                                |_|                   |__/
 */
-import * as THREE from 'three';
 import { TransformControls } from 'three/examples/jsm/controls/TransformControls.js';
-import { Lensflare, LensflareElement } from 'three/examples/jsm/objects/Lensflare.js';
-import { Object3D, Vector3, Euler, Box3, AnimationClip, AnimationAction, Light } from 'three';
+import { Object3D, Vector3, Euler, Box3, AnimationClip, AnimationAction, Light, AmbientLight, DirectionalLight, HemisphereLight, SpotLight, PointLight, RectAreaLight } from 'three';
 import * as shared from './Shared';
 import Animation from './Animation';
 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, ColorSpace, ToneMappingOptions, SSAOOptions } 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, SSAOOptions } from './Interface';
 export declare type InitOptions = ViewportOptions;
 export declare type InitEvents = SceneGlobalEvents;
 export interface SoonSpaceConstructor {
@@ -24,14 +22,19 @@ export interface SoonSpaceConstructor {
     options?: InitOptions;
     events?: InitEvents;
 }
+export * from 'three';
 export * from './Interface';
 declare global {
     interface Window {
         THREE: typeof THREE;
     }
+    interface GlobalThis {
+        THREE: typeof THREE;
+    }
 }
-export default class SoonSpace {
-    static readonly THREE: typeof THREE;
+export declare class SoonSpace {
+    static readonly THREE: typeof import("three");
+    readonly THREE: typeof import("three");
     static readonly TWEEN: {
         Easing: {
             Linear: {
@@ -112,13 +115,8 @@ export default class SoonSpace {
         update: (time?: number | undefined, preserve?: boolean | undefined) => boolean;
     };
     static readonly utils: typeof shared;
-    readonly THREE: typeof THREE;
     readonly THREE_PLUGINS: {
         TransformControls: typeof TransformControls;
-        Lensflare: {
-            Lensflare: typeof Lensflare;
-            LensflareElement: typeof LensflareElement;
-        };
     };
     readonly version: string;
     readonly options: InitOptions;
@@ -203,7 +201,7 @@ export default class SoonSpace {
      * 设置场景的颜色空间
      * @param colorSpace
      */
-    setColorSpace(colorSpace: ColorSpace): void;
+    setColorSpace(colorSpace: IColorSpace): void;
     setToneMapping(options?: ToneMappingOptions): void;
     /**
      * 设置开启鼠标悬浮
@@ -235,7 +233,7 @@ export default class SoonSpace {
      * 设置场景环境
      * @returns
      */
-    setEnvironment(): THREE.Texture;
+    setEnvironment(): import("three").Texture;
     /**
      * 播放模型动画
      * @param model
@@ -454,7 +452,7 @@ export default class SoonSpace {
      * 创建环境关
      * @param options
      */
-    createAmbientLight(options: AmbientLightOptions): THREE.AmbientLight;
+    createAmbientLight(options: AmbientLightOptions): AmbientLight;
     /**
      * 设置环境关
      * @param options
@@ -464,7 +462,7 @@ export default class SoonSpace {
      * 创建平行光
      * @param options
      */
-    createDirectionalLight(options: DirectionalLightOptions): THREE.DirectionalLight;
+    createDirectionalLight(options: DirectionalLightOptions): DirectionalLight;
     /**
      * 设置平行光
      * @param options
@@ -474,7 +472,7 @@ export default class SoonSpace {
      * 创建半球光
      * @param options
      */
-    createHemisphereLight(options: HemisphereLightOptions): THREE.HemisphereLight;
+    createHemisphereLight(options: HemisphereLightOptions): HemisphereLight;
     /**
      * 设置半球光
      * @param options
@@ -484,7 +482,7 @@ export default class SoonSpace {
      * 创建聚光灯
      * @param options
      */
-    createSpotLight(options: SpotLightOptions): THREE.SpotLight;
+    createSpotLight(options: SpotLightOptions): SpotLight;
     /**
      * 设置聚光灯
      * @param options
@@ -494,7 +492,7 @@ export default class SoonSpace {
      * 创建点光源
      * @param options
      */
-    createPointLight(options: PointLightOptions): THREE.PointLight;
+    createPointLight(options: PointLightOptions): PointLight;
     /**
      * 设置点光源
      * @param options
@@ -505,7 +503,7 @@ export default class SoonSpace {
      * @param options
      * @returns
      */
-    createRectAreaLight(options: RectAreaLightOptions): THREE.RectAreaLight;
+    createRectAreaLight(options: RectAreaLightOptions): RectAreaLight;
     /**
      * 设置矩形区域光源
      * @param options
@@ -1069,17 +1067,17 @@ export default class SoonSpace {
      * 添加网格辅助器
      * @param options
      */
-    addGridHelper(options: GridHelperOptions): THREE.GridHelper;
+    addGridHelper(options: GridHelperOptions): import("three").GridHelper;
     /**
      * 添加轴线辅助器
      * @param options
      */
-    addAxesHelper(options: AxesHelperOptions): THREE.AxesHelper;
+    addAxesHelper(options: AxesHelperOptions): import("three").AxesHelper;
     /**
      * 添加包围盒辅助器
      * @param options
      */
-    addBoxHelper(options: BoxHelperOptions): THREE.Box3Helper;
+    addBoxHelper(options: BoxHelperOptions): import("three").Box3Helper;
     /**
      * 添加面辅助器
      * @param options
@@ -1099,22 +1097,22 @@ export default class SoonSpace {
      * 添加平行光辅助器
      * @param options
      */
-    addDirectionalLightHelper(options: DirectionalLightHelperOptions): THREE.DirectionalLightHelper;
+    addDirectionalLightHelper(options: DirectionalLightHelperOptions): import("three").DirectionalLightHelper;
     /**
      * 添加半球光辅助器
      * @param options
      */
-    addHemisphereLightHelper(options: HemisphereLightHelperOptions): THREE.HemisphereLightHelper;
+    addHemisphereLightHelper(options: HemisphereLightHelperOptions): import("three").HemisphereLightHelper;
     /**
      * 添加聚光灯辅助器
      * @param options
      */
-    addSpotLightHelper(options: SpotLightHelperOptions): THREE.SpotLightHelper;
+    addSpotLightHelper(options: SpotLightHelperOptions): import("three").SpotLightHelper;
     /**
      * 添加点光辅助器
      * @param options
      */
-    addPointLightHelper(options: PointLightHelperOptions): THREE.PointLightHelper;
+    addPointLightHelper(options: PointLightHelperOptions): import("three").PointLightHelper;
     /**
      * 添加矩形区域光辅助器
      * @param options
@@ -1144,3 +1142,4 @@ export default class SoonSpace {
      */
     hideAllHelper(): void;
 }
+export default SoonSpace;