soonspacejs 2.5.22 → 2.5.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.5.22",
+  "version": "2.5.23",
   "homepage": "http://www.xwbuilders.com:8800/",
   "description": "soonspacejs 2.x",
   "module": "./dist/index.esm.js",
@@ -26,5 +26,5 @@
     "@tweenjs/tween.js": "^18.6.4",
     "@types/three": "0.141.0"
   },
-  "gitHead": "1b53294e499b7b60c3a9145dcade0227d05e2b20"
+  "gitHead": "effb9048a8b6d02f73e50bf32a513d7058823648"
 }

package/types/Library/index.d.ts

@@ -1,6 +1,5 @@
 export * from './BaseObject3D';
 export * from './BaseMesh';
-export * from './SceneManage';
 export * from './Group';
 export * from './PluginObject';
 export * from './PoiNode';

package/types/Manager/Canvas3DManage.d.ts

@@ -1,8 +1,9 @@
+import { Scene } from 'three';
 import DefaultManage from './DefaultManage';
 import Viewport from '../Viewport';
-import { Group, GroupInfo, Canvas3D, Canvas3DInfo, SceneManage } from '../Library';
+import { Group, GroupInfo, Canvas3D, Canvas3DInfo } from '../Library';
 declare class Canvas3DManage extends DefaultManage {
-    constructor(viewport: Viewport, scene: SceneManage);
+    constructor(viewport: Viewport, scene: Scene);
     create(info: Canvas3DInfo): Canvas3D;
     createToGroup(groupInfo: GroupInfo, poiInfo: Canvas3DInfo[]): Group;
     addForGroup(group: Group | null, poiInfo: Canvas3DInfo[]): Group | null;

package/types/Manager/DefaultManage.d.ts

@@ -1,11 +1,11 @@
-import { Object3D } from 'three';
+import { Object3D, Scene } from 'three';
 import Viewport from '../Viewport';
-import { Group, GroupInfo, SceneManage, BaseObject3D } from '../Library';
+import { Group, GroupInfo, BaseObject3D } from '../Library';
 declare class DefaultManage {
     readonly type: string;
-    readonly scene: SceneManage;
+    readonly scene: Scene;
     readonly viewport: Viewport;
-    constructor(type: string, viewport: Viewport, scene: SceneManage);
+    constructor(type: string, viewport: Viewport, scene: Scene);
     /***
      * group
      */

package/types/Manager/GroupManage.d.ts

@@ -1,7 +1,7 @@
-import { SceneManage } from '../Library';
+import { Scene } from 'three';
 import Viewport from '../Viewport';
 import DefaultManage from './DefaultManage';
 declare class GroupManage extends DefaultManage {
-    constructor(viewport: Viewport, scene: SceneManage);
+    constructor(viewport: Viewport, scene: Scene);
 }
 export default GroupManage;

package/types/Manager/HelperManage.d.ts

@@ -1,11 +1,11 @@
 import Viewport from '../Viewport';
 import DefaultManage from './DefaultManage';
-import { GridHelper, AxesHelper, Box3Helper, DirectionalLightHelper, HemisphereLightHelper, SpotLightHelper, PointLightHelper } from 'three';
+import { GridHelper, AxesHelper, Box3Helper, DirectionalLightHelper, HemisphereLightHelper, SpotLightHelper, PointLightHelper, Scene } from 'three';
 import { RectAreaLightHelper } from 'three/examples/jsm/helpers/RectAreaLightHelper.js';
 import { GridHelperOptions, AxesHelperOptions, BoxHelperOptions, PlaneHelperOptions, GroundHelperOptions, DirectionalLightHelperOptions, HemisphereLightHelperOptions, SpotLightHelperOptions, PointLightHelperOptions, RectAreaLightHelperOptions } from '../Interface';
-import { BaseMesh, Ground, SceneManage } from '../Library';
+import { BaseMesh, Ground } from '../Library';
 declare class HelperManage extends DefaultManage {
-    constructor(viewport: Viewport, scene: SceneManage);
+    constructor(viewport: Viewport, scene: Scene);
     addGridHelper(options: GridHelperOptions): GridHelper;
     addAxesHelper(options: AxesHelperOptions): AxesHelper;
     addBoxHelper(options: BoxHelperOptions): Box3Helper;

package/types/Manager/LightManage.d.ts

@@ -1,10 +1,9 @@
-import { AmbientLight, DirectionalLight, HemisphereLight, SpotLight, PointLight, RectAreaLight } from 'three';
+import { Scene, AmbientLight, DirectionalLight, HemisphereLight, SpotLight, PointLight, RectAreaLight } from 'three';
 import DefaultManage from './DefaultManage';
 import Viewport from '../Viewport';
 import { AmbientLightOptions, DirectionalLightOptions, HemisphereLightOptions, SpotLightOptions, PointLightOptions, RectAreaLightOptions } from '../Interface';
-import { SceneManage } from '../Library';
 declare class LightManage extends DefaultManage {
-    constructor(viewport: Viewport, scene: SceneManage);
+    constructor(viewport: Viewport, scene: Scene);
     createAmbientLight(options: AmbientLightOptions): AmbientLight;
     setAmbientLight(light: AmbientLight | null, options: AmbientLightOptions): boolean;
     createDirectionalLight(options: DirectionalLightOptions): DirectionalLight;

package/types/Manager/ModelManage.d.ts

@@ -1,10 +1,10 @@
-import { LoadingManager } from 'three';
+import { Scene, LoadingManager } from 'three';
 import { FBXLoader } from 'three/examples/jsm/loaders/FBXLoader.js';
 import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import localforage from 'localforage';
 import { DatLoader } from '../Loader/DatLoader';
 import Viewport from '../Viewport';
-import { BaseObject3D, Group, GroupInfo, Model, ModelInfo, SceneManage } from '../Library';
+import { BaseObject3D, Group, GroupInfo, Model, ModelInfo } from '../Library';
 import { CloneModelInfo } from '../Interface';
 import DefaultManage from './DefaultManage';
 declare class ModelManage extends DefaultManage {
@@ -25,7 +25,7 @@ declare class ModelManage extends DefaultManage {
     gltfLoader: GLTFLoader;
     fbxLoader: FBXLoader;
     dracoDecoderPath: string | null;
-    constructor(viewport: Viewport, scene: SceneManage);
+    constructor(viewport: Viewport, scene: Scene);
     /**
      * 设置 draco path
      * @param path
@@ -36,7 +36,7 @@ declare class ModelManage extends DefaultManage {
      * @param modelInfo
      * @returns
      */
-    load(modelInfo: ModelInfo, parent?: BaseObject3D | null): Promise<Model | null>;
+    load(modelInfo: ModelInfo, parent?: BaseObject3D | Scene | null): Promise<Model | null>;
     /**
      * 模型解析
      * @param format
@@ -45,7 +45,7 @@ declare class ModelManage extends DefaultManage {
      * @returns
      */
     parse(modelInfo: ModelInfo): Promise<Model | null>;
-    clone(model: Model, info: CloneModelInfo, parent?: BaseObject3D | null): Promise<Model>;
+    clone(model: Model, info: CloneModelInfo, parent?: BaseObject3D | Scene | null): Promise<Model>;
     loadToGroup(groupInfo: GroupInfo, modelInfo: ModelInfo[]): Promise<Group>;
     addForGroup(group: Group | null, modelInfo: ModelInfo[]): Promise<Group | null>;
     /**

package/types/Manager/PluginObjectManage.d.ts

@@ -1,9 +1,9 @@
-import { Object3D } from 'three';
+import { Object3D, Scene } from 'three';
 import DefaultManage from './DefaultManage';
-import { PluginObject, PluginObjectInfo, SceneManage } from '../Library';
+import { PluginObject, PluginObjectInfo } from '../Library';
 import Viewport from '../Viewport';
 declare class PluginManage extends DefaultManage {
-    constructor(viewport: Viewport, scene: SceneManage);
+    constructor(viewport: Viewport, scene: Scene);
     createObject(info: PluginObjectInfo, object?: Object3D): PluginObject;
     addToObject(pluginObject: PluginObject | null, object: Object3D): PluginObject | null;
 }

package/types/Manager/PoiManage.d.ts

@@ -1,11 +1,11 @@
 import DefaultManage from './DefaultManage';
-import { SpriteMaterial } from 'three';
-import { Poi, PoiInfo, Group, GroupInfo, BaseObject3D, SceneManage } from '../Library';
+import { SpriteMaterial, Scene } from 'three';
+import { Poi, PoiInfo, Group, GroupInfo, BaseObject3D } from '../Library';
 import { ClonePoiInfo } from '../Interface';
 import Viewport from '../Viewport';
 declare class PoiManage extends DefaultManage {
     materials: Map<string, SpriteMaterial>;
-    constructor(viewport: Viewport, scene: SceneManage);
+    constructor(viewport: Viewport, scene: Scene);
     create(info: PoiInfo): Poi;
     clone(poi: Poi, poiInfo: ClonePoiInfo, parent?: BaseObject3D | null): Poi | void;
     createToGroup(groupInfo: GroupInfo, poiInfo: PoiInfo[]): Group;

package/types/Manager/PoiNodeManage.d.ts

@@ -1,8 +1,9 @@
+import { Scene } from 'three';
 import DefaultManage from './DefaultManage';
 import Viewport from '../Viewport';
-import { PoiNode, PoiNodeInfo, Group, GroupInfo, SceneManage } from '../Library';
+import { PoiNode, PoiNodeInfo, Group, GroupInfo } from '../Library';
 declare class PoiNodeManage extends DefaultManage {
-    constructor(viewport: Viewport, scene: SceneManage);
+    constructor(viewport: Viewport, scene: Scene);
     create(info: PoiNodeInfo): PoiNode;
     createToGroup(groupInfo: GroupInfo, poiNodeInfo: PoiNodeInfo[]): Group;
     addForGroup(group: Group | null, poiNodeInfo: PoiNodeInfo[]): Group | null;

package/types/Manager/TopologyManage.d.ts

@@ -1,11 +1,12 @@
 import DefaultManage from './DefaultManage';
-import { Group, GroupInfo, SceneManage, Topology, TopologyInfo } from '../Library';
+import { Group, GroupInfo, Topology, TopologyInfo } from '../Library';
 import { TopologyInfoForGml, ShortestPathInfo, ShortestPathByMultipleStartPoints, ShortestPathByMultipleEndPoints, TopologyNodeInfo } from '../Interface';
 import Viewport from '../Viewport';
 import { Dijkstras } from '../Math/dijkstra';
+import { Scene } from 'three';
 declare class TopologyManage extends DefaultManage {
     dijkstra: Dijkstras;
-    constructor(viewport: Viewport, scene: SceneManage);
+    constructor(viewport: Viewport, scene: Scene);
     createFromGml(topologyInfoForGml: TopologyInfoForGml): Promise<Topology>;
     create(topologyInfo: TopologyInfo): Topology;
     resetNodes(topology: Topology, nodes: TopologyNodeInfo[]): Topology;

package/types/Manager/index.d.ts

@@ -1,6 +1,6 @@
-import { Object3D } from 'three';
+import { Object3D, Scene } from 'three';
 import Viewport from '../Viewport';
-import { BaseObject3D, SceneManage } from '../Library';
+import { BaseObject3D } from '../Library';
 import LightManage from './LightManage';
 import ModelManage from './ModelManage';
 import PoiManage from './PoiManage';
@@ -29,7 +29,7 @@ declare class Manager {
     readonly viewport: Viewport;
     readonly store: ManagerStore;
     readonly cache: ManageCache;
-    readonly scene: SceneManage;
+    scene: Scene;
     constructor(viewport: Viewport);
     /**
      * level update

package/types/index.d.ts

@@ -25,6 +25,7 @@ export interface SoonSpaceConstructor {
 import * as THREE from 'three';
 export * from 'three';
 export * from './Interface';
+import { BoxSpace, FindObjectsNearPosition } from './tools/index';
 declare global {
     interface Window {
         THREE: typeof THREE;
@@ -1221,5 +1222,20 @@ export declare class SoonSpace {
      * 隐藏所有辅助器
      */
     hideAllHelper(): void;
+    /**
+     *  创建 查找位置附近的 box 空间范围内的物体
+     * @param boxSpace - 描述查找空间的信息对象
+     * @param objects - 所有需要被查找的对象
+     * @returns 用于查找的函数
+     */
+    createFindObjectsInBoxNearPosition(boxSpace: BoxSpace, objects: Object3D[]): FindObjectsNearPosition;
+    /**
+     *  创建 查找位置附近的球形空间范围内的物体
+     *
+     * @param radius - 描述查找半径
+     * @param objects - 所有需要被查找的对象
+     * @returns 用于查找的函数
+     */
+    createFindObjectsInSphereNearPosition(radius: number, objects: Object3D[]): FindObjectsNearPosition;
 }
 export default SoonSpace;

package/types/tools/index.d.ts

@@ -0,0 +1,34 @@
+import type { Object3D } from 'three';
+import { Vector3 } from 'three';
+/**
+ * 盒子空间
+ */
+export interface BoxSpace {
+    top: number;
+    bottom: number;
+    left: number;
+    right: number;
+    front: number;
+    back: number;
+}
+/**
+ * 位置附近的对象查找器
+ * @param position - 指定查找的位置
+ * @returns 所有包含在指定空间的对象
+ */
+export declare type FindObjectsNearPosition = (position: Vector3) => Object3D[];
+/**
+ *  创建 查找位置附近的 box 空间范围内的物体
+ * @param boxSpace - 描述查找空间的信息对象
+ * @param objects - 所有需要被查找的对象
+ * @returns 用于查找的函数
+ */
+export declare function createFindObjectsInBoxNearPosition(boxSpace: BoxSpace, objects: Object3D[]): FindObjectsNearPosition;
+/**
+ *  创建 查找位置附近的球形空间范围内的物体
+ *
+ * @param radius - 描述查找半径
+ * @param objects - 所有需要被查找的对象
+ * @returns 用于查找的函数
+ */
+export declare function createFindObjectsInSphereNearPosition(radius: number, objects: Object3D[]): FindObjectsNearPosition;

package/types/Library/SceneManage.d.ts

@@ -1,7 +0,0 @@
-import { BaseObject3D, BaseObject3DInfo } from './BaseObject3D';
-declare type SceneManageInfo = BaseObject3DInfo;
-declare class SceneManage extends BaseObject3D {
-    readonly isSceneManage: boolean;
-    constructor(param: SceneManageInfo);
-}
-export { SceneManage, SceneManageInfo, };