@openglobus/og 0.23.0 → 0.24.1

package/lib/js/entity/Polyline.d.ts

@@ -1,13 +1,14 @@
 import { Entity } from "./Entity";
 import { Extent } from "../Extent";
 import { LonLat } from "../LonLat";
-import { NumberArray3, Vec3 } from "../math/Vec3";
-import { NumberArray2 } from "../math/Vec2";
-import { NumberArray4 } from "../math/Vec4";
+import { Vec3 } from "../math/Vec3";
+import type { NumberArray3 } from "../math/Vec3";
+import type { NumberArray2 } from "../math/Vec2";
+import type { NumberArray4 } from "../math/Vec4";
 import { PolylineHandler } from "./PolylineHandler";
 import { RenderNode } from "../scene/RenderNode";
-import { WebGLBufferExt } from "../webgl/Handler";
-import { TypedArray } from "../utils/shared";
+import type { WebGLBufferExt } from "../webgl/Handler";
+import type { TypedArray } from "../utils/shared";
 import { Ellipsoid } from "../ellipsoid/Ellipsoid";
 export type Geodetic = LonLat | NumberArray2 | NumberArray3;
 export type Cartesian = Vec3 | NumberArray3;
@@ -62,7 +63,7 @@ declare class Polyline {
     /**
      * Polyline RGBA color.
      * @protected
-     * @type {Float32Array} - (exactly 4 entries)
+     * @type {Float32Array}
      */
     protected _defaultColor: Float32Array | NumberArray4;
     /**
@@ -297,7 +298,8 @@ declare class Polyline {
     getPathLonLat(): SegmentPathLonLatExt[];
     getPathColors(): NumberArray4[][];
     /**
-     * @todo
+     * Sets polyline colors.
+     * @todo - Test the function.
      * @param {NumberArray4[][]} pathColors
      */
     setPathColors(pathColors: SegmentPathColor[]): void;

package/lib/js/entity/Polyline.js

@@ -1348,7 +1348,8 @@ class Polyline {
         return this._pathColors;
     }
     /**
-     * @todo
+     * Sets polyline colors.
+     * @todo - Test the function.
      * @param {NumberArray4[][]} pathColors
      */
     setPathColors(pathColors) {

package/lib/js/entity/Ray.d.ts

@@ -1,5 +1,7 @@
-import { NumberArray3, Vec3 } from "../math/Vec3";
-import { NumberArray4, Vec4 } from "../math/Vec4";
+import { Vec3 } from "../math/Vec3";
+import { Vec4 } from "../math/Vec4";
+import type { NumberArray3 } from "../math/Vec3";
+import type { NumberArray4 } from "../math/Vec4";
 import { Entity } from "./Entity";
 import { RayHandler } from "./RayHandler";
 export interface IRayParams {

package/lib/js/entity/RayHandler.d.ts

@@ -1,10 +1,10 @@
-import { TypedArray } from "../utils/shared";
+import type { TypedArray } from "../utils/shared";
 import { EntityCollection } from "./EntityCollection";
 import { Ray } from "./Ray";
 import { Renderer } from "../renderer/Renderer";
 import { Vec3 } from "../math/Vec3";
 import { Vec4 } from "../math/Vec4";
-import { WebGLBufferExt } from "../webgl/Handler";
+import type { WebGLBufferExt } from "../webgl/Handler";
 declare class RayHandler {
     static __counter__: number;
     protected __id: number;

package/lib/js/entity/Strip.d.ts

@@ -1,9 +1,11 @@
 import { Entity } from "./Entity";
 import { RenderNode } from "../scene/RenderNode";
-import { NumberArray3, Vec3 } from "../math/Vec3";
-import { NumberArray4, Vec4 } from "../math/Vec4";
+import { Vec3 } from "../math/Vec3";
+import { Vec4 } from "../math/Vec4";
+import type { NumberArray3 } from "../math/Vec3";
+import type { NumberArray4 } from "../math/Vec4";
 import { StripHandler } from "./StripHandler";
-import { WebGLBufferExt } from "../webgl/Handler";
+import type { WebGLBufferExt } from "../webgl/Handler";
 type TPoiExt = Vec3 | NumberArray3;
 type TStripExt = [TPoiExt, TPoiExt];
 type TPoi = Vec3;

package/lib/js/input/KeyboardHandler.d.ts

@@ -1,4 +1,4 @@
-import { EventCallback, EventCallbackStamp } from "../Events";
+import type { EventCallback, EventCallbackStamp } from "../Events";
 interface ICallbackHandler {
     callback: EventCallbackStamp;
     sender: any;

package/lib/js/input/MouseHandler.d.ts

@@ -1,6 +1,7 @@
 export type MouseEventExt = MouseEvent & {
     wheelDelta?: number;
     deltaY?: number;
+    isTouchPad?: boolean;
 };
 export interface MouseHandlerEvent {
     button?: number;

package/lib/js/input/MouseHandler.js

@@ -1,3 +1,13 @@
+function _checkTouchPad(e) {
+    //@ts-ignore
+    if (e.deltaMode !== 0) {
+        return false;
+    }
+    //@ts-ignore
+    return Math.abs(e.deltaY) < 50;
+    //@ts-ignore
+    //return e.wheelDeltaY ? e.wheelDeltaY === -3 * e.deltaY : e.deltaMode === 0
+}
 class MouseHandler {
     constructor(htmlObject) {
         this._htmlObject = htmlObject;
@@ -13,11 +23,12 @@ class MouseHandler {
                 //     callback.call(sender, event);
                 //     event.preventDefault();
                 // }, false);
-                this._htmlObject.addEventListener('wheel', function (event) {
+                this._htmlObject.addEventListener('wheel', (event) => {
                     let delta = event.deltaY || event.detail || event.wheelDelta || 0;
                     if (event.wheelDelta == undefined) {
                         event.wheelDelta = delta * (-120);
                     }
+                    event.isTouchPad = _checkTouchPad(event);
                     callback.call(sender, event);
                     event.preventDefault();
                 }, false);

package/lib/js/layer/BaseGeoImage.d.ts

@@ -1,12 +1,13 @@
 import { Extent } from "../Extent";
-import { EventCallback, EventsHandler } from "../Events";
-import { Layer, LayerEventsList, ILayerParams } from "./Layer";
+import type { EventCallback, EventsHandler } from "../Events";
+import { Layer } from "./Layer";
+import type { LayerEventsList, ILayerParams } from "./Layer";
 import { LonLat } from "../LonLat";
 import { Material } from "./Material";
-import { NumberArray2 } from "../math/Vec2";
-import { NumberArray4 } from "../math/Vec4";
+import type { NumberArray2 } from "../math/Vec2";
+import type { NumberArray4 } from "../math/Vec4";
 import { Planet } from "../scene/Planet";
-import { WebGLBufferExt, WebGLTextureExt } from "../webgl/Handler";
+import type { WebGLBufferExt, WebGLTextureExt } from "../webgl/Handler";
 export interface IBaseGeoImageParams extends ILayerParams {
     fullExtent?: boolean;
     corners?: NumberArray2[];

package/lib/js/layer/Bing.d.ts

@@ -1,4 +1,5 @@
-import { XYZ, IXYZParams } from "./XYZ";
+import { XYZ } from "./XYZ";
+import type { IXYZParams } from "./XYZ";
 export declare class Bing extends XYZ {
     constructor(name: string | null, options?: IXYZParams);
 }

package/lib/js/layer/CanvasTiles.d.ts

@@ -1,7 +1,8 @@
-import { EventCallback, EventsHandler } from "../Events";
-import { ILayerParams, Layer, LayerEventsList } from "./Layer";
+import type { EventCallback, EventsHandler } from "../Events";
+import { Layer } from "./Layer";
+import type { ILayerParams, LayerEventsList } from "./Layer";
 import { Material } from "../layer/Material";
-import { NumberArray4 } from "../math/Vec4";
+import type { NumberArray4 } from "../math/Vec4";
 import { Planet } from "../scene/Planet";
 type ApplyImageFunc = (material: HTMLCanvasElement | ImageBitmap | HTMLImageElement) => void;
 type DrawTileCallback = (material: Material, applyImage: ApplyImageFunc) => void;

package/lib/js/layer/GeoImage.d.ts

@@ -1,4 +1,5 @@
-import { BaseGeoImage, IBaseGeoImageParams } from "./BaseGeoImage";
+import { BaseGeoImage } from "./BaseGeoImage";
+import type { IBaseGeoImageParams } from "./BaseGeoImage";
 import { Material } from "./Material";
 export interface IGeoImageParams extends IBaseGeoImageParams {
     image?: HTMLImageElement | HTMLCanvasElement | ImageBitmap;

package/lib/js/layer/GeoTexture2d.d.ts

@@ -1,6 +1,7 @@
-import { BaseGeoImage, IBaseGeoImageParams } from './BaseGeoImage';
+import { BaseGeoImage } from './BaseGeoImage';
+import type { IBaseGeoImageParams } from './BaseGeoImage';
 import { Material } from "../layer/Material";
-import { WebGLTextureExt } from "../webgl/Handler";
+import type { WebGLTextureExt } from "../webgl/Handler";
 interface IGeoTexture2dParams extends IBaseGeoImageParams {
     texture?: WebGLTextureExt;
     frameWidth?: number;

package/lib/js/layer/GeoVideo.d.ts

@@ -1,4 +1,5 @@
-import { BaseGeoImage, IBaseGeoImageParams } from "./BaseGeoImage";
+import { BaseGeoImage } from "./BaseGeoImage";
+import type { IBaseGeoImageParams } from "./BaseGeoImage";
 import { Material } from "./Material";
 export interface IGeoVideoParams extends IBaseGeoImageParams {
     videoElement?: HTMLVideoElement;

package/lib/js/layer/KML.d.ts

@@ -1,7 +1,9 @@
-import { Billboard, IBillboardParams } from "../entity/Billboard";
+import { Billboard } from "../entity/Billboard";
+import type { IBillboardParams } from "../entity/Billboard";
 import { Entity } from "../entity/Entity";
 import { Extent } from "../Extent";
-import { Vector, IVectorParams } from "./Vector";
+import { Vector } from "./Vector";
+import type { IVectorParams } from "./Vector";
 interface IKMLParams extends IVectorParams {
     color?: string;
     billboard?: IBillboardParams;
@@ -22,7 +24,7 @@ export declare class KML extends Vector {
     protected _AGBRtoRGBA(agbr: string): string | undefined;
     /**
      * @protected
-     returns array of longitude, latitude, altitude (altitude optional)
+     * @returns array of longitude, latitude, altitude (altitude optional)
      */
     protected _parseKMLcoordinates(coords: Element): number[][];
     protected _kmlPlacemarkToEntity(placemark: Element | undefined | null, extent: Extent): Entity | undefined;

package/lib/js/layer/KML.js

@@ -42,7 +42,7 @@ export class KML extends Vector {
     }
     /**
      * @protected
-     returns array of longitude, latitude, altitude (altitude optional)
+     * @returns array of longitude, latitude, altitude (altitude optional)
      */
     _parseKMLcoordinates(coords) {
         const coordinates = coords.innerHTML.trim()

package/lib/js/layer/Layer.d.ts

@@ -1,12 +1,13 @@
-import { EventsHandler } from "../Events";
+import type { EventsHandler } from "../Events";
 import { Extent } from "../Extent";
 import { Node } from "../quadTree/Node";
 import { Material } from "./Material";
 import { Planet } from "../scene/Planet";
 import { Segment } from "../segment/Segment";
-import { Vec3, NumberArray3 } from "../math/Vec3";
-import { NumberArray4 } from "../math/Vec4";
-import { IDefaultTextureParams } from "../webgl/Handler";
+import { Vec3 } from "../math/Vec3";
+import type { NumberArray3 } from "../math/Vec3";
+import type { NumberArray4 } from "../math/Vec4";
+import type { IDefaultTextureParams } from "../webgl/Handler";
 export interface ILayerParams {
     properties?: any;
     labelMaxLetters?: number;

package/lib/js/layer/Material.d.ts

@@ -1,8 +1,8 @@
 import { Layer } from "./Layer";
 import { Node } from "../quadTree/Node";
 import { Segment } from "../segment/Segment";
-import { WebGLTextureExt } from "../webgl/Handler";
-import { NumberArray4 } from "../math/Vec4";
+import type { WebGLTextureExt } from "../webgl/Handler";
+import type { NumberArray4 } from "../math/Vec4";
 /**
  * @class Material
  * @param {Segment} segment

package/lib/js/layer/OpenStreetMap.d.ts

@@ -1,4 +1,5 @@
-import { XYZ, IXYZParams } from "./XYZ";
+import { XYZ } from "./XYZ";
+import type { IXYZParams } from "./XYZ";
 export declare class OpenStreetMap extends XYZ {
     constructor(name: string | null, options?: IXYZParams);
 }

package/lib/js/layer/Vector.d.ts

@@ -1,13 +1,15 @@
-import { Entity, IEntityParams } from "../entity/Entity";
+import { Entity } from "../entity/Entity";
+import type { IEntityParams } from "../entity/Entity";
 import { EntityCollection } from "../entity/EntityCollection";
 import { EntityCollectionsTreeStrategy } from "../quadTree/EntityCollectionsTreeStrategy";
-import { EventsHandler } from "../Events";
+import type { EventsHandler } from "../Events";
 import { GeometryHandler } from "../entity/GeometryHandler";
-import { ILayerParams, Layer, LayerEventsList } from "./Layer";
-import { NumberArray3 } from "../math/Vec3";
+import { Layer } from "./Layer";
+import type { ILayerParams, LayerEventsList } from "./Layer";
+import type { NumberArray3 } from "../math/Vec3";
 import { Planet } from "../scene/Planet";
 import { Material } from "./Material";
-import { NumberArray4 } from "../math/Vec4";
+import type { NumberArray4 } from "../math/Vec4";
 export interface IVectorParams extends ILayerParams {
     entities?: Entity[] | IEntityParams[];
     polygonOffsetUnits?: number;
@@ -73,7 +75,7 @@ declare class Vector extends Layer {
      * Second index - far distance to the entity, when entity becomes zero scale.
      * Third index - far distance to the entity, when entity becomes invisible.
      * @public
-     * @type {NumberArray3} - (exactly 3 entries)
+     * @type {NumberArray3}
      */
     scaleByDistance: NumberArray3;
     pickingScale: Float32Array;
@@ -197,7 +199,7 @@ declare class Vector extends Layer {
     /**
      * Safety entities loop.
      * @public
-     * @param {(entity: Entity, index?: number) => void} callback - Entity callback.
+     * @param {function(Entity, number): void} callback - Entity callback.
      */
     each(callback: (entity: Entity, index?: number) => void): void;
     /**

package/lib/js/layer/Vector.js

@@ -380,7 +380,7 @@ class Vector extends Layer {
     /**
      * Safety entities loop.
      * @public
-     * @param {(entity: Entity, index?: number) => void} callback - Entity callback.
+     * @param {function(Entity, number): void} callback - Entity callback.
      */
     each(callback) {
         let e = this._entities;

package/lib/js/layer/WMS.d.ts

@@ -1,6 +1,7 @@
 import { Extent } from "../Extent";
 import { Segment } from "../segment/Segment";
-import { XYZ, IXYZParams } from "./XYZ";
+import { XYZ } from "./XYZ";
+import type { IXYZParams } from "./XYZ";
 interface IWMSParams extends IXYZParams {
     extra?: any;
     layers: string;

package/lib/js/layer/XYZ.d.ts

@@ -1,8 +1,9 @@
-import { Layer, ILayerParams, LayerEventsList } from "./Layer";
+import { Layer } from "./Layer";
+import type { ILayerParams, LayerEventsList } from "./Layer";
 import { Segment } from "../segment/Segment";
-import { EventsHandler } from "../Events";
+import type { EventsHandler } from "../Events";
 import { Material } from "./Material";
-import { NumberArray4 } from "../math/Vec4";
+import type { NumberArray4 } from "../math/Vec4";
 export interface IXYZParams extends ILayerParams {
     url?: string;
     subdomains?: string[];

package/lib/js/math/Mat3.d.ts

@@ -67,7 +67,7 @@ export declare class Mat3 {
      * @public
      * @returns {Mat4}
      */
-    toMatrix4(): Mat4;
+    getMat4(): Mat4;
 }
 /**
  * Mat3 factory.

package/lib/js/math/Mat3.js

@@ -106,7 +106,7 @@ export class Mat3 {
      * @public
      * @returns {Mat4}
      */
-    toMatrix4() {
+    getMat4() {
         let res = new Mat4();
         let b = res._m;
         let a = this._m;

package/lib/js/math/Mat4.d.ts

@@ -37,6 +37,15 @@ export declare class Mat4 {
      * @returns {Mat4} -
      */
     static identity(): Mat4;
+    /**
+     * Get rotation matrix around the point
+     * @public
+     * @param {number} angle - Rotation angle in radians
+     * @param {Vec3} [center] - Point that the camera rotates around
+     * @param {Vec3} [up] - Camera up vector
+     */
+    static getRotationAroundPoint(angle: number, center?: Vec3, up?: Vec3): Mat4;
+    static getRotation(angle: number, up?: Vec3): Mat4;
     /**
      * Sets column-major order array matrix.
      * @public
@@ -62,7 +71,7 @@ export declare class Mat4 {
      * @public
      * @returns {Mat3} -
      */
-    toMatrix3(): Mat3;
+    getMat3(): Mat3;
     /**
      * Multiply to 3d vector.
      * @public

package/lib/js/math/Mat4.js

@@ -45,6 +45,22 @@ export class Mat4 {
         res._m[15] = 1;
         return res;
     }
+    /**
+     * Get rotation matrix around the point
+     * @public
+     * @param {number} angle - Rotation angle in radians
+     * @param {Vec3} [center] - Point that the camera rotates around
+     * @param {Vec3} [up] - Camera up vector
+     */
+    static getRotationAroundPoint(angle, center = Vec3.ZERO, up = Vec3.UP) {
+        let rot = Mat4.getRotation(angle, up);
+        let tr = new Mat4().setIdentity().translate(center);
+        let ntr = new Mat4().setIdentity().translate(center.negateTo());
+        return tr.mul(rot).mul(ntr);
+    }
+    static getRotation(angle, up = Vec3.UP) {
+        return new Mat4().setRotation(up, angle);
+    }
     /**
      * Sets column-major order array matrix.
      * @public
@@ -94,7 +110,7 @@ export class Mat4 {
      * @public
      * @returns {Mat3} -
      */
-    toMatrix3() {
+    getMat3() {
         let res = new Mat3();
         let a = this._m, b = res._m;
         b[0] = a[0];

package/lib/js/math/Plane.d.ts

@@ -9,7 +9,9 @@ import { Line3 } from "./Line3";
 declare class Plane {
     p: Vec3;
     n: Vec3;
-    constructor(p: Vec3, n: Vec3);
+    constructor(p?: Vec3, n?: Vec3);
+    setByPoints(v0: Vec3, v1: Vec3, v2: Vec3): Plane;
+    static fromPoints(v0: Vec3, v1: Vec3, v2: Vec3): Plane;
     set(p: Vec3, n: Vec3): void;
     getNormal(): Vec3;
     distance(p: Vec3): number;

package/lib/js/math/Plane.js

@@ -12,7 +12,17 @@ const INTERSECT = 2;
 class Plane {
     constructor(p, n) {
         this.p = p ? p.clone() : new Vec3();
-        this.n = n ? n.clone() : this.p.normal();
+        this.n = n ? n.clone() : (this.p.isZero() ? Vec3.UP : this.p.getNormal());
+    }
+    setByPoints(v0, v1, v2) {
+        let u = Vec3.sub(v1, v0);
+        let v = Vec3.sub(v2, v0);
+        this.n = u.cross(v);
+        this.p.copy(v0);
+        return this;
+    }
+    static fromPoints(v0, v1, v2) {
+        return new Plane().setByPoints(v0, v1, v2);
     }
     set(p, n) {
         this.p.copy(p);

package/lib/js/math/Quat.d.ts

@@ -238,10 +238,15 @@ export declare class Quat {
      * @returns {Quat} -
      */
     setFromAxisAngle(axis: Vec3, angle: number): Quat;
+    /**
+     * @typedef {Object} QuatAxisAngle
+     * @property {Vec3} axis - The rotation axis.
+     * @property {number} angle - The rotation angle in radians.
+     */
     /**
      * Returns axis and angle of the current Quat.
      * @public
-     * @returns { axis: Vec3, angle: number } -
+     * @returns QuatAxisAngle -
      */
     getAxisAngle(): {
         axis: Vec3;
@@ -298,6 +303,7 @@ export declare class Quat {
      * Returns quaternion and vector production.
      * @public
      * @param {Vec3} v - 3d Vector.
+     * @param {Vec3} res - result output vector.
      * @returns {Vec3} -
      */
     mulVec3Res(v: Vec3, res: Vec3): Vec3;

package/lib/js/math/Quat.js

@@ -413,10 +413,15 @@ export class Quat {
         this.set(v.x * sin_a, v.y * sin_a, v.z * sin_a, Math.cos(half_angle));
         return this;
     }
+    /**
+     * @typedef {Object} QuatAxisAngle
+     * @property {Vec3} axis - The rotation axis.
+     * @property {number} angle - The rotation angle in radians.
+     */
     /**
      * Returns axis and angle of the current Quat.
      * @public
-     * @returns { axis: Vec3, angle: number } -
+     * @returns QuatAxisAngle -
      */
     getAxisAngle() {
         let x = this.x, y = this.y, z = this.z, w = this.w;
@@ -617,6 +622,7 @@ export class Quat {
      * Returns quaternion and vector production.
      * @public
      * @param {Vec3} v - 3d Vector.
+     * @param {Vec3} res - result output vector.
      * @returns {Vec3} -
      */
     mulVec3Res(v, res) {

package/lib/js/math/Ray.d.ts

@@ -45,7 +45,7 @@ export declare class Ray {
      */
     getPoint(distance: number): Vec3;
     /**
-     * Returns ray hit a triange result.
+     * Returns ray hit a triangle result.
      * @public
      * @param {Vec3} v0 - First triangle corner coordinate.
      * @param {Vec3} v1 - Second triangle corner coordinate.
@@ -54,17 +54,13 @@ export declare class Ray {
      * @returns {number} - Hit code, could 0 - og.Ray.OUTSIDE, 1 - og.Ray.INSIDE,
      *      2 - og.Ray.INPLANE and 3 - og.Ray.AWAY(ray goes away from triangle).
      */
-    hitTriangle(v0: Vec3, v1: Vec3, v2: Vec3, res: Vec3): number;
+    hitTriangleRes(v0: Vec3, v1: Vec3, v2: Vec3, res: Vec3): number;
     /**
-     * Gets a ray hit a plane result. If the ray cross the plane returns 1 - og.Ray.INSIDE otherwise returns 0 - og.Ray.OUTSIDE.
-     * @public
-     * @param {Vec3} v0 - First plane point.
-     * @param {Vec3} v1 - Second plane point.
-     * @param {Vec3} v2 - Third plane point.
-     * @param {Vec3} res - Hit point object pointer that stores hit result.
-     * @returns {number}
+     * Finds the intersection of the ray with a plane.
+     * @param {Plane} plane - The plane to intersect with.
+     * @returns {Vec3 | null} The intersection point or null if no intersection.
      */
-    hitPlane(v0: Vec3, v1: Vec3, v2: Vec3, res: Vec3): number;
+    hitPlaneRes(plane: Plane, res: Vec3): number;
     /**
      * Returns a ray hit sphere coordiante. If there isn't hit returns null.
      * @public
@@ -73,10 +69,4 @@ export declare class Ray {
      */
     hitSphere(sphere: Sphere): Vec3 | null;
     hitBox(box: Box): void;
-    /**
-     * Finds the intersection of the ray with a plane.
-     * @param {Plane} plane - The plane to intersect with.
-     * @returns {Vec3 | null} The intersection point or null if no intersection.
-     */
-    hitPlane2(plane: Plane, res: Vec3): number;
 }