@pirireis/webglobeplugins 0.6.46-a → 0.6.48-a

package/heatwave/plugins/heatwaveglobeshell.js

@@ -10,7 +10,7 @@ import { GlobeShellWiggle, Float2LegendWithRatio } from "../../programs";
  * @param dataWidthHeight : {width: number, height: number}
  * @param options : {bbox: number[], minMaxEdges: {min: number, max: number}, escapeValue: number, resolution: number[], meshPartition: number[]}
  */
-export default class Plugin {
+export default class HeatWaveGlobeShellPlugin {
     constructor(id, dataManager, colorRampData, dataWidthHeight,
         {
             bbox = [-180, -90, 180, 90],
@@ -143,12 +143,15 @@ export default class Plugin {
 
     _updateData(ratio, textureData0 = null, textureData1 = null) {
         if (!textureData0 || !textureData1) {
-            this.isAble = false;
+            if (this._disCarded) return;
+            this.heatProgram.discard();
+            this.drawHeat();
+            this._disCarded = true;
             return;
         };
         this.heatProgram.setBlendRatio(ratio);
         if (this._lastTexture0data !== textureData0 || this._lastTexture1data !== textureData1) {
-            this.isAble = true;
+            this._disCarded = false;
             this._lastTexture0data = textureData0;
             this._lastTexture1data = textureData1;
             this.heatProgram.setFloatTextureData(textureData0, textureData1, this._dataWidthHeight.width, this._dataWidthHeight.height);
@@ -166,7 +169,7 @@ export default class Plugin {
 
     draw3D() {
         if (!this._isOn) return;
-        if (!this.isAble) return;
+        // if (!this.isAble) return;
         this.gl.disable(this.gl.DEPTH_TEST);
         this.globeShell.draw();
         this.gl.enable(this.gl.DEPTH_TEST);

package/package.json

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

package/programs/float2legendwithratio/logic.js

@@ -46,7 +46,10 @@ export default class {
         out vec4 outColor;
 
         void main() {
-            
+            if ( u_blend_ratio < 0.0) {
+                outColor = vec4(0.0, 0.0, 0.0, 0.0);
+                return;
+            }
             float f0 = texture(u_float_texture0, v_texcoord).r;
             float f1 = texture(u_float_texture1, v_texcoord).r;
             // outColor = vec4(

package/programs/float2legendwithratio/object.js

@@ -96,6 +96,11 @@ export default class {
     }
 
 
+    discard() {
+        this.heatParametersBlockManager.update({ blend_ratio: -1 });
+    }
+
+
     setColorRampTextureData(data, size) {
         const { gl, colorRampTexture } = this;
         gl.bindTexture(gl.TEXTURE_2D, colorRampTexture);

package/rangerings/rangeringangletext.js

@@ -104,6 +104,7 @@ export default class RangeRingAngleText {
             if (this._centerCollection.has(centerID)) {
                 this._fillDeleteBucket(centerID, deleteBucket);
             }
+
             const maxRadius = rings.reduce((acc, { radius }) => Math.max(acc, radius), 0);
             const textHide_ = _hideAll ? ENUM_TEXT_HIDE.HIDE : textHide;
             const show = hide !== ENUM_HIDE.HIDE && textHide_ === ENUM_TEXT_HIDE.SHOW;
@@ -289,7 +290,6 @@ export default class RangeRingAngleText {
 
     __realCoords(long, lat, radius, stepAngle, centerID, outBucket) {
         const { coords, coordsZ, attribs } = outBucket;
-
         const coords_ = realCircle(this.globe, long, lat, radius, stepAngle);
         {   // add 0
             const { long, lat } = coords_[0];
@@ -303,8 +303,7 @@ export default class RangeRingAngleText {
             });
         }
 
-        const _stepAngle = this.globe.Units.AngleUtoDeg(stepAngle)
-        let aci = _stepAngle;
+        let aci = stepAngle;
 
         for (let i = 1; i < coords_.length; i++) {
             if (aci >= 360) break;
@@ -317,7 +316,7 @@ export default class RangeRingAngleText {
                 "__fid__": key,
                 "aci": (360 - aci).toFixed(0).toString().padStart(3, '0')
             })
-            aci += _stepAngle;
+            aci += stepAngle;
         }
     }
 
@@ -339,8 +338,7 @@ export default class RangeRingAngleText {
         const stepAngle = centerMap.get("stepAngle");
         const { coords, coordsZ, attribs } = outDeleteBucket;
         let i = 0;
-        const _stepAngle = this.globe.Units.AngleUtoDeg(stepAngle)
-        for (let aci = 0; aci < 360; aci += _stepAngle) {
+        for (let aci = 0; aci < 360; aci += stepAngle) {
             const key = this._key(centerID, i++);
             coords.push(0, 0);
             coordsZ.push(0);

package/wind/index.js

@@ -1,7 +1,7 @@
 import WindPlugin from "./plugin";
 import createVectorFieldImage from "./vectorfieldimage";
 import imageToMagnitude from "./imagetovectorfieldandmagnitude";
-
-export { createVectorFieldImage, imageToMagnitude, WindPlugin };
+import { createImageFromBase64 } from "../util/webglobjectbuilders";
+export { createVectorFieldImage, imageToMagnitude, WindPlugin, createImageFromBase64 };
 
 // TODO: image resmindeki degerlerden ruzgar siddetinin magnitudunun hesaplanip float32array donderen bir fonksiyonun yazilmasi gerekiyor