@pirireis/webglobeplugins 0.16.4 → 0.17.0

package/programs/totems/camerauniformblock.js

@@ -1,8 +1,7 @@
 import { globeProgramCache } from "../programcache";
 import { fromLongLatToUnitVector } from "../../Math/vec3";
-import { RADIANS } from "../../Math/methods";
+import { RADIAN } from "../../Math/methods";
 import { GlobeChangeObserver } from "./globe-changes";
-// import { approximatedZoomLevel } from "../../util/geometry/index";
 export const CameraUniformBlockString = `
 layout(std140) uniform CameraUniformBlock {
     mat4 view; // 64 bytes           0
@@ -93,49 +92,39 @@ export class CameraUniformBlockTotem {
         const globe = this.globe;
         this._globeChangeObserver?.checkChanges();
         gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
-        {
-            // view, projection, translate
-            gl.bufferSubData(gl.UNIFORM_BUFFER, 0, modelView);
-            gl.bufferSubData(gl.UNIFORM_BUFFER, 64, projection);
-            traslateFloat32.set([translate.x, translate.y, translate.z], 0);
-            gl.bufferSubData(gl.UNIFORM_BUFFER, 128, traslateFloat32);
-        }
-        {
-            // zoom level
-            gl.bufferSubData(gl.UNIFORM_BUFFER, 160, new Float32Array([globe.api_GetCurrentLODWithDecimal()]));
-        }
-        {
-            // mapWH
-            if (globe.api_GetCurrentGeometry() === 1) {
-                const { width, height } = globe.api_GetCurrentWorldWH();
-                mapWHFloat32.set([width, height]);
-                gl.bufferSubData(gl.UNIFORM_BUFFER, 144, mapWHFloat32);
-            }
-        }
-        {
-            // float world_distance; // 4 bytes 164
-            // float world_tilt; // 4 bytes     168
-            // float world_north_angle; // 4 bytes 172
-            // vec2 world_center_radian; // 8 bytes    180
-            const { CenterLong, CenterLat, Distance, Tilt, NorthAng } = globe.api_GetCurrentLookInfo();
-            gl.bufferSubData(gl.UNIFORM_BUFFER, 164, new Float32Array([
-                Distance,
-                Radian * Tilt,
-                Radian * NorthAng,
-                Radian * CenterLong,
-                Radian * CenterLat,
-            ]));
+        // view, projection, translate
+        gl.bufferSubData(gl.UNIFORM_BUFFER, 0, modelView);
+        gl.bufferSubData(gl.UNIFORM_BUFFER, 64, projection);
+        traslateFloat32.set([translate.x, translate.y, translate.z], 0);
+        gl.bufferSubData(gl.UNIFORM_BUFFER, 128, traslateFloat32);
+        // zoom level
+        gl.bufferSubData(gl.UNIFORM_BUFFER, 160, new Float32Array([globe.api_GetCurrentLODWithDecimal()]));
+        // mapWH
+        if (globe.api_GetCurrentGeometry() === 1) {
+            const { width, height } = globe.api_GetCurrentWorldWH();
+            mapWHFloat32.set([width, height]);
+            gl.bufferSubData(gl.UNIFORM_BUFFER, 144, mapWHFloat32);
         }
+        // float world_distance; // 4 bytes 164
+        // float world_tilt; // 4 bytes     168
+        // float world_north_angle; // 4 bytes 172
+        // vec2 world_center_radian; // 8 bytes    180
+        const { CenterLong, CenterLat, Distance, Tilt, NorthAng } = globe.api_GetCurrentLookInfo();
+        gl.bufferSubData(gl.UNIFORM_BUFFER, 164, new Float32Array([
+            Distance,
+            Radian * Tilt,
+            Radian * NorthAng,
+            Radian * CenterLong,
+            Radian * CenterLat,
+        ]));
         // this._frustumPlanes = getFrustumPlanes(projection, translate);
         gl.bindBuffer(gl.UNIFORM_BUFFER, null);
-        {
-            // isMoved
-            const currentLOD = globe.api_GetCurrentLODWithDecimal();
-            this._isMovedParams.isMoved =
-                this._isMovedParams.lastLod !== currentLOD ||
-                    globe.api_IsScreenMoving();
-            this._isMovedParams.lastLod = currentLOD;
-        }
+        // isMoved
+        const currentLOD = globe.api_GetCurrentLODWithDecimal();
+        this._isMovedParams.isMoved =
+            this._isMovedParams.lastLod !== currentLOD ||
+                globe.api_IsScreenMoving();
+        this._isMovedParams.lastLod = currentLOD;
         this.__setCameraVectors();
         // this._calculateAproximatedLOD();
     }
@@ -146,7 +135,7 @@ export class CameraUniformBlockTotem {
         const globe = this.globe;
         const currentGeom = globe.api_GetCurrentGeometry();
         if (currentGeom === 0) {
-            const { Fp, FUPos } = globe;
+            const { Fp } = globe; // FUPos
             const cameraVector = [Fp.x, Fp.y, Fp.z];
             const length = Math.sqrt(cameraVector.reduce((sum, val) => sum + val * val, 0));
             this._normalizedCameraVector[0] = cameraVector[0] / length;
@@ -155,7 +144,7 @@ export class CameraUniformBlockTotem {
         }
         else if (currentGeom === 1) {
             const { CenterLong, CenterLat } = globe.api_GetCurrentLookInfo();
-            fromLongLatToUnitVector(_0vec3, [CenterLong * RADIANS, CenterLat * RADIANS]);
+            fromLongLatToUnitVector(_0vec3, [CenterLong * RADIAN, CenterLat * RADIAN]);
             this._normalizedCameraVector[0] = _0vec3[0];
             this._normalizedCameraVector[1] = _0vec3[1];
             this._normalizedCameraVector[2] = _0vec3[2];
@@ -197,7 +186,7 @@ export class CameraUniformBlockTotem {
         const globe = this.globe;
         const { CenterLong, CenterLat } = globe.api_GetCurrentLookInfo();
         const result = [0, 0, 0];
-        fromLongLatToUnitVector(result, [CenterLong * RADIANS, CenterLat * RADIANS]);
+        fromLongLatToUnitVector(result, [CenterLong * RADIAN, CenterLat * RADIAN]);
         return result;
     }
     getGlobeChanges() {

package/programs/two-d/pixel-padding-for-compass.js

@@ -1,4 +1,4 @@
-import { createProgram } from "../../util";
+import { createProgram } from "../../util/webglobjectbuilders";
 import { CameraUniformBlockTotemCache, CameraUniformBlockString } from "../totems";
 import { noRegisterGlobeProgramCache } from "../programcache";
 const vertexCount = 720;
@@ -73,29 +73,19 @@ class Logic {
         this._lastOpacity = 1;
         this.program = createProgram(this.gl, vertexShaderSource, fragmentShaderSource);
         const { gl, program } = this;
-        { // assign attribute locations
-            //             in vec2 screen_coordinate;
-            // in float pixel_radius_small_ratio;
-            // in float pixel_radius_big_ratio;
-            // in vec4 rgba;
-            gl.bindAttribLocation(program, 0, "screen_coordinate");
-            gl.bindAttribLocation(program, 1, "pixel_radius_small_ratio");
-            gl.bindAttribLocation(program, 2, "pixel_radius_big_ratio");
-            gl.bindAttribLocation(program, 3, "rgba");
-        }
-        {
-            this._opacityLocation = gl.getUniformLocation(program, "plugin_opacity");
-            const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-            gl.useProgram(program);
-            gl.uniform1f(this._opacityLocation, this._lastOpacity);
-            gl.useProgram(currentProgram);
-        }
-        {
-            this.cameraBlockBindingPoint = 0;
-            const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
-            this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
-            gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBindingPoint);
-        }
+        gl.bindAttribLocation(program, 0, "screen_coordinate");
+        gl.bindAttribLocation(program, 1, "pixel_radius_small_ratio");
+        gl.bindAttribLocation(program, 2, "pixel_radius_big_ratio");
+        gl.bindAttribLocation(program, 3, "rgba");
+        this._opacityLocation = gl.getUniformLocation(program, "plugin_opacity");
+        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+        gl.useProgram(program);
+        gl.uniform1f(this._opacityLocation, this._lastOpacity);
+        gl.useProgram(currentProgram);
+        this.cameraBlockBindingPoint = 0;
+        const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
+        gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBindingPoint);
     }
     draw(vao, length, opacity) {
         const { globe, gl, program, cameraBlockTotem, cameraBlockBindingPoint, _opacityLocation } = this;

package/programs/vectorfields/logics/drawrectangleparticles.js

@@ -1,5 +1,4 @@
-import { createProgram } from "../../../util";
-import { UBO_BINDING_POINT, shaderUboSource } from "./ubo.js";
+import { createProgram } from "../../../util/webglobjectbuilders";
 import { glProgramCache } from "../../programcache";
 import { SeaWaveUbo } from "./ubo-new";
 /**

package/programs/vectorfields/logics/pixelbased.js

@@ -1,5 +1,4 @@
-import { createShader } from "../../../util";
-import { UBO_SIZE, UBO_BINDING_POINT, shaderUboSource } from "./ubo.js";
+import { createShader } from "../../../util/webglobjectbuilders";
 import { glProgramCache } from "../../programcache";
 import { SeaWaveUbo } from "./ubo-new";
 // program output is buffer

package/programs/vectorfields/pingpongbuffermanager.js

@@ -5,7 +5,7 @@
  *
  * update coords and draw particles programs will use this class.
  */
-export default class {
+export class PingPongBufferManager {
     constructor(gl, particleCount, inPositionLocation = 0) {
         this.gl = gl;
         this._inPositionLocation = inPositionLocation;

package/range-tools-on-terrain/bearing-line/adapters.js

@@ -18,7 +18,7 @@ export const flatLinesInputAdapter = (bearingLine) => {
     };
 };
 export const flatLinesBearingInputAdapter = (bearingLine) => {
-    const { long, lat, rgba, key, bearingLat = 0, bearingLong = 0, msl } = bearingLine;
+    const { long, lat, rgba, key, bearingLat = 0, bearingLong = 0 } = bearingLine;
     return {
         key: key,
         start: [long, lat],

package/range-tools-on-terrain/circle-line-chain/adapters.js

@@ -1,9 +1,4 @@
 export const keyMethod = (chainKey, nodeKey) => `${chainKey}_${nodeKey}`;
-const distance = (node1, node2) => {
-    const dx = node1.long - node2.long;
-    const dy = node1.lat - node2.lat;
-    return Math.sqrt(dx * dx + dy * dy);
-};
 export const circleDataAdaptor = (globe, chain) => {
     const circleInputs = [];
     const { chainKey, chainProperties, nodes } = chain;

package/range-tools-on-terrain/circle-line-chain/plugin.js

@@ -102,7 +102,7 @@ export class CircleLineChainPlugin {
             return;
         const chainKeys = [];
         const chainsToClean = [];
-        for (const { chainKey, chainProperties, nodes } of chains) {
+        for (const { chainKey } of chains) {
             if (this._chainListMap.hasChain(chainKey)) {
                 chainsToClean.push(chainKey);
             }

package/range-tools-on-terrain/range-ring/plugin.js

@@ -1,7 +1,7 @@
 import { CircleOnTerrainPlugin } from "../../semiplugins/shape-on-terrain/circle-plugin";
 import { ArcOnTerrainPlugin } from "../../semiplugins/shape-on-terrain/arc-plugin";
 import { Padding1DegreePlugin } from '../../semiplugins/shape-on-terrain/padding-1-degree';
-import { padding1DegreeInputAdapter, rangeRingToArcInputAdapter, rangeRingToCircleInputAdapter, allCircleKeysAdapter, allArcKeysAdapter, createColorRatios } from "./adapters";
+import { padding1DegreeInputAdapter, rangeRingToArcInputAdapter, rangeRingToCircleInputAdapter, allCircleKeysAdapter, allArcKeysAdapter, createColorRatios, } from "./adapters";
 import RangeRingAngleText from "./rangeringangletext";
 import { opacityCheck } from "../../util/check/typecheck";
 export var ENUM_HIDE;
@@ -311,7 +311,7 @@ export class RangeRingPlugin {
         if (this.draw1degrePadding) {
             this.paddingPlugin?.draw3D();
         }
-        for (const [key, writer] of this.textWritersMap) {
+        for (const [, writer] of this.textWritersMap) {
             writer.draw();
         }
     }
@@ -338,7 +338,6 @@ export class RangeRingPlugin {
             console.warn("Globe or WebGL context is not initialized, cannot update text");
             return;
         }
-        const globe = this.globe;
         const textWritersMap = this.textWritersMap;
         let keys = centerIDs ?? this._memory.keys();
         for (const centerID of keys) {
@@ -351,7 +350,7 @@ export class RangeRingPlugin {
             if (rangeRingData.textHide === ENUM_TEXT_HIDE.HIDE) {
                 continue;
             }
-            for (const [key, writer] of textWritersMap) {
+            for (const [, writer] of textWritersMap) {
                 writer.insertText(rangeRingData);
             }
         }
@@ -365,13 +364,12 @@ export class RangeRingPlugin {
             console.warn("Globe or WebGL context is not initialized, cannot delete text");
             return;
         }
-        const globe = this.globe;
         const textWritersMap = this.textWritersMap;
         for (const centerID of centerIDs) {
             const rangeRingData = this._memory.get(centerID);
             if (!rangeRingData)
                 continue;
-            for (const [key, writer] of textWritersMap) {
+            for (const [, writer] of textWritersMap) {
                 writer.deleteText(rangeRingData);
             }
         }

package/semiplugins/lightweight/line-plugin.js

@@ -164,7 +164,6 @@ export class LinePlugin {
         const globe = this.globe;
         const { flatViewOn, globeViewOn, variativeColorsOn, dashedLineOpacityVariativeOn, dashedLineRatioVariativeOn, bufferType = "DYNAMIC_DRAW" } = this._options;
         const m = this.bufferManagersMap;
-        const initialCapacity = this._options.initialCapacity;
         if (flatViewOn) {
             m.set("start_position", {
                 bufferManager: new BufferManager(globe.gl, 2, { bufferType, initialCapacity: this._options.initialCapacity }),

package/semiplugins/shape-on-terrain/arc-plugin.js

@@ -1,9 +1,8 @@
 // import { ArcOnTerrainPluginOptions } from "./type";
 import { LineStripProgramCache } from "../../programs/line-on-globe/linestrip/linestrip";
 import { createBufferAndReadInfo } from "../../util/gl-util/buffer/attribute-loader";
-// import { populateFloat32Array } from "../../util/jshelpers/data-filler";
 import { BufferManager, BufferOrchestrator } from "../../util/account/single-attribute-buffer-management/index";
-import { globe3Dcoordinates, globe2Dcoordinates, RADIANS } from "../../Math/methods";
+import { globe3Dcoordinates, globe2Dcoordinates, RADIAN } from "../../Math/methods";
 import { generateArcPoints, evenlySpacedArcPoints } from "../../Math/arc-cdf-points";
 import { StaticDynamicState, StaticDynamicStrategy } from "../../util/build-strategy/static-dynamic";
 import { opacityCheck } from "../../util/check/typecheck";
@@ -19,8 +18,8 @@ const _start = [0, 0, 0];
 const _end = [0, 0, 0];
 const _0arc = arc.create([1, 0, 0], [0, 1, 0]); // zero arc for intersection tests
 function createArc(start, end) {
-    vec3.fromLongLatToUnitVector(_start, [start[0] * RADIANS, start[1] * RADIANS]);
-    vec3.fromLongLatToUnitVector(_end, [end[0] * RADIANS, end[1] * RADIANS]);
+    vec3.fromLongLatToUnitVector(_start, [start[0] * RADIAN, start[1] * RADIAN]);
+    vec3.fromLongLatToUnitVector(_end, [end[0] * RADIAN, end[1] * RADIAN]);
     return arc.create(_start, _end);
 }
 export class ArcOnTerrainPlugin {
@@ -279,7 +278,6 @@ export class ArcOnTerrainPlugin {
         if (!this.bufferManagersMap?.has(bufferKey[0]))
             return;
         const longLat = [0, 0];
-        const _attractionStrength = 0;
         const longLatArr = new Float32Array(2 * this._options.vertexCount);
         const data = [{
                 key: "staticArcs",
@@ -302,7 +300,7 @@ export class ArcOnTerrainPlugin {
             for (let i = 0; i < generatedPoints.length; i++) {
                 const point = generatedPoints[i];
                 vec3.fromUnitVectorToLongLat(longLat, point);
-                longLatArr.set([longLat[0] / RADIANS, longLat[1] / RADIANS], i * 2);
+                longLatArr.set([longLat[0] / RADIAN, longLat[1] / RADIAN], i * 2);
             }
             data[0].key = key;
             data[0].height = arcInput.height ?? this._options.defaultHeightFromGroundIn3D;
@@ -365,7 +363,7 @@ export class ArcOnTerrainPlugin {
             for (let i = 0; i < generatedPoints.length; i++) {
                 const point = generatedPoints[i];
                 vec3.fromUnitVectorToLongLat(longLat, point);
-                longLatArr.set([longLat[0] / RADIANS, longLat[1] / RADIANS], i * 2);
+                longLatArr.set([longLat[0] / RADIAN, longLat[1] / RADIAN], i * 2);
             }
             result.push({
                 key: key,

package/semiplugins/shape-on-terrain/circle-plugin.js

@@ -297,7 +297,7 @@ export class CircleOnTerrainPlugin {
             return;
         const wrapper = [null];
         for (const key of subSetIDs) {
-            const [circleInput, circleForAzimuthCalc] = this.circleMap.get(key) || [];
+            const [circleInput,] = this.circleMap.get(key) || [];
             if (circleInput) {
                 wrapper[0] = circleInput;
                 this.bufferOrchestrator.insertBulk(wrapper, this.bufferManagersMap, ["color"]);
@@ -393,7 +393,7 @@ export class CircleOnTerrainPlugin {
                 console.warn(`CircleOnTerrainPlugin: Circle ${key} not found in circleMap.`);
                 continue;
             }
-            const [{ radius, center, height = null, color = null, msl = undefined }, _] = this.circleMap.get(key);
+            const [{ radius, center, height = null, color = null, msl = undefined },] = this.circleMap.get(key);
             const circlePointsLongLat = new Float64Array((CIRCLE_POINTS_COUNT) * 2);
             CircleCDF.globeFindPointByPolarHalfCircle(circlePointsLongLat, globe, center[0], center[1], radius, zeroRotation, templateAngles);
             datas.push({

package/semiplugins/shape-on-terrain/padding-1-degree.js

@@ -437,7 +437,6 @@ export class Padding1DegreePlugin {
     }
     __innerCircle(subSetIDs = null) {
         // Implement inner circle padding logic
-        console.log("innerCircle Level Update");
         const datas = this._dataMap;
         let keys;
         if (subSetIDs) {
@@ -514,7 +513,7 @@ function preAdapter(globe, paddingInput, paddingRatio, outerCoords) {
             paddingInput.radius * paddingRatio, // inner radius
             i);
             const longDifference = Math.abs(long - endLong);
-            const latDifference = Math.abs(lat - endLat);
+            // const latDifference = Math.abs(lat - endLat);
             if (longDifference > 45) {
                 outerCoords[i] = null;
                 innerCoords[i] = null;

package/semiplugins/shell/bbox-renderer/index.js

@@ -0,0 +1,2 @@
+import { BBOXGlobeShell } from './object';
+export { BBOXGlobeShell };