@pirireis/webglobeplugins 0.6.45-a → 0.6.46-a

package/heatwave/plugins/heatwaveglobeshell.js

@@ -50,6 +50,7 @@ export default class Plugin {
         const gl = this.gl;
         gl.bindFramebuffer(gl.FRAMEBUFFER, this._frameBuffer);
         gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, this._coloredHeatTexture, 0);
+        gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
         const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
         const currentWidth = gl.canvas.width;
         const currentHeight = gl.canvas.height;

package/package.json

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

package/rangerings/enum.js

@@ -1,7 +1,3 @@
 
 export const ENUM_HIDE = Object.freeze({ SHOW: 0, HIDE: 1, HIDE_1_DEGREE_PADDINGS: 2 });
 export const ENUM_TEXT_HIDE = Object.freeze({ SHOW: 0, HIDE: 1 });
-export const COMPASS_MODES = Object.freeze({
-    COMPASS: 1,
-    REAL: 0,
-});

package/rangerings/index.js

@@ -1,5 +1,5 @@
 import { RangeRings } from "./plugin";
 import { ringKeyMethod } from "./ring-account";
 import RangeRingAngleText from './rangeringangletext';
-import { ENUM_HIDE, ENUM_TEXT_HIDE, COMPASS_MODES } from './enum';
-export { RangeRings, ENUM_HIDE, ENUM_TEXT_HIDE, COMPASS_MODES, RangeRingAngleText, ringKeyMethod };
+import { ENUM_HIDE, ENUM_TEXT_HIDE } from './enum';
+export { RangeRings, ENUM_HIDE, ENUM_TEXT_HIDE, RangeRingAngleText, ringKeyMethod };

package/rangerings/plugin.js

@@ -41,7 +41,6 @@
  * @method setOpacity          @param {number} opacity
  * 
  * @method setOneDegreePaddingOn //  performance consuming, might be removed
- * @method setCompass // removed
  * 
  */
 
@@ -110,7 +109,7 @@ class RangeRings {
             const paddingDatas = this.__reconstructCentralRingsBigPaddings(centerID);
             paddingBufferOrchestrator.updateBulk(paddingDatas, bufferManagersCompMapPadding, ["circlePoint", "paddingPoint", "circlePoint3d", "paddingPoint3d"]);
         }
-        this.textPlugin?.updateCentersXY(items);
+        this.paddingTextPlugin?.updateCentersXY(items);
 
         this.__contextTextWriterUpdate(items.map(({ centerID }) => centerID), textWriterIDs);
         globe.DrawRender();
@@ -148,7 +147,7 @@ class RangeRings {
             const paddingDatas = this.__reconstructCentralRingsBigPaddings(item.centerID);
             paddingBufferOrchestrator.insertBulk(paddingDatas, bufferManagersCompMapPadding);
         }
-        this.textPlugin?.insertBulk(items);
+        this.paddingTextPlugin?.insertBulk(items);
         this.__contextTextWriterUpdate(items.map(({ centerID }) => centerID), textWriterIDs);
         globe.DrawRender();
     }
@@ -208,7 +207,7 @@ class RangeRings {
             const paddingDatas = this.__reconstructCentralPaddingProperties(centerID)
             paddingBufferOrchestrator.updateBulk(paddingDatas, bufferManagersCompMapPadding, ["rgba"]);
         }
-        this.textPlugin?.updateCentersHide(centerHides);
+        this.paddingTextPlugin?.updateCentersHide(centerHides);
         this.__contextTextWriterUpdate(centerHides.map(({ centerID }) => centerID), textWriterIDs);
         globe.DrawRender();
         /**
@@ -265,7 +264,7 @@ class RangeRings {
                 paddingBufferOrchestrator.deleteBulk(paddingKeys, bufferManagersCompMapPadding);
             }
         }
-        this.textPlugin?.removeCenters(centerIDs);
+        this.paddingTextPlugin?.removeCenters(centerIDs);
         this._ringAccount.removeCenters(centerIDs);
         globe.DrawRender();
     }
@@ -276,7 +275,7 @@ class RangeRings {
     setOpacity(opacity) {
         if (typeof opacity !== "number" || opacity < 0 || opacity > 1) throw new Error("Invalid value for opacity");
         this._opacity = opacity;
-        this.textPlugin?.setOpacity(opacity);
+        this.paddingTextPlugin?.setOpacity(opacity);
         this._textWritersMap.forEach((writer) => writer.setOpacity(opacity));
         this.globe.DrawRender();
     }
@@ -550,7 +549,7 @@ class RangeRings {
         this._initPrograms();
         this._initBufferManagers();
         if (this._showNumbers) {
-            this.textPlugin = new RangeRingAngleText(globe, this.id + "text", { flatCompassMode: this.compass, style: this._numbersStyle, opacity: this._opacity });
+            this.paddingTextPlugin = new RangeRingAngleText(globe, this.id + "text", { style: this._numbersStyle, opacity: this._opacity });
             delete this._numbersStyle;
         }
     }
@@ -602,7 +601,7 @@ class RangeRings {
         this._padding2dProgram = null;
         this._padding3dProgram = null;
         this._bigPadding3dFlatProgram = null;
-        this.textPlugin?.free();
+        this.paddingTextPlugin?.free();
         this._isFreed = true;
     }
 

package/rangerings/rangeringangletext.js

@@ -1,17 +1,10 @@
-
 import {
     CSObjectArrayUpdateTypes,
 } from "@pirireis/webglobe";
-import { ENUM_HIDE, ENUM_TEXT_HIDE, COMPASS_MODES } from "./enum";
-
-
-const Degree = 180 / Math.PI;
-
-
+import { ENUM_HIDE, ENUM_TEXT_HIDE } from "./enum";
 
 const fidKey = "__fid__";
 
-
 const object = {
     "displayName": "RangeRingAngleText",
     "layerType": 3,
@@ -28,12 +21,10 @@ const object = {
 
 
 export default class RangeRingAngleText {
-    constructor(globe, id, { style = null, flatCompassMode = COMPASS_MODES.REAL, hideAll = false, opacity = 1 } = {}) {
+    constructor(globe, id, { style = null, hideAll = false, opacity = 1 } = {}) {
         this.globe = globe;
         this.ObjectArray = globe.ObjectArray;
         this.id = id;
-        this._flatCompassMode = flatCompassMode;
-        this._lastImplicitCompassMode = this.__implicitCompassMode();
 
         this._hideAll = hideAll;
         this._opacity = opacity;
@@ -78,12 +69,6 @@ export default class RangeRingAngleText {
         this.ObjectArray.StyleChanged(this.object);
     }
 
-    setCompass(mode) {
-        if (mode === this._flatCompassMode) return;
-        this._flatCompassMode = mode;
-        this.__onCompassChange();
-    }
-
 
     free() {
         this.flush();
@@ -290,42 +275,15 @@ export default class RangeRingAngleText {
         this.ObjectArray.SetData(this.object, data);
     }
 
-    //------------------GLOBE EVENTS------------------//
-
-    setGeometry() {
-        this.__onCompassChange();
-    }
 
 
     //------------------PRIVATE METHODS------------------//
 
-    __implicitCompassMode() {
-        const is3D = this.globe.api_GetCurrentGeometry() === 0;
-        if (is3D) {
-            return COMPASS_MODES.REAL;
-        } else {
-            return this._flatCompassMode;
-        }
-    }
-
-
-    __onCompassChange() {
-        if (this._lastImplicitCompassMode === this.__implicitCompassMode()) return;
-        this._lastImplicitCompassMode = this.__implicitCompassMode();
-        this._updateAll();
-    }
 
 
 
-    // TODO: compass ve gercek mesafeye gore farkli hesaplamalar yapilacak __implicitCompassMode
     _appendCircle(long, lat, radius, step, centerID, outBucket) {
-        const currentCompassMode = this.__implicitCompassMode();
-        if (currentCompassMode == COMPASS_MODES.REAL) {
-            this.__realCoords(long, lat, radius, step, centerID, outBucket);
-        } else if (currentCompassMode == COMPASS_MODES.COMPASS) {
-            // throw new Error("Not implemented yet");
-            // this.__compassCoords(long, lat, radius, step, centerID, outBucket);
-        }
+        this.__realCoords(long, lat, radius, step, centerID, outBucket);
 
     }
 
@@ -344,7 +302,10 @@ export default class RangeRingAngleText {
                 "aci": "K"
             });
         }
-        let aci = stepAngle;
+
+        const _stepAngle = this.globe.Units.AngleUtoDeg(stepAngle)
+        let aci = _stepAngle;
+
         for (let i = 1; i < coords_.length; i++) {
             if (aci >= 360) break;
             const { long, lat } = coords_[i];
@@ -354,51 +315,13 @@ export default class RangeRingAngleText {
             // fidkey is the key
             attribs.push({
                 "__fid__": key,
-                "aci": (360 - aci).toString().padStart(3, '0')
+                "aci": (360 - aci).toFixed(0).toString().padStart(3, '0')
             })
-            aci += stepAngle;
+            aci += _stepAngle;
         }
     }
 
 
-    __compassCoords(long, lat, radius, stepAngle, centerID, outBucket) {
-
-        const Dlong = Degree * long;
-        const Dlat = Degree * lat;
-
-        const R = 6371.0 * 1000;
-        const { coords, coordsZ, attribs } = outBucket;
-        const { globe } = this;
-        const radianRadius = radius / R;
-        const scale = Math.cos(lat);
-        {   // add 0
-            const x = Dlong + Degree * (radianRadius * Math.cos(Math.PI / 2));
-            const y = Dlat + Degree * (radianRadius * Math.sin(Math.PI / 2) * scale);
-            coords.push(long, lat);
-            coordsZ.push(0);
-            const key = this._key(centerID, 0);
-            attribs.push({
-                "__fid__": key,
-                "aci": "K"
-            })
-        }
-        let aci = stepAngle;
-        let i = 1;
-        const RStep = stepAngle / Degree;
-        for (let cstep = Math.PI / 2 - RStep; cstep > -Math.PI * 1.5; cstep -= RStep) {
-            if (aci >= 360) break;
-            const x = Dlong + Degree * (radianRadius * Math.cos(cstep));
-            const y = Dlat + Degree * (radianRadius * Math.sin(cstep) * scale);
-            coords.push(long, lat);
-            coordsZ.push(0);
-            const key = this._key(centerID, i++);
-            attribs.push({
-                "__fid__": key,
-                "aci": Math.floor(aci).toString()
-            })
-            aci += stepAngle;
-        }
-    }
 
 
     _updateData(bucket, mode) {
@@ -416,7 +339,8 @@ export default class RangeRingAngleText {
         const stepAngle = centerMap.get("stepAngle");
         const { coords, coordsZ, attribs } = outDeleteBucket;
         let i = 0;
-        for (let aci = 0; aci < 360; aci += stepAngle) {
+        const _stepAngle = this.globe.Units.AngleUtoDeg(stepAngle)
+        for (let aci = 0; aci < 360; aci += _stepAngle) {
             const key = this._key(centerID, i++);
             coords.push(0, 0);
             coordsZ.push(0);
@@ -447,19 +371,6 @@ export default class RangeRingAngleText {
 }
 
 
-const readCoords = (long, lat, radius, stepAngle) => {
-
-    const result = []
-    const degree = radius / R;
-
-    return result;
-}
-
-
-
-
-const R = 6371.0;
-
 
 const realCircle = (globe, longitude, latitude, radius, stepAngle) => {
     const pointsLongLat = globe.Math.GetEllipseGeo(