Website updates

openlayers · Nov 16, 2023 · 6c34b9c · 6c34b9c
1 parent 7a93886
commit 6c34b9c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/dist/en/main/examples/common.js b/dist/en/main/examples/common.js
diff --git a/dist/en/main/examples/common.js.map b/dist/en/main/examples/common.js.map
diff --git a/dist/en/main/ol/dist/ol.js b/dist/en/main/ol/dist/ol.js
diff --git a/dist/en/main/ol/dist/ol.js.map b/dist/en/main/ol/dist/ol.js.map
diff --git a/dist/en/main/ol/renderer/webgl/PointsLayer.js b/dist/en/main/ol/renderer/webgl/PointsLayer.js
@@ -196,7 +196,7 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
 
     if (this.hitDetectionEnabled_) {
       this.attributes.push({
-        name: 'a_hitColor',
+        name: 'a_prop_hitColor',
         size: 4,
         type: AttributeType.FLOAT,
       });

diff --git a/dist/en/main/ol/webgl/ShaderBuilder.js b/dist/en/main/ol/webgl/ShaderBuilder.js
@@ -480,15 +480,15 @@ ${this.uniforms_
   .join('\n')}
 attribute vec2 a_position;
 attribute float a_index;
-attribute vec4 a_hitColor;
+attribute vec4 a_prop_hitColor;
 ${this.attributes_
   .map(function (attribute) {
     return 'attribute ' + attribute + ';';
   })
   .join('\n')}
 varying vec2 v_texCoord;
 varying vec2 v_quadCoord;
-varying vec4 v_hitColor;
+varying vec4 v_prop_hitColor;
 varying vec2 v_centerPx;
 varying float v_angle;
 varying vec2 v_quadSizePx;
@@ -532,7 +532,7 @@ void main(void) {
   float u = a_index == 0.0 || a_index == 3.0 ? texCoord.s : texCoord.p;
   float v = a_index == 2.0 || a_index == 3.0 ? texCoord.t : texCoord.q;
   v_texCoord = vec2(u, v);
-  v_hitColor = a_hitColor;
+  v_prop_hitColor = a_prop_hitColor;
   v_angle = angle;
   c = cos(-v_angle);
   s = sin(-v_angle);
@@ -562,7 +562,7 @@ ${this.uniforms_
   })
   .join('\n')}
 varying vec2 v_texCoord;
-varying vec4 v_hitColor;
+varying vec4 v_prop_hitColor;
 varying vec2 v_centerPx;
 varying float v_angle;
 varying vec2 v_quadSizePx;
@@ -582,7 +582,7 @@ void main(void) {
   gl_FragColor = ${this.symbolColorExpression_};
   if (u_hitDetection > 0) {
     if (gl_FragColor.a < 0.05) { discard; };
-    gl_FragColor = v_hitColor;
+    gl_FragColor = v_prop_hitColor;
   }
 }`;
   }
@@ -609,7 +609,7 @@ attribute vec2 a_segmentEnd;
 attribute float a_parameters;
 attribute float a_distance;
 attribute vec2 a_joinAngles;
-attribute vec4 a_hitColor;
+attribute vec4 a_prop_hitColor;
 ${this.attributes_
   .map(function (attribute) {
     return 'attribute ' + attribute + ';';
@@ -620,7 +620,7 @@ varying vec2 v_segmentEnd;
 varying float v_angleStart;
 varying float v_angleEnd;
 varying float v_width;
-varying vec4 v_hitColor;
+varying vec4 v_prop_hitColor;
 varying float v_distanceOffsetPx;
 ${this.varyings_
   .map(function (varying) {
@@ -696,7 +696,7 @@ void main(void) {
   v_segmentStart = segmentStartPx;
   v_segmentEnd = segmentEndPx;
   v_width = lineWidth;
-  v_hitColor = a_hitColor;
+  v_prop_hitColor = a_prop_hitColor;
   v_distanceOffsetPx = a_distance / u_resolution - (lineOffsetPx * angleTangentSum);
 ${this.varyings_
   .map(function (varying) {
@@ -727,7 +727,7 @@ varying vec2 v_segmentEnd;
 varying float v_angleStart;
 varying float v_angleEnd;
 varying float v_width;
-varying vec4 v_hitColor;
+varying vec4 v_prop_hitColor;
 varying float v_distanceOffsetPx;
 ${this.varyings_
   .map(function (varying) {
@@ -856,7 +856,7 @@ void main(void) {
   gl_FragColor = color * smoothstep(0., -1., distance);
   if (u_hitDetection > 0) {
     if (gl_FragColor.a < 0.1) { discard; };
-    gl_FragColor = v_hitColor;
+    gl_FragColor = v_prop_hitColor;
   }
 }`;
   }
@@ -878,13 +878,13 @@ ${this.uniforms_
   })
   .join('\n')}
 attribute vec2 a_position;
-attribute vec4 a_hitColor;
+attribute vec4 a_prop_hitColor;
 ${this.attributes_
   .map(function (attribute) {
     return 'attribute ' + attribute + ';';
   })
   .join('\n')}
-varying vec4 v_hitColor;
+varying vec4 v_prop_hitColor;
 ${this.varyings_
   .map(function (varying) {
     return 'varying ' + varying.type + ' ' + varying.name + ';';
@@ -893,7 +893,7 @@ ${this.varyings_
 ${this.vertexShaderFunctions_.join('\n')}
 void main(void) {
   gl_Position = u_projectionMatrix * vec4(a_position, u_depth, 1.0);
-  v_hitColor = a_hitColor;
+  v_prop_hitColor = a_prop_hitColor;
 ${this.varyings_
   .map(function (varying) {
     return '  ' + varying.name + ' = ' + varying.expression + ';';
@@ -917,7 +917,7 @@ ${this.uniforms_
     return 'uniform ' + uniform + ';';
   })
   .join('\n')}
-varying vec4 v_hitColor;
+varying vec4 v_prop_hitColor;
 ${this.varyings_
   .map(function (varying) {
     return 'varying ' + varying.type + ' ' + varying.name + ';';
@@ -954,7 +954,7 @@ void main(void) {
   gl_FragColor = ${this.fillColorExpression_} * u_globalAlpha;
   if (u_hitDetection > 0) {
     if (gl_FragColor.a < 0.1) { discard; };
-    gl_FragColor = v_hitColor;
+    gl_FragColor = v_prop_hitColor;
   }
 }`;
   }