soonspacejs 2.11.44 → 2.11.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.11.44",
+  "version": "2.11.45",
   "homepage": "https://www.xwbuilders.com/soonspacejs/",
   "description": "soonspacejs 2.x",
   "module": "./dist/index.esm.js",
@@ -27,5 +27,5 @@
   "peerDependencies": {
     "three": ">=0.155.0"
   },
-  "gitHead": "ab02c9aa47b07ccab6aad29abbf1211ccdcb222e"
+  "gitHead": "ca9a3e502e638afcd979543604db399e5ca9b0be"
 }

package/types/Constants/index.d.ts

@@ -14,8 +14,9 @@ export declare enum ObjecType {
 export declare enum ModelFormat {
     sbm = "SBM",
     sbmx = "SBMX",
-    dat = "DAT",
     glb = "GLB",
     gltf = "GLTF",
-    fbx = "FBX"
+    fbx = "FBX",
+    obj = "OBJ",
+    stl = "STL"
 }

package/types/Manager/ModelManage.d.ts

@@ -1,7 +1,9 @@
 import { LoadingManager, Object3D } from 'three';
 import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
+import { STLLoader } from 'three/examples/jsm/loaders/STLLoader.js';
 import localforage from 'localforage';
 import { FBXLoader } from '../Loader/FBXLoader.js';
+import { OBJLoader } from '../Loader/OBJLoader.js';
 import Viewport from '../Viewport';
 import { Group, GroupInfo, Model, ModelInfo } from '../Library';
 import { CloneModelInfo, ManageCache } from '../Interface';
@@ -24,6 +26,8 @@ declare class ModelManage extends DefaultManage {
     loadingManager: LoadingManager;
     gltfLoader: GLTFLoader;
     fbxLoader: FBXLoader;
+    objLoader: OBJLoader;
+    stlLoader: STLLoader;
     constructor(viewport: Viewport, cache: ManageCache);
     /**
      * 设置 draco path
@@ -59,10 +63,41 @@ declare class ModelManage extends DefaultManage {
      */
     private _initLoadingManager;
     private _setModelsMap;
+    /**
+     * 解析 sbm 格式
+     * @param modelInfo
+     * @returns
+     */
     private _parseSbm;
+    /**
+     * 解析 sbmx 格式
+     * @param modelInfo
+     * @returns
+     */
     private _parseSbmx;
+    /**
+     * 解析 gltf、glb 格式
+     * @param modelInfo
+     * @param _buffer
+     * @returns
+     */
     private _parseGltf;
+    /**
+     * 解析 fbx 格式
+     * @param modelInfo
+     * @returns
+     */
     private _parseFbx;
+    /**
+     * 解析 obj 格式
+     * @param modelInfo
+     */
+    private _parseObj;
+    /**
+     * 解析 stl 格式
+     * @param modelInfo
+     */
+    private _parseStl;
     private _innerLoad;
     private _fetchBuffer;
     private _getBuffer;

package/types/Viewport/RendererManager.d.ts

@@ -1,18 +1,16 @@
 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: HTMLElement;
     interactiveContainer: HTMLElement;
     rendererCSS2D: CSS2DRenderer;
     rendererCSS3D: CSS3DRenderer;
-    constructor(viewport: Viewport, soongis?: SoonGIS | undefined);
+    constructor(viewport: Viewport);
     setInternalState(name: keyof InternalOptions, state: boolean): void;
     _initContainer(): HTMLElement;
     _initRenderer(): WebGLRenderer;

package/types/Viewport/ViewHelper.d.ts

@@ -1,7 +1,6 @@
-import * as THREE from 'three';
-import { Camera, WebGLRenderer } from 'three';
+import { Camera, Object3D, WebGLRenderer } from 'three';
 import { Controls } from '../Controls';
-declare class ViewHelper extends THREE.Object3D {
+declare class ViewHelper extends Object3D {
     camera: Camera;
     controls: Controls;
     render: (renderer: WebGLRenderer) => void;

package/types/Viewport/index.d.ts

@@ -4,10 +4,8 @@ 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';
@@ -22,7 +20,6 @@ export declare const innerRenderState: {
     needsUpdate: boolean;
 };
 declare class Viewport {
-    readonly soongis?: SoonGIS | undefined;
     clock: Clock;
     raycaster: Raycaster;
     options: ViewportOptions;
@@ -49,8 +46,7 @@ declare class Viewport {
     mixer: AnimationMixer;
     clipsSet: Set<AnimationClip>;
     viewHelper: ViewHelper;
-    soongisManager: SoonGISManager;
-    eventHandler: EventHandler | undefined;
+    eventHandler: EventHandler;
     /**
      * render 前回调（每帧执行）
      */
@@ -61,7 +57,7 @@ declare class Viewport {
     postRender: Map<string | number, () => void>;
     private _loop;
     resizeObserver: ResizeObserver;
-    constructor(options: ViewportOptions, soongis?: SoonGIS | undefined);
+    constructor(options: ViewportOptions);
     _initInfo(): void;
     _initStats(): void;
     /**

package/types/index.d.ts

@@ -9,7 +9,6 @@
 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';
@@ -17,7 +16,6 @@ import { CreatePathAnimationOptions, CreatePathAnimationActionForCameraOptions,
 import * as library from './Library';
 import { BaseObject3D, Model, ModelInfo, Poi, PoiInfo, PoiNode, PoiNodeInfo, Topology, TopologyInfo, Group, GroupInfo, Canvas3D, Canvas3DInfo, PluginObject, PluginObjectInfo, DecalInfo, Decal, DecalGeometryInfo } 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, CameraType } from './Interface';
@@ -30,7 +28,6 @@ export interface SoonSpaceConstructor {
     el?: string | HTMLElement;
     options?: InitOptions;
     events?: InitEvents;
-    soongis?: SoonGIS;
 }
 export * from './Library';
 export * from './Interface';
@@ -54,6 +51,9 @@ export declare class SoonSpace {
             Cubic: {
                 In: (amount: number) => number;
                 Out: (amount: number) => number;
+                /******* Init methods */
+                /******/
+                /******/
                 InOut: (amount: number) => number;
             };
             Quartic: {
@@ -63,9 +63,7 @@ export declare class SoonSpace {
             };
             Quintic: {
                 In: (amount: number) => number;
-                Out: (amount: number) => number; /******* Init methods */
-                /******/
-                /******/
+                Out: (amount: number) => number;
                 InOut: (amount: number) => number;
             };
             Sinusoidal: {
@@ -135,6 +133,9 @@ export declare class SoonSpace {
             Cubic: {
                 In: (amount: number) => number;
                 Out: (amount: number) => number;
+                /******* Init methods */
+                /******/
+                /******/
                 InOut: (amount: number) => number;
             };
             Quartic: {
@@ -144,9 +145,7 @@ export declare class SoonSpace {
             };
             Quintic: {
                 In: (amount: number) => number;
-                Out: (amount: number) => number; /******* Init methods */
-                /******/
-                /******/
+                Out: (amount: number) => number;
                 InOut: (amount: number) => number;
             };
             Sinusoidal: {
@@ -231,7 +230,6 @@ 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>;

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

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

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

@@ -1,42 +0,0 @@
-import { PerspectiveCamera, Vector3 } from 'three';
-import type { Map, MercatorCoordinate } from 'maplibre-gl';
-import type SoonGIS from 'soongis';
-import Viewport from '..';
-import { IVector3 } from '../..';
-import { Coordinate } from './coords-to-matrix';
-declare class SoonGISManager {
-    readonly viewport: Viewport;
-    readonly soongis?: SoonGIS | undefined;
-    readonly SOONSPACE_LAYER_ID = "SOONSPACE_LAYER";
-    readonly map: Map | undefined;
-    readonly camera: PerspectiveCamera;
-    readonly _basisCoordinate: Coordinate;
-    readonly _basisMercatorCoordinate: MercatorCoordinate | undefined;
-    readonly _mapResize: () => void;
-    constructor(viewport: Viewport, soongis?: SoonGIS | undefined);
-    /**
-     * 从笛卡尔转经纬度
-     * @param position
-     * @returns
-     */
-    fromPositionToCoordinate(position: IVector3): Coordinate | null;
-    /**
-     * 从经纬度转笛卡尔
-     * @param coordinates
-     * @returns
-     */
-    fromCoordinateToPosition(coordinate: Coordinate): Vector3 | null;
-    /**
-     * 设置经纬度、海拔
-     * @param coordinates
-     */
-    /**
-     * 使用 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

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