@openglobus/og 0.13.10 → 0.13.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.13.10",
+  "version": "0.13.12",
   "description": "[OpenGlobus](https://www.openglobus.org/) is a javascript library designed to display interactive 3d maps and planets with map tiles, imagery and vector data, markers and 3d objects. It uses the WebGL technology, open source and completely free.",
   "directories": {
     "example": "./sandbox"

package/src/og/entity/LabelHandler.js

@@ -85,8 +85,7 @@ class LabelHandler extends BillboardHandler {
     }
 
     _addLabelToArrays(label) {
-        this._renderer.labelWorker.make(label);
-        console.time(`label${label.id}`)
+        this._renderer.labelWorker.make({ handler: this, label: label });
     }
 
     assignFontAtlas(label) {
@@ -122,8 +121,6 @@ class LabelHandler extends BillboardHandler {
             label.update();
 
             this.refresh();
-            console.timeEnd(`label${label.id}`)
-            console.log(label)
         }
     }
 

package/src/og/entity/LabelWorker.js

@@ -14,33 +14,30 @@ class LabelWorker extends BaseWorker {
     }
 
     _onMessage(e) {
+        let s = this._source.get(e.data.id);
 
-        let label = this._source.get(e.data.id);
-
-        if (label._lockId === LOCK_UPDATE) {
+        if (s.label._lockId === LOCK_UPDATE) {
             requestAnimationFrame(() => {
-                this.make(label);
+                this.make({ handler: s.handler, label: s.label });
             });
         } else {
-            label._handler.workerCallback(e.data, label);
+            s.handler.workerCallback(e.data, s.label);
         }
 
         this._source.delete(e.data.id);
-        super._onMessage(e)
-
-        this.check();
     }
 
 
-    make() {
-        const label = arguments[0],
-        handler = label._handler;
+    make(data) {
+        let label = data.label,
+            handler = data.handler;
+
         if (handler._entityCollection) {
 
             if (this._workerQueue.length) {
                 var w = this._workerQueue.pop();
 
-                this._source.set(this._id, label);
+                this._source.set(this._id, data);
 
                 let labelData = new Float32Array([
                     /*0*/this._id++,
@@ -67,7 +64,7 @@ class LabelWorker extends BaseWorker {
                     labelData.buffer,
                 ]);
             } else {
-                this._pendingQueue.push(label);
+                this._pendingQueue.push(data);
             }
         }
     }

package/types/entity/LabelWorker.d.ts

@@ -4,6 +4,6 @@ export class LabelWorker extends BaseWorker {
     constructor(numWorkers?: number);
     _source: Map<any, any>;
     _onMessage(e: any): void;
-    make(...args: any[]): void;
+    make(data: any): void;
 }
 import { BaseWorker } from "../utils/BaseWorker.js";