@antv/l7-layers 2.20.3 → 2.20.6

package/es/polygon/models/water.js

@@ -1,5 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 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";
@@ -13,9 +14,10 @@ import { lodashUtil } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { polygonTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/water/polygon_water_frag.glsl' */
-var water_frag = "uniform sampler2D u_texture;\nuniform float u_time: 0.0;\nuniform float u_speed: 1.0;\nuniform float u_opacity: 1.0;\n\nvarying vec4 v_Color;\nvarying vec2 v_uv;\n\nfloat rand(vec2 n) { return 0.5 + 0.5 * fract(sin(dot(n.xy, vec2(12.9898, 78.233)))* 43758.5453); }\n\nfloat water(vec3 p) {\n  float t = u_time * u_speed;\n  p.z += t * 2.; p.x += t * 2.;\n  vec3 c1 = texture2D(u_texture, p.xz / 30.).xyz;\n  p.z += t * 3.; p.x += t * 0.52;\n  vec3 c2 = texture2D(u_texture, p.xz / 30.).xyz;\n  p.z += t * 4.; p.x += t * 0.8;\n  vec3 c3 = texture2D(u_texture, p.xz / 30.).xyz;\n  c1 += c2 - c3;\n  float z = (c1.x + c1.y + c1.z) / 3.;\n  return p.y + z / 4.;\n}\n\nfloat map(vec3 p) {\n  float d = 100.0;\n  d = water(p);\n  return d;\n}\n\nfloat intersect(vec3 ro, vec3 rd) {\n  float d = 0.0;\n  for (int i = 0; i <= 100; i++) {\n    float h = map(ro + rd * d);\n    if (h < 0.1) return  d;\n    d += h;\n  }\n  return 0.0;\n}\n\nvec3 norm(vec3 p) {\n  float eps = .1;\n  return normalize(vec3(\n    map(p + vec3(eps, 0, 0)) - map(p + vec3(-eps, 0, 0)),\n    map(p + vec3(0, eps, 0)) - map(p + vec3(0, -eps, 0)),\n    map(p + vec3(0, 0, eps)) - map(p + vec3(0, 0, -eps))\n  ));\n} \n\nfloat calSpc() {\n  vec3 l1 = normalize(vec3(1, 1, 1));\n  vec3 ro = vec3(-3, 20, -8);\n  vec3 rc = vec3(0, 0, 0);\n  vec3 ww = normalize(rc - ro);\n  vec3 uu = normalize(cross(vec3(0,1,0), ww));\n  vec3 vv = normalize(cross(rc - ro, uu));\n  vec3 rd = normalize(uu * v_uv.x + vv * v_uv.y + ww);\n  float d = intersect(ro, rd);\n  vec3 p = ro + rd * d;\n  vec3 n = norm(p);\n  float spc = pow(max(0.0, dot(reflect(l1, n), rd)), 30.0);\n  return spc;\n}\n\nvoid main() {\n  float opacity = u_opacity;\n  gl_FragColor = v_Color;\n  gl_FragColor.a *= opacity;\n\n  float spc = calSpc();\n  gl_FragColor += spc * 0.4;\n}\n";
+var water_frag = "uniform sampler2D u_texture;\nlayout(std140) uniform commonUniforms {\n  float u_speed;\n  float u_time;\n};\n\nout vec4 outputColor;\n\n\nin vec4 v_Color;\nin vec2 v_uv;\n\nfloat rand(vec2 n) { return 0.5 + 0.5 * fract(sin(dot(n.xy, vec2(12.9898, 78.233)))* 43758.5453); }\n\nfloat water(vec3 p) {\n  float t = u_time * u_speed;\n  p.z += t * 2.; p.x += t * 2.;\n  vec3 c1 = texture(SAMPLER_2D(u_texture), p.xz / 30.).xyz;\n  p.z += t * 3.; p.x += t * 0.52;\n  vec3 c2 = texture(SAMPLER_2D(u_texture), p.xz / 30.).xyz;\n  p.z += t * 4.; p.x += t * 0.8;\n  vec3 c3 = texture(SAMPLER_2D(u_texture), p.xz / 30.).xyz;\n  c1 += c2 - c3;\n  float z = (c1.x + c1.y + c1.z) / 3.;\n  return p.y + z / 4.;\n}\n\nfloat map(vec3 p) {\n  float d = 100.0;\n  d = water(p);\n  return d;\n}\n\nfloat intersect(vec3 ro, vec3 rd) {\n  float d = 0.0;\n  for (int i = 0; i <= 100; i++) {\n    float h = map(ro + rd * d);\n    if (h < 0.1) return  d;\n    d += h;\n  }\n  return 0.0;\n}\n\nvec3 norm(vec3 p) {\n  float eps = .1;\n  return normalize(vec3(\n    map(p + vec3(eps, 0, 0)) - map(p + vec3(-eps, 0, 0)),\n    map(p + vec3(0, eps, 0)) - map(p + vec3(0, -eps, 0)),\n    map(p + vec3(0, 0, eps)) - map(p + vec3(0, 0, -eps))\n  ));\n} \n\nfloat calSpc() {\n  vec3 l1 = normalize(vec3(1, 1, 1));\n  vec3 ro = vec3(-3, 20, -8);\n  vec3 rc = vec3(0, 0, 0);\n  vec3 ww = normalize(rc - ro);\n  vec3 uu = normalize(cross(vec3(0,1,0), ww));\n  vec3 vv = normalize(cross(rc - ro, uu));\n  vec3 rd = normalize(uu * v_uv.x + vv * v_uv.y + ww);\n  float d = intersect(ro, rd);\n  vec3 p = ro + rd * d;\n  vec3 n = norm(p);\n  float spc = pow(max(0.0, dot(reflect(l1, n), rd)), 30.0);\n  return spc;\n}\n\nvoid main() {\n\n  outputColor = v_Color;\n  float spc = calSpc();\n  outputColor += spc * 0.4;\n}\n";
 /* babel-plugin-inline-import '../shaders/water/polygon_water_vert.glsl' */
-var water_vert = "attribute vec4 a_Color;\nattribute vec2 a_uv;\nattribute vec3 a_Position;\nuniform mat4 u_ModelMatrix;\n\n\nvarying vec4 v_Color;\nvarying vec2 v_uv;\nuniform float u_opacity: 1.0;\n\n\n#pragma include \"projection\"\n\nvoid main() {\n  v_uv = a_uv;\n\n  v_Color = a_Color;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));\n}\n\n";
+var water_vert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 14) in vec2 a_uv;\nlayout(std140) uniform commonUniforms {\n  float u_speed;\n  float u_time;\n};\nout vec4 v_Color;\nout vec2 v_uv;\n\n\n#pragma include \"projection\"\n\nvoid main() {\n  v_uv = a_uv;\n  v_Color = a_Color;\n  v_Color.a *= opacity;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));\n}\n\n";
+import { ShaderLocation } from "../../core/CommonStyleAttribute";
 var isNumber = lodashUtil.isNumber;
 var WaterModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(WaterModel, _BaseModel);
@@ -27,16 +29,27 @@ var WaterModel = /*#__PURE__*/function (_BaseModel) {
   _createClass(WaterModel, [{
     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$speed = _ref.speed,
         speed = _ref$speed === void 0 ? 0.5 : _ref$speed;
-      return {
-        u_texture: this.texture,
+      var commonOptions = {
         u_speed: speed,
-        u_opacity: isNumber(opacity) ? opacity : 1.0
+        u_time: this.layer.getLayerAnimateTime(),
+        u_texture: this.texture
       };
+
+      // u_opacity: isNumber(opacity) ? opacity : 1.0,
+      this.textures = [this.texture];
+      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+      return commonBufferInfo;
     }
   }, {
     key: "getAnimateUniforms",
@@ -73,21 +86,23 @@ var WaterModel = /*#__PURE__*/function (_BaseModel) {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
+              this.initUniformsBuffer();
+              _context2.next = 3;
               return this.layer.buildLayerModel({
                 moduleName: 'polygonWater',
                 vertexShader: water_vert,
                 fragmentShader: water_frag,
                 triangulation: polygonTriangulation,
+                inject: this.getInject(),
                 primitive: gl.TRIANGLES,
                 depth: {
                   enable: false
                 }
               });
-            case 2:
+            case 3:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 4:
+            case 5:
             case "end":
               return _context2.stop();
           }
@@ -120,6 +135,7 @@ var WaterModel = /*#__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.STATIC_DRAW,

package/es/polygon/shaders/extrude/polygon_extrude_frag.glsl

@@ -1,24 +1,24 @@
-uniform vec4 u_sourceColor;
-uniform vec4 u_targetColor;
-uniform float u_linearColor: 0;
-
-uniform float u_topsurface: 1.0;
-uniform float u_sidesurface: 1.0;
-
-varying vec4 v_Color;
-
+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;
+};
+
+in vec4 v_Color;
 #pragma include "picking"
-
+out vec4 outputColor;
 void main() {
 
-
      // top face
     if(u_topsurface < 1.0) {
       discard;
     }
 
-    gl_FragColor = v_Color;
+    outputColor = v_Color;
   
-
-  gl_FragColor = filterColor(gl_FragColor);
+  outputColor = filterColor(outputColor);
 }

package/es/polygon/shaders/extrude/polygon_extrude_picklight_frag.glsl

@@ -1,19 +1,22 @@
-uniform float u_opacity: 1.0;
-uniform vec4 u_sourceColor;
-uniform vec4 u_targetColor;
-uniform float u_linearColor: 0;
 
-uniform float u_topsurface: 1.0;
-uniform float u_sidesurface: 1.0;
+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;
+};
 
-varying vec4 v_Color;
-varying vec3 v_uvs;
-varying vec2 v_texture_data;
+in vec4 v_Color;
+in vec3 v_uvs;
+in vec2 v_texture_data;
+out vec4 outputColor;
 
 #pragma include "picking"
 
 void main() {
-  float opacity = u_opacity;
   float isSide =  v_texture_data.x;
   float sidey = v_uvs[2];
   float lightWeight = v_texture_data.y;
@@ -29,19 +32,18 @@ void main() {
       // side use linear
       vec4 linearColor = mix(u_targetColor, u_sourceColor, sidey);
       linearColor.rgb *= lightWeight;
-      gl_FragColor = linearColor;
+      outputColor = linearColor;
     } else {
       // side notuse linear
-       gl_FragColor = v_Color;
+       outputColor = v_Color;
     }
   } else {
     // top face
     if(u_topsurface < 1.0) {
       discard;
     }
-    gl_FragColor = v_Color;
+    outputColor = v_Color;
   }
 
-  gl_FragColor.a *= opacity;
-  gl_FragColor = filterColorAlpha(gl_FragColor, lightWeight);
+  outputColor = filterColorAlpha(outputColor, lightWeight);
 }

package/es/polygon/shaders/extrude/polygon_extrude_picklight_vert.glsl

@@ -1,23 +1,23 @@
-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 float u_heightfixed: 0.0; // 默认不固定
-uniform float u_raisingHeight: 0.0;
-
-varying vec2 v_texture_data;
-varying vec3 v_uvs;
-varying vec4 v_Color;
+out vec2 v_texture_data;
+out vec3 v_uvs;
+out vec4 v_Color;
 
 
 #pragma include "projection"
@@ -46,7 +46,7 @@ void main() {
   float lightWeight = calc_lighting(pos);
   v_texture_data = vec2(a_Position.z,lightWeight);
 
-  v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w);
+  v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w * opacity);
 
   setPickingColor(a_PickingColor);
 }

package/es/polygon/shaders/extrude/polygon_extrude_vert.glsl

@@ -1,26 +1,20 @@
-precision highp float;
-
-#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;
-
-uniform vec4 u_sourceColor;
-uniform vec4 u_targetColor;
-uniform float u_linearColor: 0;
-
-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;
+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;
+
+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;
+};
+
+out vec4 v_Color;
 
 #pragma include "projection"
 #pragma include "light"
@@ -28,7 +22,7 @@ uniform float u_raisingHeight: 0.0;
 
 void main() {
  
-  float isSide = a_Position.z;
+float isSide = a_Position.z;
  float topU = a_uvs[0];
  float topV = 1.0 - a_uvs[1];
  float sidey = a_uvs[2];

package/es/polygon/shaders/extrude/polygon_extrudetex_frag.glsl

@@ -1,19 +1,24 @@
 uniform sampler2D u_texture;
-uniform float u_opacity: 1.0;
-uniform vec4 u_sourceColor;
-uniform vec4 u_targetColor;
-uniform float u_linearColor: 0;
 
-uniform float u_topsurface: 1.0;
-uniform float u_sidesurface: 1.0;
+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;
+};
 
-varying vec4 v_Color;
-varying vec3 v_uvs;
-varying vec2 v_texture_data;
+in vec4 v_Color;
+in vec3 v_uvs;
+in vec2 v_texture_data;
 
 
 #pragma include "picking"
 
+out vec4 outputColor;
+
 void main() {
   float opacity = u_opacity;
   float isSide = v_texture_data.x;
@@ -31,9 +36,9 @@ void main() {
     if(u_linearColor == 1.0) {
       vec4 linearColor = mix(u_targetColor, u_sourceColor, sidey);
       linearColor.rgb *= lightWeight;
-      gl_FragColor = linearColor;
+      outputColor = linearColor;
     } else {
-      gl_FragColor = v_Color;
+      outputColor = v_Color;
     }
   } else {
 
@@ -42,11 +47,10 @@ void main() {
       discard;
     }
 
-    gl_FragColor = texture2D(u_texture, vec2(topU, topV));
-    // gl_FragColor = vec4(1.0, 0., 0., 1.0);
+    outputColor = texture(SAMPLER_2D(u_texture), vec2(topU, topV));
   }
   
 
-  gl_FragColor.a *= opacity;
-  gl_FragColor = filterColor(gl_FragColor);
+  outputColor.a *= opacity;
+  outputColor = filterColor(outputColor);
 }

package/es/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/es/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/es/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/es/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/es/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/{lib/polygon/shaders/polygon_linear_vert.glsl → es/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/es/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/es/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/es/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));
+}
+