@openglobus/og 0.11.6 → 0.12.1

package/src/og/ellipsoid/Ellipsoid.js

@@ -562,7 +562,7 @@ class Ellipsoid {
             // qw >= 0.0.  Looking outward or tangent.
             return null;
         }
-    }
+    }
 }
 
 export { Ellipsoid };

package/src/og/entity/BaseBillboard.js

@@ -6,6 +6,7 @@
 
 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.
@@ -97,16 +98,16 @@ class BaseBillboard {
          * @protected
          * @type {number}
          */
-        this._handlerIndex = -1;
-
-        /**
-         * An indication that the object is ready to draw
-         * @protected
-         * @type {number}
-         */
-        this._isReady = false;
-
-        this._lockId = -1;
+        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() {
@@ -132,10 +133,10 @@ class BaseBillboard {
         this._position.y = y;
         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 !== -1) {
-            this._lockId = -2;
+        if (this._isReady && this._handler) {
+            this._handler.setPositionArr(this._handlerIndex, this._positionHigh, this._positionLow);
+        } else if (this._lockId !== LOCK_FREE) {
+            this._lockId = LOCK_UPDATE;
         }
     }
 
@@ -149,10 +150,10 @@ class BaseBillboard {
         this._position.y = position.y;
         this._position.z = position.z;
         Vec3.doubleToTwoFloats(position, this._positionHigh, this._positionLow);
-        if (this._isReady) {
-            this._handler.setPositionArr(this._handlerIndex, this._positionHigh, this._positionLow);
-        } else if (this._lockId !== -1) {
-            this._lockId = -2;
+        if (this._isReady && this._handler) {
+            this._handler.setPositionArr(this._handlerIndex, this._positionHigh, this._positionLow);
+        } else if (this._lockId !== LOCK_FREE) {
+            this._lockId = LOCK_UPDATE;
         }
     }
 
@@ -176,10 +177,10 @@ class BaseBillboard {
         this._offset.x = x;
         this._offset.y = y;
         z != undefined && (this._offset.z = z);
-        if (this._isReady) {
-            this._handler.setOffsetArr(this._handlerIndex, this._offset);
-        } else if (this._lockId !== -1) {
-            this._lockId = -2;
+        if (this._isReady && this._handler) {
+            this._handler.setOffsetArr(this._handlerIndex, this._offset);
+        } else if (this._lockId !== LOCK_FREE) {
+            this._lockId = LOCK_UPDATE;
         }
     }
 
@@ -189,14 +190,7 @@ class BaseBillboard {
      * @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);
-        if (this._isReady) {
-            this._handler.setOffsetArr(this._handlerIndex, offset);
-        } else if (this._lockId !== -1) {
-            this._lockId = -2;
-        }
+        this.setOffset(offset.x, offset.y, offset.z);
     }
 
     /**
@@ -214,11 +208,13 @@ class BaseBillboard {
      * @param {number} rotation - Screen space rotation in radians.
      */
     setRotation(rotation) {
-        this._rotation = rotation;
-        if (this._isReady) {
-            this._handler.setRotationArr(this._handlerIndex, rotation);
-        } else if (this._lockId !== -1) {
-            this._lockId = -2;
+        if (rotation !== this._rotation) {
+            this._rotation = rotation;
+            if (this._isReady && this._handler) {
+                this._handler.setRotationArr(this._handlerIndex, rotation);
+            } else if (this._lockId !== LOCK_FREE) {
+                this._lockId = LOCK_UPDATE;
+            }
         }
     }
 
@@ -237,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) {
+                this._handler.setRgbaArr(this._handlerIndex, this._color);
+            } else if (this._lockId !== LOCK_FREE) {
+                this._lockId = LOCK_UPDATE;
+            }
+        }
     }
 
     /**
@@ -250,14 +252,16 @@ 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);
-        if (this._isReady) {
-            this._handler.setRgbaArr(this._handlerIndex, this._color);
-        } else if (this._lockId !== -1) {
-            this._lockId = -2;
+        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) {
+                this._handler.setRgbaArr(this._handlerIndex, this._color);
+            } else if (this._lockId !== LOCK_FREE) {
+                this._lockId = LOCK_UPDATE;
+            }
         }
     }
 
@@ -267,15 +271,7 @@ class BaseBillboard {
      * @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);
-        if (this._isReady) {
-            this._handler.setRgbaArr(this._handlerIndex, color);
-        } else if (this._lockId !== -1) {
-            this._lockId = -2;
-        }
+        this.setColor(color.x, color.y, color.z, color.w);
     }
 
     /**
@@ -302,11 +298,13 @@ class BaseBillboard {
      * @param {boolean} visibility - Visibility flag.
      */
     setVisibility(visibility) {
-        this._visibility = visibility;
-        if (this._isReady) {
-            this._handler.setVisibility(this._handlerIndex, visibility);
-        } else if (this._lockId !== -1) {
-            this._lockId = -2;
+        if (visibility !== this._visibility) {
+            this._visibility = visibility;
+            if (this._isReady && this._handler) {
+                this._handler.setVisibility(this._handlerIndex, visibility);
+            } else if (this._lockId !== LOCK_FREE) {
+                this._lockId = LOCK_UPDATE;
+            }
         }
     }
 
@@ -330,10 +328,10 @@ class BaseBillboard {
         this._alignedAxis.x = x;
         this._alignedAxis.y = y;
         this._alignedAxis.z = z;
-        if (this._isReady) {
-            this._handler.setAlignedAxisArr(this._handlerIndex, this._alignedAxis);
-        } else if (this._lockId !== -1) {
-            this._lockId = -2;
+        if (this._isReady && this._handler) {
+            this._handler.setAlignedAxisArr(this._handlerIndex, this._alignedAxis);
+        } else if (this._lockId !== LOCK_FREE) {
+            this._lockId = LOCK_UPDATE;
         }
     }
 
@@ -343,14 +341,7 @@ class BaseBillboard {
      * @param {math.Vecto3} alignedAxis - Vector to align.
      */
     setAlignedAxis3v(alignedAxis) {
-        this._alignedAxis.x = alignedAxis.x;
-        this._alignedAxis.y = alignedAxis.y;
-        this._alignedAxis.z = alignedAxis.z;
-        if (this._isReady) {
-            this._handler.setAlignedAxisArr(this._handlerIndex, alignedAxis);
-        } else if (this._lockId !== -1) {
-            this._lockId = -2;
-        }
+        this.setAlignedAxis(alignedAxis.x, alignedAxis.y, alignedAxis.z);
     }
 
     /**
@@ -377,12 +368,12 @@ class BaseBillboard {
      * @param {Vec3} color - Picking color.
      */
     setPickingColor3v(color) {
-        if (this._isReady) {
-            this._handler.setPickingColorArr(this._handlerIndex, color);
-        } else if (this._lockId !== -1) {
-            this._lockId = -2;
+        if (this._isReady && this._handler) {
+            this._handler.setPickingColorArr(this._handlerIndex, color);
+        } else if (this._lockId !== LOCK_FREE) {
+            this._lockId = LOCK_UPDATE;
         }
     }
 }
 
-export { BaseBillboard };
+export { BaseBillboard };

package/src/og/entity/BillboardHandler.js

@@ -6,6 +6,7 @@
 
 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;
@@ -80,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;
@@ -126,9 +131,9 @@ class BillboardHandler {
         while (i--) {
             var bi = this._billboards[i];
             bi._handlerIndex = -1;
-            bi._handler = null;
-            bi._isReady = false;
-            bi._lockId = -1;
+            bi._handler = null;
+            bi._isReady = false;
+            bi._lockId = LOCK_FREE;
         }
         this._billboards.length = 0;
         this._billboards = [];
@@ -202,7 +207,7 @@ class BillboardHandler {
     }
 
     add(billboard) {
-        if (billboard._handlerIndex == -1) {
+        if (billboard._handlerIndex == -1) {
             billboard._isReady = true;
             billboard._handler = this;
             billboard._handlerIndex = this._billboards.length;
@@ -625,14 +630,16 @@ class BillboardHandler {
         this.refresh();
 
         billboard._handlerIndex = -1;
-        billboard._handler = null;
-        billboard._isReady = false;
-        billboard._lockId = -1;
+        billboard._handler = null;
+        billboard._isReady = false;
+        billboard._lockId = LOCK_FREE;
     }
 
     remove(billboard) {
         if (billboard._isReady && this.__staticId == billboard._handler.__staticId) {
             this._removeBillboard(billboard);
+        } else {
+            billboard._handler = null;
         }
     }
 
@@ -1042,4 +1049,4 @@ class BillboardHandler {
     }
 }
 
-export { BillboardHandler };
+export { BillboardHandler };