@openglobus/og 0.11.2 → 0.11.7

package/src/og/entity/BaseBillboard.js

@@ -2,20 +2,21 @@
  * @module og/entity/BaseBillboard
  */
 
-'use strict';
+"use strict";
 
-import * as utils from '../utils/shared.js';
-import { Vec3 } from '../math/Vec3.js';
+import * as utils from "../utils/shared.js";
+import { Vec3 } from "../math/Vec3.js";
+import { LOCK_FREE, LOCK_UPDATE } from "./LabelWorker.js";
 
 /**
  * Base prototype for billboard and label classes.
  * @class
  * @param {Object} [options] - Options:
- * @param {og.Vec3|Array.<number>} [options.position] - Billboard spatial position.
+ * @param {Vec3|Array.<number>} [options.position] - Billboard spatial position.
  * @param {number} [options.rotation] - Screen angle rotaion.
- * @param {og.Vec4|string|Array.<number>} [options.color] - Billboard color.
- * @param {og.Vec3|Array.<number>} [options.alignedAxis] - Billboard aligned vector.
- * @param {og.Vec3|Array.<number>} [options.offset] - Billboard center screen offset.
+ * @param {Vec4|string|Array.<number>} [options.color] - Billboard color.
+ * @param {Vec3|Array.<number>} [options.alignedAxis] - Billboard aligned vector.
+ * @param {Vec3|Array.<number>} [options.offset] - Billboard center screen offset.
  * @param {boolean} [options.visibility] - Visibility.
  */
 class BaseBillboard {
@@ -33,14 +34,14 @@ class BaseBillboard {
         /**
          * Billboard center cartesian position.
          * @protected
-         * @type {og.Vec3}
+         * @type {Vec3}
          */
         this._position = utils.createVector3(options.position);
 
         this._positionHigh = new Vec3();
-        
+
         this._positionLow = new Vec3();
-        
+
         Vec3.doubleToTwoFloats(this._position, this._positionHigh, this._positionLow);
 
         /**
@@ -53,21 +54,21 @@ class BaseBillboard {
         /**
          * RGBA color.
          * @protected
-         * @type {og.Vec4}
+         * @type {Vec4}
          */
         this._color = utils.createColorRGBA(options.color);
 
         /**
          * Cartesian aligned axis vector.
          * @protected
-         * @type {og.Vec3}
+         * @type {Vec3}
          */
         this._alignedAxis = utils.createVector3(options.alignedAxis);
 
         /**
          * Billboard center screen space offset. Where x,y - screen space offset and z - depth offset.
          * @protected
-         * @type {og.math.Vecto3}
+         * @type {math.Vecto3}
          */
         this._offset = utils.createVector3(options.offset);
 
@@ -81,14 +82,14 @@ class BaseBillboard {
         /**
          * Entity instance that holds this billboard.
          * @protected
-         * @type {og.Entity}
+         * @type {Entity}
          */
         this._entity = null;
 
         /**
          * Handler that stores and renders this billboard object.
          * @protected
-         * @type {og.BillboardHandler}
+         * @type {BillboardHandler}
          */
         this._handler = null;
 
@@ -98,6 +99,15 @@ class BaseBillboard {
          * @type {number}
          */
         this._handlerIndex = -1;
+
+        /**
+         * An indication that the object is ready to draw
+         * @protected
+         * @type {number}
+         */
+        this._isReady = false;
+
+        this._lockId = LOCK_FREE;
     }
 
     static get _staticCounter() {
@@ -121,28 +131,36 @@ class BaseBillboard {
     setPosition(x, y, z) {
         this._position.x = x;
         this._position.y = y;
-        this._position.z = z;        
-        Vec3.doubleToTwoFloats(position, this._positionHigh, this._positionLow);
-        this._handler && this._handler.setPositionArr(this._handlerIndex, this._positionHigh, this._positionLow);
+        this._position.z = z;
+        Vec3.doubleToTwoFloats(this._position, this._positionHigh, this._positionLow);
+        if (this._isReady) {
+            this._handler.setPositionArr(this._handlerIndex, this._positionHigh, this._positionLow);
+        } else if (this._lockId !== LOCK_FREE) {
+            this._lockId = LOCK_UPDATE;
+        }
     }
 
     /**
      * Sets billboard position.
      * @public
-     * @param {og.Vec3} position - Cartesian coordinates.
+     * @param {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);
+        if (this._isReady) {
+            this._handler.setPositionArr(this._handlerIndex, this._positionHigh, this._positionLow);
+        } else if (this._lockId !== LOCK_FREE) {
+            this._lockId = LOCK_UPDATE;
+        }
     }
 
     /**
      * Returns billboard position.
      * @public
-     * @returns {og.Vec3}
+     * @returns {Vec3}
      */
     getPosition() {
         return this._position;
@@ -158,26 +176,27 @@ class BaseBillboard {
     setOffset(x, y, z) {
         this._offset.x = x;
         this._offset.y = y;
-        (z != undefined) && (this._offset.z = z);
-        this._handler && this._handler.setOffsetArr(this._handlerIndex, this._offset);
+        z != undefined && (this._offset.z = z);
+        if (this._isReady) {
+            this._handler.setOffsetArr(this._handlerIndex, this._offset);
+        } else if (this._lockId !== LOCK_FREE) {
+            this._lockId = LOCK_UPDATE;
+        }
     }
 
     /**
      * Sets screen space offset.
      * @public
-     * @param {og.Vec2} offset - Offset size.
+     * @param {Vec2} offset - Offset size.
      */
     setOffset3v(offset) {
-        this._offset.x = offset.x;
-        this._offset.y = offset.y;
-        (offset.z != undefined) && (this._offset.z = offset.z);
-        this._handler && this._handler.setOffsetArr(this._handlerIndex, offset);
+        this.setOffset(offset.x, offset.y, offset.z);
     }
 
     /**
      * Returns billboard screen space offset size.
      * @public
-     * @returns {og.Vec3}
+     * @returns {Vec3}
      */
     getOffset() {
         return this._offset;
@@ -189,8 +208,14 @@ class BaseBillboard {
      * @param {number} rotation - Screen space rotation in radians.
      */
     setRotation(rotation) {
-        this._rotation = rotation;
-        this._handler && this._handler.setRotationArr(this._handlerIndex, rotation);
+        if (rotation !== this._rotation) {
+            this._rotation = rotation;
+            if (this._isReady) {
+                this._handler.setRotationArr(this._handlerIndex, rotation);
+            } else if (this._lockId !== LOCK_FREE) {
+                this._lockId = LOCK_UPDATE;
+            }
+        }
     }
 
     /**
@@ -208,8 +233,14 @@ class BaseBillboard {
      * @param {number} a - Billboard opacity.
      */
     setOpacity(a) {
-        this._color.w = a;
-        this.setColor(this._color.x, this._color.y, this._color.z, a);
+        if (a !== this._color.w) {
+            a != undefined && (this._color.w = a);
+            if (this._isReady) {
+                this._handler.setRgbaArr(this._handlerIndex, this._color);
+            } else if (this._lockId !== LOCK_FREE) {
+                this._lockId = LOCK_UPDATE;
+            }
+        }
     }
 
     /**
@@ -221,24 +252,26 @@ class BaseBillboard {
      * @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);
+        if (a !== this._color.w || r !== this._color.x || g !== this._color.y || this._color.z !== b) {
+            this._color.x = r;
+            this._color.y = g;
+            this._color.z = b;
+            a != undefined && (this._color.w = a);
+            if (this._isReady) {
+                this._handler.setRgbaArr(this._handlerIndex, this._color);
+            } else if (this._lockId !== LOCK_FREE) {
+                this._lockId = LOCK_UPDATE;
+            }
+        }
     }
 
     /**
      * Sets RGBA color. Each channel from 0.0 to 1.0.
      * @public
-     * @param {og.Vec4} color - RGBA vector.
+     * @param {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);
+        this.setColor(color.x, color.y, color.z, color.w);
     }
 
     /**
@@ -253,7 +286,7 @@ class BaseBillboard {
     /**
      * Returns RGBA color.
      * @public
-     * @returns {og.Vec4}
+     * @returns {Vec4}
      */
     getColor() {
         return this._color;
@@ -265,8 +298,14 @@ class BaseBillboard {
      * @param {boolean} visibility - Visibility flag.
      */
     setVisibility(visibility) {
-        this._visibility = visibility;
-        this._handler && this._handler.setVisibility(this._handlerIndex, visibility);
+        if (visibility !== this._visibility) {
+            this._visibility = visibility;
+            if (this._isReady) {
+                this._handler.setVisibility(this._handlerIndex, visibility);
+            } else if (this._lockId !== LOCK_FREE) {
+                this._lockId = LOCK_UPDATE;
+            }
+        }
     }
 
     /**
@@ -289,25 +328,26 @@ class BaseBillboard {
         this._alignedAxis.x = x;
         this._alignedAxis.y = y;
         this._alignedAxis.z = z;
-        this._handler && this._handler.setAlignedAxisArr(this._handlerIndex, this._alignedAxis);
+        if (this._isReady) {
+            this._handler.setAlignedAxisArr(this._handlerIndex, this._alignedAxis);
+        } else if (this._lockId !== LOCK_FREE) {
+            this._lockId = LOCK_UPDATE;
+        }
     }
 
     /**
      * Sets billboard aligned vector.
      * @public
-     * @param {og.math.Vecto3} alignedAxis - Vector to align.
+     * @param {math.Vecto3} alignedAxis - Vector to align.
      */
     setAlignedAxis3v(alignedAxis) {
-        this._alignedAxis.x = alignedAxis.x;
-        this._alignedAxis.y = alignedAxis.y;
-        this._alignedAxis.z = alignedAxis.z;
-        this._handler && this._handler.setAlignedAxisArr(this._handlerIndex, alignedAxis);
+        this.setAlignedAxis(alignedAxis.x, alignedAxis.y, alignedAxis.z);
     }
 
     /**
      * Returns aligned vector.
      * @public
-     * @returns {og.Vec3}
+     * @returns {Vec3}
      */
     getAlignedAxis() {
         return this._alignedAxis;
@@ -325,10 +365,14 @@ class BaseBillboard {
     /**
      * Sets billboard picking color.
      * @public
-     * @param {og.Vec3} color - Picking color.
+     * @param {Vec3} color - Picking color.
      */
     setPickingColor3v(color) {
-        this._handler && this._handler.setPickingColorArr(this._handlerIndex, color);
+        if (this._isReady) {
+            this._handler.setPickingColorArr(this._handlerIndex, color);
+        } else if (this._lockId !== LOCK_FREE) {
+            this._lockId = LOCK_UPDATE;
+        }
     }
 }
 

package/src/og/entity/Billboard.js

@@ -2,20 +2,20 @@
  * @module og/entity/Billboard
  */
 
-'use strict';
+"use strict";
 
-import { BaseBillboard } from './BaseBillboard.js';
+import { BaseBillboard } from "./BaseBillboard.js";
 
 /**
  * Represents basic quad billboard image.
  * @class
- * @extends {og.BaseBillboard}
+ * @extends {BaseBillboard}
  * @param {Object} [options] - Options:
- * @param {og.Vec3|Array.<number>} [options.position] - Billboard spatial position.
+ * @param {Vec3|Array.<number>} [options.position] - Billboard spatial position.
  * @param {number} [options.rotation] - Screen angle rotaion.
- * @param {og.Vec4|string|Array.<number>} [options.color] - Billboard color.
- * @param {og.Vec3|Array.<number>} [options.alignedAxis] - Billboard aligned vector.
- * @param {og.Vec3|Array.<number>} [options.offset] - Billboard center screen offset.
+ * @param {Vec4|string|Array.<number>} [options.color] - Billboard color.
+ * @param {Vec3|Array.<number>} [options.alignedAxis] - Billboard aligned vector.
+ * @param {Vec3|Array.<number>} [options.offset] - Billboard center screen offset.
  * @param {boolean} [options.visibility] - Visibility.
  * @param {string} [options.src] - Billboard image url source.
  * @param {Image} [options.image] - Billboard image object.
@@ -76,7 +76,10 @@ class Billboard extends BaseBillboard {
                 ta.loadImage(src, function (img) {
                     if (ta.nodes[img.__nodeIndex]) {
                         that._image = img;
-                        bh.setTexCoordArr(that._handlerIndex, ta.nodes[that._image.__nodeIndex].texCoords);
+                        bh.setTexCoordArr(
+                            that._handlerIndex,
+                            ta.nodes[that._image.__nodeIndex].texCoords
+                        );
                     } else {
                         ta.addImage(img);
                         ta.createTexture();
@@ -106,7 +109,8 @@ class Billboard extends BaseBillboard {
     setSize(width, height) {
         this._width = width;
         this._height = height;
-        this._handler && this._handler.setSizeArr(this._handlerIndex, width * this._scale, height * this._scale);
+        this._handler &&
+            this._handler.setSizeArr(this._handlerIndex, width * this._scale, height * this._scale);
     }
 
     /**
@@ -158,4 +162,4 @@ class Billboard extends BaseBillboard {
     }
 }
 
-export { Billboard };
+export { Billboard };