@openglobus/og 0.11.2 → 0.11.7

package/src/og/math/Vec4.js

@@ -2,9 +2,10 @@
  * @module og/math/Vec4
  */
 
-'use strict';
+"use strict";
 
-import { Vec3 } from './Vec3.js';
+import { Vec3 } from "./Vec3.js";
+import { frac } from "../math.js";
 
 /**
  * Class represents a 4d vector.
@@ -15,9 +16,7 @@ import { Vec3 } from './Vec3.js';
  * @param {number} [w] - Fourth value.
  */
 export class Vec4 {
-
     constructor(x, y, z, w) {
-
         /**
          * @public
          * @type {number}
@@ -46,15 +45,17 @@ export class Vec4 {
     /**
      * Identity vector [0,0,0,1].
      * @const
-     * @type {og.math.Vec4}
+     * @type {Vec4}
      */
-    static get identity() { return new Vec4(0, 0, 0, 1) }
+    static get identity() {
+        return new Vec4(0, 0, 0, 1);
+    }
 
     /**
      * Creates 4d vector from array.
      * @function
      * @param {Array.<number>} - (exactly 4 entries)
-     * @returns {og.math.Vec4}
+     * @returns {Vec4}
      */
     static fromVec(arr) {
         return new Vec4(arr[0], arr[1], arr[2], arr[3]);
@@ -63,7 +64,7 @@ export class Vec4 {
     /**
      * Converts to 3d vector, without fourth value.
      * @public
-     * @returns {og.Vec3}
+     * @returns {Vec3}
      */
     toVec3() {
         return new Vec3(this.x, this.y, this.z);
@@ -72,7 +73,7 @@ export class Vec4 {
     /**
      * Returns clone vector.
      * @public
-     * @returns {og.math.Vec4}
+     * @returns {Vec4}
      */
     clone(v) {
         return new Vec4(this.x, this.y, this.z, this.w);
@@ -81,7 +82,7 @@ export class Vec4 {
     /**
      * Compares with vector. Returns true if it equals another.
      * @public
-     * @param {og.math.Vec4} p - Vector to compare.
+     * @param {Vec4} p - Vector to compare.
      * @returns {boolean}
      */
     equal(v) {
@@ -90,8 +91,8 @@ export class Vec4 {
 
     /**
      * Copy input vector's values.
-     * @param {og.math.Vec4} v - Vector to copy.
-     * @returns {og.math.Vec4}
+     * @param {Vec4} v - Vector to copy.
+     * @returns {Vec4}
      */
     copy(v) {
         this.x = v.x;
@@ -127,7 +128,7 @@ export class Vec4 {
      * @param {number} y - Value Y.
      * @param {number} z - Value Z.
      * @param {number} w - Value W.
-     * @returns {og.math.Vec4}
+     * @returns {Vec4}
      */
     set(x, y, z, w) {
         this.x = x;
@@ -140,8 +141,8 @@ export class Vec4 {
     /**
      * Adds vector to the current.
      * @public
-     * @param {og.math.Vec4}
-     * @returns {og.math.Vec4}
+     * @param {Vec4}
+     * @returns {Vec4}
      */
     addA(v) {
         this.x += v.x;
@@ -154,8 +155,8 @@ export class Vec4 {
     /**
      * Subtract vector from the current.
      * @public
-     * @param {og.math.Vec4} v - Subtract vector.
-     * @returns {og.math.Vec4}
+     * @param {Vec4} v - Subtract vector.
+     * @returns {Vec4}
      */
     subA(v) {
         this.x -= v.x;
@@ -169,7 +170,7 @@ export class Vec4 {
      * Scale current vector.
      * @public
      * @param {number} scale - Scale value.
-     * @returns {og.math.Vec4}
+     * @returns {Vec4}
      */
     scale(scale) {
         this.x *= scale;
@@ -182,7 +183,7 @@ export class Vec4 {
     /**
      * Makes vector affinity. Thereby fourh component becomes to 1.0.
      * @public
-     * @returns {og.math.Vec4}
+     * @returns {Vec4}
      */
     affinity() {
         var iw = 1 / this.w;
@@ -197,7 +198,7 @@ export class Vec4 {
      * Scale current vector to another instance.
      * @public
      * @param {number} scale - Scale value.
-     * @returns {og.Vec3}
+     * @returns {Vec3}
      */
     scaleTo(scale) {
         return new Vec4(this.x * scale, this.y * scale, this.z * scale, this.w * scale);
@@ -206,7 +207,7 @@ export class Vec4 {
     /**
      * Vector's edge function that returns vector where each component is 0.0 if it's smaller then edge and otherwise 1.0.
      * @public
-     * @returns {og.math.Vec4}
+     * @returns {Vec4}
      */
     getStep(edge) {
         return new Vec4(
@@ -220,21 +221,16 @@ export class Vec4 {
     /**
      * The vector fract function returns the vector of fractional parts of each value, i.e. x minus floor(x).
      * @public
-     * @returns {og.math.Vec4}
+     * @returns {Vec4}
      */
     getFrac(v) {
-        return new Vec4(
-            og.math.frac(v.x),
-            og.math.frac(v.y),
-            og.math.frac(v.z),
-            og.math.frac(v.w)
-        );
+        return new Vec4(frac(v.x), frac(v.y), frac(v.z), frac(v.w));
     }
 
     /**
      * Gets vectors dot production.
      * @public
-     * @param {og.math.Vec4} v - Another vector.
+     * @param {math.Vec4} v - Another vector.
      * @returns {number} - Dot product.
      */
     dot(v) {
@@ -258,8 +254,8 @@ export class Vec4 {
  * @param {number} [y] - Second value.
  * @param {number} [z] - Third value.
  * @param {number} [w] - Fourth value.
- * @returns {og.math.Vec4}
+ * @returns {Vec4}
  */
 export function vec4(x, y, z, w) {
-    return new og.math.Vec4(x, y, z, w);
+    return new Vec4(x, y, z, w);
 }

package/src/og/math/coder.js

@@ -2,19 +2,19 @@
  * @module og/math/coder
  */
 
-'use strict';
+"use strict";
 
-import * as math from '../math.js';
-import { Vec4 } from './Vec4.js';
+import * as math from "../math.js";
+import { Vec4 } from "./Vec4.js";
 
 /**
  * Encode 32 bit float value to the RGBA vector.
  * @function
  * @param {number} v - 32 bit float value.
- * @returns {og.math.Vec4} - RGBA vector value.
+ * @returns {math.Vec4} - RGBA vector value.
  */
 export function encodeFloatToRGBA(v) {
-    var enc = new Vec4(1.0 * v % 1, 255.0 * v % 1, 65025.0 * v % 1, 160581375.0 * v % 1);
+    var enc = new Vec4((1.0 * v) % 1, (255.0 * v) % 1, (65025.0 * v) % 1, (160581375.0 * v) % 1);
     var yzww = new Vec4(enc.y / 255, enc.z / 255, enc.w / 255, 0);
     return enc.subA(yzww);
 }
@@ -22,26 +22,26 @@ export function encodeFloatToRGBA(v) {
 /**
  * Decode RGBA vector to 32 bit float value.
  * @function
- * @param {og.Vec4} rgba - RGBA encoded 32 bit float value.
+ * @param {Vec4} rgba - RGBA encoded 32 bit float value.
  * @returns {number} - Float value.
  */
 export function decodeFloatFromRGBA(rgba) {
     var s = 1.0 - math.step(128.0, rgba.x) * 2.0;
     var e = 2.0 * math.mod(rgba.x, 128.0) + math.step(128.0, rgba.y) - 127.0;
-    var m = math.mod(rgba.y, 128.0) * 65536.0 + rgba.z * 256.0 + rgba.w + 8388608.00;
+    var m = math.mod(rgba.y, 128.0) * 65536.0 + rgba.z * 256.0 + rgba.w + 8388608.0;
     return s * math.exp2(e) * (m * 1.1920928955078125e-7);
 }
 
 /**
  * Decode RGBA vector to 32 bit float value.
  * @function
- * @param {og.Vec4} rgba - RGBA encoded 32 bit float value.
+ * @param {Vec4} rgba - RGBA encoded 32 bit float value.
  * @returns {number} - Float value.
  */
 export function decodeFloatFromRGBAArr(arr, use32) {
     var s = 1.0 - math.step(128.0, arr[0]) * 2.0;
     var e = 2.0 * math.mod(arr[0], 128.0) + math.step(128.0, arr[1]) - 127.0;
-    var m = math.mod(arr[1], 128.0) * 65536.0 + arr[2] * 256.0 + (use32 ? arr[3] : 0.0) + 8388608.00;
+    var m = math.mod(arr[1], 128.0) * 65536.0 + arr[2] * 256.0 + (use32 ? arr[3] : 0.0) + 8388608.0;
     return s * math.exp2(e) * (m * 1.1920928955078125e-7);
 }
 
@@ -101,4 +101,4 @@ export function doubleToTwoFloatsV2(value, highLowVec) {
         highLowVec.y = Math.fround(value + doubleHigh);
     }
     return highLowVec;
-}
+}

package/src/og/math.js

@@ -77,7 +77,7 @@ export const EPSILON20 = 1e-20;
  * @param {number} base - Base value.
  * @returns {number} -
  * @example
- * og.math.log(64, 2)
+ * log(64, 2)
  * //returns 6
  */
 export function log(n, base) {
@@ -92,7 +92,7 @@ export function log(n, base) {
  * @param {number} max - Maximal edge.
  * @returns {number} -
  * @example
- * og.math.clamp(12, 1, 5)
+ * clamp(12, 1, 5)
  * //returns 5
  */
 export function clamp(number, min, max) {
@@ -200,9 +200,9 @@ export function mod(m, n) {
  * @returns {number} -
  */
 export function zeroTwoPI(a) {
-    var mod = og.math.mod(a, og.math.TWO_PI);
-    if (Math.abs(mod) < og.math.EPSILON14 && Math.abs(a) > og.math.EPSILON14) {
-        return og.math.TWO_PI;
+    var mod = mod(a, TWO_PI);
+    if (Math.abs(mod) < EPSILON14 && Math.abs(a) > EPSILON14) {
+        return TWO_PI;
     }
     return mod;
 }
@@ -235,7 +235,7 @@ export function frac(x) {
  * @returns {number} -
  */
 export function log2(x) {
-    return Math.log(x) / og.math.LOG2;
+    return Math.log(x) / LOG2;
 }
 
 /**
@@ -299,11 +299,11 @@ export function bezier1v(t, p0, p1, p2, p3) {
  * Performs a 3D bezier interpolation.
  * @function
  * @param {number} t - Interpolation value.
- * @param {og.Vec3} p0 - First control point.
- * @param {og.Vec3} p1 - Second control point.
- * @param {og.Vec3} p2 - Third control point.
- * @param {og.Vec3} p3 - Fourth control point.
- * @returns {og.Vec3} -
+ * @param {Vec3} p0 - First control point.
+ * @param {Vec3} p1 - Second control point.
+ * @param {Vec3} p2 - Third control point.
+ * @param {Vec3} p3 - Fourth control point.
+ * @returns {Vec3} -
  */
 export function bezier3v(t, p0, p1, p2, p3) {
     var u = 1 - t;
@@ -346,7 +346,7 @@ export function norm_lon(lon) {
  * @returns {number} -
  */
 export function negativePItoPI(a) {
-    return og.math.zeroTwoPI(a + Math.PI) - Math.PI;
+    return zeroTwoPI(a + Math.PI) - Math.PI;
 }
 
 /**

package/src/og/proj/EPSG3857.js

@@ -2,12 +2,12 @@
  * @module og/proj/EPSG3857
  */
 
-'use strict';
+"use strict";
 
-import { Units, Proj } from './Proj.js';
+import { Units, Proj } from "./Proj.js";
 
 /**
  * EPSG:3857 projection object.
- * @type {og.Proj}
+ * @type {Proj}
  */
-export const EPSG3857 = new Proj({ code: "epsg:3857", units: Units.METERS });
+export const EPSG3857 = new Proj({ code: "epsg:3857", units: Units.METERS });

package/src/og/proj/EPSG4326.js

@@ -2,12 +2,12 @@
  * @module og/proj/EPSG4326
  */
 
-'use strict';
+"use strict";
 
-import { Units, Proj } from './Proj.js';
+import { Units, Proj } from "./Proj.js";
 
 /**
  * EPSG:4326 projection object.
- * @type {og.Proj}
+ * @type {Proj}
  */
-export const EPSG4326 = new Proj({ code: "epsg:4326", units: Units.DEGREES });
+export const EPSG4326 = new Proj({ code: "epsg:4326", units: Units.DEGREES });

package/src/og/proj/Proj.js

@@ -2,7 +2,7 @@
  * @module og/proj/Proj
  */
 
-'use strict';
+"use strict";
 
 /**
  * Projection units: 'degrees', 'ft', 'm' or 'km'.
@@ -28,9 +28,7 @@ METERS_PER_UNIT[Units.KILOMETERS] = 1000;
 
 let _counter = 0;
 class Proj {
-
     constructor(options) {
-
         /**
          * @public
          * @type {string}
@@ -39,7 +37,7 @@ class Proj {
 
         /**
          * @public
-         * @type {og.proj.Units}
+         * @type {proj.Units}
          */
         this.units = /** @type {Units} */ (options.units);
 
@@ -54,7 +52,7 @@ class Proj {
     /**
      * Compare projections.
      * @public
-     * @param {og.Proj} proj - Projetion object.
+     * @param {Proj} proj - Projetion object.
      * @returns {boolean}
      */
     equal(proj) {
@@ -62,4 +60,4 @@ class Proj {
     }
 }
 
-export { Proj };
+export { Proj };

package/src/og/quadTree/Node.js

@@ -55,13 +55,13 @@ let BOUNDS = {
 /**
  * Quad tree planet segment node.
  * @constructor
- * @param {og.planetSegment.Segment|og.planetSegment.SegmentLonLat} segmentPrototype - Planet segment node constructor.
- * @param {og.scene.RenderNode} planet - Planet render node.
+ * @param {Segment|og.planetSegment.SegmentLonLat} segmentPrototype - Planet segment node constructor.
+ * @param {RenderNode} planet - Planet render node.
  * @param {number} partId - NorthEast, SouthWest etc.
- * @param {og.quadTree.Node} parent - Parent of this node.
+ * @param {quadTree.Node} parent - Parent of this node.
  * @param {number} id - Tree node identifier (id * 4 + 1);
  * @param {number} tileZoom - Deep index of the quad tree.
- * @param {og.Extent} extent - Planet segment extent.
+ * @param {Extent} extent - Planet segment extent.
  */
 class Node {
 
@@ -173,7 +173,7 @@ class Node {
      * Returns the same deep existent neighbour node.
      * @public
      * @param {Number} side - Neighbour side index e.g. og.quadTree.N, og.quadTree.W etc.
-     * @returns {og.quadTree.Node} -
+     * @returns {quadTree.Node} -
      */
     getEqualNeighbor(side) {
         var pn = this;
@@ -279,8 +279,8 @@ class Node {
             }
         }
 
-    if (this.inFrustum || this._cameraInside || seg.tileZoom < 3) {
-        let h = cam._lonLat.height;
+        if (this.inFrustum || this._cameraInside || seg.tileZoom < 3) {
+            let h = cam._lonLat.height;
 
             let altVis =
                 cam.eye.distance(seg.bsphere.center) - seg.bsphere.radius <
@@ -294,7 +294,7 @@ class Node {
 
             if (seg.tileZoom < 2 && seg.normalMapReady) {
                 this.traverseNodes(cam, maxZoom, terrainReadySegment, stopLoading);
-            } else if ((!maxZoom && seg.acceptForRendering(cam)) || seg.tileZoom === maxZoom) {
+            } else if ((!maxZoom && seg.acceptForRendering(cam)) || seg.tileZoom === maxZoom || !altVis && maxZoom) {
                 this.prepareForRendering(cam, altVis, this.inFrustum, terrainReadySegment, stopLoading);
             } else if (seg.tileZoom < planet.terrain._maxNodeZoom && seg.terrainReady) {
                 // Deleting terrainReady here, you have to remove