@pirireis/webglobeplugins 1.4.0 → 1.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pirireis/webglobeplugins",
-    "version": "1.4.0",
+    "version": "1.4.2",
     "main": "index.js",
     "author": "Toprak Nihat Deniz Ozturk",
     "license": "MIT",

package/programs/polygon-on-globe/texture-dem-triangles.js

@@ -55,9 +55,7 @@ ${relativeBBoxPositionRadian}
 
 
 void main() {
-    float elevation = ${WORLD_RADIUS_3D};
-    float altitude = 20000.0;
-    bool hasDemSample = false;
+
 
     // Always define v_index to avoid undefined varyings when picking is disabled.
 
@@ -74,6 +72,9 @@ void main() {
     // Always define v_index to avoid undefined varyings when picking is disabled.
     v_index = a_index;
 
+
+    float elevation = ${WORLD_RADIUS_3D};
+    float altitude = 20000.0;
     if (is3D == true) {
         for (int i = 0; i < 6; i++) {
             if( i == u_breakLoopIndex - 1 ) {

package/programs/programcache.js

@@ -89,35 +89,41 @@ const glProgramCache = (function () {
 })();
 const noRegisterGlobeProgramCache = (function () {
     const cache = new Map();
-    const keyFunction = (globe, ProgramClass, mode) => `${globe.id}_${ProgramClass.name}_${mode}`;
     function getProgram(globe, ProgramClass, mode) {
-        const key = keyFunction(globe, ProgramClass, mode);
         if (!cache.has(globe)) {
             cache.set(globe, new Map());
         }
         ;
-        if (!cache.get(globe).has(key)) {
-            cache.get(globe).set(key, {
+        if (!cache.get(globe).has(ProgramClass)) {
+            cache.get(globe).set(ProgramClass, new Map());
+        }
+        ;
+        const modeKey = mode !== undefined ? mode : '__default__';
+        if (!cache.get(globe).get(ProgramClass).has(modeKey)) {
+            cache.get(globe).get(ProgramClass).set(modeKey, {
                 program: new ProgramClass(globe, mode),
                 count: 1
             });
         }
         else {
-            cache.get(globe).get(key).count++;
+            cache.get(globe).get(ProgramClass).get(modeKey).count++;
         }
-        return cache.get(globe).get(key).program;
+        return cache.get(globe).get(ProgramClass).get(modeKey).program;
     }
     ;
     function releaseProgram(globe, ProgramClass, mode) {
-        const key = keyFunction(globe, ProgramClass, mode);
-        if (cache.has(globe) && cache.get(globe).has(key)) {
-            if (cache.get(globe).get(key).count === 0) {
+        const modeKey = mode !== undefined ? mode : '__default__';
+        if (cache.has(globe) && cache.get(globe).has(ProgramClass) && cache.get(globe).get(ProgramClass).has(modeKey)) {
+            if (cache.get(globe).get(ProgramClass).get(modeKey).count === 0) {
                 throw new Error("The program counter is already 0, cannot release program");
             }
-            cache.get(globe).get(key).count--;
-            if (cache.get(globe).get(key).count === 0) {
-                cache.get(globe).get(key).program.free();
-                cache.get(globe).delete(key);
+            cache.get(globe).get(ProgramClass).get(modeKey).count--;
+            if (cache.get(globe).get(ProgramClass).get(modeKey).count === 0) {
+                cache.get(globe).get(ProgramClass).get(modeKey).program.free();
+                cache.get(globe).get(ProgramClass).delete(modeKey);
+                if (cache.get(globe).get(ProgramClass).size === 0) {
+                    cache.get(globe).delete(ProgramClass);
+                }
             }
         }
     }

package/tracks/point-tracks/plugin.js

@@ -169,18 +169,12 @@ class PointTracksPlugin {
         const wrapper = (selectedIDsSet) => {
             const selectedIDs = Array.from(selectedIDsSet);
             if (selectedIDs.length === 0) {
-                this._selectedObj = null;
-                this._selectedID = -1;
                 callback([]);
                 return;
             }
             const selectedPoints = [];
             for (let i = 0; i < selectedIDs.length; i++) {
                 const id = selectedIDs[i];
-                if (i === 0) {
-                    this._selectedID = id;
-                    this._selectedObj = objectStore.get(id);
-                }
                 const obj = objectStore.get(id);
                 selectedPoints.push(obj);
             }
@@ -366,27 +360,38 @@ class PointTracksPlugin {
             this._tracksToPointsMap.delete(trackID);
         }
     }
-    _selfSelect() {
-        const { globe } = this;
-        const pos = globe.api_GetMousePos();
-        const x = pos.canvasX;
-        const y = globe.api_ScrH() - pos.canvasY;
-        this.screenSelection(x, y, (selectedPoints) => {
-            if (selectedPoints.length > 0) {
-                if (this._lastSelectedID !== this._selectedID) {
-                    this._lastSelectedID = this._selectedID;
-                    this._drawOptionsUBO.updateSingle("hovered_vertexID", this._selectedID);
-                    this.globe.DrawRender();
-                }
-            }
-            else {
+    _updateHoverState(x, y) {
+        const { pointSizes, _pickerDisplayer } = this;
+        const objectStore = this._StorageManagersMap.get("objectStore").bufferManager;
+        const wrapper = (selectedIDsSet) => {
+            const selectedIDs = Array.from(selectedIDsSet);
+            if (selectedIDs.length === 0) {
+                this._selectedObj = null;
+                this._selectedID = -1;
                 if (this._lastSelectedID !== -1) {
                     this._lastSelectedID = -1;
                     this._drawOptionsUBO.updateSingle("hovered_vertexID", -1);
                     this.globe.DrawRender();
                 }
+                return;
             }
-        });
+            const id = selectedIDs[0];
+            this._selectedID = id;
+            this._selectedObj = objectStore.get(id);
+            if (this._lastSelectedID !== this._selectedID) {
+                this._lastSelectedID = this._selectedID;
+                this._drawOptionsUBO.updateSingle("hovered_vertexID", this._selectedID);
+                this.globe.DrawRender();
+            }
+        };
+        _pickerDisplayer.pickXY(x, y, pointSizes.selectionPointFilling, wrapper);
+    }
+    _selfSelect() {
+        const { globe } = this;
+        const pos = globe.api_GetMousePos();
+        const x = pos.canvasX;
+        const y = globe.api_ScrH() - pos.canvasY;
+        this._updateHoverState(x, y);
     }
     _turnOffFocus() {
         const { gl } = this;