@openglobus/og 0.14.4 → 0.15.0

package/src/og/control/timeline/timelineUtils.js

@@ -0,0 +1,132 @@
+'use strict';
+
+import * as math from '../../math.js';
+
+export function addSeconds(date, seconds) {
+    return new Date(+date + seconds * 1000);
+}
+
+export function dateToStr(date, showTime = true, showMilliseconds = false) {
+
+    let month = MONTHS[date.getMonth()],
+        day = date.getUTCDate(),
+        year = date.getUTCFullYear();
+
+    if (showTime) {
+        let h = date.getUTCHours().toString().padStart(2, '0'),
+            m = date.getUTCMinutes().toString().padStart(2, '0'),
+            s = date.getUTCSeconds().toString().padStart(2, '0');
+
+        if (showMilliseconds) {
+            let ms = date.getUTCMilliseconds().toString().padStart(3, '0');
+            return `${month} ${day} ${year} ${h}:${m}:${s}.${ms}`;
+        }
+
+        return `${month} ${day} ${year} ${h}:${m}:${s}`;
+    }
+
+    return `${month} ${day} ${year}`;
+}
+
+export function createCanvasHTML() {
+    return document.createElement("canvas");
+}
+
+export function getNearestTimeLeft(t, div) {
+    return t - (t % div);
+}
+
+export function drawNotch(ctx, xOffset = 0, size = 10, thickness = 2, color = "white") {
+    ctx.lineWidth = thickness;
+    ctx.strokeStyle = color;
+    ctx.beginPath();
+    ctx.moveTo(xOffset, 0);
+    ctx.lineTo(xOffset, size);
+    ctx.stroke();
+}
+
+export function drawText(ctx, text, x, y, font = "12px Arial", fillStyle = "black", align = "left", baseLine = "bottom", rotDeg) {
+    ctx.save();
+    ctx.translate(x, y);
+    ctx.rotate(rotDeg * math.RADIANS);
+    ctx.fillStyle = fillStyle;
+    ctx.textBaseline = baseLine;
+    ctx.font = font;
+    ctx.textAlign = align;
+    ctx.fillText(text, 0, 0);
+    ctx.restore();
+}
+
+export const SCALES = [
+    [0.001, 10],
+    [0.002, 10],
+    [0.005, 10],
+    [0.01, 10],
+    [0.02, 10],
+    [0.05, 10],
+    [0.1, 10],
+    [0.25, 10],
+    [0.5, 5],
+    [1.0, 10],
+    [2.0, 10],
+    [5.0, 5],
+    [10.0, 10],
+    [15.0, 15],
+    [30.0, 6],
+    [60.0, 12], // 1min
+    [120.0, 12], // 2min
+    [300.0, 5], // 5min
+    [600.0, 10], // 10min
+    [900.0, 15], // 15min
+    [1800.0, 6], // 30min
+    [3600.0, 12], // 1hr
+    [7200.0, 10], // 2hr
+    [14400.0, 4], // 4hr
+    [21600.0, 6], // 6hr
+    [43200.0, 12], // 12hr
+    [86400.0, 24], // 24hr
+    [172800.0, 2], // 2days
+    [345600.0, 4], // 4days
+    [604800.0, 7], // 7days
+    [1296000.0, 15], // 15days
+    [2592000.0, 5], // 30days
+    [5184000.0, 6], // 60days
+    [7776000.0, 9], // 90days
+    [15552000.0, 18], // 180days
+    [31536000.0, 12], // 365days
+    [63072000.0, 2], // 2years
+    [126144000.0, 4], // 4years
+    [157680000.0, 5], // 5years
+    [315360000.0, 10], // 10years
+    [630720000.0, 2], // 20years
+    [1261440000.0, 4], // 40years
+    [1576800000.0, 5], // 50years
+    [3153600000.0, 10], // 100years
+    [6307200000.0, 2], // 200years
+    [12614400000.0, 4], // 400years
+    [15768000000.0, 5], // 500years
+    [31536000000.0, 10], // 1000years
+];
+
+export function getScale(seconds) {
+    for (let i = 0, len = SCALES.length; i < len; i++) {
+        if (SCALES[i][0] > seconds) {
+            return SCALES[i - 1];
+        }
+    }
+}
+
+export const MONTHS = [
+    "Jan",
+    "Feb",
+    "Mar",
+    "Apr",
+    "May",
+    "Jun",
+    "Jul",
+    "Aug",
+    "Sep",
+    "Oct",
+    "Nov",
+    "Dec",
+];

package/src/og/entity/Entity.js

@@ -438,13 +438,40 @@ class Entity {
 
         let ec = this._entityCollection;
         if (ec && ec.renderNode && ec.renderNode.ellipsoid) {
-            if (Math.abs(lonlat.lat) < mercator.MAX_LAT) {
-                this._lonlatMerc = lonlat.forwardMercator();
+            if (Math.abs(l.lat) < mercator.MAX_LAT) {
+                this._lonlatMerc = l.forwardMercator();
             } else {
                 this._lonlatMerc = null;
             }
 
-            ec.renderNode.ellipsoid.lonLatToCartesianRes(lonlat, this._cartesian);
+            ec.renderNode.ellipsoid.lonLatToCartesianRes(l, this._cartesian);
+            this.setCartesian3v(this._cartesian);
+        }
+    }
+
+    /**
+     * Sets geodetic coordinates of the entity point object.
+     * @public
+     * @param {number} lon - Longitude.
+     * @param {number} lat - Latitude
+     * @param {number} [height] - Height
+     */
+    setLonLat2(lon, lat, height) {
+        let l = this._lonlat;
+
+        l.lon = lon;
+        l.lat = lat;
+        l.height = height != undefined ? height : l.height;
+
+        let ec = this._entityCollection;
+        if (ec && ec.renderNode && ec.renderNode.ellipsoid) {
+            if (Math.abs(l.lat) < mercator.MAX_LAT) {
+                this._lonlatMerc = l.forwardMercator();
+            } else {
+                this._lonlatMerc = null;
+            }
+
+            ec.renderNode.ellipsoid.lonLatToCartesianRes(l, this._cartesian);
             this.setCartesian3v(this._cartesian);
         }
     }

package/src/og/entity/EntityCollection.js

@@ -505,9 +505,7 @@ class EntityCollection {
             this.billboardHandler.setRenderer(renderNode.renderer);
             this.labelHandler.setRenderer(renderNode.renderer);
             this.rayHandler.setRenderer(renderNode.renderer);
-
             this.geoObjectHandler.setRenderNode(renderNode);
-
             this.shapeHandler.setRenderNode(renderNode);
             this.polylineHandler.setRenderNode(renderNode);
             this.pointCloudHandler.setRenderNode(renderNode);

package/src/og/entity/GeoObject.js

@@ -17,11 +17,19 @@ import { Planet } from "../scene/Planet.js";
  */
 
 class GeoObject {
-    constructor(options) {
-        options = options || {};
+    constructor(options = {}) {
 
-        this.scale = options.scale || 1.0;
-        this.scaleByDistance = new Float32Array(options.scaleByDistance || [MAX32, MAX32, MAX32]);
+        this.tag = options.tag || "none";
+
+        // TODO: not instanced
+        this.instanced = true;
+
+        /**
+         * Entity instance that holds this geo object.
+         * @protected
+         * @type {Entity}
+         */
+        this._entity = null;
 
         /**
          * Geo object center cartesian position.
@@ -31,17 +39,14 @@ class GeoObject {
         this._position = utils.createVector3(options.position);
 
         this._positionHigh = new Vec3();
-
         this._positionLow = new Vec3();
-
         Vec3.doubleToTwoFloats(this._position, this._positionHigh, this._positionLow);
 
         this._pitch = options.pitch || 0.0;
         this._yaw = options.yaw || 0.0;
         this._roll = options.roll || 0.0;
 
-        this._planet = options.planet || null;
-        this._lonLatAlt = new LonLat(0, 0, 100000);
+        this._scale = options.scale || 1.0;
 
         /**
          * RGBA color.
@@ -54,25 +59,51 @@ class GeoObject {
 
         this._handler = null;
         this._handlerIndex = -1;
-        this._vertices = options.vertices;
-        this._normals = options.normals;
-        this._indices = options.indices;
-        this.instanced = options.instanced;
-        this.tag = options.tag || "none";
-        if (options.indices) {
-            this._indicesCount = options.indices.length;
-        }
-        if (options.vertices) {
-            this._verticesCount = Math.floor(options.vertices.length / 3);
-        }
+
+        this._tagData = null;
+        this._tagDataIndex = -1;
+
+        this._object3d = options.object3d;
+    }
+
+    getPosition() {
+        return this._position;
+    }
+
+    getPitch() {
+        return this._pitch;
     }
 
-    get planet() {
-        return this._handler && this._handler._planet;
+    getYaw() {
+        return this._yaw;
     }
 
-    get renderer() {
-        return this.planet && this.planet.renderer;
+    getRoll() {
+        return this._roll;
+    }
+
+    getDirection() {
+        return this._direction;
+    }
+
+    get object3d() {
+        return this._object3d;
+    }
+
+    get vertices() {
+        return this._object3d.vertices;
+    }
+
+    get normals() {
+        return this._object3d.normals;
+    }
+
+    get texCoords() {
+        return this._object3d.texCoords;
+    }
+
+    get indices() {
+        return this._object3d.indices;
     }
 
     /**
@@ -86,7 +117,7 @@ class GeoObject {
     }
 
     /**
-     * Sets RGBA color. Each channel from 0.0 to 1.0.
+     * Sets color.
      * @public
      * @param {number} r - Red.
      * @param {number} g - Green.
@@ -98,11 +129,11 @@ class GeoObject {
         this._color.y = g;
         this._color.z = b;
         a != undefined && (this._color.w = a);
-        this._handler && this._handler.setRgbaArr(this._handlerIndex, this._color);
+        this._handler && this._handler.setRgbaArr(this._tagData, this._tagDataIndex, this._color);
     }
 
     /**
-     * Sets RGBA color. Each channel from 0.0 to 1.0.
+     * Sets color.
      * @public
      * @param {og.Vec4} color - RGBA vector.
      */
@@ -111,7 +142,7 @@ class GeoObject {
         this._color.y = color.y;
         this._color.z = color.z;
         color.w != undefined && (this._color.w = color.w);
-        this._handler && this._handler.setRgbaArr(this._handlerIndex, color);
+        this._handler && this._handler.setRgbaArr(this._tagData, this._tagDataIndex, color);
     }
 
     /**
@@ -121,11 +152,11 @@ class GeoObject {
      */
     setVisibility(visibility) {
         this._visibility = visibility;
-        this._handler && this._handler.setVisibility(this._handlerIndex, visibility);
+        this._handler && this._handler.setVisibility(this._tagData, this._tagDataIndex, visibility);
     }
 
     /**
-     * Returns  geo object visibility.
+     * Returns geo object visibility.
      * @public
      * @returns {boolean}
      */
@@ -133,16 +164,8 @@ class GeoObject {
         return this._visibility;
     }
 
-    setLonLat(lon, lat, alt) {
-        this._lonLatAlt.lon = lon;
-        this._lonLatAlt.lat = lat;
-        this._lonLatAlt.height = alt;
-        this._handler._planet.ellipsoid.lonLatToCartesianRes(this._lonLatAlt, this._position);
-        this.setPosition3v(this._position);
-    }
-
     /**
-     * Sets geoObject position.
+     * Sets geo object position.
      * @public
      * @param {number} x - X coordinate.
      * @param {number} y - Y coordinate.
@@ -154,12 +177,12 @@ class GeoObject {
         this._position.z = z;
         Vec3.doubleToTwoFloats(this._position, this._positionHigh, this._positionLow);
         this._handler &&
-            this._handler.setPositionArr(this._handlerIndex, this._positionHigh, this._positionLow);
+        this._handler.setPositionArr(this._tagData, this._tagDataIndex, this._positionHigh, this._positionLow);
         this.updateDirection();
     }
 
     /**
-     * Sets billboard position.
+     * Sets geo object position.
      * @public
      * @param {og.Vec3} position - Cartesian coordinates.
      */
@@ -168,8 +191,7 @@ class GeoObject {
         this._position.y = position.y;
         this._position.z = position.z;
         Vec3.doubleToTwoFloats(position, this._positionHigh, this._positionLow);
-        this._handler &&
-            this._handler.setPositionArr(this._handlerIndex, this._positionHigh, this._positionLow);
+        this._handler && this._handler.setPositionArr(this._tagData, this._tagDataIndex, this._positionHigh, this._positionLow);
         this.updateDirection();
     }
 
@@ -180,21 +202,21 @@ class GeoObject {
 
     setPitch(pitch) {
         this._pitch = pitch;
-        this._handler && this._handler.setPitchRollArr(this._handlerIndex, pitch, this._roll);
+        this._handler && this._handler.setPitchRollArr(this._tagData, this._tagDataIndex, pitch, this._roll);
     }
 
     setRoll(roll) {
         this._roll = roll;
-        this._handler && this._handler.setPitchRollArr(this._handlerIndex, this._pitch, roll);
+        this._handler && this._handler.setPitchRollArr(this._tagData, this._tagDataIndex, this._pitch, roll);
     }
 
     setScale(scale) {
-        this.scale = scale;
-        this._handler && this._handler.setScaleArr(this._handlerIndex, scale);
+        this._scale = scale;
+        this._handler && this._handler.setScaleArr(this._tagData, this._tagDataIndex, scale);
     }
 
     getScale() {
-        return this.scale;
+        return this._scale;
     }
 
     /**
@@ -212,20 +234,14 @@ class GeoObject {
      * @param {og.Vec3} color - Picking color.
      */
     setPickingColor3v(color) {
-        this._handler && this._handler.setPickingColorArr(this._handlerIndex, color);
+        this._handler && this._handler.setPickingColorArr(this._tagData, this._tagDataIndex, color);
     }
 
     updateDirection() {
-        if (this._entity && this._entity.renderNode && this._entity.renderNode.ellipsoid) {
-            this._entity.renderNode.ellipsoid.lonLatToCartesianRes(this._lonLatAlt, this._position);
-        }
         this._qNorthFrame = Planet.getBearingNorthRotationQuat(this._position);
-
-        let qq = Quat.yRotation(this._yaw * RADIANS)
-            .mul(this._qNorthFrame)
-            .conjugate();
+        let qq = Quat.yRotation(this._yaw).mul(this._qNorthFrame).conjugate();
         this._direction = qq.mulVec3(new Vec3(0.0, 0.0, -1.0)).normalize();
-        this._handler && this._handler.setDirectionArr(this._handlerIndex, this._direction);
+        this._handler && this._handler.setDirectionArr(this._tagData, this._tagDataIndex, this._direction);
     }
 }