@antv/l7-layers 2.10.6 → 2.10.7

package/es/heatmap/models/heatmap.d.ts

@@ -10,8 +10,8 @@ export default class HeatMapModel extends BaseModel {
     private shapeType;
     render(): void;
     getUninforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): Promise<void>;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
+    buildModels(): Promise<IModel[]>;
     protected registerBuiltinAttributes(): void;
     private buildHeatMapIntensity;
     private buildHeatmapColor;

package/es/heatmap/models/heatmap.js

@@ -85,7 +85,7 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
   }, {
     key: "initModels",
     value: function () {
-      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(callbackModel) {
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var _shapeAttr$scale;
 
         var _this$rendererService2, createFramebuffer, getViewportSize, createTexture2D, shapeAttr, shapeType, _getViewportSize, width, height;
@@ -122,7 +122,7 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
                   depth: false
                 });
                 this.updateColorTexture();
-                callbackModel([this.intensityModel, this.colorModel]);
+                return _context.abrupt("return", [this.intensityModel, this.colorModel]);
 
               case 12:
               case "end":
@@ -132,7 +132,7 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
         }, _callee, this);
       }));
 
-      function initModels(_x) {
+      function initModels() {
         return _initModels.apply(this, arguments);
       }
 
@@ -140,9 +140,32 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
     }()
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.initModels(callbackModel);
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return this.initModels();
+
+              case 2:
+                return _context2.abrupt("return", _context2.sent);
+
+              case 3:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
@@ -185,14 +208,14 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
   }, {
     key: "buildHeatMapIntensity",
     value: function () {
-      var _buildHeatMapIntensity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      var _buildHeatMapIntensity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
         var model;
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context3.prev = _context3.next) {
               case 0:
                 this.layer.triangulation = HeatmapTriangulation;
-                _context2.next = 3;
+                _context3.next = 3;
                 return this.layer.buildLayerModel({
                   moduleName: 'heatmapIntensity',
                   vertexShader: heatmapFramebufferVert,
@@ -217,15 +240,15 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
                 });
 
               case 3:
-                model = _context2.sent;
-                return _context2.abrupt("return", model);
+                model = _context3.sent;
+                return _context3.abrupt("return", model);
 
               case 5:
               case "end":
-                return _context2.stop();
+                return _context3.stop();
             }
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
 
       function buildHeatMapIntensity() {
@@ -302,6 +325,8 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
           _ref2$radius = _ref2.radius,
           radius = _ref2$radius === void 0 ? 5 : _ref2$radius;
 
+      this.layerService.beforeRenderData(this.layer);
+      this.layer.hooks.beforeRender.call();
       (_this$intensityModel = this.intensityModel) === null || _this$intensityModel === void 0 ? void 0 : _this$intensityModel.draw({
         uniforms: {
           u_opacity: opacity || 1.0,
@@ -309,6 +334,7 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
           u_intensity: intensity
         }
       });
+      this.layer.hooks.afterRender.call();
     }
   }, {
     key: "drawColorMode",

package/es/heatmap/models/hexagon.d.ts

@@ -2,7 +2,7 @@ import { IModel, IModelUniform } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class HexagonModel extends BaseModel {
     getUninforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
+    buildModels(): Promise<IModel[]>;
     protected registerBuiltinAttributes(): void;
 }

package/es/heatmap/models/hexagon.js

@@ -1,8 +1,10 @@
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -47,36 +49,75 @@ var HexagonModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.buildModels(callbackModel);
-    }
+    value: function () {
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return this.buildModels();
+
+              case 2:
+                return _context.abrupt("return", _context.sent);
+
+              case 3:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      var _ref2 = this.layer.getLayerConfig(),
-          _ref2$mask = _ref2.mask,
-          mask = _ref2$mask === void 0 ? false : _ref2$mask,
-          _ref2$maskInside = _ref2.maskInside,
-          maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
-
-      this.layer.buildLayerModel({
-        moduleName: 'heatmapHexagon',
-        vertexShader: heatmapGridVert,
-        fragmentShader: heatmapGridFrag,
-        triangulation: HeatmapGridTriangulation,
-        depth: {
-          enable: false
-        },
-        primitive: gl.TRIANGLES,
-        blend: this.getBlend(),
-        stencil: getMask(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, model;
+
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _ref2 = this.layer.getLayerConfig(), _ref2$mask = _ref2.mask, mask = _ref2$mask === void 0 ? false : _ref2$mask, _ref2$maskInside = _ref2.maskInside, maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
+                _context2.next = 3;
+                return this.layer.buildLayerModel({
+                  moduleName: 'heatmapHexagon',
+                  vertexShader: heatmapGridVert,
+                  fragmentShader: heatmapGridFrag,
+                  triangulation: HeatmapGridTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  primitive: gl.TRIANGLES,
+                  blend: this.getBlend(),
+                  stencil: getMask(mask, maskInside)
+                });
+
+              case 3:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 5:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/es/heatmap/shaders/hexagon_3d_vert.glsl

@@ -25,21 +25,10 @@ uniform vec2 u_SceneCenterMKT;
 void main() {
   mat2 rotationMatrix = mat2(cos(u_angle), sin(u_angle), -sin(u_angle), cos(u_angle));
   vec2 offset =(vec2(a_Position.xy * u_radius * rotationMatrix * u_coverage));
-  // vec2 lnglat = unProjectFlat(a_Pos.xy + offset); // 实际的经纬度
-  // vec2 lnglat = (a_Pos.xy + offset); 
-  // vec4 project_pos = project_position(vec4(lnglat, a_Position.z * a_Size, 1.0));
-  // gl_Position = project_common_position_to_clipspace(project_pos);
-  // float lightWeight = calc_lighting(project_pos);
-  // v_color =vec4(a_Color.rgb*lightWeight, a_Color.w);
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    // vec2 lnglat = (a_Pos.xy + offset); 
-    // vec4 project_pos = project_position(vec4(lnglat, a_Position.z * a_Size, 1.0));
 
-    // float lightWeight = calc_lighting(project_pos);
-    // v_color =vec4(a_Color.rgb*lightWeight, a_Color.w);
-  
-    // gl_Position = u_Mvp * vec4(lnglat , a_Position.z * a_Size, 1.0);
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+ 
     vec2 lnglat = unProjectFlat(a_Pos.xy + offset); // 经纬度
     vec2 customLnglat = customProject(lnglat) - u_SceneCenterMKT; // 将经纬度转换为高德2.0需要的平面坐标
     vec4 project_pos = project_position(vec4(customLnglat, a_Position.z * a_Size, 1.0));

package/es/image/index.d.ts

@@ -3,8 +3,7 @@ import { IImageLayerStyleOptions } from '../core/interface';
 import { ImageModelType } from './models/index';
 export default class ImageLayer extends BaseLayer<IImageLayerStyleOptions> {
     type: string;
-    buildModels(): void;
-    rebuildModels(): void;
-    protected getDefaultConfig(): {} | {} | {};
-    protected getModelType(): ImageModelType;
+    buildModels(): Promise<void>;
+    protected getDefaultConfig(): {};
+    getModelType(): ImageModelType;
 }

package/es/image/index.js

@@ -1,3 +1,4 @@
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
@@ -5,6 +6,7 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -36,52 +38,45 @@ var ImageLayer = /*#__PURE__*/function (_BaseLayer) {
 
   _createClass(ImageLayer, [{
     key: "buildModels",
-    value: function buildModels() {
-      var _this2 = this;
-
-      var modelType = this.getModelType();
-      this.layerModel = new ImageModels[modelType](this);
-      this.layerModel.initModels(function (models) {
-        _this2.dispatchModelLoad(models);
-      });
-    }
-  }, {
-    key: "rebuildModels",
-    value: function rebuildModels() {
-      var _this3 = this;
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var modelType;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                modelType = this.getModelType();
+                this.layerModel = new ImageModels[modelType](this);
+                _context.next = 4;
+                return this.initLayerModels();
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
 
-      this.layerModel.buildModels(function (models) {
-        _this3.dispatchModelLoad(models);
-      });
-    }
+      return buildModels;
+    }()
   }, {
     key: "getDefaultConfig",
     value: function getDefaultConfig() {
       var type = this.getModelType();
       var defaultConfig = {
-        image: {},
-        dataImage: {},
-        tileDataImage: {}
+        image: {}
       };
       return defaultConfig[type];
     }
   }, {
     key: "getModelType",
     value: function getModelType() {
-      var _shapeAttribute$scale;
-
-      var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
-      var shape = shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
-
-      if (shape === 'dataImage') {
-        return 'dataImage';
-      } else if (shape === 'image') {
-        return 'image';
-      } else if (shape === 'tileDataImage') {
-        return 'tileDataImage';
-      } else {
-        return 'image';
-      }
+      return 'image';
     }
   }]);
 

package/es/image/models/image.d.ts

@@ -3,8 +3,8 @@ import BaseModel from '../../core/BaseModel';
 export default class ImageModel extends BaseModel {
     protected texture: ITexture2D;
     getUninforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
     clearModels(): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(): Promise<IModel[]>;
     protected registerBuiltinAttributes(): void;
 }

package/es/image/models/image.js

@@ -1,8 +1,10 @@
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -43,73 +45,98 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      var _this = this;
-
-      var _ref2 = this.layer.getLayerConfig(),
-          _ref2$mask = _ref2.mask,
-          mask = _ref2$mask === void 0 ? false : _ref2$mask,
-          _ref2$maskInside = _ref2.maskInside,
-          maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
-
-      var source = this.layer.getSource();
-      var createTexture2D = this.rendererService.createTexture2D;
-      this.texture = createTexture2D({
-        height: 0,
-        width: 0
-      });
+    value: function () {
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var _this = this;
+
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, canvas, img, imageData, model;
+
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _ref2 = this.layer.getLayerConfig(), _ref2$mask = _ref2.mask, mask = _ref2$mask === void 0 ? false : _ref2$mask, _ref2$maskInside = _ref2.maskInside, maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
+                source = this.layer.getSource();
+                createTexture2D = this.rendererService.createTexture2D;
+                this.texture = createTexture2D({
+                  height: 0,
+                  width: 0
+                });
+
+                if (!isMini) {
+                  _context.next = 12;
+                  break;
+                }
+
+                // @ts-ignore
+                canvas = this.layerService.sceneService.getSceneConfig().canvas;
+                img = canvas.createImage();
+                img.crossOrigin = 'anonymous';
+                img.src = source.data.originData;
+
+                img.onload = function () {
+                  _this.texture = createTexture2D({
+                    data: img,
+                    width: img.width,
+                    height: img.height
+                  });
+
+                  _this.layerService.reRender();
+                };
+
+                _context.next = 16;
+                break;
+
+              case 12:
+                _context.next = 14;
+                return source.data.images;
+
+              case 14:
+                imageData = _context.sent;
+                this.texture = createTexture2D({
+                  data: imageData[0],
+                  width: imageData[0].width,
+                  height: imageData[0].height,
+                  mag: gl.LINEAR,
+                  min: gl.LINEAR
+                });
+
+              case 16:
+                _context.next = 18;
+                return this.layer.buildLayerModel({
+                  moduleName: 'rasterImage',
+                  vertexShader: ImageVert,
+                  fragmentShader: ImageFrag,
+                  triangulation: RasterImageTriangulation,
+                  primitive: gl.TRIANGLES,
+                  blend: {
+                    // Tip: 优化显示效果
+                    enable: true
+                  },
+                  depth: {
+                    enable: false
+                  },
+                  stencil: getMask(mask, maskInside)
+                });
+
+              case 18:
+                model = _context.sent;
+                return _context.abrupt("return", [model]);
+
+              case 20:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
 
-      if (isMini) {
-        // @ts-ignore
-        var canvas = this.layerService.sceneService.getSceneConfig().canvas;
-        var img = canvas.createImage();
-        img.crossOrigin = 'anonymous';
-        img.src = source.data.originData;
-
-        img.onload = function () {
-          _this.texture = createTexture2D({
-            data: img,
-            width: img.width,
-            height: img.height
-          });
-
-          _this.layerService.reRender();
-        };
-      } else {
-        source.data.images.then(function (imageData) {
-          _this.texture = createTexture2D({
-            data: imageData[0],
-            width: imageData[0].width,
-            height: imageData[0].height,
-            mag: gl.LINEAR,
-            min: gl.LINEAR
-          });
-
-          _this.layerService.reRender();
-        });
+      function initModels() {
+        return _initModels.apply(this, arguments);
       }
 
-      this.layer.buildLayerModel({
-        moduleName: 'rasterImage',
-        vertexShader: ImageVert,
-        fragmentShader: ImageFrag,
-        triangulation: RasterImageTriangulation,
-        primitive: gl.TRIANGLES,
-        blend: {
-          // Tip: 优化显示效果
-          enable: true
-        },
-        depth: {
-          enable: false
-        },
-        stencil: getMask(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+      return initModels;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -119,9 +146,32 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.initModels(callbackModel);
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return this.initModels();
+
+              case 2:
+                return _context2.abrupt("return", _context2.sent);
+
+              case 3:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/es/image/models/index.d.ts

@@ -1,4 +1,4 @@
-export declare type ImageModelType = 'image' | 'dataImage' | 'tileDataImage';
+export declare type ImageModelType = 'image';
 declare const ImageModels: {
     [key in ImageModelType]: any;
 };

package/es/image/models/index.js

@@ -1,9 +1,5 @@
-import DataImageModel from "./dataImage";
 import ImageModel from "./image";
-import TileDataImageModel from "./tileDataImage";
 var ImageModels = {
-  image: ImageModel,
-  dataImage: DataImageModel,
-  tileDataImage: TileDataImageModel
+  image: ImageModel
 };
 export default ImageModels;

package/es/image/shaders/dataImage_frag.glsl

@@ -11,28 +11,22 @@ uniform float u_noDataValue;
 uniform bool u_clampLow: true;
 uniform bool u_clampHigh: true;
 
-uniform float u_pixelConstant;
-uniform float u_pixelConstantR;
-uniform float u_pixelConstantG;
-uniform float u_pixelConstantB;
-uniform float u_pixelConstantRGB;
-
 void main() {
   vec4 baseColor = texture2D(u_texture, vec2(v_texCoord.x, v_texCoord.y));
 
   float r = baseColor.r;
   float g = baseColor.g;
   float b = baseColor.b;
-
-  float value = u_pixelConstant + ((r * u_pixelConstantR + g * u_pixelConstantG + b * u_pixelConstantB) * u_pixelConstantRGB);
-  if (value == u_noDataValue) {
-    gl_FragColor = vec4(0.0, 0, 0, 0.0);
-  } else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1])) {
-    gl_FragColor = vec4(0, 0, 0, 0);
-  } else {
+  float value = -10000.0 + ((r * 256.0 * 256.0 + g * 256.0 + b) * 0.1);
+  // if (value == u_noDataValue) {
+  //   gl_FragColor = vec4(0.0, 0, 0, 0.0);
+  // } else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1])) {
+  //   gl_FragColor = vec4(0, 0, 0, 0);
+  // } else {
     float normalisedValue =(value - u_domain[0]) / (u_domain[1] - u_domain[0]);
     vec4 color = texture2D(u_colorTexture, vec2(normalisedValue, 0));
-    gl_FragColor = color;
-    gl_FragColor.a =  gl_FragColor.a * u_opacity ;
-  }
+    gl_FragColor = vec4(r,g,b, 1.0);
+    // gl_FragColor = color;
+    // gl_FragColor.a =  gl_FragColor.a * u_opacity ;
+  // }
 }