@openglobus/og 0.13.12 → 0.14.2

package/src/og/webgl/Handler.js

@@ -662,18 +662,27 @@ class Handler {
         this._initPrograms();
         this._setDefaults();
 
+        this.observer = new IntersectionObserver((entries) => {
+            this._toggleVisibilityChange(entries[0].isIntersecting === true);
+        }, { threshold: 0 });
+        this.observer.observe(this.canvas);
+
         document.addEventListener("visibilitychange", () => {
-            if (document.visibilityState === 'visible') {
-                this.start();
-                this.ONCANVASRESIZE && this.ONCANVASRESIZE();
-                this.events.dispatch(this.events.visibilitychange, true);
-            } else {
-                this.events.dispatch(this.events.visibilitychange, false);
-                this.stop();
-            }
+            this._toggleVisibilityChange(document.visibilityState === 'visible');
         });
     }
 
+    _toggleVisibilityChange(visibility) {
+        if (visibility) {
+            this.start();
+            this.ONCANVASRESIZE && this.ONCANVASRESIZE();
+            this.events.dispatch(this.events.visibilitychange, true);
+        } else {
+            this.events.dispatch(this.events.visibilitychange, false);
+            this.stop();
+        }
+    }
+
     /**
      * Sets default gl render parameters. Used in init function.
      * @private
@@ -919,6 +928,10 @@ class Handler {
         }
     }
 
+    isStopped() {
+        return !this._requestAnimationFrameId;
+    }
+
     /**
      * Check is gl context type equals webgl2
      * @public
@@ -934,7 +947,7 @@ class Handler {
     _animationFrameCallback() {
         this._requestAnimationFrameId = window.requestAnimationFrame(() => {
             this.drawFrame();
-            this._animationFrameCallback();
+            this._requestAnimationFrameId && this._animationFrameCallback();
         });
     }
 

package/types/Globe.d.ts

@@ -42,6 +42,7 @@
  * @param {Number} [options.minEqualZoomAltitude=10000.0] - Minimal altitude since segments on the screen bacame the same zoom level
  * @param {Number} [options.minEqualZoomCameraSlope=0.8] - Minimal camera slope above te globe where segments on the screen bacame the same zoom level
  * @param {Number} [options.loadingBatchSize=12] -
+ * @param {Number} [options.quadTreeStrategyPrototype] - Prototype of quadTree. QuadTreeStrategy for Earth is default.
  */
 export class Globe {
     static set _staticCounter(arg: any);
@@ -64,6 +65,12 @@ export class Globe {
      * @type {String}
      */
     private _planetName;
+    /**
+     * quad tree type.
+     * @private
+     * @type {Number}
+     */
+    private _quadTreeType;
     planet: Planet;
     sun: any;
     _opacityCounter: number;

package/types/camera/Camera.d.ts

@@ -4,7 +4,7 @@
  * @param {Renderer} [renderer] - Renderer uses the camera instance.
  * @param {Object} [options] - Camera options:
  * @param {Object} [options.name] - Camera name.
- * @param {number} [options.viewAngle=38] - Camera angle of view. Default is 30.0
+ * @param {number} [options.viewAngle=47] - Camera angle of view. Default is 47.0
  * @param {number} [options.near=1] - Camera near plane distance. Default is 1.0
  * @param {number} [options.far=og.math.MAX] - Camera far plane distance. Deafult is og.math.MAX
  * @param {Vec3} [options.eye=[0,0,0]] - Camera eye position. Default (0,0,0)
@@ -95,7 +95,7 @@ export class Camera {
     _pv: Vec3;
     _pn: Vec3;
     _peye: Vec3;
-    isMoved: boolean;
+    isMoving: boolean;
     _tanViewAngle_hrad: number;
     _tanViewAngle_hradOneByHeight: number;
     frustums: Frustum[];
@@ -109,7 +109,7 @@ export class Camera {
      * @public
      * @param {Renderer} renderer - OpenGlobus renderer object.
      * @param {Object} [options] - Camera options:
-     * @param {number} [options.viewAngle] - Camera angle of view. Default is 30.0
+     * @param {number} [options.viewAngle] - Camera angle of view.
      * @param {number} [options.near] - Camera near plane distance. Default is 1.0
      * @param {number} [options.far] - Camera far plane distance. Deafult is og.math.MAX
      * @param {Vec3} [options.eye] - Camera eye position. Default (0,0,0)

package/types/camera/PlanetCamera.d.ts

@@ -5,7 +5,7 @@
  * @param {RenderNode} planet - Planet render node.
  * @param {Object} [options] - Planet camera options:
  * @param {Object} [options.name] - Camera name.
- * @param {number} [options.viewAngle=37] - Camera angle of view. Default is 35.0
+ * @param {number} [options.viewAngle] - Camera angle of view.
  * @param {number} [options.near] - Camera near plane distance. Default is 1.0
  * @param {number} [options.far] - Camera far plane distance. Deafult is og.math.MAX
  * @param {number} [options.minAltitude] - Minimal altitude for the camera. Deafult is 5

package/types/control/LayerSwitcher.d.ts

@@ -19,7 +19,7 @@ export class LayerSwitcher extends Control {
         collectLayers: (planet: any) => any;
         pickBaseLayers: (layers: any) => any;
         pickOverlays: (layers: any) => any;
-        classifyObject: (object: any) => "Terrain Providers" | "Overlays" | "BaseLayers";
+        classifyObject: (object: any) => "Terrain Providers" | "Base Layers" | "Overlays";
         sortByZIndex: (layers: any) => any;
         serializeZIndices: (layers: any) => any;
         normalizeOverlay: (overlay: any) => any;

package/types/control/ScaleControl.d.ts

@@ -11,10 +11,11 @@ export class ScaleControl extends Control {
     planet: any;
     _minWidth: number;
     _maxWidth: number;
+    _isCenter: any;
     _renderTemplate(): ChildNode;
     el: ChildNode;
     _scaleLabelEl: any;
-    _draw(e: any): void;
+    _drawScreen(px: any): void;
     _mPx: number;
     currWidth: number;
     _metersInMinSize: number;

package/types/control/SimpleSkyBackground.d.ts

@@ -0,0 +1,11 @@
+export function simpleSkyBackground(options: any): SimpleSkyBackground;
+/**
+ * Frame per second(FPS) display control.
+ * @class
+ * @extends {Control}
+ * @param {Object} [options] - Control options.
+ */
+export class SimpleSkyBackground extends Control {
+    _drawBackground(): void;
+}
+import { Control } from "./Control.js";

package/types/control/Sun.d.ts

@@ -18,7 +18,8 @@ export class Sun extends Control {
      * @private
      * @type {boolean}
      */
-    private offsetVertical;
+    private activationHeight;
+    offsetVertical: any;
     offsetHorizontal: any;
     /**
      * Light source.

package/types/ellipsoid/Ellipsoid.d.ts

@@ -114,10 +114,11 @@ export class Ellipsoid {
     /**
      * Gets Wgs84 geodetic coordiantes from cartesian ECEF.
      * @public
-     * @param {Vec3} cartesian - Cartesian coordinates.
+     * @param {Vec3} p - Cartesian coordinates.
      * @returns {LonLat} -
      */
-    public cartesianToLonLat(cartesian: Vec3): LonLat;
+    public projToSurface(p: Vec3): LonLat;
+    cartesianToLonLat(cart: any): LonLat;
     /**
      * Gets ellipsoid surface normal.
      * @public

package/types/entity/Ray.d.ts

@@ -18,8 +18,6 @@ export class Ray {
      */
     public readonly id: number;
     _thickness: any;
-    _length: any;
-    _lengthHighLow: Float32Array;
     _startPosition: any;
     _startPositionHigh: Vec3;
     _startPositionLow: Vec3;
@@ -80,7 +78,6 @@ export class Ray {
      * @param {Vec3} position - Cartesian coordinates.
      */
     public setEndPosition3v(position: Vec3): void;
-    setLength(length: any): void;
     setThickness(thickness: any): void;
     setColors4v(startColor: any, endColor: any): void;
     setColorsHTML(startColor: any, endColor: any): void;

package/types/entity/RayHandler.d.ts

@@ -17,7 +17,6 @@ export class RayHandler {
     _startPositionLowBuffer: any;
     _endPositionHighBuffer: any;
     _endPositionLowBuffer: any;
-    _lengthBuffer: any;
     _thicknessBuffer: any;
     _rgbaBuffer: any;
     _vertexArr: any[];
@@ -25,7 +24,6 @@ export class RayHandler {
     _startPositionLowArr: any[];
     _endPositionHighArr: any[];
     _endPositionLowArr: any[];
-    _lengthArr: any[];
     _thicknessArr: any[];
     _rgbaArr: any[];
     _pickingColorBuffer: any;
@@ -54,14 +52,12 @@ export class RayHandler {
     setPickingColorArr(index: any, color: any): void;
     setRgbaArr(index: any, startColor: any, endColor: any): void;
     setThicknessArr(index: any, thickness: any): void;
-    setLengthArr(index: any, length: any): void;
     setVisibility(index: any, visibility: any): void;
     setVertexArr(index: any, vertexArr: any): void;
     createStartPositionBuffer(): void;
     createEndPositionBuffer(): void;
     createRgbaBuffer(): void;
     createThicknessBuffer(): void;
-    createLengthBuffer(): void;
     createVertexBuffer(): void;
     createPickingColorBuffer(): void;
 }

package/types/index.d.ts

@@ -42,4 +42,9 @@ import * as entity from "./entity/index.js";
 export const Entity: typeof entity.Entity;
 import { Geoid } from "./terrain/Geoid.js";
 import { Popup } from "./Popup.js";
-export { bv, jd, math, mercator, utils, input, layer, terrain, control, webgl, wgs84, Camera, Ellipsoid, PlanetCamera, Globe, LightSource, Renderer, Clock, Events, Extent, LonLat, scene, RenderNode, Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4, entity, Geoid, Popup };
+import { QuadTreeStrategy } from "./quadTree/QuadTreeStrategy.js";
+import { MarsQuadTreeStrategy } from "./quadTree/MarsQuadTreeStrategy.js";
+import { EarthQuadTreeStrategy } from "./quadTree/EarthQuadTreeStrategy.js";
+import { Wgs84QuadTreeStrategy } from "./quadTree/Wgs84QuadTreeStrategy.js";
+import { quadTreeStrategyType } from "./utils/quadTreeType.js";
+export { bv, jd, math, mercator, utils, input, layer, terrain, control, webgl, wgs84, Camera, Ellipsoid, PlanetCamera, Globe, LightSource, Renderer, Clock, Events, Extent, LonLat, scene, RenderNode, Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4, entity, Geoid, Popup, QuadTreeStrategy, MarsQuadTreeStrategy, EarthQuadTreeStrategy, Wgs84QuadTreeStrategy, quadTreeStrategyType };

package/types/layer/Layer.d.ts

@@ -158,6 +158,14 @@ export class Layer {
      * @type {Events}
      */
     public events: Events;
+    _ambient: Float32Array;
+    _diffuse: Float32Array;
+    _specular: Float32Array;
+    set diffuse(arg: any);
+    set ambient(arg: any);
+    set specular(arg: any);
+    set shininess(arg: any);
+    get normalMapCreator(): any;
     get instanceName(): string;
     get rendererEvents(): Events;
     set opacity(arg: number);

package/types/math/Vec3.d.ts

@@ -151,6 +151,9 @@ export class Vec3 {
      * @returns {Vec3} -
      */
     static div(a: Vec3, b: Vec3): Vec3;
+    static length2(a: any): any;
+    static length(a: any): any;
+    static dot(a: any, b: any): any;
     static get LERP_DELTA(): number;
     constructor(x?: number, y?: number, z?: number);
     /**
@@ -208,10 +211,10 @@ export class Vec3 {
     public equal(p: Vec3): boolean;
     /**
      * Copy input vector's values.
-     * @param {Vec3} point3 - Vector to copy.
+     * @param {Vec3} p - Vector to copy.
      * @returns {Vec3} -
      */
-    copy(point3: Vec3): Vec3;
+    copy(p: Vec3): Vec3;
     /**
      * Gets vector's length.
      * @public
@@ -233,31 +236,31 @@ export class Vec3 {
     /**
      * Adds vector to the current.
      * @public
-     * @param {Vec3} point3 - Point to add.
+     * @param {Vec3} p - Point to add.
      * @returns {Vec3} -
      */
-    public addA(point3: Vec3): Vec3;
+    public addA(p: Vec3): Vec3;
     /**
      * Gets two vectors summarization.
      * @public
-     * @param {Vec3} point3 - Vector to add.
+     * @param {Vec3} p - Vector to add.
      * @returns {Vec3} Returns a sum vector.
      */
-    public add(point3: Vec3): Vec3;
+    public add(p: Vec3): Vec3;
     /**
      * Subtract vector from the current.
      * @public
-     * @param {Vec3} point3 - Subtract vector.
+     * @param {Vec3} p - Subtract vector.
      * @returns {Vec3} -
      */
-    public subA(point3: Vec3): Vec3;
+    public subA(p: Vec3): Vec3;
     /**
      * Gets vector subtraction.
      * @public
-     * @param {Vec3} point3 - Subtract vector.
+     * @param {Vec3} p - Subtract vector.
      * @return {Vec3} Returns new instance of a subtraction
      */
-    public sub(point3: Vec3): Vec3;
+    public sub(p: Vec3): Vec3;
     /**
      * Scale current vector.
      * @public
@@ -303,10 +306,10 @@ export class Vec3 {
     /**
      * Gets vectors dot production.
      * @public
-     * @param {Vec3} point3 - Another vector.
+     * @param {Vec3} a - Another vector.
      * @returns {number} -
      */
-    public dot(point3: Vec3): number;
+    public dot(a: Vec3): number;
     /**
      * Gets vectors dot production.
      * @public
@@ -380,17 +383,17 @@ export class Vec3 {
     /**
      * Gets distance to point.
      * @public
-     * @param {Vec3} point3 - Distant point.
+     * @param {Vec3} p - Distant point.
      * @returns {number} -
      */
-    public distance(point3: Vec3): number;
+    public distance(p: Vec3): number;
     /**
      * Gets square distance to point.
      * @public
-     * @param {Vec3} point3 - Distant point.
+     * @param {Vec3} p - Distant point.
      * @returns {number} -
      */
-    public distance2(point3: Vec3): number;
+    public distance2(p: Vec3): number;
     /**
      * Sets vector's values.
      * @public

package/types/math/Vec4.d.ts

@@ -80,15 +80,14 @@ export class Vec4 {
      * Converts vector to a number array.
      * @public
      * @returns {Array.<number>} - (exactly 4 entries)
-     * @deprecated
      */
-    public toVec(): Array<number>;
+    public toArray(): Array<number>;
     /**
      * Converts vector to a number array.
      * @public
      * @returns {Array.<number>} - (exactly 4 entries)
      */
-    public toArray(): Array<number>;
+    public toArray3(): Array<number>;
     /**
      * Sets vector's values.
      * @public

package/types/math.d.ts

@@ -235,26 +235,26 @@ export const HOURS_TO_DEGREES: 15;
 export const DEGREES_TO_HOURS: number;
 /** @const */
 export const SQRT_HALF: number;
-export const EPSILON1: 0.1;
-export const EPSILON2: 0.01;
-export const EPSILON3: 0.001;
-export const EPSILON4: 0.0001;
-export const EPSILON5: 0.00001;
-export const EPSILON6: 0.000001;
-export const EPSILON7: 1e-7;
-export const EPSILON8: 1e-8;
-export const EPSILON9: 1e-9;
-export const EPSILON10: 1e-10;
-export const EPSILON11: 1e-11;
-export const EPSILON12: 1e-12;
-export const EPSILON13: 1e-13;
-export const EPSILON14: 1e-14;
-export const EPSILON15: 1e-15;
-export const EPSILON16: 1e-16;
-export const EPSILON17: 1e-17;
-export const EPSILON18: 1e-18;
-export const EPSILON19: 1e-19;
-export const EPSILON20: 1e-20;
+export const EPS1: 0.1;
+export const EPS2: 0.01;
+export const EPS3: 0.001;
+export const EPS4: 0.0001;
+export const EPS5: 0.00001;
+export const EPS6: 0.000001;
+export const EPS7: 1e-7;
+export const EPS8: 1e-8;
+export const EPS9: 1e-9;
+export const EPS10: 1e-10;
+export const EPS11: 1e-11;
+export const EPS12: 1e-12;
+export const EPS13: 1e-13;
+export const EPS14: 1e-14;
+export const EPS15: 1e-15;
+export const EPS16: 1e-16;
+export const EPS17: 1e-17;
+export const EPS18: 1e-18;
+export const EPS19: 1e-19;
+export const EPS20: 1e-20;
 /**
  * Equation function.
  */

package/types/quadTree/EarthQuadTreeStrategy.d.ts

@@ -0,0 +1,3 @@
+export class EarthQuadTreeStrategy extends QuadTreeStrategy {
+}
+import { QuadTreeStrategy } from "./QuadTreeStrategy.js";

package/types/quadTree/MarsQuadTreeStrategy.d.ts

@@ -0,0 +1,3 @@
+export class MarsQuadTreeStrategy extends QuadTreeStrategy {
+}
+import { QuadTreeStrategy } from "./QuadTreeStrategy.js";

package/types/quadTree/Node.d.ts

@@ -18,7 +18,6 @@ export class Node {
     nodeId: any;
     state: number;
     appliedTerrainNodeId: number;
-    sideSize: number[];
     sideSizeLog2: number[];
     ready: boolean;
     neighbors: any[][];

package/types/quadTree/QuadTreeStrategy.d.ts

@@ -0,0 +1,21 @@
+export class QuadTreeStrategy {
+    constructor(options?: {});
+    name: string;
+    _planet: any;
+    projection: import("../proj/Proj.js").Proj;
+    /**
+     * grid tree list.
+     * @protected
+     * @type {quadTree.Node[]}
+     */
+    protected _quadTreeList: quadTree.Node[];
+    destroyBranches(): void;
+    clearLayerMaterial(layer: any): void;
+    get planet(): any;
+    init(): void;
+    preRender(): void;
+    preLoad(): void;
+    collectRenderNodes(): void;
+    clear(): void;
+    get quadTreeList(): quadTree.Node[];
+}

package/types/quadTree/Wgs84QuadTreeStrategy.d.ts

@@ -0,0 +1,3 @@
+export class Wgs84QuadTreeStrategy extends QuadTreeStrategy {
+}
+import { QuadTreeStrategy } from "./QuadTreeStrategy.js";

package/types/renderer/Renderer.d.ts

@@ -144,6 +144,7 @@ export class Renderer {
     public fontAtlas: utils.FontAtlas;
     _entityCollections: any[];
     _currentOutput: string;
+    _fnScreenFrame: (() => void) | (() => void);
     labelWorker: LabelWorker;
     /**
      * Sets renderer events activity.
@@ -216,7 +217,6 @@ export class Renderer {
      */
     public initialize(): void;
     screenDepthFramebuffer: Framebuffer;
-    _fnScreenFrame: (() => void) | (() => void);
     screenTexture: {
         screen: any;
         picking: any;

package/types/scene/Planet.d.ts

@@ -123,12 +123,6 @@ export class Planet extends RenderNode {
      */
     protected _renderedNodes: quadTree.Node;
     _renderedNodesInFrustum: any[];
-    /**
-     * Created nodes cache
-     * @protected
-     * @type {quadTree.Node}
-     */
-    protected _quadTreeNodesCacheMerc: quadTree.Node;
     /**
      * Current visible mercator segments tree nodes array.
      * @protected
@@ -190,24 +184,7 @@ export class Planet extends RenderNode {
      * @type {Object}
      */
     protected _heightPickingFramebuffer: any;
-    /**
-     * Mercator grid tree.
-     * @protected
-     * @type {quadTree.Node}
-     */
-    protected _quadTree: quadTree.Node;
-    /**
-     * North grid tree.
-     * @protected
-     * @type {quadTree.Node}
-     */
-    protected _quadTreeNorth: quadTree.Node;
-    /**
-     * South grid tree.
-     * @protected
-     * @type {quadTree.Node}
-     */
-    protected _quadTreeSouth: quadTree.Node;
+    quadTreeStrategy: any;
     /**
      * Night glowing gl texture.
      * @protected
@@ -274,6 +251,11 @@ export class Planet extends RenderNode {
     _renderCompletedActivated: boolean;
     _terrainCompleted: boolean;
     _terrainCompletedActivated: boolean;
+    set diffuse(arg: any);
+    set ambient(arg: any);
+    set specular(arg: any);
+    set shininess(arg: any);
+    get normalMapCreator(): NormalMapCreator;
     get layers(): Layer[];
     /**
      * Add the given control to the renderer of the planet scene.

package/types/segment/Segment.d.ts

@@ -1,3 +1,6 @@
+export const TILEGROUP_COMMON: 0;
+export const TILEGROUP_NORTH: 1;
+export const TILEGROUP_SOUTH: 2;
 /**
  * Planet segment Web Mercator tile class that stored and rendered with quad tree.
  * @class
@@ -154,6 +157,7 @@ export class Segment {
     _indexBuffer: any;
     readyToEngage: boolean;
     plainProcessing: boolean;
+    checkZoom(): boolean;
     /**
      * Returns entity terrain point.
      * @public
@@ -219,10 +223,6 @@ export class Segment {
      * Clear but not destroy segment data.
      */
     clearSegment(): void;
-    /**
-     * Removes cache records.
-     */
-    _freeCache(): void;
     /**
      * Clear and destroy all segment data.
      */

package/types/segment/SegmentLonLat.d.ts

@@ -1,3 +1,4 @@
+export const POLE_PIECE_SIZE: number;
 /**
  * Planet segment Web Mercator tile class that stored and rendered with quad tree.
  * @class
@@ -9,11 +10,14 @@
  */
 export class SegmentLonLat extends Segment {
     _extentMerc: Extent;
+    _isNorth: boolean;
     projectNative(coords: any): any;
     getTerrainPoint(xyz: any, insideSegmentPosition: any, res: any, normal: any): number;
-    acceptForRendering(camera: any): any;
-    _isNorth: boolean;
+    _getMaxZoom(): number;
+    _assignTileXIndexes(extent: any): void;
+    _assignTileYIndexes(extent: any): void;
     normalMapNormalsRaw: Float32Array;
+    _freeCache(): void;
 }
 import { Segment } from "./Segment.js";
 import { Extent } from "../Extent.js";

package/types/segment/SegmentLonLatWgs84.d.ts

@@ -0,0 +1,4 @@
+export class SegmentLonLatWgs84 extends SegmentLonLat {
+    constructor(node: any, planet: any, tileZoom: any, extent: any);
+}
+import { SegmentLonLat } from "./SegmentLonLat.js";

package/types/terrain/MapboxTerrain.d.ts

@@ -9,7 +9,8 @@ export class MapboxTerrain extends GlobusTerrain {
     plainGridSize: any;
     _imageSize: any;
     _ctx: CanvasRenderingContext2D;
+    _imageDataCache: {};
     _createTemporalCanvas(size: any): CanvasRenderingContext2D;
-    _createHeights(data: any, tileIndex: any, tileX: any, tileY: any, tileZoom: any, extent: any): Float32Array;
+    _createHeights(data: any, tileIndex: any, tileX: any, tileY: any, tileZoom: any, extent: any, preventChildren: any): Float32Array;
 }
 import { GlobusTerrain } from "./GlobusTerrain.js";

package/types/utils/quadTreeType.d.ts

@@ -0,0 +1,8 @@
+export namespace quadTreeStrategyType {
+    export { EarthQuadTreeStrategy as earth };
+    export { MarsQuadTreeStrategy as mars };
+    export { Wgs84QuadTreeStrategy as wgs84 };
+}
+import { EarthQuadTreeStrategy } from "../quadTree/EarthQuadTreeStrategy.js";
+import { MarsQuadTreeStrategy } from "../quadTree/MarsQuadTreeStrategy.js";
+import { Wgs84QuadTreeStrategy } from "../quadTree/Wgs84QuadTreeStrategy.js";

package/types/webgl/Handler.d.ts

@@ -258,6 +258,8 @@ export class Handler {
     createTexture_l: any;
     createTexture_mm: any;
     createTexture_a: any;
+    observer: IntersectionObserver;
+    _toggleVisibilityChange(visibility: any): void;
     /**
      * Sets default gl render parameters. Used in init function.
      * @private
@@ -363,7 +365,8 @@ export class Handler {
      */
     public start(): void;
     stop(): void;
-    _requestAnimationFrameId: number;
+    _requestAnimationFrameId: any;
+    isStopped(): boolean;
     /**
      * Check is gl context type equals webgl2
      * @public