@openglobus/og 0.11.4 → 0.11.8

package/src/og/entity/BillboardHandler.js

@@ -2,10 +2,11 @@
  * @module og/entity/BillboardHandler
  */
 
-'use strict';
+"use strict";
 
-import * as shaders from '../shaders/billboard.js';
-import { concatTypedArrays, spliceTypedArray } from '../utils/shared.js';
+import * as shaders from "../shaders/billboard.js";
+import { concatTypedArrays, spliceTypedArray } from "../utils/shared.js";
+import { LOCK_UPDATE, LOCK_FREE } from "./LabelWorker.js";
 
 const PICKINGCOLOR_BUFFER = 0;
 const POSITION_BUFFER = 1;
@@ -24,11 +25,10 @@ const ALIGNEDAXIS_BUFFER = 8;
  */
 class BillboardHandler {
     /**
-     * 
-     * @param {*} entityCollection 
+     *
+     * @param {*} entityCollection
      */
     constructor(entityCollection) {
-
         /**
          * Picking rendering option.
          * @public
@@ -81,6 +81,10 @@ class BillboardHandler {
         this.__staticId = BillboardHandler._staticCounter++;
     }
 
+    isEqual(handler) {
+        return handler && (handler.__staticId === this.__staticId);
+    }
+
     static get _staticCounter() {
         if (!this._counter && this._counter !== 0) {
             this._counter = 0;
@@ -100,7 +104,6 @@ class BillboardHandler {
 
     initProgram() {
         if (this._renderer.handler) {
-
             if (!this._renderer.handler.programs.billboard) {
                 this._renderer.handler.addProgram(shaders.billboard_screen());
             }
@@ -129,13 +132,14 @@ class BillboardHandler {
             var bi = this._billboards[i];
             bi._handlerIndex = -1;
             bi._handler = null;
+            bi._isReady = false;
+            bi._lockId = LOCK_FREE;
         }
         this._billboards.length = 0;
         this._billboards = [];
     }
 
     clear() {
-
         this._texCoordArr = null;
         this._vertexArr = null;
         this._positionHighArr = null;
@@ -204,6 +208,7 @@ class BillboardHandler {
 
     add(billboard) {
         if (billboard._handlerIndex == -1) {
+            billboard._isReady = true;
             billboard._handler = this;
             billboard._handlerIndex = this._billboards.length;
             this._billboards.push(billboard);
@@ -215,36 +220,180 @@ class BillboardHandler {
 
     _addBillboardToArrays(billboard) {
         if (billboard._visibility) {
-            this._vertexArr = concatTypedArrays(this._vertexArr, [-0.5, 0.5, -0.5, -0.5, 0.5, -0.5, 0.5, -0.5, 0.5, 0.5, -0.5, 0.5]);
+            this._vertexArr = concatTypedArrays(
+                this._vertexArr,
+                [-0.5, 0.5, -0.5, -0.5, 0.5, -0.5, 0.5, -0.5, 0.5, 0.5, -0.5, 0.5]
+            );
         } else {
-            this._vertexArr = concatTypedArrays(this._vertexArr, [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+            this._vertexArr = concatTypedArrays(
+                this._vertexArr,
+                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+            );
         }
 
-        this._texCoordArr = concatTypedArrays(this._texCoordArr, [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
-
-        var x = billboard._positionHigh.x, y = billboard._positionHigh.y, z = billboard._positionHigh.z, w;
-        this._positionHighArr = concatTypedArrays(this._positionHighArr, [x, y, z, x, y, z, x, y, z, x, y, z, x, y, z, x, y, z]);
-
-        x = billboard._positionLow.x; y = billboard._positionLow.y; z = billboard._positionLow.z;
-        this._positionLowArr = concatTypedArrays(this._positionLowArr, [x, y, z, x, y, z, x, y, z, x, y, z, x, y, z, x, y, z]);
-
-        x = billboard._width; y = billboard._height;
+        this._texCoordArr = concatTypedArrays(
+            this._texCoordArr,
+            [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+        );
+
+        var x = billboard._positionHigh.x,
+            y = billboard._positionHigh.y,
+            z = billboard._positionHigh.z,
+            w;
+        this._positionHighArr = concatTypedArrays(this._positionHighArr, [
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z
+        ]);
+
+        x = billboard._positionLow.x;
+        y = billboard._positionLow.y;
+        z = billboard._positionLow.z;
+        this._positionLowArr = concatTypedArrays(this._positionLowArr, [
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z
+        ]);
+
+        x = billboard._width;
+        y = billboard._height;
         this._sizeArr = concatTypedArrays(this._sizeArr, [x, y, x, y, x, y, x, y, x, y, x, y]);
 
-        x = billboard._offset.x; y = billboard._offset.y; z = billboard._offset.z;
-        this._offsetArr = concatTypedArrays(this._offsetArr, [x, y, z, x, y, z, x, y, z, x, y, z, x, y, z, x, y, z]);
-
-        x = billboard._color.x; y = billboard._color.y; z = billboard._color.z; w = billboard._color.w;
-        this._rgbaArr = concatTypedArrays(this._rgbaArr, [x, y, z, w, x, y, z, w, x, y, z, w, x, y, z, w, x, y, z, w, x, y, z, w]);
+        x = billboard._offset.x;
+        y = billboard._offset.y;
+        z = billboard._offset.z;
+        this._offsetArr = concatTypedArrays(this._offsetArr, [
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z
+        ]);
+
+        x = billboard._color.x;
+        y = billboard._color.y;
+        z = billboard._color.z;
+        w = billboard._color.w;
+        this._rgbaArr = concatTypedArrays(this._rgbaArr, [
+            x,
+            y,
+            z,
+            w,
+            x,
+            y,
+            z,
+            w,
+            x,
+            y,
+            z,
+            w,
+            x,
+            y,
+            z,
+            w,
+            x,
+            y,
+            z,
+            w,
+            x,
+            y,
+            z,
+            w
+        ]);
 
         x = billboard._rotation;
         this._rotationArr = concatTypedArrays(this._rotationArr, [x, x, x, x, x, x]);
 
-        x = billboard._alignedAxis.x; y = billboard._alignedAxis.y; z = billboard._alignedAxis.z;
-        this._alignedAxisArr = concatTypedArrays(this._alignedAxisArr, [x, y, z, x, y, z, x, y, z, x, y, z, x, y, z, x, y, z]);
-
-        x = billboard._entity._pickingColor.x / 255; y = billboard._entity._pickingColor.y / 255; z = billboard._entity._pickingColor.z / 255;
-        this._pickingColorArr = concatTypedArrays(this._pickingColorArr, [x, y, z, x, y, z, x, y, z, x, y, z, x, y, z, x, y, z]);
+        x = billboard._alignedAxis.x;
+        y = billboard._alignedAxis.y;
+        z = billboard._alignedAxis.z;
+        this._alignedAxisArr = concatTypedArrays(this._alignedAxisArr, [
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z
+        ]);
+
+        x = billboard._entity._pickingColor.x / 255;
+        y = billboard._entity._pickingColor.y / 255;
+        z = billboard._entity._pickingColor.z / 255;
+        this._pickingColorArr = concatTypedArrays(this._pickingColorArr, [
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z,
+            x,
+            y,
+            z
+        ]);
     }
 
     _displayPASS() {
@@ -272,19 +421,43 @@ class BillboardHandler {
 
         gl.uniform1f(shu.uOpacity, ec._fadingOpacity);
 
-        gl.uniform2fv(shu.uFloatParams, [ec.renderNode._planetRadius2 || 0, r.activeCamera._tanViewAngle_hradOneByHeight]);
+        gl.uniform2fv(shu.uFloatParams, [
+            ec.renderNode._planetRadius2 || 0,
+            r.activeCamera._tanViewAngle_hradOneByHeight
+        ]);
 
         gl.bindBuffer(gl.ARRAY_BUFFER, this._texCoordBuffer);
-        gl.vertexAttribPointer(sha.a_texCoord, this._texCoordBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.vertexAttribPointer(
+            sha.a_texCoord,
+            this._texCoordBuffer.itemSize,
+            gl.FLOAT,
+            false,
+            0,
+            0
+        );
 
         gl.bindBuffer(gl.ARRAY_BUFFER, this._vertexBuffer);
         gl.vertexAttribPointer(sha.a_vertices, this._vertexBuffer.itemSize, gl.FLOAT, false, 0, 0);
 
         gl.bindBuffer(gl.ARRAY_BUFFER, this._positionHighBuffer);
-        gl.vertexAttribPointer(sha.a_positionsHigh, this._positionHighBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.vertexAttribPointer(
+            sha.a_positionsHigh,
+            this._positionHighBuffer.itemSize,
+            gl.FLOAT,
+            false,
+            0,
+            0
+        );
 
         gl.bindBuffer(gl.ARRAY_BUFFER, this._positionLowBuffer);
-        gl.vertexAttribPointer(sha.a_positionsLow, this._positionLowBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.vertexAttribPointer(
+            sha.a_positionsLow,
+            this._positionLowBuffer.itemSize,
+            gl.FLOAT,
+            false,
+            0,
+            0
+        );
 
         gl.bindBuffer(gl.ARRAY_BUFFER, this._rgbaBuffer);
         gl.vertexAttribPointer(sha.a_rgba, this._rgbaBuffer.itemSize, gl.FLOAT, false, 0, 0);
@@ -296,10 +469,24 @@ class BillboardHandler {
         gl.vertexAttribPointer(sha.a_offset, this._offsetBuffer.itemSize, gl.FLOAT, false, 0, 0);
 
         gl.bindBuffer(gl.ARRAY_BUFFER, this._rotationBuffer);
-        gl.vertexAttribPointer(sha.a_rotation, this._rotationBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.vertexAttribPointer(
+            sha.a_rotation,
+            this._rotationBuffer.itemSize,
+            gl.FLOAT,
+            false,
+            0,
+            0
+        );
 
         gl.bindBuffer(gl.ARRAY_BUFFER, this._alignedAxisBuffer);
-        gl.vertexAttribPointer(sha.a_alignedAxis, this._alignedAxisBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.vertexAttribPointer(
+            sha.a_alignedAxis,
+            this._alignedAxisBuffer.itemSize,
+            gl.FLOAT,
+            false,
+            0,
+            0
+        );
 
         gl.drawArrays(gl.TRIANGLES, 0, this._vertexBuffer.numItems);
     }
@@ -329,19 +516,43 @@ class BillboardHandler {
 
         gl.uniform1f(shu.pickingScale, ec.pickingScale);
 
-        gl.uniform2fv(shu.uFloatParams, [ec.renderNode._planetRadius2 || 0, r.activeCamera._tanViewAngle_hradOneByHeight]);
+        gl.uniform2fv(shu.uFloatParams, [
+            ec.renderNode._planetRadius2 || 0,
+            r.activeCamera._tanViewAngle_hradOneByHeight
+        ]);
 
         gl.bindBuffer(gl.ARRAY_BUFFER, this._vertexBuffer);
         gl.vertexAttribPointer(sha.a_vertices, this._vertexBuffer.itemSize, gl.FLOAT, false, 0, 0);
 
         gl.bindBuffer(gl.ARRAY_BUFFER, this._positionHighBuffer);
-        gl.vertexAttribPointer(sha.a_positionsHigh, this._positionHighBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.vertexAttribPointer(
+            sha.a_positionsHigh,
+            this._positionHighBuffer.itemSize,
+            gl.FLOAT,
+            false,
+            0,
+            0
+        );
 
         gl.bindBuffer(gl.ARRAY_BUFFER, this._positionLowBuffer);
-        gl.vertexAttribPointer(sha.a_positionsLow, this._positionLowBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.vertexAttribPointer(
+            sha.a_positionsLow,
+            this._positionLowBuffer.itemSize,
+            gl.FLOAT,
+            false,
+            0,
+            0
+        );
 
         gl.bindBuffer(gl.ARRAY_BUFFER, this._pickingColorBuffer);
-        gl.vertexAttribPointer(sha.a_pickingColor, this._pickingColorBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.vertexAttribPointer(
+            sha.a_pickingColor,
+            this._pickingColorBuffer.itemSize,
+            gl.FLOAT,
+            false,
+            0,
+            0
+        );
 
         gl.bindBuffer(gl.ARRAY_BUFFER, this._sizeBuffer);
         gl.vertexAttribPointer(sha.a_size, this._sizeBuffer.itemSize, gl.FLOAT, false, 0, 0);
@@ -350,10 +561,24 @@ class BillboardHandler {
         gl.vertexAttribPointer(sha.a_offset, this._offsetBuffer.itemSize, gl.FLOAT, false, 0, 0);
 
         gl.bindBuffer(gl.ARRAY_BUFFER, this._rotationBuffer);
-        gl.vertexAttribPointer(sha.a_rotation, this._rotationBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.vertexAttribPointer(
+            sha.a_rotation,
+            this._rotationBuffer.itemSize,
+            gl.FLOAT,
+            false,
+            0,
+            0
+        );
 
         gl.bindBuffer(gl.ARRAY_BUFFER, this._alignedAxisBuffer);
-        gl.vertexAttribPointer(sha.a_alignedAxis, this._alignedAxisBuffer.itemSize, gl.FLOAT, false, 0, 0);
+        gl.vertexAttribPointer(
+            sha.a_alignedAxis,
+            this._alignedAxisBuffer.itemSize,
+            gl.FLOAT,
+            false,
+            0,
+            0
+        );
 
         gl.drawArrays(gl.TRIANGLES, 0, this._vertexBuffer.numItems);
     }
@@ -406,20 +631,26 @@ class BillboardHandler {
 
         billboard._handlerIndex = -1;
         billboard._handler = null;
+        billboard._isReady = false;
+        billboard._lockId = LOCK_FREE;
     }
 
     remove(billboard) {
-        if (billboard._handler && this.__staticId == billboard._handler.__staticId) {
+        if (billboard._isReady && this.__staticId == billboard._handler.__staticId) {
             this._removeBillboard(billboard);
+        } else {
+            billboard._handler = null;
         }
     }
 
     setPositionArr(index, positionHigh, positionLow) {
-
         var i = index * 18;
 
         // High
-        var a = this._positionHighArr, x = positionHigh.x, y = positionHigh.y, z = positionHigh.z;
+        var a = this._positionHighArr,
+            x = positionHigh.x,
+            y = positionHigh.y,
+            z = positionHigh.z;
 
         a[i] = x;
         a[i + 1] = y;
@@ -446,7 +677,10 @@ class BillboardHandler {
         a[i + 17] = z;
 
         // Low
-        a = this._positionLowArr; x = positionLow.x; y = positionLow.y; z = positionLow.z;
+        a = this._positionLowArr;
+        x = positionLow.x;
+        y = positionLow.y;
+        z = positionLow.z;
 
         a[i] = x;
         a[i + 1] = y;
@@ -476,9 +710,11 @@ class BillboardHandler {
     }
 
     setPickingColorArr(index, color) {
-
         var i = index * 18;
-        var a = this._pickingColorArr, x = color.x / 255, y = color.y / 255, z = color.z / 255;
+        var a = this._pickingColorArr,
+            x = color.x / 255,
+            y = color.y / 255,
+            z = color.z / 255;
 
         a[i] = x;
         a[i + 1] = y;
@@ -508,9 +744,10 @@ class BillboardHandler {
     }
 
     setSizeArr(index, width, height) {
-
         var i = index * 12;
-        var a = this._sizeArr, x = width, y = height;
+        var a = this._sizeArr,
+            x = width,
+            y = height;
 
         a[i] = x;
         a[i + 1] = y;
@@ -534,9 +771,11 @@ class BillboardHandler {
     }
 
     setOffsetArr(index, offset) {
-
         var i = index * 18;
-        var a = this._offsetArr, x = offset.x, y = offset.y, z = offset.z;
+        var a = this._offsetArr,
+            x = offset.x,
+            y = offset.y,
+            z = offset.z;
 
         a[i] = x;
         a[i + 1] = y;
@@ -566,9 +805,12 @@ class BillboardHandler {
     }
 
     setRgbaArr(index, rgba) {
-
         var i = index * 24;
-        var a = this._rgbaArr, x = rgba.x, y = rgba.y, z = rgba.z, w = rgba.w;
+        var a = this._rgbaArr,
+            x = rgba.x,
+            y = rgba.y,
+            z = rgba.z,
+            w = rgba.w;
 
         a[i] = x;
         a[i + 1] = y;
@@ -604,7 +846,6 @@ class BillboardHandler {
     }
 
     setRotationArr(index, rotation) {
-
         var i = index * 6;
         var a = this._rotationArr;
 
@@ -619,7 +860,6 @@ class BillboardHandler {
     }
 
     setTexCoordArr(index, tcoordArr) {
-
         var i = index * 12;
         var a = this._texCoordArr;
 
@@ -655,7 +895,6 @@ class BillboardHandler {
     }
 
     setVertexArr(index, vertexArr) {
-
         var i = index * 12;
         var a = this._vertexArr;
 
@@ -679,9 +918,11 @@ class BillboardHandler {
     }
 
     setAlignedAxisArr(index, alignedAxis) {
-
         var i = index * 18;
-        var a = this._alignedAxisArr, x = alignedAxis.x, y = alignedAxis.y, z = alignedAxis.z;
+        var a = this._alignedAxisArr,
+            x = alignedAxis.x,
+            y = alignedAxis.y,
+            z = alignedAxis.z;
 
         a[i] = x;
         a[i + 1] = y;
@@ -763,19 +1004,31 @@ class BillboardHandler {
     createTexCoordBuffer() {
         var h = this._renderer.handler;
         h.gl.deleteBuffer(this._texCoordBuffer);
-        this._texCoordBuffer = h.createArrayBuffer(this._texCoordArr, 2, this._texCoordArr.length / 2);
+        this._texCoordBuffer = h.createArrayBuffer(
+            this._texCoordArr,
+            2,
+            this._texCoordArr.length / 2
+        );
     }
 
     createAlignedAxisBuffer() {
         var h = this._renderer.handler;
         h.gl.deleteBuffer(this._alignedAxisBuffer);
-        this._alignedAxisBuffer = h.createArrayBuffer(this._alignedAxisArr, 3, this._alignedAxisArr.length / 3);
+        this._alignedAxisBuffer = h.createArrayBuffer(
+            this._alignedAxisArr,
+            3,
+            this._alignedAxisArr.length / 3
+        );
     }
 
     createPickingColorBuffer() {
         var h = this._renderer.handler;
         h.gl.deleteBuffer(this._pickingColorBuffer);
-        this._pickingColorBuffer = h.createArrayBuffer(this._pickingColorArr, 3, this._pickingColorArr.length / 3);
+        this._pickingColorBuffer = h.createArrayBuffer(
+            this._pickingColorArr,
+            3,
+            this._pickingColorArr.length / 3
+        );
     }
 
     refreshTexCoordsArr() {
@@ -796,4 +1049,4 @@ class BillboardHandler {
     }
 }
 
-export { BillboardHandler };
+export { BillboardHandler };

package/src/og/entity/Entity.js

@@ -17,6 +17,7 @@ import { Ray } from "./Ray.js";
 import { PointCloud } from "./PointCloud.js";
 import { Sphere } from "../shapes/Sphere.js";
 import { Vec3 } from "../math/Vec3.js";
+import { GeoObject } from "./GeoObject.js";
 
 /**
  * Entity instances aggregate multiple forms of visualization into a single high-level object.
@@ -158,6 +159,7 @@ class Entity {
             polyline: [Polyline, this.setPolyline],
             pointCloud: [PointCloud, this.setPointCloud],
             geometry: [Geometry, this.setGeometry],
+            geoObject: [GeoObject, this.setGeoObject],
             strip: [Strip, this.setStrip],
             ray: [Ray, this.setRay]
         };
@@ -211,6 +213,13 @@ class Entity {
          */
         this.geometry = this._createOptionFeature("geometry", options.geometry);
 
+        /**
+         * Geo object entity
+         * @public
+         * @type {og.Geometry}
+         */
+        this.geoObject = this._createOptionFeature("geoObject", options.geoObject);
+
         /**
          * Strip entity.
          * @public
@@ -249,7 +258,7 @@ class Entity {
     /**
      * Adds current entity into the specified entity collection.
      * @public
-     * @param {EntityCollection|og.layer.Vector} collection - Specified entity collection or vector layer.
+     * @param {EntityCollection|Vector} collection - Specified entity collection or vector layer.
      * @param {Boolean} [rightNow=false] - Entity insertion option for vector layer.
      * @returns {Entity} - This object.
      */
@@ -278,6 +287,9 @@ class Entity {
         // billboards
         this.billboard && this.billboard.setVisibility(visibility);
 
+        // billboards
+        this.geoObject && this.geoObject.setVisibility(visibility);
+
         // labels
         this.label && this.label.setVisibility(visibility);
 
@@ -333,6 +345,9 @@ class Entity {
         // billboards
         this.billboard && this.billboard.setPosition3v(p);
 
+        // geoObject
+        this.geoObject && this.geoObject.setPosition3v(p);
+
         // labels
         this.label && this.label.setPosition3v(p);
 
@@ -374,6 +389,9 @@ class Entity {
         // billboards
         this.billboard && this.billboard.setPosition3v(p);
 
+        // geoObject
+        this.geoObject && this.geoObject.setPosition3v(p);
+
         // labels
         this.label && this.label.setPosition3v(p);
 
@@ -580,6 +598,24 @@ class Entity {
         return geometry;
     }
 
+    /**
+     * Sets entity geoObject.
+     * @public
+     * @param {GeoObject} geoObject - GeoObject.
+     * @returns {GeoObject} -
+     */
+    setGeoObject(geoObject) {
+        if (this.geoObject) {
+            this.geoObject.remove();
+        }
+        this.geoObject = geoObject;
+        this.geoObject._entity = this;
+        this.geoObject.setPosition3v(this._cartesian);
+        this.geoObject.setVisibility(this._visibility);
+        this._entityCollection && this._entityCollection._geoObjectHandler.add(geoObject);
+        return geoObject;
+    }
+
     /**
      * Sets entity strip.
      * @public
@@ -648,6 +684,8 @@ class Entity {
         // strip
         this.strip && this.strip.setPickingColor3v(c);
 
+        // billboard
+        this.geoObject && this.geoObject.setPickingColor3v(c);
         for (var i = 0; i < this.childrenNodes.length; i++) {
             this.childrenNodes[i].setPickingColor();
         }