@splnlss/3d-story-viewer 0.7.0 → 0.8.0

package/build/types/src/viewer/ContentLayer/GaussianSplatLayer.d.ts

@@ -7,13 +7,11 @@ export class GaussianSplatLayer extends ContentLayer {
     loadState: string;
     loadAttempt: number;
     abortController: AbortController;
-    splatMesh: SplatMesh;
-    visible: boolean;
-    transformMatrix: any;
+    splatMesh: any;
+    transformMatrix: import("three").Matrix4;
     load(): Promise<void>;
-    createPagedMesh(): SplatMesh;
-    createDirectMesh(attempt: any): Promise<SplatMesh>;
+    createPagedMesh(spark: any): any;
+    createDirectMesh(spark: any, attempt: any): Promise<any>;
     disposeMesh(mesh: any): void;
 }
 import { ContentLayer } from '.';
-import { SplatMesh } from '@sparkjsdev/spark';

package/build/types/src/viewer/ContentLayer/MeshLayer.d.ts

@@ -1,6 +1,6 @@
 export class MeshLayer extends ContentLayer {
     constructor(url: any, options?: {}, callbacks?: {});
     isMeshLayer: boolean;
-    mesh: any;
+    mesh: import("three").Group<import("three").Object3DEventMap>;
 }
 import { ContentLayer } from '.';

package/build/types/src/viewer/ContentLayer/TilesLayer.d.ts

@@ -4,9 +4,11 @@ export class TilesLayer extends ContentLayer {
     firstSet: any;
     camera: any;
     renderer: any;
-    dracoLoader: any;
-    ktx2loader: any;
+    dracoLoader: DRACOLoader;
+    ktx2loader: KTX2Loader;
     tiles: TilesRenderer<import("3d-tiles-renderer").TilesRendererEventMap>;
 }
 import { ContentLayer } from '.';
+import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader.js';
+import { KTX2Loader } from 'three/examples/jsm/loaders/KTX2Loader.js';
 import { TilesRenderer } from '3d-tiles-renderer';

package/build/types/src/viewer/ContentLayer/gaussianSplatUtils.d.ts

@@ -1,2 +1,3 @@
 export function validateGaussianSplatLayerDefinition(definition: any): any;
-export function makeGaussianSplatTransform(transform: any): any;
+export function makeGaussianSplatTransform(transform: any): Matrix4;
+import { Matrix4 } from 'three';

package/build/types/src/viewer/ContentLayer/index.d.ts

@@ -1,11 +1,13 @@
-export class ContentLayer {
+export class ContentLayer extends Object3D<import("three").Object3DEventMap> {
+    constructor();
     type: string;
     isContentLayer: boolean;
+    /** @type {string | null} */
+    contentLayerId: string | null;
     labels: Set<any>;
     setLabels(labels: any): void;
     setEnabled(enabled: any): void;
-    visible: any;
     update(): void;
-    dispose(): void;
     disposeObjectResources(root?: this): void;
 }
+import { Object3D } from 'three';

package/build/types/src/viewer/EnvironmentControls.d.ts

@@ -3,7 +3,7 @@ export const DRAG: 1;
 export const ROTATE: 2;
 export const ZOOM: 3;
 export const WAITING: 4;
-export class EnvironmentControls {
+export class EnvironmentControls extends EventDispatcher<any> {
     constructor(scene?: any, camera?: any, domElement?: any, tilesRenderer?: any);
     set enabled(v: boolean);
     get enabled(): boolean;
@@ -25,7 +25,7 @@ export class EnvironmentControls {
     adjustHeight: boolean;
     enableDamping: boolean;
     dampingFactor: number;
-    fallbackPlane: any;
+    fallbackPlane: Plane;
     useFallbackPlane: boolean;
     scaleZoomOrientationAtEdges: boolean;
     autoAdjustCameraRotation: boolean;
@@ -33,21 +33,21 @@ export class EnvironmentControls {
     pointerTracker: any;
     needsUpdate: boolean;
     actionHeightOffset: number;
-    pivotPoint: any;
+    pivotPoint: Vector3;
     zoomDirectionSet: boolean;
     zoomPointSet: boolean;
-    zoomDirection: any;
-    zoomPoint: any;
+    zoomDirection: Vector3;
+    zoomPoint: Vector3;
     zoomDelta: number;
-    rotationInertiaPivot: any;
-    rotationInertia: any;
-    dragInertia: any;
+    rotationInertiaPivot: Vector3;
+    rotationInertia: Vector2;
+    dragInertia: Vector3;
     inertiaTargetDistance: number;
     inertiaStableFrames: number;
     pivotMesh: any;
-    raycaster: any;
-    up: any;
-    clock: any;
+    raycaster: Raycaster;
+    up: Vector3;
+    clock: Clock;
     _detachCallback: () => void;
     _upInitialized: boolean;
     _lastUsedState: number;
@@ -71,7 +71,7 @@ export class EnvironmentControls {
     _updateZoom(): void;
     _updateZoomDirection(): void;
     _updateZoomPoint(): boolean;
-    _getPointBelowCamera(point?: any, up?: any): any;
+    _getPointBelowCamera(point?: any, up?: Vector3): any;
     _updatePosition(deltaTime: any): void;
     _updateRotation(deltaTime: any): void;
     _applyRotation(x: any, y: any, pivotPoint: any): void;
@@ -80,3 +80,9 @@ export class EnvironmentControls {
     _alignCameraUp(up: any, alpha?: number): void;
     _clampRotation(up: any): void;
 }
+import { EventDispatcher } from 'three';
+import { Plane } from 'three';
+import { Vector3 } from 'three';
+import { Vector2 } from 'three';
+import { Raycaster } from 'three';
+import { Clock } from 'three';

package/build/types/src/viewer/GlobeControls.d.ts

@@ -1,17 +1,17 @@
 export class GlobeControls extends EnvironmentControls {
-    get tilesGroup(): any;
-    get ellipsoidFrame(): any;
+    get tilesGroup(): Matrix4;
+    get ellipsoidFrame(): Matrix4;
     get ellipsoidFrameInverse(): any;
     isGlobeControls: boolean;
     _dragMode: number;
     _rotationMode: number;
     nearMargin: number;
     farMargin: number;
-    globeInertia: any;
+    globeInertia: Quaternion;
     globeInertiaFactor: number;
     ellipsoid: Ellipsoid;
-    ellipsoidGroup: any;
-    _ellipsoidFrameInverse: any;
+    ellipsoidGroup: Group<import("three").Object3DEventMap>;
+    _ellipsoidFrameInverse: Matrix4;
     setEllipsoid(ellipsoid: any, ellipsoidGroup: any): void;
     getVectorToCenter(target: any): any;
     getDistanceToCenter(): any;
@@ -27,4 +27,7 @@ export class GlobeControls extends EnvironmentControls {
     _isNearControls(): boolean;
 }
 import { EnvironmentControls } from './EnvironmentControls.js';
-import { Ellipsoid } from '../../node_modules/3d-tiles-renderer/src/three/renderer/math/Ellipsoid.js';
+import { Matrix4 } from 'three';
+import { Quaternion } from 'three';
+import { Ellipsoid } from '3d-tiles-renderer';
+import { Group } from 'three';

package/build/types/src/viewer/GlobeManager.d.ts

@@ -4,7 +4,7 @@ export class GlobeManager extends EventDispatcher {
     camera: any;
     renderer: any;
     tiles: TilesRenderer<import("3d-tiles-renderer").TilesRendererEventMap>;
-    dracoLoader: any;
+    dracoLoader: DRACOLoader;
     apiToken: any;
     googleMapsToken: any;
     initTiles(): void;
@@ -13,3 +13,4 @@ export class GlobeManager extends EventDispatcher {
 }
 import { EventDispatcher } from '../modules/EventDispatcher';
 import { TilesRenderer } from '3d-tiles-renderer';
+import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader.js';

package/build/types/src/viewer/Sky.d.ts

@@ -1,6 +1,9 @@
-export class Sky {
+export class Sky extends Mesh<import("three").BufferGeometry<import("three").NormalBufferAttributes, import("three").BufferGeometryEventMap>, import("three").Material<import("three").MaterialEventMap> | import("three").Material<import("three").MaterialEventMap>[], import("three").Object3DEventMap> {
+    constructor();
     isSky: boolean;
     type: string;
-    material: any;
+    material: ShaderMaterial;
     setSurfaceUp(v: any): void;
 }
+import { Mesh } from 'three';
+import { ShaderMaterial } from 'three';

package/build/types/src/viewer/TransitionControls.d.ts

@@ -1,7 +1,7 @@
 export class TransitionControls extends EventDispatcher {
     constructor(camera: any);
     camera: any;
-    lookAt: any;
+    lookAt: Vector3;
     cameraTween: any;
     lookAtTween: any;
     activeTransition: {
@@ -17,3 +17,4 @@ export class TransitionControls extends EventDispatcher {
     cameraUpTween: any;
 }
 import { EventDispatcher } from '../modules/EventDispatcher';
+import { Vector3 } from 'three';

package/build/types/src/viewer/index.d.ts

@@ -24,18 +24,18 @@ declare class Viewer extends EventDispatcher {
     isViewer: boolean;
     type: string;
     disposed: boolean;
-    sparkRenderer: SparkRenderer;
+    sparkRenderer: any;
     transparentBackground: boolean;
     state: StateDispatcher;
-    renderer: any;
-    css2DRenderer: any;
-    clock: any;
-    camera: any;
-    cameraForward: any;
-    cameraRight: any;
-    cameraUp: any;
-    scene: any;
-    content: any;
+    renderer: WebGLRenderer;
+    css2DRenderer: CSS2DRenderer;
+    clock: Clock;
+    camera: PerspectiveCamera;
+    cameraForward: Vector3;
+    cameraRight: Vector3;
+    cameraUp: Vector3;
+    scene: Scene<import("three").Object3DEventMap>;
+    content: Group<import("three").Object3DEventMap>;
     topLayerIndex: number;
     enabledLayers: any[];
     labels: Map<any, any>;
@@ -48,7 +48,7 @@ declare class Viewer extends EventDispatcher {
     cameraCoords: ViewerCoords;
     /** @type {ViewerCoords} */
     pointerCoords: ViewerCoords;
-    pointerXYZ: any;
+    pointerXYZ: Vector3;
     keysDown: {};
     _keysEnabled: boolean;
     /** Camera-relative translation speed in WGS84 ECEF metres/second. */
@@ -77,7 +77,7 @@ declare class Viewer extends EventDispatcher {
     _onKeyUp: (event: any) => void;
     _onResize: (event: any) => void;
     sky: Sky;
-    pointerRaycaster: any;
+    pointerRaycaster: Raycaster;
     _onPointerMove: (event: any) => void;
     set keysEnabled(enabled: boolean);
     get keysEnabled(): boolean;
@@ -85,12 +85,15 @@ declare class Viewer extends EventDispatcher {
     /**
      * @param {number} lon
      * @param {number} lat
-     * @returns {{ lon: number, lat: number, alt: number }}
+     * @param {import('./surfacePicking.js').SurfacePickOptions} [options]
+     * @returns {{ lon: number, lat: number, alt: number, source: 'splats' | 'globe' | 'content', layerId: string | null }} WGS84 degrees and ellipsoidal meters, from loaded surfaces only.
      */
-    getElevation(lon: number, lat: number): {
+    getElevation(lon: number, lat: number, options?: import("./surfacePicking.js").SurfacePickOptions): {
         lon: number;
         lat: number;
         alt: number;
+        source: "splats" | "globe" | "content";
+        layerId: string | null;
     };
     /**
      * @param {[number, number, number?][]} coords
@@ -100,15 +103,16 @@ declare class Viewer extends EventDispatcher {
     setBackgroundColor(color: any): void;
     appendTo(container: any): void;
     container: any;
-    stats: any;
+    stats: Stats;
     updateCameraDirections(): void;
     setAnimate(bool?: boolean): void;
     /** @param {Event} [event] */
     resizeView(event?: Event): void;
     loadEnv(url: any): Promise<void>;
     clearContentLayers(): void;
-    ensureSparkRenderer(): SparkRenderer;
+    ensureSparkRenderer(): Promise<any>;
     disposeSparkRenderer(): void;
+    sparkRendererGeneration: any;
     /** @param {import('../main.js').ContentLayerDefinition[]} content */
     defineContentLayers(content?: import("../main.js").ContentLayerDefinition[]): void;
     enableContentLayers(labels?: any[]): void;
@@ -132,7 +136,25 @@ declare class Viewer extends EventDispatcher {
     }): HTMLElement;
     animate(time: any): void;
     render(): void;
-    getCameraPivot(): any;
+    /**
+     * Explicit-action raycast; do not call on every pointermove. Returns the nearest
+     * loaded surface, not a survey measurement. RAD accuracy depends on streamed LOD.
+     * @param {number} screenX Client X in CSS pixels.
+     * @param {number} screenY Client Y in CSS pixels.
+     * @param {import('./surfacePicking.js').SurfacePickOptions} [options]
+     * @returns {{ lon: number, lat: number, alt: number, point: Vector3, source: 'splats' | 'globe' | 'content', layerId: string | null } | null} WGS84 degrees, ellipsoidal meters, ECEF point in meters.
+     */
+    pickCoordinates(screenX: number, screenY: number, options?: import("./surfacePicking.js").SurfacePickOptions): {
+        lon: number;
+        lat: number;
+        alt: number;
+        point: Vector3;
+        source: "splats" | "globe" | "content";
+        layerId: string | null;
+    } | null;
+    /** @param {Raycaster} raycaster @param {import('./surfacePicking.js').SurfacePickOptions} [options] */
+    _raycastSurfaces(raycaster: Raycaster, options?: import("./surfacePicking.js").SurfacePickOptions): any;
+    getCameraPivot(): Vector3;
     /**
      * @param {number} lon
      * @param {number} lat
@@ -174,10 +196,18 @@ export namespace ViewerEvents {
     let CONTENT_LAYER_ERROR: "content-layer-error";
 }
 import { EventDispatcher } from '../modules/EventDispatcher';
-import { SparkRenderer } from '@sparkjsdev/spark';
 import { StateDispatcher } from '../modules/StateDispatcher';
+import { WebGLRenderer } from 'three';
+import { CSS2DRenderer } from 'three/examples/jsm/renderers/CSS2DRenderer.js';
+import { Clock } from 'three';
+import { PerspectiveCamera } from 'three';
+import { Vector3 } from 'three';
+import { Scene } from 'three';
+import { Group } from 'three';
 import { GlobeControls } from './GlobeControls';
 import { TransitionControls } from './TransitionControls';
 import { GlobeManager } from './GlobeManager';
 import { Sky } from './Sky';
+import { Raycaster } from 'three';
+import Stats from 'stats.js';
 export { Viewer as default };

package/build/types/src/viewer/loadSpark.d.ts

@@ -0,0 +1 @@
+export function loadSpark(): any;

package/build/types/src/viewer/mods.d.ts

@@ -1 +1,2 @@
 export { ShaderChunk as default };
+import { ShaderChunk } from 'three';

package/build/types/src/viewer/shaders/chunks.d.ts

@@ -1 +1,2 @@
 export { ShaderChunk as default };
+import { ShaderChunk } from 'three';

package/build/types/src/viewer/surfacePicking.d.ts

@@ -0,0 +1,31 @@
+/**
+ * @typedef {Object} SurfacePickOptions
+ * @property {'all' | 'splats' | 'globe' | 'content'} [source] Defaults to all (nearest hit).
+ * @property {string[]} [layerIds] Restrict content to these IDs; never includes the globe.
+ */
+/**
+ * Explicit-action splat picking, deliberately separate from camera/hover raycasts.
+ * Spark 2.2's WASM quadratic uses float32 b*b-a*c: long rays against small splats
+ * lose the discriminant. Work in float64 and calculate closest approach instead.
+ * Uses Spark's public iterator: original direct-format splats, or currently selected
+ * RAD pages (not its coarser raycastIndices). This is not a full-resolution survey.
+ * Gaussian ellipsoid/disk approximation follows Spark 2.2's rust raycast.rs.
+ */
+export function raycastGaussianSplats(mesh: any, raycaster: any): {
+    distance: any;
+    point: any;
+    object: any;
+    splatIndex: number;
+};
+/** @param {SurfacePickOptions} options */
+export function raycastSurfaces(viewer: any, raycaster: any, options?: SurfacePickOptions): any;
+export type SurfacePickOptions = {
+    /**
+     * Defaults to all (nearest hit).
+     */
+    source?: "all" | "splats" | "globe" | "content";
+    /**
+     * Restrict content to these IDs; never includes the globe.
+     */
+    layerIds?: string[];
+};

package/build/types/src/viewer/utils.d.ts

@@ -3,10 +3,12 @@ export function ecefToGeodeticRotation(x: any, y: any, z: any, quaternion: any):
     lat: number;
     alt: number;
     pitch: number;
-    yaw: any;
-    roll: any;
+    yaw: number;
+    roll: number;
 };
-export function geodeticToEcefUpVector(lon: any, lat: any): any;
-export function geodeticToEcefRotation(lon: any, lat: any, pitch: any, yaw: any, roll: any): any;
+export function geodeticToEcefUpVector(lon: any, lat: any): Vector3;
+export function geodeticToEcefRotation(lon: any, lat: any, pitch: any, yaw: any, roll: any): Quaternion;
 export function exportScene(root: any): void;
+import { Vector3 } from 'three';
+import { Quaternion } from 'three';
 export { ecefToGeodeticPosition, geodeticToEcefPosition } from "../geospatial.js";

package/build/types/src/workers/geojson.worker.d.ts

@@ -1,9 +1,9 @@
 export function createArrowGeometry(data: any): {
-    origin: any;
+    origin: import("three").Vector3Tuple;
     meshVertexBuffer: Float32Array<any>;
 };
 export function createPerimeterGeometry(data: any, color: any): {
-    origin: any;
+    origin: import("three").Vector3Tuple;
     lineVertexBuffer: Float32Array<any>;
     lineVertexRGBBuffer: Uint8Array<ArrayBuffer>;
     meshVertexBuffer: Float32Array<any>;

package/build/types/utils/elevation/gltf.d.ts

@@ -12,4 +12,5 @@ export function raycastMesh(rayOrigin: any, rayDir: any, positions: any, indices
     point: any[];
     barycentric: number[];
 };
-export function intersectGltf(nodes: any, meshes: any, point: any): any;
+export function intersectGltf(nodes: any, meshes: any, point: any): Vector3;
+import { Vector3 } from 'three';