Website updates

Author: ahocevar

dist/en/main/apidoc/module-ol_renderer_webgl_PointsLayer-WebGLPointsLayerRenderer.html

@@ -188,7 +188,7 @@ <h4 class="name">
 
         <div class="tag-source">
             <a href="https://github.com/openlayers/openlayers/blob/main/src/ol/renderer/webgl/PointsLayer.js">renderer/webgl/PointsLayer.js</a>,
-            <a href="https://github.com/openlayers/openlayers/blob/main/src/ol/renderer/webgl/PointsLayer.js#L127">line 127</a>
+            <a href="https://github.com/openlayers/openlayers/blob/main/src/ol/renderer/webgl/PointsLayer.js#L130">line 130</a>
         </div>
 
     </div>

dist/en/main/examples/common.js

@@ -721,10 +721,11 @@ declare namespace ol {
                 export { _ol_render_webgl_compileUtil$getGlslSizeFromType as getGlslSizeFromType };
                 export { _ol_render_webgl_compileUtil$getGlslTypeFromType as getGlslTypeFromType };
                 export { _ol_render_webgl_compileUtil$packColor as packColor };
+                export { _ol_render_webgl_compileUtil$unpackColor as unpackColor };
             }
             export namespace encodeUtil {
                 export { _ol_render_webgl_encodeUtil$colorDecodeId as colorDecodeId };
-                export { _ol_render_webgl_encodeUtil$colorEncodeId as colorEncodeId };
+                export { _ol_render_webgl_encodeUtil$colorEncodeIdAndPack as colorEncodeIdAndPack };
             }
             export namespace renderinstructions {
                 export { _ol_render_webgl_renderinstructions$generateLineStringRenderInstructions as generateLineStringRenderInstructions };
@@ -1612,8 +1613,9 @@ import { generateUniformsFromContext as _ol_render_webgl_compileUtil$generateUni
 import { getGlslSizeFromType as _ol_render_webgl_compileUtil$getGlslSizeFromType } from '../../ol/render/webgl/compileUtil.js';
 import { getGlslTypeFromType as _ol_render_webgl_compileUtil$getGlslTypeFromType } from '../../ol/render/webgl/compileUtil.js';
 import { packColor as _ol_render_webgl_compileUtil$packColor } from '../../ol/render/webgl/compileUtil.js';
+import { unpackColor as _ol_render_webgl_compileUtil$unpackColor } from '../../ol/render/webgl/compileUtil.js';
 import { colorDecodeId as _ol_render_webgl_encodeUtil$colorDecodeId } from '../../ol/render/webgl/encodeUtil.js';
-import { colorEncodeId as _ol_render_webgl_encodeUtil$colorEncodeId } from '../../ol/render/webgl/encodeUtil.js';
+import { colorEncodeIdAndPack as _ol_render_webgl_encodeUtil$colorEncodeIdAndPack } from '../../ol/render/webgl/encodeUtil.js';
 import { generateLineStringRenderInstructions as _ol_render_webgl_renderinstructions$generateLineStringRenderInstructions } from '../../ol/render/webgl/renderinstructions.js';
 import { generatePointRenderInstructions as _ol_render_webgl_renderinstructions$generatePointRenderInstructions } from '../../ol/render/webgl/renderinstructions.js';
 import { generatePolygonRenderInstructions as _ol_render_webgl_renderinstructions$generatePolygonRenderInstructions } from '../../ol/render/webgl/renderinstructions.js';

dist/en/main/examples/common.js.map

@@ -1,4 +1,4 @@
-export const COMMON_HEADER: "#ifdef GL_FRAGMENT_PRECISION_HIGH\nprecision highp float;\n#else\nprecision mediump float;\n#endif\nuniform mat4 u_projectionMatrix;\nuniform mat4 u_screenToWorldMatrix;\nuniform vec2 u_viewportSizePx;\nuniform float u_pixelRatio;\nuniform float u_globalAlpha;\nuniform float u_time;\nuniform float u_zoom;\nuniform float u_resolution;\nuniform float u_rotation;\nuniform vec4 u_renderExtent;\nuniform vec2 u_patternOrigin;\nuniform float u_depth;\nuniform mediump int u_hitDetection;\n\nconst float PI = 3.141592653589793238;\nconst float TWO_PI = 2.0 * PI;\nfloat currentLineMetric = 0.; // an actual value will be used in the stroke shaders\n";
+export const COMMON_HEADER: "#ifdef GL_FRAGMENT_PRECISION_HIGH\nprecision highp float;\n#else\nprecision mediump float;\n#endif\nuniform mat4 u_projectionMatrix;\nuniform mat4 u_screenToWorldMatrix;\nuniform vec2 u_viewportSizePx;\nuniform float u_pixelRatio;\nuniform float u_globalAlpha;\nuniform float u_time;\nuniform float u_zoom;\nuniform float u_resolution;\nuniform float u_rotation;\nuniform vec4 u_renderExtent;\nuniform vec2 u_patternOrigin;\nuniform float u_depth;\nuniform mediump int u_hitDetection;\n\nconst float PI = 3.141592653589793238;\nconst float TWO_PI = 2.0 * PI;\nfloat currentLineMetric = 0.; // an actual value will be used in the stroke shaders\n\nvec4 unpackColor(vec2 packedColor) {\n  return vec4(\n    min(floor(packedColor[0] / 256.0) / 255.0, 1.0),\n    min(mod(packedColor[0], 256.0) / 255.0, 1.0),\n    min(floor(packedColor[1] / 256.0) / 255.0, 1.0),\n    min(mod(packedColor[1], 256.0) / 255.0, 1.0)\n  );\n}\n";
 /**
  * @typedef {Object} AttributeDescription
  * @property {string} name Attribute name, as will be declared in the header of the vertex shader (including a_)

dist/en/main/ol/dist/ol.d.ts

@@ -5,6 +5,7 @@
 import {colorToGlsl, numberToGlsl, stringToGlsl} from '../../expr/gpu.js';
 import {createDefaultStyle} from '../../style/flat.js';
 import {LINESTRING_ANGLE_COSINE_CUTOFF} from './bufferUtil.js';
+import {UNPACK_COLOR_FN} from './compileUtil.js';
 
 export const COMMON_HEADER = `#ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
@@ -28,6 +29,8 @@ uniform mediump int u_hitDetection;
 const float PI = 3.141592653589793238;
 const float TWO_PI = 2.0 * PI;
 float currentLineMetric = 0.; // an actual value will be used in the stroke shaders
+
+${UNPACK_COLOR_FN}
 `;
 
 const DEFAULT_STYLE = createDefaultStyle();
@@ -503,7 +506,7 @@ export class ShaderBuilder {
 ${this.uniforms_.map((uniform) => `uniform ${uniform.type} ${uniform.name};`).join('\n')}
 attribute vec2 a_position;
 attribute vec2 a_localPosition;
-attribute vec4 a_hitColor;
+attribute vec2 a_hitColor;
 
 varying vec2 v_texCoord;
 varying vec2 v_quadCoord;
@@ -543,7 +546,7 @@ void main(void) {
   float u = mix(texCoord.s, texCoord.p, a_localPosition.x * 0.5 + 0.5);
   float v = mix(texCoord.t, texCoord.q, a_localPosition.y * 0.5 + 0.5);
   v_texCoord = vec2(u, v);
-  v_hitColor = a_hitColor;
+  v_hitColor = unpackColor(a_hitColor);
   v_angle = angle;
   c = cos(-v_angle);
   s = sin(-v_angle);
@@ -622,7 +625,7 @@ attribute float a_angleTangentSum;
 attribute float a_distanceLow;
 attribute float a_distanceHigh;
 attribute vec2 a_joinAngles;
-attribute vec4 a_hitColor;
+attribute vec2 a_hitColor;
 
 varying vec2 v_segmentStartPx;
 varying vec2 v_segmentEndPx;
@@ -709,7 +712,7 @@ void main(void) {
   v_segmentStartPx = segmentStartPx;
   v_segmentEndPx = segmentEndPx;
   v_width = lineWidth;
-  v_hitColor = a_hitColor;
+  v_hitColor = unpackColor(a_hitColor);
 
   v_distancePx = a_distanceLow / u_resolution - (lineOffsetPx * a_angleTangentSum);
   float distanceHighPx = a_distanceHigh / u_resolution;
@@ -922,7 +925,7 @@ ${this.attributes_
     return `${COMMON_HEADER}
 ${this.uniforms_.map((uniform) => `uniform ${uniform.type} ${uniform.name};`).join('\n')}
 attribute vec2 a_position;
-attribute vec4 a_hitColor;
+attribute vec2 a_hitColor;
 
 varying vec4 v_hitColor;
 
@@ -935,7 +938,7 @@ varying ${attribute.varyingType} ${attribute.varyingName};`,
 ${this.vertexShaderFunctions_.join('\n')}
 void main(void) {
   gl_Position = u_projectionMatrix * vec4(a_position, u_depth, 1.0);
-  v_hitColor = a_hitColor;
+  v_hitColor = unpackColor(a_hitColor);
 ${this.attributes_
   .map(
     (attribute) =>