@openglobus/og 0.28.7 → 1.0.0-rc10

package/lib/scene/{RenderNode.d.ts → Scene.d.ts}

@@ -1,47 +1,51 @@
-import { BaseNode } from "./BaseNode";
 import { Renderer } from "../renderer/Renderer";
-import { LightSource } from "../light/LightSource";
-import { EntityCollection } from "../entity/EntityCollection";
+import type { EntityCollection } from "../entity/EntityCollection";
 import { Quat } from "../math/Quat";
 import { Vec3 } from "../math/Vec3";
 /**
  * Render node is a logical part of a render mechanism. Represents scene rendering.
- * For example one scene node for rendering the Earth, another one for rendering the Moon, another node for rendering stars etc.
- * Each render node has own model view space defined with matrices(scale, rotation, translation, transformation).
- * There are collections of light sources, entities and so on in the node.
- * Access to the node is renderer.renderNodes["Earth"]
+ * For example, one scene node for rendering the Earth, another one for rendering the Moon, another node for rendering stars etc.
+ * Each render node has its own model view space defined with matrices(scale, rotation, translation, transformation).
+ * There are collections of light sources, entities, and so on in the node.
+ * Access to the node is renderer.scenes[ "Earth"]
  * @class
- * @extends {BaseNode}
  * @param {string} name - Node name.
  */
-declare class RenderNode extends BaseNode {
+declare class Scene {
+    static __counter__: number;
+    protected __id: number;
     /**
-     * Renderer that calls frame() callback.
+     * Node name.
+     * @protected
+     * @type {string}
+     */
+    protected _name: string;
+    /**
+     * Top scene tree node pointer.
      * @public
-     * @type {Renderer}
+     * @type {Scene}
      */
-    renderer: Renderer | null;
-    drawMode: number;
-    /** Show rendering.
+    topNode: Scene;
+    /**
+     * Children nodes.
      * @public
+     * @type {Array.<Scene>}
      */
-    show: boolean;
-    protected _isActive: boolean;
-    childNodes: RenderNode[];
+    childNodes: Scene[];
     /**
-     * Lighting calculations.
+     * Parent node pointer.
      * @public
-     * @type {boolean}
+     * @type {Scene}
      */
-    lightEnabled: boolean;
+    parentNode: Scene | null;
     /**
-     * Point light array.
+     * Assigned renderer.
      * @public
-     * @type {Array.<LightSource>}
+     * @type {Renderer}
      */
-    _lightPosition: Float32Array;
-    _lightParams: Float32Array;
-    _lightShininess: number;
+    renderer: Renderer | null;
+    drawMode: number;
+    protected _isActive: boolean;
     /**
      * Entity collection array.
      * @public
@@ -51,13 +55,15 @@ declare class RenderNode extends BaseNode {
     protected _entityCollectionsByDepthOrder: EntityCollection[][];
     protected _pickingId: number;
     constructor(name?: string);
+    protected _onDraw: () => void;
+    get name(): string;
     getFrameRotation(cartesian: Vec3): Quat;
     /**
      * Adds node to the current hierarchy.
      * @public
-     * @type {RenderNode}
+     * @type {Scene}
      */
-    addNode(node: RenderNode): void;
+    addNode(node: Scene): void;
     /**
      * Assign render node with renderer.
      * @public
@@ -69,11 +75,21 @@ declare class RenderNode extends BaseNode {
     onremove(): void;
     remove(): void;
     /**
-     * Adds entity collection.
+     * Destroy node.
+     * @public
+     */
+    destroy(): void;
+    /**
+     * Clear current node.
+     * @protected
+     */
+    protected _clear(): void;
+    /**
+     * Adds an entity collection.
      * @public
      * @param {EntityCollection} entityCollection - Entity collection.
      * @param {boolean} [isHidden] - If it's true that this collection has specific rendering.
-     * @returns {RenderNode} -
+     * @returns {Scene} -
      */
     addEntityCollection(entityCollection: EntityCollection, isHidden?: boolean): void;
     /**
@@ -83,23 +99,6 @@ declare class RenderNode extends BaseNode {
      */
     removeEntityCollection(entityCollection: EntityCollection): void;
     updateEntityCollectionsDepthOrder(): void;
-    /**
-     * Adds point light source.
-     * @public
-     * @param {LightSource} light - Light source.
-     * @returns {RenderNode}
-     */
-    addLight(light: LightSource): RenderNode;
-    /**
-     * Calls render frame node's callback. Used in renderer.
-     * @public
-     */
-    preDrawNode(): void;
-    /**
-     * Calls render frame node's callback. Used in renderer.
-     * @public
-     */
-    drawNode(): void;
     /**
      * Gets render node activity.
      * @public
@@ -120,10 +119,6 @@ declare class RenderNode extends BaseNode {
     setDrawMode(mode: number): void;
     updateBillboardsTexCoords(): void;
     updateStrokeTexCoords(): void;
-    frame(): void;
-    preFrame(): void;
-    protected _preDrawNodes(): void;
-    protected _drawNodes(): void;
     drawEntityCollections(ec: EntityCollection[], depthOrder?: number): void;
     /**
      * Draw entity collections picking frame.
@@ -132,5 +127,6 @@ declare class RenderNode extends BaseNode {
      */
     drawPickingEntityCollections(ec: EntityCollection[]): void;
     protected _entityCollectionPickingCallback(): void;
+    isEqual(node: Scene): boolean;
 }
-export { RenderNode };
+export { Scene };

package/lib/scene/SkyBox.d.ts

@@ -1,13 +1,16 @@
-import { RenderNode } from './RenderNode';
+import { Scene } from "./Scene";
 import type { WebGLBufferExt, WebGLTextureExt, Texture3DParams } from "../webgl/Handler";
-declare class SkyBox extends RenderNode {
+declare class SkyBox extends Scene {
     params: Texture3DParams;
+    size: number;
     vertexPositionBuffer: WebGLBufferExt | null;
     texture: WebGLTextureExt | null;
-    constructor(params: Texture3DParams);
+    constructor(params: Texture3DParams, size?: number);
     static createDefault(RESOURCES_URL: string): SkyBox;
     init(): void;
-    preFrame(): void;
+    onremove(): void;
+    setSize(size: number): void;
+    protected _onPredraw: () => void;
     protected _createBuffers(): void;
 }
 export { SkyBox };

package/lib/scene/index.d.ts

@@ -1,5 +1,5 @@
 import { Axes } from "./Axes";
 import { Planet } from "./Planet";
 import { SkyBox } from "./SkyBox";
-import { RenderNode } from "./RenderNode";
-export { Planet, Axes, SkyBox, RenderNode };
+import { Scene } from "./Scene";
+export { Planet, Axes, SkyBox, Scene };

package/lib/segment/Segment.d.ts

@@ -11,7 +11,7 @@ import { Material } from "../layer/Material";
 import { Node } from "../quadTree/Node";
 import { Planet } from "../scene/Planet";
 import { PlanetCamera } from "../camera/PlanetCamera";
-import { Program } from "../webgl/Program";
+import { ShaderProgram } from "../webgl/ShaderProgram";
 import { Proj } from "../proj/Proj";
 import { Sphere } from "../bv/Sphere";
 import type { NumberArray6 } from "../bv/Sphere";
@@ -147,7 +147,7 @@ declare class Segment {
      */
     terrainExists: boolean;
     /**
-     * Means that tree passage reach the segment, and the segment terrain is ready.
+     * Means that tree passage reaches the segment, and the segment terrain is ready.
      * @type {boolean}
      */
     passReady: boolean;
@@ -159,23 +159,25 @@ declare class Segment {
     terrainVerticesHigh: Float32Array | null;
     terrainVerticesLow: Float32Array | null;
     noDataVertices: Uint8Array | null;
-    tempVertices: Float64Array | null;
-    tempVerticesHigh: Float32Array | null;
-    tempVerticesLow: Float32Array | null;
+    renderVertices: Float64Array | null;
+    renderVerticesHigh: Float32Array | null;
+    renderVerticesLow: Float32Array | null;
     normalMapTexture: WebGLTextureExt | null;
     normalMapTextureBias: Float32Array;
     normalMapVertices: Float64Array | null;
-    normalMapVerticesHigh: Float32Array | null;
-    normalMapVerticesLow: Float32Array | null;
     normalMapNormals: Float32Array | null;
     vertexNormalBuffer: WebGLBufferExt | null;
     vertexPositionBuffer: WebGLBufferExt | null;
     vertexPositionBufferHigh: WebGLBufferExt | null;
     vertexPositionBufferLow: WebGLBufferExt | null;
     vertexTextureCoordBuffer: WebGLBufferExt | null;
+    skirtVertexPositionBufferHigh: WebGLBufferExt | null;
+    skirtVertexPositionBufferLow: WebGLBufferExt | null;
+    skirtIndexBuffer: WebGLBufferExt | null;
     _globalTextureCoordinates: Float32Array;
     _inTheQueue: boolean;
     _appliedNeighborsZoom: [number, number, number, number];
+    _appliedNeighborsZoomNodeId: [number, number, number, number];
     _slices: Slice[];
     _indexBuffer: WebGLBufferExt | null;
     readyToEngage: boolean;
@@ -184,7 +186,18 @@ declare class Segment {
     _transitionOpacity: number;
     _transitionTimestamp: number;
     quadTreeStrategy: QuadTreeStrategy;
+    _relativeCenter: Vec3;
+    _rtcEyePositionHigh: Float32Array;
+    _rtcEyePositionLow: Float32Array;
+    __doubleToTwoFloats: (pos: Vec3, highPos: Vec3, lowPos: Vec3) => void;
     constructor(node: Node, quadTreeStrategy: QuadTreeStrategy, tileZoom: number, extent: Extent);
+    getRTCPosition(pos: Vec3, rtcPositionHigh: Vec3, rtcPositionLow: Vec3): void;
+    static recalcRTCVertices: (relativeCenter: Vec3, vertices: Float64Array, verticesHigh: Float32Array, verticesLow: Float32Array) => void;
+    setRelativeCenter(c: Vec3): void;
+    updateRTCEyePosition(camera: PlanetCamera): void;
+    protected _setRTCEyePositionUniforms(gl: WebGL2RenderingContext, shu: {
+        [id: string]: WebGLUniformLocation;
+    }): void;
     checkZoom(): boolean;
     /**
      * Returns entity terrain point.
@@ -226,12 +239,14 @@ declare class Segment {
      */
     elevationsNotExists(): void;
     protected _checkEqualization(neighborSide: number, neigborNode: Node): boolean;
+    protected _equalizeSide(side: number): void;
     equalize(): void;
     engage(): void;
     _terrainWorkerCallback(data: ITerrainWorkerData): void;
     _normalMapEdgeEqualize(side: number): void;
     applyTerrain(elevations?: number[] | TypedArray | null): void;
     deleteBuffers(): void;
+    protected _deleteSkirtBuffers(): void;
     deleteMaterials(): void;
     deleteElevations(): void;
     clearSegment(): void;
@@ -266,19 +281,27 @@ declare class Segment {
      */
     getMaterialByLayer(layer: Layer): Material | undefined;
     /**
-     * @param layer
+     * Computes cyclic longitude shift for `sourceExtent` to align it with `targetExtent`
+     * in wrapped horizontal coordinate space (for example, Web Mercator world copies).
      * @protected
-     *
-     * @todo siplify layer._extentMerc in this.getLayerExtent(layer)
-     *
+     * @param {Extent} sourceExtent - Source extent to shift along longitude.
+     * @param {Extent} targetExtent - Target extent used as alignment reference.
+     * @param {number} worldWidth - Full world width in projection units.
+     * @returns {number} Longitude shift to apply to `sourceExtent`.
      */
-    protected _getLayerExtentOffset(layer: Layer): [number, number, number, number];
+    protected _getCyclicLonShift(sourceExtent: Extent, targetExtent: Extent, worldWidth: number): number;
     initSlice(sliceIndex: number): Slice;
-    screenRendering(sh: Program, layerSlice: Layer[], sliceIndex: number, defaultTexture?: WebGLTextureExt | null, isOverlay?: boolean, forcedOpacity?: number): void;
+    screenRendering(sh: ShaderProgram, layerSlice: Layer[], sliceIndex: number, defaultTexture?: WebGLTextureExt | null, isOverlay?: boolean, forcedOpacity?: number): void;
     increaseTransitionOpacity(): void;
     fadingTransitionOpacity(): void;
-    colorPickingRendering(sh: Program, layerSlice: Layer[], sliceIndex: number, defaultTexture?: WebGLTextureExt | null, isOverlay?: boolean): void;
-    depthRendering(sh: Program, layerSlice?: Layer[]): void;
+    colorPickingRendering(sh: ShaderProgram, layerSlice: Layer[], sliceIndex: number, defaultTexture?: WebGLTextureExt | null, isOverlay?: boolean): void;
+    protected _appendSkirtVertexPair(vertices: Float64Array, verticesHigh: Float32Array, verticesLow: Float32Array, vertexIndex: number, out: number): number;
+    protected _ensureSkirtBuffers(): boolean;
+    protected _drawSkirts(gl: WebGL2RenderingContext, sha: {
+        [id: string]: number;
+    }): void;
+    depthRendering(sh: ShaderProgram, layerSlice?: Layer[], renderSkirts?: boolean): void;
+    ensureIndexBuffer(): void;
     protected _getIndexBuffer(): WebGLBufferExt;
     layerOverlap(layer: Layer): boolean;
     getDefaultTexture(): WebGLTextureExt | null;

package/lib/segment/SegmentLonLat.d.ts

@@ -32,7 +32,6 @@ declare class SegmentLonLat extends Segment {
      * @todo simplify layer._extentMerc in layer.getNativeExtent(this)
      *
      */
-    protected _getLayerExtentOffset(layer: Layer): [number, number, number, number];
     layerOverlap(layer: Layer): boolean;
     getDefaultTexture(): WebGLTextureExt | null;
     getExtentLonLat(): Extent;

package/lib/shadeModeConstants.d.ts

@@ -0,0 +1,7 @@
+export declare const SHADE_UNLIT = 0;
+export declare const SHADE_PHONG = 0.5;
+export declare const SHADE_PBR = 1;
+export type ShadeMode = typeof SHADE_UNLIT | typeof SHADE_PHONG | typeof SHADE_PBR;
+export type ShadeModeString = "none" | "unlit" | "phong" | "pbr";
+export type ShadeModeInput = ShadeMode | ShadeModeString;
+export declare function normalizeShadeMode(mode: ShadeModeInput): ShadeMode;

package/lib/shaders/applyDeferredDepth.d.ts

@@ -0,0 +1,2 @@
+import { ShaderProgram } from "../webgl/ShaderProgram";
+export declare function applyDeferredDepth(): ShaderProgram;

package/lib/shaders/atmos/atmos.d.ts

@@ -1,4 +1,4 @@
-import { Program } from '../../webgl/Program';
+import { ShaderProgram } from "../../webgl/ShaderProgram";
 export interface AtmosphereParameters {
     ATMOS_HEIGHT: number;
     RAYLEIGH_SCALE: number;
@@ -22,5 +22,5 @@ export interface AtmosphereParameters {
 }
 export declare const DEFAULT_PARAMS: AtmosphereParameters;
 export declare const MARS_PARAMS: AtmosphereParameters;
-export declare function transmittance(atmosParams?: AtmosphereParameters): Program;
-export declare function scattering(atmosParams?: AtmosphereParameters): Program;
+export declare function transmittance(atmosParams?: AtmosphereParameters): ShaderProgram;
+export declare function scattering(atmosParams?: AtmosphereParameters): ShaderProgram;

package/lib/shaders/billboard/billboard.d.ts

@@ -1,3 +1,4 @@
-import { Program } from '../../webgl/Program';
-export declare function billboardPicking(): Program;
-export declare function billboard_screen(): Program;
+import { ShaderProgram } from "../../webgl/ShaderProgram";
+export declare function billboardPicking(): ShaderProgram;
+export declare function billboard_screen(): ShaderProgram;
+export declare function billboard_screen_woit(): ShaderProgram;

package/lib/shaders/common/uniforms.d.ts

@@ -0,0 +1,27 @@
+export declare const projectorUniforms: {
+    u_projectorCount: string;
+    u_projectorLayer: string;
+    u_projectorViewProjRTE: string;
+    u_projectorEyeRel: string;
+    u_projectorColor: string;
+    u_projectorParams: string;
+    u_projectorDepthArray: string;
+};
+export declare const shadowMapUniforms: {
+    u_shadowMapCount: string;
+    u_shadowMapLayer: string;
+    u_shadowMapViewProjRTE: string;
+    u_shadowMapEyeRel: string;
+    u_shadowMapParams: string;
+    u_shadowMapDepthArray: string;
+};
+export declare const cascadeShadowUniforms: {
+    u_cascadeShadowCount: string;
+    u_cascadeShadowLayer: string;
+    u_cascadeShadowViewProjRTE: string;
+    u_cascadeShadowEyeRel: string;
+    u_cascadeShadowParams: string;
+    u_cascadeShadowSplits: string;
+    u_cascadeShadowViewForward: string;
+    u_cascadeShadowDepthArray: string;
+};

package/lib/shaders/deferredShading/deferredShading.d.ts

@@ -0,0 +1,2 @@
+import { ShaderProgram } from "../../webgl/ShaderProgram";
+export declare function deferredShading(): ShaderProgram;

package/lib/shaders/deferredShading/deferredShadingAtmos.d.ts

@@ -0,0 +1,3 @@
+import { ShaderProgram } from "../../webgl/ShaderProgram";
+import type { AtmosphereParameters } from "../atmos/atmos";
+export declare function deferredShadingAtmos(atmosParams?: AtmosphereParameters): ShaderProgram;

package/lib/shaders/depth.d.ts

@@ -1,2 +1,2 @@
-import { Program } from '../webgl/Program';
-export declare function depth(): Program;
+import { ShaderProgram } from "../webgl/ShaderProgram";
+export declare function depth(): ShaderProgram;

package/lib/shaders/geo_object/geo_object.d.ts

@@ -1,4 +1,9 @@
-import { Program } from "../../webgl/Program";
-export declare const geo_object: () => Program;
-export declare const geo_object_picking: () => Program;
-export declare const geo_object_depth: () => Program;
+import { ShaderProgram } from "../../webgl/ShaderProgram";
+import type { AtmosphereParameters } from "../atmos/atmos";
+export declare const geo_object_deferred: () => ShaderProgram;
+export declare const geo_object_forward: () => ShaderProgram;
+export declare const geo_object_woit: () => ShaderProgram;
+export declare function geo_object_woit_atmos(atmosParams?: AtmosphereParameters): ShaderProgram;
+export declare const geo_object_picking: () => ShaderProgram;
+export declare const geo_object_depth: () => ShaderProgram;
+export declare const geo_object_depth_camera: () => ShaderProgram;

package/lib/shaders/label/label.d.ts

@@ -1,4 +1,4 @@
-import { Program } from '../../webgl/Program';
-export declare function label_webgl2(): Program;
-export declare function label_screen(): Program;
-export declare function labelPicking(): Program;
+import { ShaderProgram } from "../../webgl/ShaderProgram";
+export declare function label_webgl2(): ShaderProgram;
+export declare function label_woit(): ShaderProgram;
+export declare function labelPicking(): ShaderProgram;

package/lib/shaders/pointCloud.d.ts

@@ -1,2 +1,2 @@
-import { Program } from '../webgl/Program';
-export declare function pointCloud(): Program;
+import { ShaderProgram } from "../webgl/ShaderProgram";
+export declare function pointCloud(): ShaderProgram;

package/lib/shaders/polyline/polyline.d.ts

@@ -1,3 +1,7 @@
-import { Program } from '../../webgl/Program';
-export declare function polyline_screen(): Program;
-export declare function polyline_picking(): Program;
+import { ShaderProgram } from "../../webgl/ShaderProgram";
+export declare function polylineTex(): ShaderProgram;
+export declare function polylinePlain(): ShaderProgram;
+export declare function polylineTexWoit(): ShaderProgram;
+export declare function polylineWoitTex(): ShaderProgram;
+export declare function polylineWoitPlain(): ShaderProgram;
+export declare function polyline_picking(): ShaderProgram;

package/lib/shaders/projectorsPass/projectorsPass.d.ts

@@ -0,0 +1,2 @@
+import { ShaderProgram } from "../../webgl/ShaderProgram";
+export declare function projectorsPass(): ShaderProgram;

package/lib/shaders/ray/ray.d.ts

@@ -1,2 +1,3 @@
-import { Program } from '../../webgl/Program';
-export declare function rayScreen(): Program;
+import { ShaderProgram } from "../../webgl/ShaderProgram";
+export declare function rayScreen(): ShaderProgram;
+export declare function rayScreenWoit(): ShaderProgram;

package/lib/shaders/screenFrame.d.ts

@@ -1,2 +1,2 @@
-import { Program } from '../webgl/Program';
-export declare function screenFrame(): Program;
+import { ShaderProgram } from "../webgl/ShaderProgram";
+export declare function screenFrame(): ShaderProgram;

package/lib/shaders/segment/segment.d.ts

@@ -0,0 +1,7 @@
+import { AtmosphereParameters } from "../atmos/atmos";
+import { ShaderProgram } from "../../webgl/ShaderProgram";
+export declare function segment_screen_deferred(): ShaderProgram;
+export declare function segment_screen_wl_forward_noatmos(): ShaderProgram;
+export declare function segment_screen_wl_forward_atmos(atmosParams?: AtmosphereParameters): ShaderProgram;
+export declare function segment_colorPicking(): ShaderProgram;
+export declare function segment_depth(): ShaderProgram;

package/lib/shaders/skybox.d.ts

@@ -1,2 +1,2 @@
-import { Program } from '../webgl/Program';
-export declare function skybox(): Program;
+import { ShaderProgram } from "../webgl/ShaderProgram";
+export declare function skybox(): ShaderProgram;

package/lib/shaders/strip/strip.d.ts

@@ -0,0 +1,3 @@
+import { ShaderProgram } from "../../webgl/ShaderProgram";
+export declare function stripTransparent(): ShaderProgram;
+export declare function stripForward(): ShaderProgram;

package/lib/shaders/tone_mapping/toneMapping.d.ts

@@ -1,2 +1,2 @@
-import { Program } from '../../webgl/Program';
-export declare function toneMapping(): Program;
+import { ShaderProgram } from "../../webgl/ShaderProgram";
+export declare function toneMappingProgram(operator?: string): ShaderProgram;

package/lib/shaders/varianceBlur.d.ts

@@ -0,0 +1,2 @@
+import { ShaderProgram } from "../webgl/ShaderProgram";
+export declare function varianceBlur(): ShaderProgram;

package/lib/shaders/weightedOITResolve.d.ts

@@ -0,0 +1,2 @@
+import { ShaderProgram } from "../webgl/ShaderProgram";
+export declare function weightedOITResolve(): ShaderProgram;

package/lib/terrain/BilTerrain.d.ts

@@ -1,5 +1,5 @@
-import { GlobusTerrain } from "./GlobusTerrain";
 import type { IGlobusTerrainParams } from "./GlobusTerrain";
+import { GlobusTerrain } from "./GlobusTerrain";
 import { Segment } from "../segment/Segment";
 import { Extent } from "../Extent";
 import type { TypedArray } from "../utils/shared";

package/lib/terrain/EmptyTerrain.d.ts

@@ -18,14 +18,13 @@ export type UrlRewriteFunc = (tileX: number, tileY: number, tileZoom: number, ti
  * Class represents terrain provider without elevation data.
  * @param {IEmptyTerrainParams} [options] - Provider options:
  * @param {string} [options.name="empty"] - Provider name.
- * @param {boolean} [options.equalizeVertices] -
+ * @param {boolean} [options.equalizeVertices=false] - Enables vertex equalization on tile borders.
  * @param {number} [options.minZoom=2] - Minimal visible zoom index when terrain handler works.
- * @param {number} [options.minZoom=50] - Maximal visible zoom index when terrain handler works.
+ * @param {number} [options.maxZoom=19] - Maximal visible zoom index when terrain handler works.
  * @param {number} [options.maxNativeZoom=19] - Maximal available terrain zoom level.
- * @param {Array.<number>} [options.gridSizeByZoom] - Array of segment triangulation grid sizes where array index agreed to the segment zoom index.
- * @param {Array.<number>} [gridSizeByZoom] - Array of values, where each value corresponds to the size of a tile(or segment) on the globe. Each value must be power of two.
- * @param {Geoid} [options.geoid] -
- * @param {string} [options.geoidSrc] -
+ * @param {Array.<number>} [options.gridSizeByZoom] - Segment triangulation grid sizes by zoom index.
+ * @param {Geoid} [options.geoid] - Geoid model instance.
+ * @param {string} [options.geoidSrc] - URL to geoid model source.
  */
 declare class EmptyTerrain {
     static __counter__: number;
@@ -107,7 +106,7 @@ declare class EmptyTerrain {
     isReady(): boolean;
     abortLoading(): void;
     clearCache(): void;
-    getHeightAsync(lonLat: LonLat, callback: (height: number) => void): boolean;
+    getHeightAsync(lonLat: LonLat, callback: (height: number) => void, zoom?: number): boolean;
     loadTerrain(segment: Segment, forceLoading?: boolean): void;
 }
 export { EmptyTerrain };

package/lib/terrain/GlobusTerrain.d.ts

@@ -29,22 +29,20 @@ type TileData = {
 /**
  * Class that loads segment elevation data, converts it to the array and passes it to the planet segment.
  * @class
- * @extends {GlobusTerrain}
+ * @extends {EmptyTerrain}
  * @param {string} [name=""] - Terrain provider name.
  * @param {IGlobusTerrainParams} [options] - Provider options:
  * @param {number} [options.minZoom=3] - Minimal visible zoom index when terrain handler works.
- * @param {number} [options.minZoom=14] - Maximal visible zoom index when terrain handler works.
- * @param {number} [options.minNativeZoom=14] - Maximal available terrain zoom level.
- * @param {string} [options.url="//openglobus.org/heights/srtm3/{z}/{y}/{x}.ddm"] - Terrain source path url template. Default is openglobus ddm elevation file.
- * @param {Array.<number>} [options.gridSizeByZoom] - Array of segment triangulation grid sizes where array index agreed to the segment zoom index.
+ * @param {number} [options.maxZoom=14] - Maximal visible zoom index when terrain handler works.
+ * @param {number} [options.maxNativeZoom=14] - Maximal available terrain zoom level.
+ * @param {string} [options.url="https://{s}.srtm3.openglobus.org/{z}/{y}/{x}.ddm"] - Terrain source URL template.
+ * @param {Array.<number>} [options.gridSizeByZoom] - Segment triangulation grid sizes where array index matches segment zoom index.
  * @param {number} [options.plainGridSize=32] - Elevation grid size. Default is 32x32. Must be power of two.
- * @param {string} [options.responseType="arraybuffer"] - Response type.
- * @param {number} [options.MAX_LOADING_TILES] - Maximum at one time loading tiles.
- * @param {Array.<number>} [gridSizeByZoom] - Array of values, where each value corresponds to the size of a tile(or segment) on the globe. Each value must be power of two.
- * @param {number} [heightFactor=1] - Elevation height multiplier.
+ * @param {number} [options.heightFactor=1] - Elevation height multiplier.
+ * @param {FetchCache} [options.cache="default"] - Fetch cache mode.
  *
- * @fires GlobusTerrainEvents#load
- * @fires GlobusTerrainEvents#loadend
+ * @fires load
+ * @fires loadend
  */
 declare class GlobusTerrain extends EmptyTerrain {
     events: GlobusTerrainEvents;
@@ -88,7 +86,7 @@ declare class GlobusTerrain extends EmptyTerrain {
      * @public
      * @param {string} url - Url template.
      * @example <caption>Default openglobus url template:</caption>:
-     * "http://earth3.openglobus.org/{z}/{y}/{x}.ddm"
+     * "https://{s}.srtm3.openglobus.org/{z}/{y}/{x}.ddm"
      */
     setUrl(url: string): void;
     /**
@@ -101,8 +99,8 @@ declare class GlobusTerrain extends EmptyTerrain {
     /**
      * Starts to load segment elevation data.
      * @public
-     * @param {Segment} segment - Segment that wants a terrain data.
-     * @param {boolean} [forceLoading] -
+     * @param {Segment} segment - Segment that requests terrain data.
+     * @param {boolean} [forceLoading=false] - Forces loading even if default filter would skip it.
      */
     loadTerrain(segment: Segment, forceLoading?: boolean): void;
     protected _getSubdomain(): string;
@@ -110,15 +108,15 @@ declare class GlobusTerrain extends EmptyTerrain {
     /**
      * Creates default query url string.
      * @protected
-     * @param {Segment} segment -
-     * @returns {string} -
+     * @param {Segment} segment - Segment to create URL for.
+     * @returns {string} URL string.
      */
     protected _createUrl(segment: Segment): string;
     /**
      * Returns actual url query string.
      * @protected
-     * @param {Segment} segment - Segment that loads image data.
-     * @returns {string} - Url string.
+     * @param {Segment} segment - Segment that loads terrain data.
+     * @returns {string} URL string.
      */
     protected _getHTTPRequestString(segment: Segment): string;
     /**
@@ -130,7 +128,7 @@ declare class GlobusTerrain extends EmptyTerrain {
     /**
      * Converts loaded data to segment elevation data type(column major elevation data array in meters)
      * @public
-     * @returns {Array.<number>} -
+     * @returns {Array.<number> | TypedArray} Column-major elevation data array in meters.
      */
     protected _createHeights(data: any, segment?: Segment | null, tileGroup?: number, x?: number, y?: number, z?: number, extent?: Extent, isMaxZoom?: boolean): TypedArray | number[];
     /**
@@ -138,9 +136,6 @@ declare class GlobusTerrain extends EmptyTerrain {
      */
     protected _applyElevationsData(segment: Segment, elevations: number[] | TypedArray | null): void;
 }
-type GlobusTerrainEventsList = [
-    "load",
-    "loadend"
-];
+type GlobusTerrainEventsList = ["load", "loadend"];
 type GlobusTerrainEvents = EventsHandler<GlobusTerrainEventsList>;
 export { GlobusTerrain };

package/lib/terrain/MapterhornTerrain.d.ts

@@ -0,0 +1,10 @@
+import { RgbTerrain } from "./RgbTerrain";
+import type { IRgbTerrainParams } from "./RgbTerrain";
+/**
+ * Mapterhorn Web Mercator RGB terrain (512px WebP tiles, Terrarium encoding).
+ * @class
+ * @extends {RgbTerrain}
+ */
+export declare class MapterhornTerrain extends RgbTerrain {
+    constructor(name?: string | null, options?: IRgbTerrainParams);
+}