@pirireis/webglobeplugins 0.16.7 → 0.17.0

package/programs/totems/camerauniformblock.js

@@ -2,7 +2,6 @@ import { globeProgramCache } from "../programcache";
 import { fromLongLatToUnitVector } from "../../Math/vec3";
 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;

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,7 +1,6 @@
 // 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, RADIAN } from "../../Math/methods";
 import { generateArcPoints, evenlySpacedArcPoints } from "../../Math/arc-cdf-points";
@@ -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",

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

@@ -513,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 };

package/{programs/globeshell/wiggle → semiplugins/shell/bbox-renderer}/logic.js

@@ -1,23 +1,11 @@
-import { createProgram } from '../../../util';
-export default class Logic {
-    constructor() {
-        this.id = "GlobeShellProgram";
-        this.description = "This program implements flyweight pattern for globe." +
-            "At globes draw3D call stack, this program should be prior to any program that uses it." +
-            "draw3D method of this object only sets Projetion, ModelView and Translate matrices and if the mode is 2D mapWH .";
-    }
-    init(globe, gl) {
-        this.gl = gl;
-        this.globe = globe;
-        this.programWrapper = this._createProgramWrapper();
-        this._transformArray = new Float32Array(3);
-        this.setGeometry();
-        this.resize();
-        this.updateTime(0);
-        this.setMesh({ xRes: 64, yRes: 64, eastWestTied: false });
-    }
-    _createProgramWrapper() {
-        const vertexShader = `#version 300 es
+import { createProgram } from '../../../util/webglobjectbuilders';
+import { noRegisterGlobeProgramCache } from '../../../programs/programcache';
+import { CameraUniformBlockString, CameraUniformBlockTotemCache, CameraUniformBlockTotem } from "../../../programs/totems/camerauniformblock";
+const UniformBlockBindingPoints = {
+    ShellBlock: 0,
+    CameraBlock: 1,
+};
+const vertexShader = `#version 300 es
         #define R 6378.137
         #define PI 3.1415926535897932384626433832795
         #define POLE 20037508.34
@@ -35,14 +23,7 @@ export default class Logic {
             float u_opacity;
         };
 
-        uniform mat4 u_model_view_matrix;
-        uniform mat4 u_projection_matrix;
-        uniform vec3 u_translate;
-
-        uniform vec2 u_mapWH;
-        uniform vec2 u_scrWH;
-
-        uniform bool u_is3D; 
+        ${CameraUniformBlockString}
 
         out float v_opacity;
         out vec2 v_texture_coordinate;
@@ -72,8 +53,8 @@ export default class Logic {
             float mercX = x * POLE_BY_PI;
             float mercY = log(tan(HALF_PI - y / 2.0 )) * POLE_BY_PI;
 
-            float normX = ( mercX - u_translate.x ) / u_mapWH.x;
-            float normY = ( mercY - u_translate.y ) / u_mapWH.y;
+            float normX = ( mercX - translate.x ) / mapWH.x;
+            float normY = ( mercY - translate.y ) / mapWH.y;
             return vec2(normX, normY);
         }       
 
@@ -89,16 +70,16 @@ export default class Logic {
 
         void main() {
             vec2 texCoord = f_texCoord();
-            if (u_is3D){
+            if (is3D){
                 vec3 unit_sphere_pos = f_onSphere(texCoord);
                 float wiggle = f_wiggle(texCoord);
                 vec3 position = f_position(unit_sphere_pos, wiggle);
-                gl_Position = u_projection_matrix * u_model_view_matrix * vec4(position  - u_translate, 1.0);
+                gl_Position = projection * view * vec4(position  - translate, 1.0);
             }  else {
                 vec2 position = f_onFlat(texCoord);
-                gl_Position = u_projection_matrix * vec4(
-                    position.x * u_scrWH.x,
-                    (1.0 - position.y) * u_scrWH.y,
+                gl_Position = projection * vec4(
+                    position.x * screenWH.x,
+                    (1.0 - position.y) * screenWH.y,
                     0.0,
                     1.0);
             }
@@ -106,7 +87,7 @@ export default class Logic {
             v_opacity = u_opacity;
         }
         `;
-        const fragmentShader = `#version 300 es
+const fragmentShader = `#version 300 es
         precision lowp float;
         in vec2 v_texture_coordinate;
         in float v_opacity;
@@ -118,22 +99,33 @@ export default class Logic {
            outColor = texture(u_texture, v_texture_coordinate);
            outColor.a *= v_opacity;
         }`;
+class BBOXGlobeShellProgram {
+    constructor(globe) {
+        this.id = "BBOXGlobeShellProgram";
+        this.description = "This program implements flyweight pattern for globe." +
+            "At globes draw3D call stack, this program should be prior to any program that uses it." +
+            "draw3D method of this object only sets Projetion, ModelView and Translate matrices and if the mode is 2D mapWH .";
+        this.gl = globe.gl;
+        this.globe = globe;
+        this.programWrapper = this._createProgramWrapper();
+        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
+        this.cameraBlockTotem.assignBindingPoint(this.programWrapper.program, UniformBlockBindingPoints.CameraBlock);
+        this._transformArray = new Float32Array(3);
+        // this.setGeometry();
+        // this.resize();
+        this.updateTime(0);
+        this.setMesh({ xRes: 64, yRes: 64, eastWestTied: false });
+    }
+    _createProgramWrapper() {
         const gl = this.gl;
         const program = createProgram(gl, vertexShader, fragmentShader);
         const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
         gl.useProgram(program);
-        this.shellBlockBindingPoint = 0;
         const shellBlockIndex = gl.getUniformBlockIndex(program, "ShellBlock");
-        gl.uniformBlockBinding(program, shellBlockIndex, this.shellBlockBindingPoint);
+        gl.uniformBlockBinding(program, shellBlockIndex, UniformBlockBindingPoints.ShellBlock);
         gl.useProgram(currentProgram);
         return {
             program,
-            u_model_view_matrix: gl.getUniformLocation(program, "u_model_view_matrix"),
-            u_projection_matrix: gl.getUniformLocation(program, "u_projection_matrix"),
-            u_translate: gl.getUniformLocation(program, "u_translate"),
-            u_is3D: gl.getUniformLocation(program, "u_is3D"),
-            u_scrWH: gl.getUniformLocation(program, "u_scrWH"),
-            u_mapWH: gl.getUniformLocation(program, "u_mapWH"),
             u_texture: gl.getUniformLocation(program, "u_texture"),
             u_mesh_resolution: gl.getUniformLocation(program, "u_mesh_resolution"),
         };
@@ -149,62 +141,58 @@ export default class Logic {
         gl.uniform1f(this.programWrapper.u_time, time);
         gl.useProgram(currentProgram);
     }
-    setRotationAndTranslation(uProjectionMatrix, uModelViewMatrix, uTranslate, resetCurrentProgram = false) {
-        const gl = this.gl;
-        let currentProgram = null;
-        if (resetCurrentProgram) {
-            currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-        }
-        ;
-        gl.useProgram(this.programWrapper.program);
-        gl.uniformMatrix4fv(this.programWrapper.u_projection_matrix, false, uProjectionMatrix);
-        gl.uniformMatrix4fv(this.programWrapper.u_model_view_matrix, false, uModelViewMatrix);
-        this._transformArray.set([uTranslate.x, uTranslate.y, uTranslate.z], 0);
-        gl.uniform3fv(this.programWrapper.u_translate, this._transformArray);
-        if (resetCurrentProgram)
-            gl.useProgram(currentProgram);
-    }
-    setGeometry() {
-        const { globe, gl } = this;
-        const { u_is3D, u_scrWH, program } = this.programWrapper;
-        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-        const is3D = this.globe.api_GetCurrentGeometry() === 0;
-        gl.useProgram(program);
-        if (globe.api_GetCurrentGeometry() === globe.api_GeometryTypes().FLAT) {
-            gl.uniform2f(u_scrWH, globe.api_ScrW(), globe.api_ScrH());
-        }
-        gl.uniform1i(u_is3D, is3D);
-        gl.useProgram(currentProgram);
-    }
-    resize() {
-        const { gl, globe } = this;
-        if (!globe)
-            return;
-        const { program, u_scrWH } = this.programWrapper;
-        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-        gl.useProgram(program);
-        if (globe.api_GetCurrentGeometry() === globe.api_GeometryTypes().FLAT) {
-            gl.uniform2f(u_scrWH, globe.api_ScrW(), globe.api_ScrH());
-        }
-        gl.useProgram(currentProgram);
-    }
-    // only sets data does not draw
-    draw3D(uProjectionMatrix, uModelViewMatrix, uTranslate) {
-        const { gl, globe } = this;
-        const { program, u_model_view_matrix, u_projection_matrix, u_translate } = this.programWrapper;
-        gl.disable(gl.DEPTH_TEST);
-        gl.useProgram(program);
-        gl.uniformMatrix4fv(u_projection_matrix, false, uProjectionMatrix);
-        gl.uniformMatrix4fv(u_model_view_matrix, false, uModelViewMatrix);
-        // this._transformArray.set([], 0);
-        gl.uniform3f(u_translate, uTranslate.x, uTranslate.y, uTranslate.z);
-        if (globe.api_GetCurrentGeometry() === 1) {
-            const { width, height } = globe.api_GetCurrentWorldWH();
-            gl.uniform2fv(this.programWrapper.u_mapWH, [width, height]);
-        }
-        gl.enable(gl.DEPTH_TEST);
-    }
-    draw(texture, shellBlockDataManager, drawLines = false) {
+    // setRotationAndTranslation(uProjectionMatrix, uModelViewMatrix, uTranslate, resetCurrentProgram = false) {
+    //     const gl = this.gl;
+    //     let currentProgram = null;
+    //     if (resetCurrentProgram) { currentProgram = gl.getParameter(gl.CURRENT_PROGRAM) };
+    //     gl.useProgram(this.programWrapper.program);
+    //     gl.uniformMatrix4fv(this.programWrapper.projection, false, uProjectionMatrix);
+    //     gl.uniformMatrix4fv(this.programWrapper.view, false, uModelViewMatrix);
+    //     this._transformArray.set([uTranslate.x, uTranslate.y, uTranslate.z], 0);
+    //     gl.uniform3fv(this.programWrapper.translate, this._transformArray);
+    //     if (resetCurrentProgram) gl.useProgram(currentProgram);
+    // }
+    // setGeometry() {
+    //     const { globe, gl } = this;
+    //     const { is3D, screenWH, program } = this.programWrapper;
+    //     const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+    //     const is3D = this.globe.api_GetCurrentGeometry() === 0;
+    //     gl.useProgram(program);
+    //     if (globe.api_GetCurrentGeometry() === globe.api_GeometryTypes().FLAT) {
+    //         gl.uniform2f(screenWH, globe.api_ScrW(), globe.api_ScrH());
+    //     }
+    //     gl.uniform1i(is3D, is3D);
+    //     gl.useProgram(currentProgram);
+    // }
+    // resize() {
+    //     const { gl, globe } = this;
+    //     if (!globe) return;
+    //     const { program, screenWH } = this.programWrapper;
+    //     const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+    //     gl.useProgram(program);
+    //     if (globe.api_GetCurrentGeometry() === globe.api_GeometryTypes().FLAT) {
+    //         gl.uniform2f(screenWH, globe.api_ScrW(), globe.api_ScrH());
+    //     }
+    //     gl.useProgram(currentProgram);
+    // }
+    // only sets
+    //  data does not draw
+    // draw3D(csRenderPass) {
+    //     const { gl, globe } = this;
+    //     const { program } = this.programWrapper; //view, projection, translate
+    //     gl.disable(gl.DEPTH_TEST);
+    //     gl.useProgram(program);
+    //     // gl.uniformMatrix4fv(projection, false, uProjectionMatrix);
+    //     // gl.uniformMatrix4fv(view, false, uModelViewMatrix);
+    //     // // this._transformArray.set([], 0);
+    //     // gl.uniform3f(translate, uTranslate.x, uTranslate.y, uTranslate.z);
+    //     if (globe.api_GetCurrentGeometry() === 1) {
+    //         const { width, height } = globe.api_GetCurrentWorldWH();
+    //         gl.uniform2fv(this.programWrapper.mapWH, [width, height]);
+    //     }
+    //     gl.enable(gl.DEPTH_TEST);
+    // }
+    draw(texture, shellBlockDataManager, drawLines = false, csRenderPass) {
         const { gl, programWrapper, _vao, _drawCount } = this;
         const { program, u_texture } = programWrapper;
         gl.useProgram(program);
@@ -213,15 +201,18 @@ export default class Logic {
         gl.bindTexture(gl.TEXTURE_2D, texture);
         gl.uniform1i(u_texture, 0);
         shellBlockDataManager.bind();
+        this.cameraBlockTotem.bind(UniformBlockBindingPoints.CameraBlock);
         if (drawLines)
             gl.drawElements(gl.LINES, _drawCount, gl.UNSIGNED_SHORT, 0);
         gl.clearColor(0, 0, 0, 0);
         gl.drawElements(gl.TRIANGLES, _drawCount, gl.UNSIGNED_SHORT, 0);
         shellBlockDataManager.unbind();
+        this.cameraBlockTotem.unbind(UniformBlockBindingPoints.CameraBlock);
         gl.bindVertexArray(null);
     }
     free() {
         const { gl, programWrapper, _vao, _indexBuffer } = this;
+        CameraUniformBlockTotemCache.release(this.globe);
         gl.deleteBuffer(_indexBuffer);
         gl.deleteVertexArray(_vao);
         gl.deleteProgram(programWrapper.program);
@@ -329,7 +320,7 @@ class ShellBlockManager {
     }
     bind() {
         const { gl, buffer } = this;
-        gl.bindBufferBase(gl.UNIFORM_BUFFER, this.shellBlockBindingPoint, buffer);
+        gl.bindBufferBase(gl.UNIFORM_BUFFER, UniformBlockBindingPoints.ShellBlock, buffer);
     }
     free() {
         const { gl, buffer } = this;
@@ -337,6 +328,14 @@ class ShellBlockManager {
     }
     unbind() {
         const { gl } = this;
-        gl.bindBufferBase(gl.UNIFORM_BUFFER, this.shellBlockBindingPoint, null);
+        gl.bindBufferBase(gl.UNIFORM_BUFFER, UniformBlockBindingPoints.ShellBlock, null);
     }
 }
+export const BBOXGlobeShellProgramCache = Object.freeze({
+    get: function (globe) {
+        return noRegisterGlobeProgramCache.getProgram(globe, BBOXGlobeShellProgram);
+    },
+    release: function (globe) {
+        noRegisterGlobeProgramCache.releaseProgram(globe, BBOXGlobeShellProgram);
+    }
+});

package/{programs/globeshell/wiggle → semiplugins/shell/bbox-renderer}/object.js

@@ -1,12 +1,11 @@
-import { globeProgramCache } from '../../programcache';
-import GlobeShellProgram from './logic';
-export default class GlobeShell {
+import { BBOXGlobeShellProgramCache } from './logic';
+export class BBOXGlobeShell {
     constructor(gl, globe, { minLon = -180, maxLon = 180, minLat = -90, maxLat = 90, height = 0, u_opacity = 1, wiggleInKM = 0, wiggleSpeed = 0,
     // eastWestTied, Not implemented yet
      } = {}) {
         this.gl = gl;
         this.globe = globe;
-        this.program = globeProgramCache.getProgram(globe, GlobeShellProgram);
+        this.program = BBOXGlobeShellProgramCache.get(globe);
         this.shellBlockManager = this.program.getShellBlockBufferManager();
         this.update = this.shellBlockManager.update.bind(this.shellBlockManager);
         this.innerTime = 0;
@@ -51,8 +50,8 @@ export default class GlobeShell {
      *
      * @param {*} program  modelView, projection, translate, mapWH, scrWH, should be set before calling this function
      */
-    draw() {
-        this.program.draw(this.texture, this.shellBlockManager);
+    draw(csRenderPass) {
+        this.program.draw(this.texture, this.shellBlockManager, csRenderPass);
         if (this.wiggleInKM > 0 && this.wiggleSpeed > 0) {
             this.innerTime += this.wiggleSpeed;
             this.shellBlockManager.update({ innerTime: this.innerTime });
@@ -60,7 +59,7 @@ export default class GlobeShell {
         }
     }
     free() {
-        globeProgramCache.releaseProgram(this.globe, GlobeShellProgram);
+        BBOXGlobeShellProgramCache.release(this.globe);
         this.shellBlockManager.free();
     }
 }