@pirireis/webglobeplugins 1.1.23 → 1.1.24

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pirireis/webglobeplugins",
-    "version": "1.1.23",
+    "version": "1.1.24",
     "main": "index.js",
     "author": "Toprak Nihat Deniz Ozturk",
     "license": "MIT",

package/programs/polygon-on-globe/texture-dem-triangles.js

@@ -4,7 +4,7 @@ import { DemTextureManagerCache, DEM_TEXTURE_BLOCK_STRING } from "../totems/atta
 import { cartesian3DToGLPosition, mercatorXYToGLPosition, POLE_BY_PI } from "../../util/shaderfunctions/geometrytransformations";
 import { relativeBBoxPositionRadian } from "../../util/shaderfunctions/geometrytransformations";
 import { drawArrays } from "../../util/gl-util/draw-options/methods";
-import { attributeLoader, resetAttributeDefault, setDefaultAttributeValues } from "../../util/gl-util/buffer/attribute-loader";
+import { AttributeLoader } from "../../util/gl-util/buffer/attribute-loader";
 import { WORLD_RADIUS_3D } from "../../Math/constants";
 import { UniformBlockManager } from "../../util/gl-util/uniform-block/manager";
 // const ESCAPE_VALUE = 0.123456;
@@ -84,7 +84,7 @@ void main() {
                 break;
             }
         }
-        vec3 position = a_position * (elevation + altitude);
+        vec3 position = a_position * (elevation + altitude * elevation_scale);
         gl_Position = cartesian3DToGLPosition(position);
     } else {
         vec2 mercatorXY = a_xy * POLE_BY_PI;
@@ -171,21 +171,23 @@ export class TextureDemTriangles {
         this.demTextureManager = DemTextureManagerCache.get(this.globe);
         this.demTextureManager.assignBindingPoint(this.program, uniformBindingPoints.dem);
     }
-    createVAO(pos3dBufferInfo, longLatBufferInfo, indexBufferInfo, variativeColorBuffer) {
-        const vao = this.gl.createVertexArray();
-        this.gl.bindVertexArray(vao);
-        attributeLoader(this.gl, pos3dBufferInfo, this.locations.attributes.a_position, 3);
-        attributeLoader(this.gl, longLatBufferInfo, this.locations.attributes.a_xy, 2);
-        attributeLoader(this.gl, indexBufferInfo, this.locations.attributes.a_index, 1, {
-            dataType: "uint16",
-            escapeValues: [IndexAttributeEscapeValue],
-        });
-        attributeLoader(this.gl, variativeColorBuffer, this.locations.attributes.a_color, 4, {
-            dataType: "uint8",
-            escapeValues: [0, 0, 0, 255]
-        });
-        this.gl.bindVertexArray(null);
-        return vao;
+    createAttributeLoader(pos3dBufferInfo, longLatBufferInfo, indexBufferInfo, variativeColorBuffer) {
+        return new AttributeLoader(this.gl, [
+            { bufferAndReadInfo: pos3dBufferInfo, index: this.locations.attributes.a_position, size: 3, options: {} },
+            { bufferAndReadInfo: longLatBufferInfo, index: this.locations.attributes.a_xy, size: 2, options: {} },
+            {
+                bufferAndReadInfo: indexBufferInfo, index: this.locations.attributes.a_index, size: 1, options: {
+                    dataType: "uint16",
+                    escapeValues: [IndexAttributeEscapeValue],
+                }
+            },
+            {
+                bufferAndReadInfo: variativeColorBuffer, index: this.locations.attributes.a_color, size: 4, options: {
+                    dataType: "uint8",
+                    escapeValues: [0, 0, 0, 255]
+                }
+            },
+        ]);
     }
     createUBO(bufferReadType = "STATIC_DRAW") {
         const ubo = styleBlockManager.createUBO(this.gl, bufferReadType);
@@ -200,12 +202,12 @@ export class TextureDemTriangles {
         DemTextureManagerCache.release(this.globe);
         CameraUniformBlockTotemCache.release(this.globe);
     }
-    draw(vao, drawOptions, ubo) {
+    draw(attributeLoader, drawOptions, ubo) {
         const gl = this.gl;
         gl.useProgram(this.program);
         this.cameraUniformBlock.bind(uniformBindingPoints.camera);
         this.demTextureManager.bindData(0, uniformBindingPoints.dem);
-        gl.bindVertexArray(vao);
+        attributeLoader.bind();
         ubo.bind();
         // This program has two fragment outputs (location 0: color, location 1: index).
         // When rendering to the default framebuffer (no picking FBO bound), only location 0
@@ -226,24 +228,12 @@ export class TextureDemTriangles {
         //     gl.drawBuffers([gl.BACK]);
         // }
         this.demTextureManager.unbindData(0, uniformBindingPoints.dem);
-        gl.bindVertexArray(null);
+        attributeLoader.unbind();
         gl.bindTexture(gl.TEXTURE_2D_ARRAY, null);
         gl.useProgram(null);
         ubo.unbind();
         this.cameraUniformBlock.unbind(uniformBindingPoints.camera);
     }
-    setDefaultDefaultAttributeValues() {
-        const gl = this.gl;
-        setDefaultAttributeValues(gl, this.locations.attributes.a_index, 1, [IndexAttributeEscapeValue], "uint16");
-        setDefaultAttributeValues(gl, this.locations.attributes.a_color, 4, [0, 0, 0, 255], "uint8");
-    }
-    resetDefaultAttributeValues() {
-        const gl = this.gl;
-        gl.disableVertexAttribArray(this.locations.attributes.a_index);
-        resetAttributeDefault(gl, this.locations.attributes.a_index);
-        gl.disableVertexAttribArray(this.locations.attributes.a_color);
-        resetAttributeDefault(gl, this.locations.attributes.a_color);
-    }
     _getUniformBlockOffset(name) {
         // hardcoded offsets based on std140 layout rules
         const offsets = {

package/programs/totems/attachments/dem-textures-manager.js

@@ -8,6 +8,7 @@ layout(std140) uniform DemTextureUniformBlock {
     vec4 u_textureDataCoverRatio[6]; // 96 bytes
     vec2 u_textureResolution; // 8 bytes
     int u_breakLoopIndex; // 4 bytes
+    float elevation_scale;
 };  
 uniform sampler2DArray u_demTexture;
 `;
@@ -17,8 +18,9 @@ const MAXLAYERS = 6;
 // CoverRatio: 6 * 16 bytes = 96
 // Resolution: 8 bytes (offset 192)
 // BreakLoopIndex: 4 bytes (offset 200)
-// Total used: 204 bytes.
-// std140 blocks are typically padded to 16 bytes alignment -> 208 bytes.
+// Elevation scale: 4 bytes (offset 204)
+// Total used: 208 bytes.
+// std140 blocks no need for padding -> 208 bytes.
 // 208 bytes / 4 bytes per float = 52 floats.
 const uniformBlockData = new Float32Array(52);
 function drawnedTilesHash(drawnTiles) {
@@ -162,6 +164,7 @@ export class DemTextureManager {
         uniformBlockData[49] = this.textureHeight;
         // Set break loop index (offset 200 bytes -> index 50)
         uniformBlockData[50] = this.mergedData.length;
+        uniformBlockData[51] = this._globe.api_GetZScale();
         // Unbind texture after updating
         gl.bindTexture(gl.TEXTURE_2D_ARRAY, null);
         gl.bindBuffer(gl.UNIFORM_BUFFER, this.uniformBuffer);

package/semiplugins/shape-on-terrain/terrain-polygon/terrain-polygon.js

@@ -41,7 +41,7 @@ export class TerrainPolygonSemiPlugin {
     _pickIndexBuffer = null;
     _variativeColorBuffer = null;
     _mercatorXYBuffer = null;
-    _vao = null;
+    _attributeLoader = null;
     _uboHandler = null;
     _uboForRealEdgeArcs = null;
     _drawPointsRangeIndexParams = {
@@ -132,7 +132,7 @@ export class TerrainPolygonSemiPlugin {
         if (this._options.variativeColorsOn) {
             this._variativeColorBuffer = gl.createBuffer();
         }
-        this._vao = this._program.createVAO({
+        this._attributeLoader = this._program.createAttributeLoader({
             offset: 0,
             stride: 0,
             buffer: this._vec3Buffer
@@ -389,10 +389,9 @@ export class TerrainPolygonSemiPlugin {
         gl.disable(gl.DEPTH_TEST);
         gl.enable(gl.BLEND);
         defaultblendfunction(gl);
-        this._program.setDefaultDefaultAttributeValues();
         // drawPoints 
         if (this._options.showTesselationPoints) {
-            this._program.draw(this._vao, this._drawPointsRangeIndexParams, this._uboHandler);
+            this._program.draw(this._attributeLoader, this._drawPointsRangeIndexParams, this._uboHandler);
         }
         if (this._pickerDisplayer && !this._options.pickablePause) {
             this._pickerDisplayer.bindFBO();
@@ -400,7 +399,7 @@ export class TerrainPolygonSemiPlugin {
             // gl.enable(gl.DEPTH_TEST);
         }
         gl.frontFace(gl.CW);
-        this._program.draw(this._vao, this._drawRangeIndexParams, this._uboHandler);
+        this._program.draw(this._attributeLoader, this._drawRangeIndexParams, this._uboHandler);
         gl.frontFace(gl.CCW);
         if (this._pickerDisplayer && !this._options.pickablePause) {
             gl.bindFramebuffer(gl.FRAMEBUFFER, null);
@@ -411,10 +410,9 @@ export class TerrainPolygonSemiPlugin {
             gl.disable(gl.DEPTH_TEST);
             // gl.enable(gl.POLYGON_OFFSET_FILL);
             // gl.polygonOffset(-3.0, -3.0);
-            this._program.draw(this._vao, this._drawRealEdgeArcs, this._uboForRealEdgeArcs);
+            this._program.draw(this._attributeLoader, this._drawRealEdgeArcs, this._uboForRealEdgeArcs);
             // gl.disable(gl.POLYGON_OFFSET_FILL);
         }
-        this._program.resetDefaultAttributeValues();
         gl.enable(gl.DEPTH_TEST);
     }
     free() {

package/util/gl-util/buffer/attribute-loader.js

@@ -99,4 +99,46 @@ function resetAttributeDefault(gl, index) {
 function setDefaultAttributeValues(gl, index, size, escapeValues, typeInfo) {
     setConstantAttribute(gl, index, size, escapeValues, DATA_TYPE_MAP[typeInfo]);
 }
+export class AttributeLoader {
+    gl;
+    meta;
+    vao;
+    stickyNotes = new Map();
+    constructor(gl, meta) {
+        this.gl = gl;
+        this.meta = meta;
+        this.vao = gl.createVertexArray();
+        gl.bindVertexArray(this.vao);
+        for (const { bufferAndReadInfo, index, size, options } of this.meta) {
+            if (bufferAndReadInfo != null && bufferAndReadInfo.buffer != null) {
+                attributeLoader(this.gl, bufferAndReadInfo, index, size, options);
+            }
+            else if (options.escapeValues) {
+                const dataType = options.dataType || "float";
+                const typeInfo = DATA_TYPE_MAP[dataType];
+                this.stickyNotes.set(index, { size, typeInfo, escapeValues: options.escapeValues });
+            }
+            else {
+                throw new Error("Invalid attribute loader configuration");
+            }
+        }
+        gl.bindVertexArray(null);
+    }
+    bind() {
+        const { gl } = this;
+        gl.bindVertexArray(this.vao);
+        for (const [index, { size, typeInfo, escapeValues }] of this.stickyNotes) {
+            setConstantAttribute(gl, index, size, escapeValues, typeInfo);
+        }
+    }
+    unbind() {
+        this.gl.bindVertexArray(null);
+        for (const index of this.stickyNotes.keys()) {
+            resetAttributeDefault(this.gl, index);
+        }
+    }
+    free() {
+        this.gl.deleteVertexArray(this.vao);
+    }
+}
 export { attributeLoader, createBufferAndReadInfo, resetAttributeDefault, setDefaultAttributeValues };