@pirireis/webglobeplugins 0.6.47-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.47-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);