@openglobus/og 0.10.6 → 0.11.1

package/src/og/math/Vec4.js

@@ -14,251 +14,252 @@ import { Vec3 } from './Vec3.js';
  * @param {number} [z] - Third value.
  * @param {number} [w] - Fourth value.
  */
-const Vec4 = function (x, y, z, w) {
+export class Vec4 {
+
+    constructor(x, y, z, w) {
+
+        /**
+         * @public
+         * @type {number}
+         */
+        this.x = x || 0.0;
+
+        /**
+         * @public
+         * @type {number}
+         */
+        this.y = y || 0.0;
+
+        /**
+         * @public
+         * @type {number}
+         */
+        this.z = z || 0.0;
+
+        /**
+         * @public
+         * @type {number}
+         */
+        this.w = w || 0.0;
+    };
 
     /**
-     * @public
-     * @type {number}
+     * Identity vector [0,0,0,1].
+     * @const
+     * @type {og.math.Vec4}
      */
-    this.x = x || 0.0;
+    static get identity() { return new Vec4(0, 0, 0, 1) };
 
     /**
-     * @public
-     * @type {number}
+     * Creates 4d vector from array.
+     * @function
+     * @param {Array.<number,number,number,number>}
+     * @returns {og.math.Vec4}
      */
-    this.y = y || 0.0;
+    static fromVec(arr) {
+        return new Vec4(arr[0], arr[1], arr[2], arr[3]);
+    };
 
     /**
+     * Converts to 3d vector, without fourth value.
      * @public
-     * @type {number}
+     * @returns {og.Vec3}
      */
-    this.z = z || 0.0;
+    toVec3() {
+        return new Vec3(this.x, this.y, this.z);
+    };
 
     /**
+     * Returns clone vector.
      * @public
-     * @type {number}
+     * @returns {og.math.Vec4}
      */
-    this.w = w || 0.0;
-};
-
-/**
- * Identity vector [0,0,0,1].
- * @const
- * @type {og.math.Vec4}
- */
-Vec4.identity = new Vec4(0, 0, 0, 1);
-
-/**
- * Vector 4d object creator.
- * @function
- * @param {number} [x] - First cvalue.
- * @param {number} [y] - Second value.
- * @param {number} [z] - Third value.
- * @param {number} [w] - Fourth value.
- * @returns {og.math.Vec4}
- */
-export function vec4(x, y, z, w) {
-    return new og.math.Vec4(x, y, z, w);
-};
+    clone(v) {
+        return new Vec4(this.x, this.y, this.z, this.w);
+    };
 
-/**
- * Creates 4d vector from array.
- * @function
- * @param {Array.<number,number,number,number>}
- * @returns {og.math.Vec4}
- */
-Vec4.fromVec = function (arr) {
-    return new Vec4(arr[0], arr[1], arr[2], arr[3]);
-};
+    /**
+     * Compares with vector. Returns true if it equals another.
+     * @public
+     * @param {og.math.Vec4} p - Vector to compare.
+     * @returns {boolean}
+     */
+    equal(v) {
+        return this.x === v.x && this.y === v.y && this.z === v.z && this.w === v.w;
+    };
 
-/**
- * Converts to 3d vector, without fourth value.
- * @public
- * @returns {og.Vec3}
- */
-Vec4.prototype.toVec3 = function () {
-    return new Vec3(this.x, this.y, this.z);
-};
+    /**
+     * Copy input vector's values.
+     * @param {og.math.Vec4} v - Vector to copy.
+     * @returns {og.math.Vec4}
+     */
+    copy(v) {
+        this.x = v.x;
+        this.y = v.y;
+        this.z = v.z;
+        this.w = v.w;
+        return this;
+    };
 
-/**
- * Returns clone vector.
- * @public
- * @returns {og.math.Vec4}
- */
-Vec4.prototype.clone = function (v) {
-    return new Vec4(this.x, this.y, this.z, this.w);
-};
+    /**
+     * Converts vector to a number array.
+     * @public
+     * @returns {Array.<number,number,number,number>}
+     * @deprecated
+     */
+    toVec() {
+        return [this.x, this.y, this.z, this.w];
+    };
 
-/**
- * Compares with vector. Returns true if it equals another.
- * @public
- * @param {og.math.Vec4} p - Vector to compare.
- * @returns {boolean}
- */
-Vec4.prototype.equal = function (v) {
-    return this.x === v.x && this.y === v.y && this.z === v.z && this.w === v.w;
-};
+    /**
+     * Converts vector to a number array.
+     * @public
+     * @returns {Array.<number,number,number,number>}
+     */
+    toArray() {
+        return [this.x, this.y, this.z, this.w];
+    };
 
-/**
- * Copy input vector's values.
- * @param {og.math.Vec4} v - Vector to copy.
- * @returns {og.math.Vec4}
- */
-Vec4.prototype.copy = function (v) {
-    this.x = v.x;
-    this.y = v.y;
-    this.z = v.z;
-    this.w = v.w;
-    return this;
-};
+    /**
+     * Sets vector's values.
+     * @public
+     * @param {number} x - Value X.
+     * @param {number} y - Value Y.
+     * @param {number} z - Value Z.
+     * @param {number} w - Value W.
+     * @returns {og.math.Vec4}
+     */
+    set(x, y, z, w) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.w = w;
+        return this;
+    };
 
-/**
- * Converts vector to a number array.
- * @public
- * @returns {Array.<number,number,number,number>}
- * @deprecated
- */
-Vec4.prototype.toVec = function () {
-    return [this.x, this.y, this.z, this.w];
-};
+    /**
+     * Adds vector to the current.
+     * @public
+     * @param {og.math.Vec4}
+     * @returns {og.math.Vec4}
+     */
+    addA(v) {
+        this.x += v.x;
+        this.y += v.y;
+        this.z += v.z;
+        this.w += v.w;
+        return this;
+    };
 
-/**
- * Converts vector to a number array.
- * @public
- * @returns {Array.<number,number,number,number>}
- */
-Vec4.prototype.toArray = function () {
-    return [this.x, this.y, this.z, this.w];
-};
+    /**
+     * Subtract vector from the current.
+     * @public
+     * @param {og.math.Vec4} v - Subtract vector.
+     * @returns {og.math.Vec4}
+     */
+    subA(v) {
+        this.x -= v.x;
+        this.y -= v.y;
+        this.z -= v.z;
+        this.w -= v.w;
+        return this;
+    };
 
-/**
- * Sets vector's values.
- * @public
- * @param {number} x - Value X.
- * @param {number} y - Value Y.
- * @param {number} z - Value Z.
- * @param {number} w - Value W.
- * @returns {og.math.Vec4}
- */
-Vec4.prototype.set = function (x, y, z, w) {
-    this.x = x;
-    this.y = y;
-    this.z = z;
-    this.w = w;
-    return this;
-};
+    /**
+     * Scale current vector.
+     * @public
+     * @param {number} scale - Scale value.
+     * @returns {og.math.Vec4}
+     */
+    scale(scale) {
+        this.x *= scale;
+        this.y *= scale;
+        this.z *= scale;
+        this.w *= scale;
+        return this;
+    };
 
-/**
- * Adds vector to the current.
- * @public
- * @param {og.math.Vec4}
- * @returns {og.math.Vec4}
- */
-Vec4.prototype.addA = function (v) {
-    this.x += v.x;
-    this.y += v.y;
-    this.z += v.z;
-    this.w += v.w;
-    return this;
-};
+    /**
+     * Makes vector affinity. Thereby fourh component becomes to 1.0.
+     * @public
+     * @returns {og.math.Vec4}
+     */
+    affinity() {
+        var iw = 1 / this.w;
+        this.x *= iw;
+        this.y *= iw;
+        this.z *= iw;
+        this.w = 1.0;
+        return this;
+    };
 
-/**
- * Subtract vector from the current.
- * @public
- * @param {og.math.Vec4} v - Subtract vector.
- * @returns {og.math.Vec4}
- */
-Vec4.prototype.subA = function (v) {
-    this.x -= v.x;
-    this.y -= v.y;
-    this.z -= v.z;
-    this.w -= v.w;
-    return this;
-};
+    /**
+     * Scale current vector to another instance.
+     * @public
+     * @param {number} scale - Scale value.
+     * @returns {og.Vec3}
+     */
+    scaleTo(scale) {
+        return new Vec4(this.x * scale, this.y * scale, this.z * scale, this.w * scale);
+    };
 
-/**
- * Scale current vector.
- * @public
- * @param {number} scale - Scale value.
- * @returns {og.math.Vec4}
- */
-Vec4.prototype.scale = function (scale) {
-    this.x *= scale;
-    this.y *= scale;
-    this.z *= scale;
-    this.w *= scale;
-    return this;
-};
+    /**
+     * 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}
+     */
+    getStep(edge) {
+        return new Vec4(
+            this.x < edge ? 0.0 : 1.0,
+            this.y < edge ? 0.0 : 1.0,
+            this.z < edge ? 0.0 : 1.0,
+            this.w < edge ? 0.0 : 1.0
+        );
+    };
 
-/**
- * Makes vector affinity. Thereby fourh component becomes to 1.0.
- * @public
- * @returns {og.math.Vec4}
- */
-Vec4.prototype.affinity = function () {
-    var iw = 1 / this.w;
-    this.x *= iw;
-    this.y *= iw;
-    this.z *= iw;
-    this.w = 1.0;
-    return this;
-};
+    /**
+     * The vector fract function returns the vector of fractional parts of each value, i.e. x minus floor(x).
+     * @public
+     * @returns {og.math.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)
+        );
+    };
 
-/**
- * Scale current vector to another instance.
- * @public
- * @param {number} scale - Scale value.
- * @returns {og.Vec3}
- */
-Vec4.prototype.scaleTo = function (scale) {
-    return new Vec4(this.x * scale, this.y * scale, this.z * scale, this.w * scale);
-};
+    /**
+     * Gets vectors dot production.
+     * @public
+     * @param {og.math.Vec4} v - Another vector.
+     * @returns {number} - Dot product.
+     */
+    dot(v) {
+        return v.x * this.x + v.y * this.y + v.z * this.z + v.w * this.w;
+    };
 
-/**
- * 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}
- */
-Vec4.prototype.getStep = function (edge) {
-    return new Vec4(
-        this.x < edge ? 0.0 : 1.0,
-        this.y < edge ? 0.0 : 1.0,
-        this.z < edge ? 0.0 : 1.0,
-        this.w < edge ? 0.0 : 1.0
-    );
-};
+    /**
+     * Returns true if vector's values are zero.
+     * @public
+     * @returns {boolean} -
+     */
+    isZero() {
+        return !(this.x || this.y || this.z || this.w);
+    };
+}
 
 /**
- * The vector fract function returns the vector of fractional parts of each value, i.e. x minus floor(x).
- * @public
+ * Vector 4d object creator.
+ * @function
+ * @param {number} [x] - First cvalue.
+ * @param {number} [y] - Second value.
+ * @param {number} [z] - Third value.
+ * @param {number} [w] - Fourth value.
  * @returns {og.math.Vec4}
  */
-Vec4.prototype.getFrac = function (v) {
-    return new Vec4(
-        og.math.frac(v.x),
-        og.math.frac(v.y),
-        og.math.frac(v.z),
-        og.math.frac(v.w)
-    );
-};
-
-/**
- * Gets vectors dot production.
- * @public
- * @param {og.math.Vec4} v - Another vector.
- * @returns {number} - Dot product.
- */
-Vec4.prototype.dot = function (v) {
-    return v.x * this.x + v.y * this.y + v.z * this.z + v.w * this.w;
-};
-
-/**
- * Returns true if vector's values are zero.
- * @public
- * @returns {boolean} -
- */
-Vec4.prototype.isZero = function () {
-    return !(this.x || this.y || this.z || this.w);
+export function vec4(x, y, z, w) {
+    return new og.math.Vec4(x, y, z, w);
 };
-
-export { Vec4 };

package/src/og/scene/Planet.js

@@ -100,7 +100,7 @@ const EVENT_NAMES = [
  * @fires og.scene.Planet#layervisibilitychange
  * @fires og.scene.Planet#geoimageadd
  */
-class Planet extends RenderNode {
+export class Planet extends RenderNode {
     constructor(options = {}) {
         super(options.name);
 
@@ -675,6 +675,10 @@ class Planet extends RenderNode {
             }
         }
 
+        this.renderer.events.on("resize", () => {
+            this._renderCompletedActivated = false;
+        });
+
         // Initialize texture coordinates buffer pool
         this._textureCoordsBufferCache = [];
 
@@ -1092,7 +1096,9 @@ class Planet extends RenderNode {
         gl.disable(gl.POLYGON_OFFSET_FILL);
 
         if (frustumIndex === cam.FARTHEST_FRUSTUM_INDEX) {
-            this._collectRenderNodes();
+            if (!this._renderCompletedActivated || this.camera._moved) {
+                this._collectRenderNodes();
+            }
 
             // Here is the planet node dispatches a draw event before
             // rendering begins and we have got render nodes.
@@ -1696,6 +1702,9 @@ class Planet extends RenderNode {
      * @param {og.Vec3} [look] - Camera "look at" point.
      * @param {og.Vec3} [up] - Camera UP vector on the end of a flying.
      * @param {Number} [ampl] - Altitude amplitude factor.
+     * @param [completeCallback]
+     * @param [startCallback]
+     * @param [frameCallback]
      */
     flyCartesian(cartesian, look, up, ampl, completeCallback, startCallback, frameCallback) {
         this.renderer.activeCamera.flyCartesian(
@@ -1716,6 +1725,9 @@ class Planet extends RenderNode {
      * @param {og.Vec3} [look] - Camera "look at" point on the end of a flying.
      * @param {og.Vec3} [up] - Camera UP vector on the end of a flying.
      * @param {Number} [ampl] - Altitude amplitude factor.
+     * @param [completeCallback]
+     * @param [startCallback]
+     * @param [frameCallback]
      */
     flyLonLat(lonlat, look, up, ampl, completeCallback, startCallback, frameCallback) {
         this.renderer.activeCamera.flyLonLat(
@@ -1766,5 +1778,3 @@ class Planet extends RenderNode {
         }
     }
 }
-
-export { Planet };

package/src/og/segment/SegmentLonLat.js

@@ -93,6 +93,13 @@ SegmentLonLat.prototype._assignTileIndexes = function () {
         );
     }
 
+    var p2 = Math.pow(2, tileZoom);
+    this.tileXE = (this.tileX + 1) % p2;
+    this.tileXW = (p2 + this.tileX - 1) % p2;
+
+    this.tileYN = this.tileY - 1;
+    this.tileYS = this.tileY + 1;
+
     this.tileIndex = Layer.getTileIndex(this.tileX, this.tileY, tileZoom);
 };
 

package/src/og/terrain/GlobusTerrain.js

@@ -51,6 +51,10 @@ const EVENT_NAMES = [
  * @fires og.terrain.GlobusTerrain#loadend
  */
 class GlobusTerrain extends EmptyTerrain {
+    /**
+     * @param {string} [name]
+     * @param {*} [options]
+     */
     constructor(name, options) {
         super();