soonspacejs 2.5.0 → 2.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "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": "61b7ed6ce3e0d761a30fb65d64a4eeb22acbfef9"
+  "gitHead": "31fbce3b336b49c8fac25f3daea7e2d18f454076"
 }

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

@@ -8,6 +8,10 @@ interface CameraViewpointData {
     position: Position;
     rotation: Rotation;
 }
+interface CameraTargetViewData {
+    position: Position;
+    target: Position;
+}
 interface FlyToObjOptions extends AnimationOptions {
     padding?: number | string;
 }
@@ -136,4 +140,4 @@ export interface ToneMappingOptions {
     type?: 'None' | 'Linear' | 'Reinhard' | 'Cineon' | 'ACESFilmic';
     exposure?: number;
 }
-export { CameraViewpointData, FlyToObjOptions, SurroundOptions, LabelOptions, InternalOptions, SelectModelOptions, EdgeSelectOptions, StrokeSelectOptions, OpacitySelectOptions, HighlightSelectOptions, EmissiveSelectOptions, FogOptions, SkyOptions, ViewportOptions, ViewportState, IntersectsOptions, };
+export { CameraViewpointData, CameraTargetViewData, FlyToObjOptions, SurroundOptions, LabelOptions, InternalOptions, SelectModelOptions, EdgeSelectOptions, StrokeSelectOptions, OpacitySelectOptions, HighlightSelectOptions, EmissiveSelectOptions, FogOptions, SkyOptions, ViewportOptions, ViewportState, IntersectsOptions, };

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/CameraManager.d.ts

@@ -1,5 +1,5 @@
 import { Box3, PerspectiveCamera, Vector3, Euler, Object3D } from 'three';
-import { Rotation, Position, AnimationOptions, FlyToViewpoint, CameraViewpointData, FlyToObjOptions, SurroundOptions, LabelOptions } from '../Interface';
+import { Rotation, Position, AnimationOptions, FlyToViewpoint, CameraViewpointData, FlyToObjOptions, SurroundOptions, LabelOptions, CameraTargetViewData } from '../Interface';
 import { BaseObject3D, BaseMesh } from '../Library';
 import Viewport from '.';
 declare class CameraManager {
@@ -16,8 +16,10 @@ declare class CameraManager {
     getMainCamera(): PerspectiveCamera;
     getCameraViewpoint(): CameraViewpointData;
     setCameraViewpoint(data: CameraViewpointData): void;
-    rotateTo(rotation: Euler, options?: AnimationOptions): Promise<void>;
+    getCameraTargetView(): CameraTargetViewData | null;
+    setCameraTargetView(data: CameraTargetViewData): void;
     moveTo(position: Position, options?: AnimationOptions): Promise<void>;
+    rotateTo(rotation: Euler, 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>;
     flyToObj(object: Object3D, rotation?: FlyToViewpoint | Rotation | Euler, options?: FlyToObjOptions): Promise<void>;

package/types/Viewport/index.d.ts

@@ -54,7 +54,6 @@ declare class Viewport {
     constructor(options: ViewportOptions);
     _initInfo(): void;
     _initStats(): void;
-    _initViewHelper(): void;
     /**
      ***************************** post-processing ***************************
      */

package/types/index.d.ts

@@ -8,7 +8,6 @@
 */
 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 * as shared from './Shared';
 import Animation from './Animation';
@@ -16,7 +15,7 @@ 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, 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, ColorSpace, ToneMappingOptions, SSAOOptions } from './Interface';
 export declare type InitOptions = ViewportOptions;
 export declare type InitEvents = SceneGlobalEvents;
 export interface SoonSpaceConstructor {
@@ -115,10 +114,6 @@ export default class SoonSpace {
     readonly THREE: typeof THREE;
     readonly THREE_PLUGINS: {
         TransformControls: typeof TransformControls;
-        Lensflare: {
-            Lensflare: typeof Lensflare;
-            LensflareElement: typeof LensflareElement;
-        };
     };
     readonly version: string;
     readonly options: InitOptions;
@@ -281,13 +276,21 @@ export default class SoonSpace {
     /******/
     /******/
     /**
-     * 获取当前相机视角数据
+     * 获取当前相机视角数据（free）
      */
     getCameraViewpoint(): CameraViewpointData;
     /**
-     * 设置相机视角数据
+     * 设置相机视角数据（free）
      */
     setCameraViewpoint(data: CameraViewpointData): void;
+    /**
+     * 获取当前相机视角数据（orbit）
+     */
+    getCameraTargetView(): CameraTargetViewData | null;
+    /**
+     * 设置相机视角数据（orbit）
+     */
+    setCameraTargetView(data: CameraTargetViewData): void;
     /**
      * 相机飞向
      * @param position