@openglobus/og 0.11.5 → 0.11.6

package/src/og/entity/EntityCollection.js

@@ -2,17 +2,18 @@
  * @module og/entity/EntityCollection
  */
 
-'use strict';
-
-import * as math from '../math.js';
-import { BillboardHandler } from './BillboardHandler.js';
-import { Events } from '../Events.js';
-import { LabelHandler } from './LabelHandler.js';
-import { PolylineHandler } from './PolylineHandler.js';
-import { RayHandler } from './RayHandler.js';
-import { PointCloudHandler } from './PointCloudHandler.js';
-import { StripHandler } from './StripHandler.js';
-import { ShapeHandler } from './ShapeHandler.js';
+"use strict";
+
+import * as math from "../math.js";
+import { BillboardHandler } from "./BillboardHandler.js";
+import { Events } from "../Events.js";
+import { LabelHandler } from "./LabelHandler.js";
+import { PolylineHandler } from "./PolylineHandler.js";
+import { RayHandler } from "./RayHandler.js";
+import { PointCloudHandler } from "./PointCloudHandler.js";
+import { StripHandler } from "./StripHandler.js";
+import { ShapeHandler } from "./ShapeHandler.js";
+import { GeoObjectHandler } from "./GeoObjectHandler.js";
 
 /**
  * An observable collection of og.Entity instances where each entity has a unique id.
@@ -65,7 +66,6 @@ import { ShapeHandler } from './ShapeHandler.js';
  */
 class EntityCollection {
     constructor(options) {
-
         options = options || {};
 
         /**
@@ -101,14 +101,16 @@ class EntityCollection {
          * @public
          * @type {Number}
          */
-        this.polygonOffsetFactor = options.polygonOffsetFactor != undefined ? options.polygonOffsetFactor : 0.0;
+        this.polygonOffsetFactor =
+            options.polygonOffsetFactor != undefined ? options.polygonOffsetFactor : 0.0;
 
         /**
          * Specifies the scale Units for gl.polygonOffset function to calculate depth values, 0.0 is default.
          * @public
          * @type {Number}
          */
-        this.polygonOffsetUnits = options.polygonOffsetUnits != undefined ? options.polygonOffsetUnits : 0.0;
+        this.polygonOffsetUnits =
+            options.polygonOffsetUnits != undefined ? options.polygonOffsetUnits : 0.0;
 
         /**
          * Billboards handler
@@ -159,6 +161,13 @@ class EntityCollection {
          */
         this.stripHandler = new StripHandler(this);
 
+        /**
+         * Geo object handler
+         * @public
+         * @type {og.GeoObjectHandler}
+         */
+        this.geoObjectHandler = new GeoObjectHandler(this);
+
         if (options.pickingEnabled != undefined) {
             this.setPickingEnabled(options.pickingEnabled);
         }
@@ -268,6 +277,7 @@ class EntityCollection {
         this.shapeHandler.pickingEnabled = enable;
         this.pointCloudHandler.pickingEnabled = enable;
         this.stripHandler.pickingEnabled = enable;
+        this.geoObjectHandler.pickingEnabled = enable;
     }
 
     /**
@@ -293,7 +303,6 @@ class EntityCollection {
     }
 
     _addRecursively(entity) {
-
         // billboard
         entity.billboard && this.billboardHandler.add(entity.billboard);
 
@@ -315,6 +324,9 @@ class EntityCollection {
         // strip
         entity.strip && this.stripHandler.add(entity.strip);
 
+        //geoObject
+        entity.geoObject && this.geoObjectHandler.add(entity.geoObject);
+
         this.events.dispatch(this.events.entityadd, entity);
 
         for (var i = 0; i < entity.childrenNodes.length; i++) {
@@ -369,7 +381,10 @@ class EntityCollection {
      * @returns {boolean} -
      */
     belongs(entity) {
-        return (entity._entityCollection && this._renderNodeIndex === entity._entityCollection._renderNodeIndex);
+        return (
+            entity._entityCollection &&
+            this._renderNodeIndex === entity._entityCollection._renderNodeIndex
+        );
     }
 
     _removeRecursively(entity) {
@@ -397,6 +412,9 @@ class EntityCollection {
         // strip
         entity.strip && this.stripHandler.remove(entity.strip);
 
+        // geoObject
+        entity.geoObject && this.geoObjectHandler.remove(entity.geoObject);
+
         for (var i = 0; i < entity.childrenNodes.length; i++) {
             this._removeRecursively(entity.childrenNodes[i]);
         }
@@ -493,13 +511,13 @@ class EntityCollection {
      * @param {RenderNode} renderNode
      */
     bindRenderNode(renderNode) {
-
         if (renderNode.renderer) {
-
             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);
@@ -542,9 +560,10 @@ class EntityCollection {
      */
     updateLabelsFontAtlas() {
         if (this.renderNode) {
-            var l = this.labelHandler._billboards;
-            for (var i = 0; i < l.length; i++) {
-                l[i].assignFontAtlas(this.renderNode.renderer.fontAtlas);
+            var l = [].concat(this.labelHandler._billboards);
+            this.labelHandler._billboards = [];
+            for (var i = 0; i < l.length; i++) {
+                this.labelHandler.assignFontAtlas(l[i]);
             }
         }
     }
@@ -558,7 +577,11 @@ class EntityCollection {
             if (this._renderNodeIndex !== -1) {
                 this.renderNode.entityCollections.splice(this._renderNodeIndex, 1);
                 // reindex in the renderNode
-                for (var i = this._renderNodeIndex; i < this.renderNode.entityCollections.length; i++) {
+                for (
+                    var i = this._renderNodeIndex;
+                    i < this.renderNode.entityCollections.length;
+                    i++
+                ) {
                     this.renderNode.entityCollections._renderNodeIndex = i;
                 }
             }
@@ -595,7 +618,6 @@ class EntityCollection {
      * @public
      */
     clear() {
-
         // TODO: Optimize by replace delete
         // code to the clearEntity function.
         this.billboardHandler.clear();
@@ -605,6 +627,7 @@ class EntityCollection {
         this.rayHandler.clear();
         this.pointCloudHandler.clear();
         this.stripHandler.clear();
+        this.geoObjectHandler.clear();
 
         var i = this._entities.length;
         while (i--) {
@@ -833,4 +856,4 @@ const EVENT_NAMES = [
     "touchenter"
 ];
 
-export { EntityCollection };
+export { EntityCollection };

package/src/og/entity/GeoObject.js

@@ -0,0 +1,228 @@
+/**
+ * @module og/shape/BaseShape
+ */
+
+"use strict";
+
+import { Quat, Vec3 } from "../math/index.js";
+import { MAX32, RADIANS, lerp } from "../math.js";
+import { LonLat } from "../LonLat.js";
+import * as utils from "../utils/shared.js";
+import { Planet } from "../scene/Planet.js";
+
+/**
+ * @class
+ * @param {Object} options -  Geo object parameters:
+ * @param {og.Vec3} [options.position] - Geo object position.
+ */
+
+class GeoObject {
+    constructor(options) {
+        options = options || {};
+
+        this.scale = options.scale || 0.02;
+        this.scaleByDistance = new Float32Array(options.scaleByDistance || [MAX32, MAX32, MAX32]);
+
+        /**
+         * Geo object center cartesian position.
+         * @protected
+         * @type {og.Vec3}
+         */
+        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);
+
+        /**
+         * RGBA color.
+         * @protected
+         * @type {og.Vec4}
+         */
+        this._color = utils.createColorRGBA(options.color);
+
+        this._direction = new Vec3(0, 0, 0);
+
+        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);
+        }
+    }
+
+    get planet() {
+        return this._handler && this._handler._planet;
+    }
+
+    get renderer() {
+        return this.planet && this.planet.renderer;
+    }
+
+    /**
+     * Sets geo object opacity.
+     * @public
+     * @param {number} a - Billboard opacity.
+     */
+    setOpacity(a) {
+        this._color.w = a;
+        this.setColor(this._color.x, this._color.y, this._color.z, a);
+    }
+
+    /**
+     * Sets RGBA color. Each channel from 0.0 to 1.0.
+     * @public
+     * @param {number} r - Red.
+     * @param {number} g - Green.
+     * @param {number} b - Blue.
+     * @param {number} a - Alpha.
+     */
+    setColor(r, g, b, a) {
+        this._color.x = r;
+        this._color.y = g;
+        this._color.z = b;
+        a != undefined && (this._color.w = a);
+        this._handler && this._handler.setRgbaArr(this._handlerIndex, this._color);
+    }
+
+    /**
+     * Sets RGBA color. Each channel from 0.0 to 1.0.
+     * @public
+     * @param {og.Vec4} color - RGBA vector.
+     */
+    setColor4v(color) {
+        this._color.x = color.x;
+        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);
+    }
+
+    /**
+     * Sets geo object visibility.
+     * @public
+     * @param {boolean} visibility - Visibility flag.
+     */
+    setVisibility(visibility) {
+        this._visibility = visibility;
+        this._handler && this._handler.setVisibility(this._handlerIndex, visibility);
+    }
+
+    /**
+     * Returns  geo object visibility.
+     * @public
+     * @returns {boolean}
+     */
+    getVisibility() {
+        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.
+     * @public
+     * @param {number} x - X coordinate.
+     * @param {number} y - Y coordinate.
+     * @param {number} z - Z coordinate.
+     */
+    setPosition(x, y, z) {
+        this._position.x = x;
+        this._position.y = y;
+        this._position.z = z;
+        Vec3.doubleToTwoFloats(this._position, this._positionHigh, this._positionLow);
+        this._handler &&
+            this._handler.setPositionArr(this._handlerIndex, this._positionHigh, this._positionLow);
+        this.updateDirection();
+    }
+
+    /**
+     * Sets billboard position.
+     * @public
+     * @param {og.Vec3} position - Cartesian coordinates.
+     */
+    setPosition3v(position) {
+        this._position.x = position.x;
+        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.updateDirection();
+    }
+
+    setYaw(yaw) {
+        this._yaw = yaw;
+        this.updateDirection();
+    }
+
+    setPitch(pitch) {
+        this._pitch = pitch;
+        this._handler && this._handler.setPitchRollArr(this._handlerIndex, pitch, this._roll);
+    }
+
+    setRoll(roll) {
+        this._roll = roll;
+        this._handler && this._handler.setPitchRollArr(this._handlerIndex, this._pitch, roll);
+    }
+
+    setScale(scale) {
+        this.scale = scale;
+        this._handler && this._handler.setScaleArr(this._handlerIndex, scale);
+    }
+
+    /**
+     * Removes geo object from handler.
+     * @public
+     */
+    remove() {
+        this._entity = null;
+        this._handler && this._handler.remove(this);
+    }
+
+    /**
+     * Sets billboard picking color.
+     * @public
+     * @param {og.Vec3} color - Picking color.
+     */
+    setPickingColor3v(color) {
+        this._handler && this._handler.setPickingColorArr(this._handlerIndex, 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();
+        this._direction = qq.mulVec3(new Vec3(0.0, 0.0, -1.0)).normalize();
+        this._handler && this._handler.setDirectionArr(this._handlerIndex, this._direction);
+    }
+}
+
+export { GeoObject };