@openglobus/og 0.18.0 → 0.18.2

package/{src/LonLat.ts → lib/js/LonLat.js}

@@ -1,13 +1,9 @@
 import * as mercator from "./mercator";
-import {NumberArray2} from "./math/Vec2";
-import {NumberArray3} from "./math/Vec3";
-
 const HALF_PI = Math.PI * 0.5;
 const INV_PI_BY_180 = 180.0 / Math.PI;
 const INV_PI_BY_360 = INV_PI_BY_180 * 2.0;
 const PI_BY_360 = Math.PI / 360.0;
 const INV_PI_BY_180_HALF_PI = INV_PI_BY_180 * HALF_PI;
-
 /**
  * Represents a geographical point with a certain latitude, longitude and height.
  * @class
@@ -16,48 +12,43 @@ const INV_PI_BY_180_HALF_PI = INV_PI_BY_180 * HALF_PI;
  * @param {number} [height] - Height over the surface.
  */
 export class LonLat {
-    /**
-     * Longitude.
-     * @public
-     * @type {number}
-     */
-    public lon: number = 0;
-
-    /**
-     * Latitude.
-     * @public
-     * @type {number}
-     */
-    public lat: number = 0;
-
-    /**
-     * Height.
-     * @public
-     * @type {number}
-     */
-    public height: number = 0;
-
-    constructor(lon: number = 0, lat: number = 0, height: number = 0) {
+    constructor(lon = 0, lat = 0, height = 0) {
+        /**
+         * Longitude.
+         * @public
+         * @type {number}
+         */
+        this.lon = 0;
+        /**
+         * Latitude.
+         * @public
+         * @type {number}
+         */
+        this.lat = 0;
+        /**
+         * Height.
+         * @public
+         * @type {number}
+         */
+        this.height = 0;
         this.lon = lon;
         this.lat = lat;
         this.height = height;
     }
-
     /**
      * Check zero coordinates
      * @returns {boolean} -
      */
-    public isZero(): boolean {
+    isZero() {
         return this.lon === 0.0 && this.lat === 0.0 && this.height === 0.0;
     }
-
     /**
      * Creates coordinates array.
      * @static
      * @param{Array.<Array<number>>} arr - Coordinates array data. (exactly 3 entries)
      * @return{Array.<LonLat>} the same coordinates array but each element is LonLat instance.
      */
-    static join(arr: NumberArray2[] | NumberArray3[]): LonLat[] {
+    static join(arr) {
         let res = [];
         for (let i = 0; i < arr.length; i++) {
             let ai = arr[i];
@@ -65,34 +56,30 @@ export class LonLat {
         }
         return res;
     }
-
     /**
      * Creates an object by coordinate array.
      * @static
      * @param {Array.<number>} arr - Coordinates array, where first is longitude, second is latitude and third is a height. (exactly 3 entries)
      * @returns {LonLat} -
      */
-    static createFromArray(arr: [number, number, number]): LonLat {
+    static createFromArray(arr) {
         return new LonLat(arr[0], arr[1], arr[2]);
     }
-
     /**
      * Create array from lonLat
      * @param lonLat
      * @returns {number[]}
      */
-    static toArray(lonLat: LonLat): [number, number, number] {
-        return [lonLat.lon, lonLat.lat, lonLat.height]
+    static toArray(lonLat) {
+        return [lonLat.lon, lonLat.lat, lonLat.height];
     }
-
     /**
      * Create array from lonLat
      * @returns {number[]}
      */
-    public toArray(): [number, number, number] {
+    toArray() {
         return LonLat.toArray(this);
     }
-
     /**
      * Converts degrees to mercator coordinates.
      * @static
@@ -101,14 +88,9 @@ export class LonLat {
      * @param {number} [height] - Height.
      * @returns {LonLat} -
      */
-    static forwardMercator(lon: number, lat: number, height: number): LonLat {
-        return new LonLat(
-            lon * mercator.POLE_BY_180,
-            Math.log(Math.tan((90.0 + lat) * PI_BY_360)) * mercator.POLE_BY_PI,
-            height
-        );
-    }
-
+    static forwardMercator(lon, lat, height) {
+        return new LonLat(lon * mercator.POLE_BY_180, Math.log(Math.tan((90.0 + lat) * PI_BY_360)) * mercator.POLE_BY_PI, height);
+    }
     /**
      * Converts degrees to mercator coordinates.
      * @static
@@ -116,13 +98,12 @@ export class LonLat {
      * @param {LonLat} res - Output mercator coordinates
      * @returns {LonLat} - Output mercator coordinates
      */
-    static forwardMercatorRes(lonLat: LonLat, res: LonLat): LonLat {
+    static forwardMercatorRes(lonLat, res) {
         res.lon = lonLat.lon * mercator.POLE_BY_180;
         res.lat = Math.log(Math.tan((90.0 + lonLat.lat) * PI_BY_360)) * mercator.POLE_BY_PI,
             res.height = lonLat.height;
         return res;
     }
-
     /**
      * Converts mercator to degrees coordinates.
      * @static
@@ -131,14 +112,9 @@ export class LonLat {
      * @param {number} [height] - Height.
      * @returns {LonLat} -
      */
-    static inverseMercator(x: number, y: number, height: number = 0): LonLat {
-        return new LonLat(
-            x * mercator.INV_POLE_BY_180,
-            INV_PI_BY_360 * Math.atan(Math.exp(y * mercator.PI_BY_POLE)) - INV_PI_BY_180_HALF_PI,
-            height
-        );
-    }
-
+    static inverseMercator(x, y, height = 0) {
+        return new LonLat(x * mercator.INV_POLE_BY_180, INV_PI_BY_360 * Math.atan(Math.exp(y * mercator.PI_BY_POLE)) - INV_PI_BY_180_HALF_PI, height);
+    }
     /**
      * Sets coordinates.
      * @public
@@ -147,76 +123,69 @@ export class LonLat {
      * @param {number} [height] - Height.
      * @returns {LonLat} -
      */
-    public set(lon: number = 0, lat: number = 0, height: number = 0): LonLat {
+    set(lon = 0, lat = 0, height = 0) {
         this.lon = lon;
         this.lat = lat;
         this.height = height;
         return this;
     }
-
     /**
      * Copy coordinates.
      * @public
      * @param {LonLat} [lonLat] - Coordinates to copy.
      * @returns {LonLat} -
      */
-    public copy(lonLat: LonLat): LonLat {
+    copy(lonLat) {
         this.lon = lonLat.lon;
         this.lat = lonLat.lat;
         this.height = lonLat.height;
         return this;
     }
-
     /**
      * Clone the coordinates.
      * @public
      * @returns {LonLat} -
      */
-    public clone(): LonLat {
+    clone() {
         return new LonLat(this.lon, this.lat, this.height);
     }
-
     /**
      * Converts to mercator coordinates.
      * @public
      * @returns {LonLat} -
      */
-    public forwardMercator(): LonLat {
+    forwardMercator() {
         return LonLat.forwardMercator(this.lon, this.lat, this.height);
     }
-
-    public forwardMercatorEPS01(): LonLat {
+    forwardMercatorEPS01() {
         let lat = this.lat;
         if (lat > 89.9) {
             lat = 89.9;
-        } else if (lat < -89.9) {
+        }
+        else if (lat < -89.9) {
             lat = -89.9;
         }
-        return new LonLat(
-            this.lon * mercator.POLE_BY_180,
-            Math.log(Math.tan((90.0 + lat) * PI_BY_360)) * mercator.POLE_BY_PI
-        );
+        return new LonLat(this.lon * mercator.POLE_BY_180, Math.log(Math.tan((90.0 + lat) * PI_BY_360)) * mercator.POLE_BY_PI);
     }
-
     /**
      * Converts from mercator coordinates.
      * @public
      * @returns {LonLat} -
      */
-    public inverseMercator(): LonLat {
+    inverseMercator() {
         return LonLat.inverseMercator(this.lon, this.lat, this.height);
     }
-
     /**
      * Compares coordinates.
      * @public
      * @param {LonLat} b - Coordinate to compare with.
      * @returns {boolean} -
      */
-    public equal(b: LonLat): boolean {
+    equal(b) {
         if (b.height) {
             return this.lon === b.lon && this.lat === b.lat && this.height === b.height;
-        } else {
+        }
+        else {
             return this.lon === b.lon && this.lat === b.lat;
         }
     }

package/lib/js/Object3d.d.ts

@@ -0,0 +1,49 @@
+import { TypedArray } from './utils/shared';
+import { NumberArray3 } from './math/Vec3';
+interface IObject3dParams {
+    name?: string;
+    vertices?: number[];
+    texCoords?: number[];
+    indices?: number[];
+    normals?: number[];
+    center?: boolean;
+    src?: string;
+    color?: number[] | TypedArray | string;
+    scale?: number;
+}
+declare class Object3d {
+    protected _name: string;
+    protected _vertices: number[];
+    protected _numVertices: number;
+    protected _texCoords: number[];
+    /**
+     * Image src.
+     * @protected
+     * @type {string}
+     */
+    protected _src: string | null;
+    protected color: Float32Array;
+    protected _indices: number[];
+    protected _normals: number[];
+    constructor(data?: IObject3dParams);
+    static centering(verts: number[]): void;
+    get src(): string | null;
+    set src(src: string | null);
+    get name(): string;
+    get vertices(): number[];
+    get normals(): number[];
+    get indices(): number[];
+    get texCoords(): number[];
+    get numVertices(): number;
+    static scale(vertices: number[], s: number): void;
+    static centroid(vertices: number[]): number[];
+    static translate(vertices: number[], v: NumberArray3): void;
+    static getNormals(vertices: number[]): number[];
+    static createSphere(lonBands?: number, latBands?: number, radius?: number, offsetX?: number, offsetY?: number, offsetZ?: number): Object3d;
+    static createDisc(radius?: number, height?: number, radialSegments?: number, isTop?: boolean, startIndex?: number, offsetX?: number, offsetY?: number, offsetZ?: number): Object3d;
+    static createCylinder(radiusTop?: number, radiusBottom?: number, height?: number, radialSegments?: number, heightSegments?: number, isTop?: boolean, isBottom?: boolean, offsetX?: number, offsetY?: number, offsetZ?: number): Object3d;
+    static createCube(length?: number, height?: number, depth?: number, xOffset?: number, yOffset?: number, zOffset?: number): Object3d;
+    static createArrow(back?: number, height?: number, front?: number): Object3d;
+    static loadObj(src: string): Promise<Object3d[]>;
+}
+export { Object3d };