soonspacejs 2.8.6 → 2.8.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.8.6",
+  "version": "2.8.8",
   "homepage": "http://www.xwbuilders.com:8800/",
   "description": "soonspacejs 2.x",
   "module": "./dist/index.esm.js",
@@ -28,5 +28,5 @@
   "peerDependencies": {
     "three": ">=0.152.2"
   },
-  "gitHead": "342a359c333c305927c93ad9a9329a4aef8acab6"
+  "gitHead": "f359f899e53f50f4ed86161539026ebfc8fe3e6f"
 }

package/types/Interface/manager.d.ts

@@ -109,8 +109,6 @@ interface TopologyNodeGraph {
         name: string;
     };
     passable: number;
-    enable?: boolean;
-    restrict?: number;
 }
 interface TopologyNodeInfo {
     id: BaseObject3DInfo['id'];

package/types/Library/Link.d.ts

@@ -3,11 +3,10 @@ import { Position, IColor } from '../Interface';
 import { BaseMesh, BaseMeshInfo } from './BaseMesh';
 interface LinkInfo extends BaseMeshInfo {
     passable?: number;
-    restrict?: number;
     start: Position;
     end: Position;
     width: number;
-    color: IColor;
+    color?: IColor;
     transparent?: boolean;
     imgUrl?: string;
 }
@@ -16,7 +15,6 @@ declare class Link extends BaseMesh {
     geometry: BufferGeometry<import("three").NormalBufferAttributes>;
     material: MeshStandardMaterial;
     passable: number;
-    restrict: number;
     constructor(params: LinkInfo);
     updateGeometry(params: Pick<LinkInfo, 'start' | 'end'>): void;
     computeVertex(up?: Vector3): void;

package/types/Manager/TopologyManage.d.ts

@@ -1,6 +1,6 @@
 import DefaultManage from './DefaultManage';
-import { Group, GroupInfo, Topology, TopologyInfo } from '../Library';
-import { TopologyInfoForGml, ShortestPathInfo, ShortestPathByMultipleStartPoints, ShortestPathByMultipleEndPoints, TopologyNodeInfo } from '../Interface';
+import { Group, GroupInfo, Topology, Node, TopologyInfo } from '../Library';
+import { TopologyInfoForGml, ShortestPathInfo, ShortestPathByMultipleStartPoints, ShortestPathByMultipleEndPoints, TopologyNodeInfo, TopologyInnerNodeInfo, Position } from '../Interface';
 import Viewport from '../Viewport';
 import { Dijkstras } from '../Math/dijkstra';
 import { Scene } from 'three';
@@ -9,10 +9,38 @@ declare class TopologyManage extends DefaultManage {
     constructor(viewport: Viewport, scene: Scene);
     createFromGml(topologyInfoForGml: TopologyInfoForGml): Promise<Topology>;
     create(topologyInfo: TopologyInfo): Topology;
+    /**
+     * 更新路径 passable
+     */
+    updatePassable(): void;
     resetNodes(topology: Topology, nodes: TopologyNodeInfo[]): Topology;
     createToGroup(groupInfo: GroupInfo, topologyInfos: TopologyInfo[]): Group;
     addForGroup(group: Group | null, topologyInfos: TopologyInfo[]): Group | null;
+    /**
+     * 计算路径
+     * @param topology
+     * @param info
+     * @returns
+     */
+    protected _getPath(topology: Topology, info: Pick<ShortestPathInfo, 'start' | 'end'>): Node[] | null;
+    protected _generateNodesInfo(nodes: Node[]): TopologyInnerNodeInfo[];
+    /**
+     * 根据两点获取最短路径
+     * @param topology
+     * @param info
+     * @returns
+     */
     getShortestPath(topology: Topology, info: ShortestPathInfo): Topology | null;
+    /**
+     * 多起点或多终点最短路径
+     * @param topology
+     * @param info
+     * @param points
+     * @param point
+     * @param pointsType
+     * @returns
+     */
+    protected _getShortestPathByMultiplePoints(topology: Topology, info: ShortestPathByMultipleStartPoints | ShortestPathByMultipleEndPoints, points: Position[], point: Position, pointsType: 'start' | 'end'): Topology | null;
     getShortestPathByMultipleStartPoints(topology: Topology, info: ShortestPathByMultipleStartPoints): Topology | null;
     getShortestPathByMultipleEndPoints(topology: Topology, info: ShortestPathByMultipleEndPoints): Topology | null;
     private setDijkstraGraph;

package/types/Viewport/CameraManager.d.ts

@@ -1,11 +1,11 @@
-import { Box3, PerspectiveCamera, Vector3, Euler, Object3D } from 'three';
+import { Box3, PerspectiveCamera, Vector3, Euler, Object3D, OrthographicCamera } from 'three';
 import { Rotation, Position, AnimationOptions, FlyToViewpoint, CameraViewpointData, FlyToObjOptions, SurroundOptions, LabelOptions, CameraTargetViewData } from '../Interface';
 import { BaseObject3D, BaseMesh } from '../Library';
 import Viewport from '.';
 declare class CameraManager {
     viewport: Viewport;
     mainCamera: PerspectiveCamera;
-    currentCamera: PerspectiveCamera;
+    currentCamera: PerspectiveCamera | OrthographicCamera;
     cameras: {
         [x: string]: PerspectiveCamera;
     };

package/types/Viewport/EffectManager.d.ts

@@ -21,7 +21,7 @@ declare class EffectManager {
     effectComposer: EffectComposer;
     passesMap: Map<string, Pass>;
     effectsMap: Map<string, EffectState>;
-    effectsNeedsUpddate: boolean;
+    effectsNeedsUpdate: boolean;
     constructor(renderer: WebGLRenderer, scene: Scene, camera: Camera);
     /**
      * 更新 Effect pass

package/types/Viewport/ViewHelper.d.ts

@@ -1,6 +1,7 @@
 import * as THREE from 'three';
 import { Camera, WebGLRenderer } from 'three';
 declare class ViewHelper extends THREE.Object3D {
+    camera: Camera;
     render: (renderer: WebGLRenderer) => void;
     handleClick: (event: MouseEvent) => void;
     update: (delta: number) => void;

package/types/Viewport/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="stats.js" />
-import { Mesh, Clock, Scene, PerspectiveCamera, WebGLRenderer, PMREMGenerator, Vector3, AnimationMixer, Raycaster, Intersection, Object3D, AnimationClip, Texture, Material } from 'three';
+import { Mesh, Clock, Scene, PerspectiveCamera, WebGLRenderer, PMREMGenerator, Vector3, AnimationMixer, Raycaster, Intersection, Object3D, AnimationClip, Texture, Material, OrthographicCamera } 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';
@@ -37,7 +37,7 @@ declare class Viewport {
     info: Info;
     stats: Stats;
     cameraManager: CameraManager;
-    camera: PerspectiveCamera;
+    camera: PerspectiveCamera | OrthographicCamera;
     controls: Controls;
     effectManager: EffectManager;
     effectComposer: EffectComposer;