@antv/l7-layers 2.20.5 → 2.20.8

package/es/polygon/shaders/water/polygon_water_frag.glsl

@@ -1,21 +1,25 @@
 uniform sampler2D u_texture;
-uniform float u_time: 0.0;
-uniform float u_speed: 1.0;
-uniform float u_opacity: 1.0;
+layout(std140) uniform commonUniforms {
+  float u_speed;
+  float u_time;
+};
 
-varying vec4 v_Color;
-varying vec2 v_uv;
+out vec4 outputColor;
+
+
+in vec4 v_Color;
+in vec2 v_uv;
 
 float rand(vec2 n) { return 0.5 + 0.5 * fract(sin(dot(n.xy, vec2(12.9898, 78.233)))* 43758.5453); }
 
 float water(vec3 p) {
   float t = u_time * u_speed;
   p.z += t * 2.; p.x += t * 2.;
-  vec3 c1 = texture2D(u_texture, p.xz / 30.).xyz;
+  vec3 c1 = texture(SAMPLER_2D(u_texture), p.xz / 30.).xyz;
   p.z += t * 3.; p.x += t * 0.52;
-  vec3 c2 = texture2D(u_texture, p.xz / 30.).xyz;
+  vec3 c2 = texture(SAMPLER_2D(u_texture), p.xz / 30.).xyz;
   p.z += t * 4.; p.x += t * 0.8;
-  vec3 c3 = texture2D(u_texture, p.xz / 30.).xyz;
+  vec3 c3 = texture(SAMPLER_2D(u_texture), p.xz / 30.).xyz;
   c1 += c2 - c3;
   float z = (c1.x + c1.y + c1.z) / 3.;
   return p.y + z / 4.;
@@ -62,10 +66,8 @@ float calSpc() {
 }
 
 void main() {
-  float opacity = u_opacity;
-  gl_FragColor = v_Color;
-  gl_FragColor.a *= opacity;
 
+  outputColor = v_Color;
   float spc = calSpc();
-  gl_FragColor += spc * 0.4;
+  outputColor += spc * 0.4;
 }

package/es/polygon/shaders/water/polygon_water_vert.glsl

@@ -1,20 +1,20 @@
-attribute vec4 a_Color;
-attribute vec2 a_uv;
-attribute vec3 a_Position;
-uniform mat4 u_ModelMatrix;
-
-
-varying vec4 v_Color;
-varying vec2 v_uv;
-uniform float u_opacity: 1.0;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 14) in vec2 a_uv;
+layout(std140) uniform commonUniforms {
+  float u_speed;
+  float u_time;
+};
+out vec4 v_Color;
+out vec2 v_uv;
 
 
 #pragma include "projection"
 
 void main() {
   v_uv = a_uv;
-
   v_Color = a_Color;
+  v_Color.a *= opacity;
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
 
   gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));

package/es/raster/buffers/triangulation.d.ts

@@ -1,4 +1,4 @@
-import { IParseDataItem } from '@antv/l7-core';
+import type { IParseDataItem } from '@antv/l7-core';
 export declare function RasterTriangulation(parserData: IParseDataItem): {
     vertices: number[];
     indices: number[];

package/es/raster/index.d.ts

@@ -1,6 +1,6 @@
 import BaseLayer from '../core/BaseLayer';
-import { IRasterLayerStyleOptions } from '../core/interface';
-import { RasterModelType } from './models/index';
+import type { IRasterLayerStyleOptions } from '../core/interface';
+import type { RasterModelType } from './models/index';
 export default class RaterLayer extends BaseLayer<IRasterLayerStyleOptions> {
     type: string;
     buildModels(): Promise<void>;

package/es/raster/models/raster.d.ts

@@ -1,16 +1,17 @@
-import { IModel, ITexture2D } from '@antv/l7-core';
+import type { IModel, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class RasterModel extends BaseModel {
     protected texture: ITexture2D;
     protected colorTexture: ITexture2D;
     getUninforms(): {
-        u_opacity: number;
-        u_texture: ITexture2D;
-        u_domain: [number, number];
-        u_clampLow: boolean;
-        u_clampHigh: boolean;
-        u_noDataValue: number;
-        u_colorTexture: ITexture2D;
+        [x: string]: any;
+    };
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
     };
     private getRasterData;
     initModels(): Promise<IModel[]>;

package/es/raster/models/raster.js

@@ -1,4 +1,5 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
@@ -10,11 +11,12 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import { AttributeType, gl } from '@antv/l7-core';
 import { getDefaultDomain } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
+import { ShaderLocation } from "../../core/CommonStyleAttribute";
 import { RasterImageTriangulation } from "../../core/triangulation";
-/* babel-plugin-inline-import '../shaders/raster_2d_frag.glsl' */
-var rasterFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\nuniform float u_min;\nuniform float u_max;\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nvarying vec2 v_texCoord;\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\n\nvoid main() {\n\n  float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;\n  if (value == u_noDataValue || isnan_emu(value))\n      discard;\n  else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))\n     discard;\n  else {\n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] -u_domain[0]);\n    vec4 color = texture2D(u_colorTexture,vec2(normalisedValue, 0));\n    \n    gl_FragColor = color;\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n    if(gl_FragColor.a < 0.01)\n      discard;\n   \n  }\n}\n";
-/* babel-plugin-inline-import '../shaders/raster_2d_vert.glsl' */
-var rasterVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\n\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n    gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
+/* babel-plugin-inline-import '../shaders/raster/raster_2d_frag.glsl' */
+var rasterFrag = "layout(std140) uniform commonUniforms {\n  vec2 u_domain;\n  float u_opacity;\n  float u_noDataValue;\n  bool u_clampLow;\n  bool u_clampHigh;\n};\n\nuniform sampler2D u_rasterTexture;\nuniform sampler2D u_colorTexture;\n\nin vec2 v_texCoord;\n\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\nout vec4 outputColor;\n\nvoid main() {\n  // Can use any component here since u_rasterTexture is under luminance format.\n  float value = texture(SAMPLER_2D(u_rasterTexture), vec2(v_texCoord.x, v_texCoord.y)).r * 255.0;\n  if (value == u_noDataValue || isnan_emu(value)) {\n    discard;\n  } else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1])) {\n    discard;\n  } else {\n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] - u_domain[0]);\n    vec4 color = texture(SAMPLER_2D(u_colorTexture), vec2(normalisedValue, 0));\n    \n    outputColor = color;\n    outputColor.a = outputColor.a * u_opacity ;\n    if (outputColor.a < 0.01)\n      discard;\n  }\n}\n";
+/* babel-plugin-inline-import '../shaders/raster/raster_2d_vert.glsl' */
+var rasterVert = "\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  vec2 u_domain;\n  float u_opacity;\n  float u_noDataValue;\n  bool u_clampLow;\n  bool u_clampHigh;\n};\n\nout vec2 v_texCoord;\n\n#pragma include \"projection\"\n\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
 var RasterModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(RasterModel, _BaseModel);
   var _super = _createSuper(RasterModel);
@@ -25,6 +27,14 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
   _createClass(RasterModel, [{
     key: "getUninforms",
     value: function getUninforms() {
+      var commoninfo = this.getCommonUniformsInfo();
+      var attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
+      this.updateStyleUnifoms();
+      return _objectSpread(_objectSpread({}, commoninfo.uniformsOption), attributeInfo.uniformsOption);
+    }
+  }, {
+    key: "getCommonUniformsInfo",
+    value: function getCommonUniformsInfo() {
       var _ref = this.layer.getLayerConfig(),
         _ref$opacity = _ref.opacity,
         opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
@@ -38,15 +48,18 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
         rampColors = _ref.rampColors;
       var newdomain = domain || getDefaultDomain(rampColors);
       this.colorTexture = this.layer.textureService.getColorTexture(rampColors, newdomain);
-      return {
-        u_opacity: opacity || 1,
-        u_texture: this.texture,
+      var commonOptions = {
         u_domain: newdomain,
+        u_opacity: opacity || 1,
+        u_noDataValue: noDataValue,
         u_clampLow: clampLow,
         u_clampHigh: typeof clampHigh !== 'undefined' ? clampHigh : clampLow,
-        u_noDataValue: noDataValue,
+        u_rasterTexture: this.texture,
         u_colorTexture: this.colorTexture
       };
+      this.textures = [this.texture, this.colorTexture];
+      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+      return commonBufferInfo;
     }
   }, {
     key: "getRasterData",
@@ -93,29 +106,50 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     key: "initModels",
     value: function () {
       var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, model;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              return _context2.abrupt("return", this.buildModels());
+            case 1:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+      return initModels;
+    }()
+  }, {
+    key: "buildModels",
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+        var source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, model;
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              this.initUniformsBuffer();
               source = this.layer.getSource();
               createTexture2D = this.rendererService.createTexture2D;
               parserDataItem = source.data.dataArray[0];
-              _context2.next = 5;
+              _context3.next = 6;
               return this.getRasterData(parserDataItem);
-            case 5:
-              _yield$this$getRaster = _context2.sent;
+            case 6:
+              _yield$this$getRaster = _context3.sent;
               data = _yield$this$getRaster.data;
               width = _yield$this$getRaster.width;
               height = _yield$this$getRaster.height;
               this.texture = createTexture2D({
-                data: data,
+                data: new Uint8Array(data),
                 width: width,
                 height: height,
                 format: gl.LUMINANCE,
-                type: gl.FLOAT
+                type: gl.UNSIGNED_BYTE,
+                alignment: 1
                 // aniso: 4,
               });
-              _context2.next = 12;
+              _context3.next = 13;
               return this.layer.buildLayerModel({
                 moduleName: 'rasterImageData',
                 vertexShader: rasterVert,
@@ -126,29 +160,10 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   enable: false
                 }
               });
-            case 12:
-              model = _context2.sent;
-              return _context2.abrupt("return", [model]);
-            case 14:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
-      return initModels;
-    }()
-  }, {
-    key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              return _context3.abrupt("return", this.initModels());
-            case 1:
+            case 13:
+              model = _context3.sent;
+              return _context3.abrupt("return", [model]);
+            case 15:
             case "end":
               return _context3.stop();
           }
@@ -174,6 +189,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
         name: 'uv',
         type: AttributeType.Attribute,
         descriptor: {
+          shaderLocation: ShaderLocation.UV,
           name: 'a_Uv',
           buffer: {
             // give the WebGL driver a hint that this buffer may change

package/es/raster/models/rasterRgb.d.ts

@@ -1,15 +1,17 @@
-import { IModel, ITexture2D } from '@antv/l7-core';
+import type { IModel, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class RasterModel extends BaseModel {
     protected texture: ITexture2D;
     protected dataOption: any;
     getUninforms(): {
-        u_opacity: number;
-        u_texture: ITexture2D;
-        u_noDataValue: number;
-        u_rminmax: any;
-        u_gminmax: any;
-        u_bminmax: any;
+        [x: string]: any;
+    };
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
     };
     private getRasterData;
     initModels(): Promise<IModel[]>;

package/es/raster/models/rasterRgb.js

@@ -1,6 +1,6 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
@@ -15,11 +15,12 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 import { AttributeType, gl } from '@antv/l7-core';
 import BaseModel from "../../core/BaseModel";
+import { ShaderLocation } from "../../core/CommonStyleAttribute";
 import { RasterImageTriangulation } from "../../core/triangulation";
-/* babel-plugin-inline-import '../shaders/raster_2d_vert.glsl' */
-var rasterVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\n\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n    gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
-/* babel-plugin-inline-import '../shaders/raster_rgb_frag.glsl' */
-var rasterFrag = "precision mediump float;\nuniform vec2 u_rminmax: vec2(0,255); \nuniform vec2 u_gminmax: vec2(0,255);\nuniform vec2 u_bminmax: vec2(0,255);\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform float u_noDataValue : 0.0;\nvarying vec2 v_texCoord;\n\nvoid main() {\n  vec3 rgb = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).rgb;\n  if(rgb == vec3(u_noDataValue)) {\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n    gl_FragColor = vec4(rgb.r / (u_rminmax.y -u_rminmax.x), rgb.g /(u_gminmax.y -u_gminmax.x), rgb.b/ (u_bminmax.y - u_bminmax.x), u_opacity);\n  }\n  if(gl_FragColor.a < 0.01)\n    discard;\n \n}";
+/* babel-plugin-inline-import '../shaders/rgb/raster_rgb_frag.glsl' */
+var rasterFrag = "uniform sampler2D u_texture;\nlayout(std140) uniform commonUniforms {\n vec2 u_rminmax;\n vec2 u_gminmax;\n vec2 u_bminmax;\n float u_opacity;\n float u_noDataValue;\n};\n\nin vec2 v_texCoord;\n\nout vec4 outputColor;\n\nvoid main() {\n\n  vec3 rgb = texture(SAMPLER_2D(u_texture),vec2(v_texCoord.x,v_texCoord.y)).rgb;\n\n  if(rgb == vec3(u_noDataValue)) {\n    outputColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n    outputColor = vec4(rgb.r / (u_rminmax.y -u_rminmax.x), rgb.g /(u_gminmax.y -u_gminmax.x), rgb.b/ (u_bminmax.y - u_bminmax.x), u_opacity);\n  }\n  if(outputColor.a < 0.01)\n    discard;\n \n}";
+/* babel-plugin-inline-import '../shaders/rgb/raster_rgb_vert.glsl' */
+var rasterVert = "\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n vec2 u_rminmax;\n vec2 u_gminmax;\n vec2 u_bminmax;\n float u_opacity;\n float u_noDataValue;\n};\n\nout vec2 v_texCoord;\n\n#pragma include \"projection\"\n\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n   gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
 var RasterModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(RasterModel, _BaseModel);
   var _super = _createSuper(RasterModel);
@@ -36,23 +37,37 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
   _createClass(RasterModel, [{
     key: "getUninforms",
     value: function getUninforms() {
+      var commoninfo = this.getCommonUniformsInfo();
+      var attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
+      this.updateStyleUnifoms();
+      return _objectSpread(_objectSpread({}, commoninfo.uniformsOption), attributeInfo.uniformsOption);
+    }
+  }, {
+    key: "getCommonUniformsInfo",
+    value: function getCommonUniformsInfo() {
       var _ref = this.layer.getLayerConfig(),
         _ref$opacity = _ref.opacity,
         opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
         _ref$noDataValue = _ref.noDataValue,
         noDataValue = _ref$noDataValue === void 0 ? 0 : _ref$noDataValue;
       var _this$dataOption = this.dataOption,
-        rMinMax = _this$dataOption.rMinMax,
-        gMinMax = _this$dataOption.gMinMax,
-        bMinMax = _this$dataOption.bMinMax;
-      return {
-        u_opacity: opacity || 1,
-        u_texture: this.texture,
-        u_noDataValue: noDataValue,
+        _this$dataOption$rMin = _this$dataOption.rMinMax,
+        rMinMax = _this$dataOption$rMin === void 0 ? [0, 255] : _this$dataOption$rMin,
+        _this$dataOption$gMin = _this$dataOption.gMinMax,
+        gMinMax = _this$dataOption$gMin === void 0 ? [0, 255] : _this$dataOption$gMin,
+        _this$dataOption$bMin = _this$dataOption.bMinMax,
+        bMinMax = _this$dataOption$bMin === void 0 ? [0, 255] : _this$dataOption$bMin;
+      var commonOptions = {
         u_rminmax: rMinMax,
         u_gminmax: gMinMax,
-        u_bminmax: bMinMax
+        u_bminmax: bMinMax,
+        u_opacity: opacity || 1,
+        u_noDataValue: noDataValue,
+        u_texture: this.texture
       };
+      this.textures = [this.texture];
+      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+      return commonBufferInfo;
     }
   }, {
     key: "getRasterData",
@@ -109,25 +124,26 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              this.initUniformsBuffer();
               source = this.layer.getSource();
               createTexture2D = this.rendererService.createTexture2D;
               parserDataItem = source.data.dataArray[0];
-              _context2.next = 5;
+              _context2.next = 6;
               return this.getRasterData(parserDataItem);
-            case 5:
+            case 6:
               _yield$this$getRaster = _context2.sent;
               data = _yield$this$getRaster.data;
               width = _yield$this$getRaster.width;
               height = _yield$this$getRaster.height;
               this.texture = createTexture2D({
                 // @ts-ignore
-                data: data,
+                data: new Float32Array(data),
                 width: width,
                 height: height,
                 format: gl.RGB,
                 type: gl.FLOAT
               });
-              _context2.next = 12;
+              _context2.next = 13;
               return this.layer.buildLayerModel({
                 moduleName: 'rasterImageDataRGBA',
                 vertexShader: rasterVert,
@@ -138,10 +154,10 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   enable: false
                 }
               });
-            case 12:
+            case 13:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 14:
+            case 15:
             case "end":
               return _context2.stop();
           }
@@ -186,6 +202,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Uv',
+          shaderLocation: ShaderLocation.UV,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,

package/es/raster/models/rasterTerrainRgb.d.ts

@@ -1,4 +1,4 @@
-import { IModel, IModelUniform, ITexture2D } from '@antv/l7-core';
+import type { IModel, IModelUniform, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class RasterTerrainRGB extends BaseModel {
     protected texture: ITexture2D;

package/es/raster/models/rasterTerrainRgb.js

@@ -11,9 +11,9 @@ import { AttributeType, gl } from '@antv/l7-core';
 import { getDefaultDomain } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { RasterImageTriangulation } from "../../core/triangulation";
-/* babel-plugin-inline-import '../shaders/raster_terrain_rgb_frag.glsl' */
+/* babel-plugin-inline-import '../shaders/terrain/terrain_rgb_frag.glsl' */
 var Raster_terrainFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\n\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\n\nvarying vec2 v_texCoord;\n\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nuniform vec4 u_unpack;\n\nfloat getElevation(vec2 coord, float bias) {\n    // Convert encoded elevation value to meters\n    vec4 data = texture2D(u_texture, coord,bias) * 255.0;\n    data.a = -1.0;\n    return dot(data, u_unpack);\n}\n\nvec4 getColor(float value) {\n   float normalisedValue =(value- u_domain[0]) / (u_domain[1] - u_domain[0]);\n    vec2 coord = vec2(normalisedValue, 0);\n    return texture2D(u_colorTexture, coord);\n}\n\nvoid main() {\n  float value = getElevation(v_texCoord,0.0);\n  if (value == u_noDataValue) {\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1])) {\n     gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n   \n    gl_FragColor = getColor(value);\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n      if(gl_FragColor.a < 0.01)\n      discard;\n  }\n}\n";
-/* babel-plugin-inline-import '../shaders/rater_terrain_rgb_vert.glsl' */
+/* babel-plugin-inline-import '../shaders/terrain/terrain_rgb_vert.glsl' */
 var Raster_terrainVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\n\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n   gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
 var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
   _inherits(RasterTerrainRGB, _BaseModel);

package/es/raster/shaders/raster/raster_2d_frag.glsl

@@ -0,0 +1,34 @@
+layout(std140) uniform commonUniforms {
+  vec2 u_domain;
+  float u_opacity;
+  float u_noDataValue;
+  bool u_clampLow;
+  bool u_clampHigh;
+};
+
+uniform sampler2D u_rasterTexture;
+uniform sampler2D u_colorTexture;
+
+in vec2 v_texCoord;
+
+bool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }
+
+out vec4 outputColor;
+
+void main() {
+  // Can use any component here since u_rasterTexture is under luminance format.
+  float value = texture(SAMPLER_2D(u_rasterTexture), vec2(v_texCoord.x, v_texCoord.y)).r * 255.0;
+  if (value == u_noDataValue || isnan_emu(value)) {
+    discard;
+  } else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1])) {
+    discard;
+  } else {
+    float normalisedValue =(value - u_domain[0]) / (u_domain[1] - u_domain[0]);
+    vec4 color = texture(SAMPLER_2D(u_colorTexture), vec2(normalisedValue, 0));
+    
+    outputColor = color;
+    outputColor.a = outputColor.a * u_opacity ;
+    if (outputColor.a < 0.01)
+      discard;
+  }
+}

package/es/raster/shaders/raster/raster_2d_vert.glsl

@@ -0,0 +1,21 @@
+
+layout(location = 0) in vec3 a_Position;
+layout(location = 14) in vec2 a_Uv;
+
+layout(std140) uniform commonUniforms {
+  vec2 u_domain;
+  float u_opacity;
+  float u_noDataValue;
+  bool u_clampLow;
+  bool u_clampHigh;
+};
+
+out vec2 v_texCoord;
+
+#pragma include "projection"
+
+void main() {
+   v_texCoord = a_Uv;
+   vec4 project_pos = project_position(vec4(a_Position, 1.0));
+  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));
+}

package/es/raster/shaders/rgb/raster_rgb_frag.glsl

@@ -0,0 +1,26 @@
+uniform sampler2D u_texture;
+layout(std140) uniform commonUniforms {
+ vec2 u_rminmax;
+ vec2 u_gminmax;
+ vec2 u_bminmax;
+ float u_opacity;
+ float u_noDataValue;
+};
+
+in vec2 v_texCoord;
+
+out vec4 outputColor;
+
+void main() {
+
+  vec3 rgb = texture(SAMPLER_2D(u_texture),vec2(v_texCoord.x,v_texCoord.y)).rgb;
+
+  if(rgb == vec3(u_noDataValue)) {
+    outputColor = vec4(0.0, 0, 0, 0.0);
+  } else {
+    outputColor = vec4(rgb.r / (u_rminmax.y -u_rminmax.x), rgb.g /(u_gminmax.y -u_gminmax.x), rgb.b/ (u_bminmax.y - u_bminmax.x), u_opacity);
+  }
+  if(outputColor.a < 0.01)
+    discard;
+ 
+}

package/es/raster/shaders/rgb/raster_rgb_vert.glsl

@@ -0,0 +1,21 @@
+
+layout(location = 0) in vec3 a_Position;
+layout(location = 14) in vec2 a_Uv;
+
+layout(std140) uniform commonUniforms {
+ vec2 u_rminmax;
+ vec2 u_gminmax;
+ vec2 u_bminmax;
+ float u_opacity;
+ float u_noDataValue;
+};
+
+out vec2 v_texCoord;
+
+#pragma include "projection"
+
+void main() {
+   v_texCoord = a_Uv;
+   vec4 project_pos = project_position(vec4(a_Position, 1.0));
+   gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));
+}

package/es/tile/core/BaseLayer.d.ts

@@ -1,5 +1,5 @@
-import { IInteractionTarget, ILayer, ILayerService, IMapService, IPickingService, IRendererService } from '@antv/l7-core';
-import { SourceTile, TilesetManager } from '@antv/l7-utils';
+import type { IInteractionTarget, ILayer, ILayerService, IMapService, IPickingService, IRendererService } from '@antv/l7-core';
+import type { SourceTile, TilesetManager } from '@antv/l7-utils';
 import { TileLayerService } from '../service/TileLayerService';
 import { TilePickService } from '../service/TilePickService';
 export default class BaseTileLayer {

package/es/tile/core/TileDebugLayer.d.ts

@@ -1,5 +1,5 @@
 import BaseLayer from '../../core/BaseLayer';
-import { IBaseLayerStyleOptions } from '../../core/interface';
+import type { IBaseLayerStyleOptions } from '../../core/interface';
 export default class TileDebugLayer extends BaseLayer<IBaseLayerStyleOptions> {
     type: string;
     zIndex: number;

package/es/tile/interaction/getRasterData.d.ts

@@ -1,4 +1,4 @@
-import { IMapService, IRendererService } from '@antv/l7-core';
-import { SourceTile } from '@antv/l7-utils';
+import type { IMapService, IRendererService } from '@antv/l7-core';
+import type { SourceTile } from '@antv/l7-utils';
 export declare function readRasterValue(tile: SourceTile, mapService: IMapService, x: number, y: number): any;
 export declare function readPixel(x: number, y: number, rendererService: IRendererService): false | Uint8Array;

package/es/tile/interaction/utils.d.ts

@@ -1,4 +1,4 @@
-import { ILayer } from '@antv/l7-core';
+import type { ILayer } from '@antv/l7-core';
 export declare function clearPickState(layers: ILayer[]): void;
 export declare function setSelect(layers: ILayer[], pickedColors: any, renderList: ILayer[]): undefined;
 export declare function setHighlight(layers: ILayer[], pickedColors: any): void;

package/es/tile/interface.d.ts

@@ -1,5 +1,5 @@
-import { ILayer, IMapService, IRendererService, ISource, ISubLayerInitOptions } from '@antv/l7-core';
-import { SourceTile } from '@antv/l7-utils';
+import type { ILayer, IMapService, IRendererService, ISource, ISubLayerInitOptions } from '@antv/l7-core';
+import type { SourceTile } from '@antv/l7-utils';
 export type Timeout = any;
 export type CacheEvent = 'click' | 'mousemove' | 'mouseup' | 'mousedown' | 'contextmenu';
 export interface ITileFactoryOptions {

package/es/tile/service/TileLayerService.d.ts

@@ -1,5 +1,5 @@
-import { ILayer, ILayerService, ILngLat, IRendererService, ITile } from '@antv/l7-core';
-import { SourceTile } from '@antv/l7-utils';
+import type { ILayer, ILayerService, ILngLat, IRendererService, ITile } from '@antv/l7-core';
+import type { SourceTile } from '@antv/l7-utils';
 import 'reflect-metadata';
 interface ITileLayerServiceOptions {
     rendererService: IRendererService;

package/es/tile/service/TilePickService.d.ts

@@ -1,5 +1,5 @@
-import { IInteractionTarget, ILayer, ILayerService, ITilePickService } from '@antv/l7-core';
-import { TileLayerService } from './TileLayerService';
+import type { IInteractionTarget, ILayer, ILayerService, ITilePickService } from '@antv/l7-core';
+import type { TileLayerService } from './TileLayerService';
 export interface ITilePickServiceOptions {
     layerService: ILayerService;
     tileLayerService: TileLayerService;

package/es/tile/service/TileSourceService.d.ts

@@ -1,4 +1,4 @@
-import { IParseDataItem } from '@antv/l7-core';
+import type { IParseDataItem } from '@antv/l7-core';
 /**
  * 专门处理 Tile 数据相关
  */