@antv/l7-layers 2.20.3 → 2.20.6

package/lib/polygon/shaders/extrude/polygon_extrudetex_vert.glsl

@@ -1,30 +1,24 @@
-precision highp float;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 9) in float a_Size;
+layout(location = 13) in vec3 a_Normal;
+layout(location = 14) in vec3 a_uvs;
 
-#define ambientRatio 0.5
-#define diffuseRatio 0.3
-#define specularRatio 0.2
 
-attribute vec4 a_Color;
-attribute vec3 a_Position;
-attribute vec3 a_Normal;
-attribute float a_Size;
-attribute vec3 a_uvs;
-uniform mat4 u_ModelMatrix;
+layout(std140) uniform commonUniforms {
+  vec4 u_sourceColor;
+  vec4 u_targetColor;
+  float u_linearColor;
+  float u_topsurface;
+  float u_sidesurface;
+  float u_heightfixed; // 默认不固定
+  float u_raisingHeight;
+};
 
-uniform sampler2D u_texture;
+out vec4 v_Color;
 
-
-uniform vec4 u_sourceColor;
-uniform vec4 u_targetColor;
-uniform float u_topsurface: 1.0;
-uniform float u_sidesurface: 1.0;
-varying vec4 v_Color;
-uniform float u_heightfixed: 0.0; // 默认不固定
-uniform float u_raisingHeight: 0.0;
-uniform float u_linearColor: 0.0;
-
-varying vec2 v_texture_data;
-varying vec3 v_uvs;
+out vec2 v_texture_data;
+out vec3 v_uvs;
 
 #pragma include "projection"
 #pragma include "light"
@@ -36,7 +30,9 @@ void main() {
   float lightWeight = calc_lighting(pos);
   vec4 project_pos = project_position(pos);
   v_uvs = a_uvs;
-
+  v_Color = a_Color;
+  v_Color.a *= opacity;
+   
   v_texture_data = vec2(a_Position.z, lightWeight);
 
   if(u_heightfixed > 0.0) { // 判断几何体是否固定高度

package/lib/polygon/shaders/extrusion/polygon_extrusion_frag.glsl

@@ -1,13 +1,9 @@
 
-uniform float u_opacity: 1.0;
-varying vec4 v_Color;
-varying vec2 v_texture_data;
-
-
+in vec4 v_Color;
 #pragma include "picking"
-
+out vec4 outputColor;
 void main() {
 
-  gl_FragColor = v_Color;
-  gl_FragColor = filterColor(gl_FragColor);
+  outputColor = v_Color;
+  outputColor = filterColor(outputColor);
 }

package/lib/polygon/shaders/extrusion/polygon_extrusion_vert.glsl

@@ -1,19 +1,9 @@
-precision highp float;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 9) in float a_Size;
+layout(location = 13) in vec3 a_Normal;
 
-#define ambientRatio 0.5
-#define diffuseRatio 0.3
-#define specularRatio 0.2
-
-attribute vec4 a_Color;
-attribute vec3 a_Position;
-attribute vec3 a_Normal;
-attribute float a_Size;
-uniform mat4 u_ModelMatrix;
-
-
-
-
-varying vec4 v_Color;
+out vec4 v_Color;
 
 #pragma include "projection"
 #pragma include "light"
@@ -22,8 +12,9 @@ varying vec4 v_Color;
 void main() {
  
   vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size + (1.0 - a_Position.z) * extrusionBase, 1.0);
-  float lightWeight = calc_lighting(pos);
+
   vec4 project_pos = project_position(pos);
+   float lightWeight = calc_lighting(project_pos);
   v_Color = a_Color;
   v_Color = vec4(v_Color.rgb * lightWeight, v_Color.w * opacity);
 

package/lib/polygon/shaders/fill/fill_frag.glsl

@@ -0,0 +1,7 @@
+in vec4 v_color;
+#pragma include "picking"
+out vec4 outputColor;
+void main() {
+  outputColor = v_color;
+  outputColor = filterColor(outputColor);
+}

package/lib/polygon/shaders/fill/fill_linear_frag.glsl

@@ -0,0 +1,20 @@
+
+layout(std140) uniform commonUniforms {
+  float u_raisingHeight;
+  float u_opacitylinear;
+  float u_dir;
+};
+
+in vec3 v_linear;
+in vec2 v_pos;
+in vec4 v_color;
+out vec4 outputColor;
+#pragma include "picking"
+
+void main() {
+   outputColor = v_color;
+  if(u_opacitylinear > 0.0) {
+    outputColor.a *= u_dir == 1.0 ? 1.0 - length(v_pos - v_linear.xy)/v_linear.z : length(v_pos - v_linear.xy)/v_linear.z;
+  }
+  outputColor = filterColor(outputColor);
+}

package/{es/polygon/shaders/polygon_linear_vert.glsl → lib/polygon/shaders/fill/fill_linear_vert.glsl}

@@ -1,28 +1,29 @@
-attribute vec4 a_Color;
-attribute vec3 a_Position;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 15) in vec3 a_linear;
 
-uniform mat4 u_ModelMatrix;
 
-uniform float u_raisingHeight: 0.0;
+layout(std140) uniform commonUniforms {
+  float u_raisingHeight;
+  float u_opacitylinear;
+  float u_dir;
+};
 
-varying vec4 v_Color;
 
+out vec4 v_color;
 
 #pragma include "projection"
 #pragma include "picking"
 
-uniform float u_opacitylinear: 0.0;
-
-attribute vec3 a_linear;
-varying vec3 v_linear;
-varying vec2 v_pos;
+out vec3 v_linear;
+out vec2 v_pos;
 
 void main() {
   if(u_opacitylinear > 0.0) {
     v_linear = a_linear;
     v_pos = a_Position.xy;
   }
-  v_Color = vec4(a_Color.xyz, a_Color.w * opacity);
+  v_color = vec4(a_Color.xyz, a_Color.w * opacity);
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
   project_pos.z += u_raisingHeight;
 

package/lib/polygon/shaders/{polygon_vert.glsl → fill/fill_vert.glsl}

@@ -1,12 +1,12 @@
-attribute vec4 a_Color;
-attribute vec3 a_Position;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
 
-uniform mat4 u_ModelMatrix;
+layout(std140) uniform commonUniforms {
+  float u_raisingHeight;
+};
 
 
-uniform float u_raisingHeight: 0.0;
-
-varying vec4 v_color;
+out vec4 v_color;
 
 
 #pragma include "projection"

package/lib/polygon/shaders/{water/polygon_ocean_frag.glsl → ocean/ocean_frag.glsl}

@@ -1,8 +1,13 @@
 
-uniform float u_time: 0.0;
-uniform float u_opacity: 1.0;
+layout(std140) uniform commonUniforms {
+  vec4 u_watercolor;
+  vec4 u_watercolor2;
+  float u_time;
+};
 
-varying vec2 v_uv;
+in vec2 v_uv;
+in float v_opacity;
+out vec4 outputColor;
 
 float coast2water_fadedepth = 0.10;
 float large_waveheight      = .750; // change to adjust the "heavy" waves
@@ -12,10 +17,7 @@ float small_wavesize        = 0.5;   // factor to ajust the small wave size
 float water_softlight_fact  = 15.;  // range [1..200] (should be << smaller than glossy-fact)
 float water_glossylight_fact= 120.; // range [1..200]
 float particle_amount       = 70.;
-// vec3 watercolor             = vec3(0.43, 0.60, 0.66); // 'transparent' low-water color (RGB)
-// vec3 watercolor2            = vec3(0.06, 0.07, 0.11); // deep-water color (RGB, should be darker than the low-water color)
-uniform vec4 u_watercolor;
-uniform vec4 u_watercolor2;
+
 vec3 water_specularcolor    = vec3(1.3, 1.3, 0.9);    // specular Color (RGB) of the water-highlights
 #define light                 vec3(-0., sin(u_time*0.5)*.5 + .35, 2.8) // position of the sun
 
@@ -39,11 +41,11 @@ float noise1( in vec2 x ) {
 }
 
 float noise(vec2 p) {
-    return texture2D(u_texture2,p*vec2(1./256.)).x;
+    return texture(SAMPLER_2D(u_texture2),p*vec2(1./256.)).x;
 }
 
 vec4 highness(vec2 p) {
-    vec4 t = texture2D(u_texture1,fract(p));
+    vec4 t = texture(SAMPLER_2D(u_texture1),fract(p));
     float clipped = -2.0-smoothstep(3.,10.,t.a)*6.9-smoothstep(10.,100.,t.a)*89.9-smoothstep(0.,10000.,t.a)*10000.0;
     return clamp(t, 0.0,3.0)+clamp(t/3.0-1.0, 0.0,1.0)+clamp(t/16.0-1.0, 0.0,1.0);
 }
@@ -109,7 +111,7 @@ vec4 color(vec2 p){
 
 vec3 terrain_map( vec2 p )
 {
-  return color(p).rgb*0.75+0.25*vec3(0.7, .55, .4)+texture2D(u_texture3, fract(p*5.)).rgb*.5; // test-terrain is simply 'sandstone'
+  return color(p).rgb*0.75+0.25*vec3(0.7, .55, .4)+texture(SAMPLER_2D(u_texture3), fract(p*5.)).rgb*.5; // test-terrain is simply 'sandstone'
 }
 
 const mat2 m = mat2( 0.72, -1.60,  1.60,  0.72 );
@@ -241,7 +243,5 @@ void main() {
         col = mix(col, watercolor, coastfade);
     }
     
-
-  float opacity = u_opacity;
-  gl_FragColor = vec4(col, opacity);  
+  outputColor = vec4(col, v_opacity);  
 }

package/lib/polygon/shaders/ocean/ocean_vert.glsl

@@ -0,0 +1,22 @@
+layout(location = 0) in vec3 a_Position;
+layout(location = 14) in vec2 a_uv;
+
+layout(std140) uniform commonUniforms {
+  vec4 u_watercolor;
+  vec4 u_watercolor2;
+  float u_time;
+};
+
+
+out vec2 v_uv;
+out float v_opacity;
+
+#pragma include "projection"
+
+void main() {
+  v_uv = a_uv;
+  v_opacity = 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/lib/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/lib/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/lib/raster/models/raster.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
@@ -15,13 +16,14 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
+var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 var _triangulation = require("../../core/triangulation");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 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; } }
-/* 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 = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(RasterModel, _BaseModel);
   var _super = _createSuper(RasterModel);
@@ -32,6 +34,14 @@ var RasterModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _createClass2.default)(RasterModel, [{
     key: "getUninforms",
     value: function getUninforms() {
+      var commoninfo = this.getCommonUniformsInfo();
+      var attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
+      this.updateStyleUnifoms();
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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,
@@ -45,15 +55,18 @@ var RasterModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         rampColors = _ref.rampColors;
       var newdomain = domain || (0, _l7Utils.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",
@@ -100,29 +113,50 @@ var RasterModel = exports.default = /*#__PURE__*/function (_BaseModel) {
     key: "initModels",
     value: function () {
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, model;
         return _regenerator.default.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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+        var source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, model;
+        return _regenerator.default.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: _l7Core.gl.LUMINANCE,
-                type: _l7Core.gl.FLOAT
+                type: _l7Core.gl.UNSIGNED_BYTE,
+                alignment: 1
                 // aniso: 4,
               });
-              _context2.next = 12;
+              _context3.next = 13;
               return this.layer.buildLayerModel({
                 moduleName: 'rasterImageData',
                 vertexShader: rasterVert,
@@ -133,29 +167,10 @@ var RasterModel = exports.default = /*#__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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        return _regenerator.default.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();
           }
@@ -181,6 +196,7 @@ var RasterModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         name: 'uv',
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
           name: 'a_Uv',
           buffer: {
             // give the WebGL driver a hint that this buffer may change