@pirireis/webglobeplugins 0.15.2-alpha → 0.15.4-alpha

package/bearing-line/plugin.js

@@ -397,8 +397,9 @@ export default class BearingLinePlugin {
         const drawRange = { first: 0, count: this.bufferOrchestrator.length };
         this.lineProgram.draw(this.lineVao, { drawRange }, this._opacity);
         if (this.drawAngleRing) {
-            this.pieceOfPieProgram.draw(this.bufferOrchestrator.length, this.ringVao, 360, this._opacity * 0.8, RINGPARTIAL_DRAW_MODE.TRIANGLE_FAN);
-            this.pieceOfPieProgram.draw(this.bufferOrchestrator.length, this.ringVao, 360, this._opacity * 0.8, RINGPARTIAL_DRAW_MODE.LINE_STRIP);
+            this.pieceOfPieProgram._defaultFlexibleUBO.updateSingle("u_opacity", this._opacity * 0.8);
+            this.pieceOfPieProgram.draw(this.bufferOrchestrator.length, this.ringVao, 360, RINGPARTIAL_DRAW_MODE.TRIANGLE_FAN);
+            this.pieceOfPieProgram.draw(this.bufferOrchestrator.length, this.ringVao, 360, RINGPARTIAL_DRAW_MODE.LINE_STRIP);
         }
         if (this.drawBearingLine) {
             // this.lineProgram.draw(this.bearingLineVAO, this.bufferOrchestrator.length, this._opacity );

package/package.json

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

package/range-tools-on-terrain/circle-line-chain/chain-list-map.js

@@ -87,10 +87,10 @@ export class ChainListMap {
         this._chainMap.set(chainKey, newChain);
         return deleteKeys;
     }
-    deleteChainAndReturnChainKeys(chainKey, writers) {
+    deleteChainAndReturnChainKeys(chainKey, textWritersMap = null) {
         const keys = this.getNodeKeysOfChain(chainKey);
-        if (writers.size > 0) {
-            writers.forEach((writer) => {
+        if (textWritersMap && textWritersMap.size > 0) {
+            textWritersMap.forEach((writer) => {
                 writer.deleteTextBulk(keys);
             });
         }
@@ -175,6 +175,19 @@ export class ChainListMap {
     getChainProperties(chainKey) {
         return this._chainSideProperties.get(chainKey);
     }
+    deleteTexts(chainKeys, textWriters) {
+        if (!textWriters || textWriters.size === 0)
+            return;
+        textWriters.forEach((writer) => {
+            chainKeys.forEach((chainKey) => {
+                const chain = this._chainMap.get(chainKey);
+                if (!chain)
+                    return;
+                const keys = chain.map((node) => node.__identity__);
+                writer.deleteTextBulk(keys);
+            });
+        });
+    }
     /**
      *
      * @param chainKey

package/range-tools-on-terrain/circle-line-chain/plugin.js

@@ -176,19 +176,19 @@ export class CircleLineChainPlugin {
             this._updateTexts(chainKeys, Array.from(this._textWritersMap.keys()));
         }
     }
-    deleteNodes(keysAndNodes, { textWriterIDs = [] } = {}) {
+    deleteNodes(keysAndNodes) {
         if (this._freed) {
             console.warn("CircleLineChainPlugin is freed, cannot delete nodes.");
             return;
         }
-        const chainKeysToReconstruct = [];
+        const chainKeysToReconstruct = keysAndNodes.map(({ chainKey }) => chainKey);
+        // this._chainListMap.deleteTexts(chainKeysToReconstruct, this._textWritersMap); // TODO: delete this method from chain-list-map
+        this._cleanChainsFromSemiPlugins(chainKeysToReconstruct);
         keysAndNodes.forEach(({ chainKey, nodeKeys }) => {
             this._chainListMap.deleteNodesBelongToAChain(chainKey, nodeKeys);
-            chainKeysToReconstruct.push(chainKey);
         });
-        this._cleanChainsFromSemiPlugins(chainKeysToReconstruct);
         this._reconstructChains(chainKeysToReconstruct);
-        this._updateTexts(chainKeysToReconstruct, textWriterIDs);
+        this._updateTexts(chainKeysToReconstruct, Array.from(this._textWritersMap.keys()));
         this.globe?.DrawRender();
     }
     updateNodesProperties(chainKey, nodesAndPropertyMap, { textWriterIDs = [] } = {}) {
@@ -295,6 +295,10 @@ export class CircleLineChainPlugin {
             // Clean chains from text writers
             const nodeKeys = this._chainListMap.getNodeKeysOfChain(chainKey);
             nodeKeys.pop(); // Remove the last key which is destination of the last circle
+            this._textWritersMap.forEach((writer) => {
+                writer.deleteTextBulk(nodeKeys);
+            });
+            // Clean chains from semi-plugins
             this.circlePlugin?.deleteBulk(nodeKeys);
             this.linePlugin?.deleteBulk(nodeKeys);
             this.arcPlugin?.deleteBulk(nodeKeys);