@pirireis/webglobeplugins 1.1.15 → 1.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pirireis/webglobeplugins",
-    "version": "1.1.15",
+    "version": "1.1.16",
     "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 } from "../../util/gl-util/buffer/attribute-loader";
+import { attributeLoader, resetAttributeDefault, setDefaultAttributeValues } 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;
@@ -40,7 +40,7 @@ ${DEM_TEXTURE_BLOCK_STRING}
 
 in vec3 a_position;
 in vec2 a_xy;
-in float a_index;
+in uint a_index;
 in uvec4 a_color;
 
 ${styleBlockManager.glslCode()}
@@ -91,12 +91,10 @@ void main() {
     }
 
     if (private_isPickedOn ==  true){
-        if (a_index == float(private_pickedIndex)) {
+        if (a_index == private_pickedIndex) {
             v_color = pickedColor;
         }
-        v_index = uint(a_index);
-    } else {
-        v_index = 0u;
+        v_index = a_index;
     }
 
     
@@ -178,7 +176,7 @@ export class TextureDemTriangles {
         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: "uint32",
+            dataType: "uint16",
             escapeValues: [IndexAttributeEscapeValue],
         });
         attributeLoader(this.gl, variativeColorBuffer, this.locations.attributes.a_color, 4, {
@@ -233,6 +231,18 @@ export class TextureDemTriangles {
         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 = {
@@ -245,25 +255,3 @@ export class TextureDemTriangles {
         return result;
     }
 }
-function drawOnTopBegin(gl) {
-    gl.disable(gl.DEPTH_TEST);
-    // gl.enable(gl.POLYGON_OFFSET_FILL);
-    // // Use an offset to "nudge" the depth value slightly closer or farther.
-    // // Common values are gl.polygonOffset(1.0, 1.0) or gl.polygonOffset(0.RESOLUTION, 0.RESOLUTION)
-    // gl.polygonOffset(1.0, 1.0);
-    // gl.depthRange(0.0, 0.0001);  // Use near 0.01% of depth range
-    // gl.enable(gl.POLYGON_OFFSET_FILL);
-    // You will need to experiment with these values!
-    // A good starting point is -1.0, -1.0.
-    // Negative values "pull" the fragments closer to the camera.
-    // gl.polygonOffset(-1.0, -1.0);
-    // gl.enable(gl.POLYGON_OFFSET_FILL);
-    // gl.polygonOffset(-1.0, -2.0);
-}
-function drawOnTopEnd(gl) {
-    gl.enable(gl.DEPTH_TEST);
-    // gl.disable(gl.POLYGON_OFFSET_FILL);
-    // gl.disable(gl.POLYGON_OFFSET_FILL);
-    // gl.depthRange(0.0, 1.0);  // Restore full depth range
-    // gl.disable(gl.POLYGON_OFFSET_FILL);
-}

package/semiplugins/shape-on-terrain/terrain-polygon/data/master-worker.js

@@ -95,7 +95,7 @@ function mergeAndSendResults() {
         indices: new Uint32Array(totalIndices),
         longLats: new Float32Array(totalLongLats),
         realEdgeArcIndices: _arcState && totalRealEdgeArcIndices > 0 ? new Uint32Array(totalRealEdgeArcIndices) : null,
-        pickIndices: totalPickIndices > 0 ? new Float32Array(totalPickIndices) : null,
+        pickIndices: totalPickIndices > 0 ? new Uint16Array(totalPickIndices) : null,
         variativeColors: totalVariativeColors > 0 ? new Uint8Array(totalVariativeColors) : null,
     };
     // Sentinel/header (as in master-worker.js)

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

@@ -106,7 +106,7 @@ self.onmessage = (event) => {
             longLats: new Float32Array((counter / 3) * 2),
             indices: new Uint32Array(indexCounter),
             realEdgeArcIndices: _arcState ? new Uint32Array(totalArcCount) : null,
-            pickIndices: _pickableState ? new Float32Array(counter / 3) : null,
+            pickIndices: _pickableState ? new Uint16Array(counter / 3) : null,
             variativeColors: _variativeColorsOnState ? new Uint8Array((counter / 3) * 4) : null,
         };
         let currentVertexOffset = 0;

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

@@ -377,6 +377,7 @@ 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);
@@ -401,6 +402,7 @@ export class TerrainPolygonSemiPlugin {
             this._program.draw(this._vao, 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

@@ -70,7 +70,6 @@ const setConstantAttribute = (gl, index, size, values, typeInfo) => {
         throw new Error(`Attribute size must be between 1 and 4. Got ${size}.`);
     }
     if (typeInfo.useIntegerPointer) {
-        return;
         gl.vertexAttrib4f(index, 0, 0, 0, 1);
         // Integer attributes: WebGL2 ONLY supports vertexAttribI4i/I4ui for constants.
         const intValues = values.map((v) => Math.trunc(v));
@@ -94,4 +93,11 @@ const setConstantAttribute = (gl, index, size, values, typeInfo) => {
     else
         gl.vertexAttrib4f(index, v[0], v[1], v[2], v[3]);
 };
-export { attributeLoader, createBufferAndReadInfo };
+function resetAttributeDefault(gl, index) {
+    gl.vertexAttrib4f(index, 0, 0, 0, 1);
+}
+function setDefaultAttributeValues(gl, index, size, escapeValues, typeInfo) {
+    // gl.disableVertexAttribArray(index);
+    setConstantAttribute(gl, index, size, escapeValues, DATA_TYPE_MAP[typeInfo]);
+}
+export { attributeLoader, createBufferAndReadInfo, resetAttributeDefault, setDefaultAttributeValues };