Skip to content

Commit a79f874

Browse files
authored
Fix various typings (#1324)
* Add TilesRenderer cameras in typings * Add missing typings in Ellipsoid * Improve DebugTilesPlugin typings * Fix WMTSTilesOverlay typings (aligned with WMTSTilesPlugin) * Deprecate load in favor of loadAsync in LoaderBase typings * WMTSTilesOverlay: url is optional
1 parent fb95933 commit a79f874

File tree

5 files changed

+21
-6
lines changed

5 files changed

+21
-6
lines changed

src/core/renderer/loaders/LoaderBase.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ export class LoaderBase<Result = any, ParseResult = Promise< Result >> {
22

33
fetchOptions: any;
44
workingPath: string;
5+
/** @deprecated in favor of `loadAsync` */
56
load( url: string ): Promise< Result >;
7+
loadAsync( url: string ): Promise< Result >;
68
resolveExternalURL( url: string ): string;
79
parse( buffer: ArrayBuffer ): ParseResult;
810

src/three/plugins/DebugTilesPlugin.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Color } from 'three';
1+
import { Color, Object3D } from 'three';
22
import { Tile } from '3d-tiles-renderer/core';
33

44
export enum ColorMode {}
@@ -24,7 +24,7 @@ export class DebugTilesPlugin {
2424
maxDebugDepth?: number,
2525
maxDebugDistance?: number,
2626
maxDebugError?: number,
27-
customColorCallback?: ( val: Tile, target: Color ) => void,
27+
customColorCallback?: ( tile: Tile, object: Object3D ) => void,
2828
unlit?: boolean,
2929
enabled?: boolean,
3030
} );

src/three/plugins/images/ImageOverlayPlugin.d.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Color, Matrix4, WebGLRenderer } from 'three';
2+
import { WMTSCapabilitiesResult, WMTSLayer, WMTSTileMatrixSet } from '../loaders/WMTSCapabilitiesLoader.js';
23

34
export class ImageOverlayPlugin {
45

@@ -82,10 +83,12 @@ export class WMSTilesOverlay extends ImageOverlay {
8283
export class WMTSTilesOverlay extends ImageOverlay {
8384

8485
constructor( options: {
85-
levels: number,
86-
dimension: number,
87-
url: string,
88-
bounds?: [ number, number, number, number ],
86+
dimensions?: { [ key: string ]: any } | null,
87+
url?: string | null,
88+
capabilities?: WMTSCapabilitiesResult | null,
89+
layer?: WMTSLayer | string | null,
90+
tileMatrixSet?: WMTSTileMatrixSet | string | null,
91+
style?: string,
8992

9093
color: number | Color,
9194
opacity: number,

src/three/renderer/math/Ellipsoid.d.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export class Ellipsoid {
1616
getCartographicToNormal( lat: number, lon: number, target: Vector3 ): Vector3;
1717
getPositionToNormal( pos: Vector3, target: Vector3 ): Vector3;
1818
getPositionToSurfacePoint( pos: Vector3, target: Vector3 ): Vector3;
19+
getPositionElevation( pos: Vector3 ): number;
1920

2021
getEastNorthUpFrame( lat: number, lon: number, height: number, target: Matrix4 ): Matrix4;
2122
getOrientedEastNorthUpFrame( lat: number, lon: number, height: number, az: number, el: number, roll: number, target: Matrix4 ): Matrix4;
@@ -42,4 +43,12 @@ export class Ellipsoid {
4243
target: Matrix4, frame: Frames,
4344
): Matrix4;
4445

46+
intersectRay( ray: Ray, target: Vector3 ): Vector3 | null;
47+
48+
calculateHorizonDistance( latitude: number, elevation: number ): number;
49+
calculateEffectiveRadius( latitude: number ): number;
50+
51+
copy( source: Ellipsoid ): Ellipsoid;
52+
clone(): Ellipsoid;
53+
4554
}

src/three/renderer/tiles/TilesRenderer.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export interface TilesRendererEventMap {
2424
export class TilesRenderer<TEventMap extends TilesRendererEventMap = TilesRendererEventMap> extends TilesRendererBase implements EventDispatcher<TEventMap> {
2525

2626
ellipsoid: Ellipsoid;
27+
cameras: Camera[];
2728
autoDisableRendererCulling : boolean;
2829
optimizeRaycast : boolean;
2930

0 commit comments

Comments
 (0)