soonspacejs 2.10.15 → 2.11.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.10.15",
+  "version": "2.11.2",
   "homepage": "http://www.xwbuilders.com:8800/",
   "description": "soonspacejs 2.x",
   "module": "./dist/index.esm.js",
@@ -29,5 +29,5 @@
   "peerDependencies": {
     "three": ">=0.155.0"
   },
-  "gitHead": "2dc1aab3663032d0449d9ca75f3bb6cea4424fab"
+  "gitHead": "ffbf8598e122d3ba75cfded86295b8aabd02ea82"
 }

package/types/Interface/events.d.ts

@@ -36,6 +36,5 @@ interface SceneGlobalEvents {
     poiDblClick?: (poi: PoiEventParams) => void;
     selectPosition?: (position: Position) => void;
     sceneClick?: (param: SceneClickParam) => void;
-    resize?: () => void;
 }
 export { ScenePoiIntersect, SceneModelIntersect, ModelEventParams, SceneClickParam, SceneGlobalEvents, };

package/types/Library/PoiNode.d.ts

@@ -11,8 +11,8 @@ interface PoiNodeInfo extends BaseObject3DInfo {
     scaleFixed?: ScaleFixed | null;
 }
 declare class PoiNode extends BaseObject3D {
-    readonly elementType?: PoiNodeInfo['type'];
-    readonly element?: PoiNodeInfo['element'];
+    readonly elementType: PoiNodeInfo['type'];
+    readonly element: PoiNodeInfo['element'];
     elementAutoDisplay: PoiNodeInfo['elementAutoDisplay'];
     occlude: PoiNodeInfo['occlude'];
     occludeThrottle: PoiNodeInfo['occludeThrottle'];

package/types/Viewport/RendererManager.d.ts

@@ -1,18 +1,20 @@
 import { WebGLRenderer } from 'three';
+import type SoonGIS from 'soongis';
 import { CSS2DRenderer, CSS3DRenderer } from '../Renderer';
 import { InternalOptions } from '../Interface';
 import Viewport from '.';
 declare class RendererManager {
     readonly viewport: Viewport;
+    readonly soongis?: SoonGIS | undefined;
     internalOptions: InternalOptions;
     renderer: WebGLRenderer;
-    container: HTMLDivElement;
-    interactiveContainer: HTMLDivElement;
+    container: HTMLElement;
+    interactiveContainer: HTMLElement;
     rendererCSS2D: CSS2DRenderer;
     rendererCSS3D: CSS3DRenderer;
-    constructor(viewport: Viewport);
+    constructor(viewport: Viewport, soongis?: SoonGIS | undefined);
     setInternalState(name: keyof InternalOptions, state: boolean): void;
-    _initContainer(): HTMLDivElement;
+    _initContainer(): HTMLElement;
     _initRenderer(): WebGLRenderer;
     _initRenderCSS2D(): CSS2DRenderer;
     _initRenderCSS3D(): CSS3DRenderer;

package/types/Viewport/SoonGISManager/coords-to-matrix.d.ts

@@ -0,0 +1,8 @@
+import type { MercatorCoordinate } from 'maplibre-gl';
+export type Coordinates = {
+    longitude: number;
+    latitude: number;
+    altitude: number;
+};
+/** calculate Matrix4 from coordinates */
+export declare function coordsToMatrix({ longitude, latitude, altitude, }: Coordinates, fromLngLat: typeof MercatorCoordinate.fromLngLat): Promise<import("three").Matrix4Tuple>;

package/types/Viewport/SoonGISManager/index.d.ts

@@ -0,0 +1,29 @@
+import { PerspectiveCamera } from 'three';
+import type { Map } from 'maplibre-gl';
+import type SoonGIS from 'soongis';
+import Viewport from '..';
+import { Coordinates } from './coords-to-matrix';
+declare class SoonGISManager {
+    readonly viewport: Viewport;
+    readonly soongis?: SoonGIS | undefined;
+    SOONSPACE_LAYER_ID: string;
+    map: Map | undefined;
+    camera: PerspectiveCamera;
+    coordinates: Coordinates;
+    _mapResize: () => void;
+    constructor(viewport: Viewport, soongis?: SoonGIS | undefined);
+    /**
+     * 设置经纬度、海拔
+     * @param coordinates
+     */
+    setCoordinates(coordinates: Coordinates): void;
+    /**
+     * 使用 map 的 render 代替 soonspace render
+     */
+    triggerRender(): void;
+    dispose(): void;
+    _initialize(): void;
+    _initSspSetting(): void;
+    _initLayer(): void;
+}
+export default SoonGISManager;

package/types/Viewport/SoonGISManager/sync-camera.d.ts

@@ -0,0 +1,2 @@
+import { Matrix4Tuple, PerspectiveCamera } from 'three';
+export declare function syncCamera(camera: PerspectiveCamera, origin: Matrix4Tuple, mapCamMx: Matrix4Tuple): void;

package/types/Viewport/index.d.ts

@@ -4,8 +4,10 @@ import { EffectComposer } from 'postprocessing';
 import Stats from 'three/examples/jsm/libs/stats.module.js';
 import { Sky } from 'three/examples/jsm/objects/Sky.js';
 import { AnimationOperate } from '@three3d/animation';
+import type SoonGIS from 'soongis';
 import Scener from './Scener';
 import { CSS2DRenderer, CSS3DRenderer } from '../Renderer';
+import SoonGISManager from './SoonGISManager';
 import RendererManager from './RendererManager';
 import CameraManager from './CameraManager';
 import EffectManager from './EffectManager';
@@ -19,6 +21,7 @@ export declare const innerRenderState: {
     needsUpdate: boolean;
 };
 declare class Viewport {
+    readonly soongis?: SoonGIS | undefined;
     clock: Clock;
     raycaster: Raycaster;
     options: ViewportOptions;
@@ -28,8 +31,8 @@ declare class Viewport {
     scene: Scene;
     sky: Sky | null;
     rendererManager: RendererManager;
-    container: HTMLDivElement;
-    interactiveContainer: HTMLDivElement;
+    container: HTMLElement;
+    interactiveContainer: HTMLElement;
     renderer: WebGLRenderer;
     rendererCSS2D: CSS2DRenderer;
     rendererCSS3D: CSS3DRenderer;
@@ -45,6 +48,7 @@ declare class Viewport {
     mixer: AnimationMixer;
     clipsSet: Set<AnimationClip>;
     viewHelper: ViewHelper;
+    soongisManager: SoonGISManager;
     /**
      * render 前回调（每帧执行）
      */
@@ -52,11 +56,11 @@ declare class Viewport {
     /**
      * render 后回调
      */
-    postRender: Map<string | number, (time: number) => void>;
+    postRender: Map<string | number, () => void>;
     private selectModel;
     private selectPoi;
     private _loop;
-    constructor(options: ViewportOptions);
+    constructor(options: ViewportOptions, soongis?: SoonGIS | undefined);
     _initInfo(): void;
     _initStats(): void;
     /**
@@ -95,7 +99,7 @@ declare class Viewport {
      */
     render(fn?: () => unknown): Promise<number>;
     /**
-     * 触发渲染
+     * 触发渲染（兼容 soongis）
      * @param count
      */
     triggerRender(count?: number): void;
@@ -113,7 +117,11 @@ declare class Viewport {
      * @param time
      * @returns
      */
-    autoRender(time: number): void;
+    autoRender(): void;
+    /**
+     * 兼容 soongis
+     */
+    baseRender(): void;
     animate(time: number): void;
     getOffsetByPosition(position: Position): {
         left: number;

package/types/index.d.ts

@@ -9,6 +9,7 @@
 import * as THREE from 'three';
 import { Object3D, Vector3, Euler, Box3, AnimationClip, Light, Texture, Mesh, Skeleton } from 'three';
 import type { Camera } from 'three';
+import type SoonGIS from 'soongis';
 import * as shared from './Shared';
 import Animation from './Animation';
 import { PathAnimation, PathAnimationOptions } from './Animation/path-animation';
@@ -16,6 +17,7 @@ import { CreatePathAnimationOptions, CreatePathAnimationActionForCameraOptions,
 import * as library from './Library';
 import { BaseObject3D, Model, ModelInfo, Poi, PoiInfo, PoiNode, PoiNodeInfo, Topology, TopologyInfo, Group, GroupInfo, Canvas3D, Canvas3DInfo, PluginObject, PluginObjectInfo } from './Library';
 import { Controls } from './Controls';
+import SoonGISManager from './Viewport/SoonGISManager';
 import Viewport from './Viewport';
 import Manager from './Manager';
 import { BaseObjectInfo, ViewportOptions, SceneGlobalEvents, PluginsConstructor, IColor, Position, Rotation, OffsetPoint, ModelAnimationFindFunc, TopologyNodeInfo, FlyToViewpoint, FlyToOptions, 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, IVector3, EnvironmentOptions, PluginsConstructorWithOptions, TopologyPassableInfo, CameraViewpointData, CameraViewpointDataLegacy } from './Interface';
@@ -25,9 +27,10 @@ import './three-patches';
 export type InitOptions = ViewportOptions;
 export type InitEvents = SceneGlobalEvents;
 export interface SoonSpaceConstructor {
-    el: string;
+    el?: string;
     options?: InitOptions;
     events?: InitEvents;
+    soongis?: SoonGIS;
 }
 export * from './Library';
 export * from './Interface';
@@ -45,9 +48,7 @@ export declare class SoonSpace {
             };
             Quadratic: {
                 In: (amount: number) => number;
-                Out: (amount: number) => number; /******* Init methods */
-                /******/
-                /******/
+                Out: (amount: number) => number;
                 InOut: (amount: number) => number;
             };
             Cubic: {
@@ -58,7 +59,7 @@ export declare class SoonSpace {
             Quartic: {
                 In: (amount: number) => number;
                 Out: (amount: number) => number;
-                InOut: (amount: number) => number;
+                InOut: (amount: number) => number; /******* Init methods */
             };
             Quintic: {
                 In: (amount: number) => number;
@@ -126,9 +127,7 @@ export declare class SoonSpace {
             };
             Quadratic: {
                 In: (amount: number) => number;
-                Out: (amount: number) => number; /******* Init methods */
-                /******/
-                /******/
+                Out: (amount: number) => number;
                 InOut: (amount: number) => number;
             };
             Cubic: {
@@ -139,7 +138,7 @@ export declare class SoonSpace {
             Quartic: {
                 In: (amount: number) => number;
                 Out: (amount: number) => number;
-                InOut: (amount: number) => number;
+                InOut: (amount: number) => number; /******* Init methods */
             };
             Quintic: {
                 In: (amount: number) => number;
@@ -228,10 +227,11 @@ export declare class SoonSpace {
     readonly library: typeof library;
     readonly signals: SignalsState;
     readonly controls: Controls;
+    readonly soongisManager: SoonGISManager;
     readonly viewport: Viewport;
     readonly manager: Manager;
     readonly plugins: Record<string, any>;
-    constructor(param: SoonSpaceConstructor);
+    constructor(params: SoonSpaceConstructor);
     /******/
     /******/
     /******* Init methods */