@pirireis/webglobeplugins 0.15.12-alpha → 0.15.14-alpha

package/package.json

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

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

@@ -34,13 +34,16 @@ export class BearingLinePlugin {
     _memory = new Map();
     _semiPluginsOptions = {
         circleOnTerrainOptions: {
-            defaultColor: [0.1, 0.1, 1, 0.5],
+            defaultColor: [1, 1, 1, 0.5],
             defaultHeightFromGroundIn3D: 30.0,
             variativeColorsOn: false,
         },
         arcOnTerrainOptions: {
             defaultHeightFromGroundIn3D: 30.0,
             variativeColorsOn: false,
+            defaultColor: [1, 1, 1, 0.5],
+            globeViewOn: true,
+            flatViewOn: false,
         },
         lineOptions: {
             flatViewOn: true,
@@ -50,11 +53,30 @@ export class BearingLinePlugin {
         },
         pieceOfPieOptions: {
             defaultColor: [1, 1, 1, 0.5],
-            defaultHeightFromGroundIn3D: 30.0,
             variativeColorsOn: false,
+            defaultHeightFromGroundIn3D: 1000.0,
         }
     };
-    constructor(id, { textWritersMap, textDataPreAdaptor, opacities, drawOptions, } = {}) {
+    constructor(id, { textWritersMap, textDataPreAdaptor, opacities, drawOptions, circleOnTerrainOptions = {
+        defaultColor: [1, 1, 1, 0.5],
+        defaultHeightFromGroundIn3D: 30.0,
+        variativeColorsOn: false,
+    }, arcOnTerrainOptions = {
+        globeViewOn: true,
+        flatViewOn: false,
+        defaultColor: [1, 1, 1, 0.5],
+        defaultHeightFromGroundIn3D: 30.0,
+        variativeColorsOn: false,
+    }, lineOptions = {
+        flatViewOn: true,
+        globeViewOn: false,
+        variativeColorsOn: false,
+        defaultColor: [1, 1, 1, 0.5],
+    }, pieceOfPieOptions = {
+        defaultColor: [1, 1, 1, 0.5],
+        variativeColorsOn: false,
+        defaultHeightFromGroundIn3D: 1000.0,
+    } } = {}) {
         this.id = id;
         if (!(textWritersMap instanceof Map))
             throw new Error("textWritersMap is not an instance of Map");
@@ -62,28 +84,49 @@ export class BearingLinePlugin {
             if (!(v instanceof ContextTextWriter3))
                 throw new Error("textWritersMap element is not an instance of ContextTextWriter3");
         });
+        if (circleOnTerrainOptions) {
+            this._semiPluginsOptions.circleOnTerrainOptions = {
+                ...this._semiPluginsOptions.circleOnTerrainOptions,
+                ...circleOnTerrainOptions
+            };
+        }
+        if (arcOnTerrainOptions) {
+            this._semiPluginsOptions.arcOnTerrainOptions = {
+                ...this._semiPluginsOptions.arcOnTerrainOptions,
+                ...arcOnTerrainOptions
+            };
+        }
+        if (lineOptions) {
+            this._semiPluginsOptions.lineOptions = {
+                ...this._semiPluginsOptions.lineOptions,
+                ...lineOptions
+            };
+        }
+        if (pieceOfPieOptions)
+            this._semiPluginsOptions.pieceOfPieOptions = {
+                ...this._semiPluginsOptions.pieceOfPieOptions,
+                ...pieceOfPieOptions
+            };
         this._textWritersMap = textWritersMap || new Map();
         this._textWritersMap.forEach((writer) => writer.setKeyAdaptor((item) => item.key));
         this._textDataPreAdaptor = textDataPreAdaptor || ((item) => item);
-        this.circlePlugin = new CircleOnTerrainPlugin(id + "_circle", {
-            variativeColorsOn: true,
-        });
+        this.circlePlugin = new CircleOnTerrainPlugin(id + "_circle");
         this.arcPlugin = new ArcOnTerrainPlugin(id + "_arc", {
-            variativeColorsOn: true,
+            ...this._semiPluginsOptions.arcOnTerrainOptions,
         });
         this.arcPluginBL = new ArcOnTerrainPlugin(id + "_arcBL", {
-            variativeColorsOn: true,
+            ...this._semiPluginsOptions.arcOnTerrainOptions,
         });
         this.pieceOfPiePlugin = new PieceOfPiePlugin(id + "_pieceOfPie", {
             bufferType: "DYNAMIC_DRAW",
+            ...this._semiPluginsOptions.pieceOfPieOptions
         });
         this.linePlugin = new LinePlugin(id + "_line", {
-            variativeColorsOn: true,
             bufferType: "DYNAMIC_DRAW",
+            ...this._semiPluginsOptions.lineOptions
         });
         this.linePluginBL = new LinePlugin(id + "_lineBL", {
-            variativeColorsOn: true,
-            bufferType: "DYNAMIC_DRAW",
+            ...this._semiPluginsOptions.lineOptions // flatViewOn: true,
         });
         if (opacities) {
             this._opacities = {
@@ -105,6 +148,15 @@ export class BearingLinePlugin {
         if (!this.globe) {
             throw new Error("Globe is not set, cannot set default semi plugin color.");
         }
+        if (semiPluginName === "ALL") {
+            this.circlePlugin.setDefaultColor(color);
+            this.arcPlugin.setDefaultColor(color);
+            this.arcPluginBL.setDefaultColor(color);
+            this.linePlugin.setDefaultColor(color);
+            this.linePluginBL.setDefaultColor(color);
+            this.pieceOfPiePlugin.setDefaultColor(color);
+            return;
+        }
         switch (semiPluginName) {
             case "circleOnTerrain":
                 this.circlePlugin.setDefaultColor(color);

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

@@ -181,6 +181,7 @@ export class CircleLineChainPlugin {
             this.circlePlugin?.deleteBulk(keys);
             this._updateTexts(chainKeys, Array.from(this._textWritersMap.keys()));
         }
+        this.globe?.DrawRender();
     }
     deleteNodes(keysAndNodes) {
         if (this._freed) {

package/semiplugins/lightweight/piece-of-pie-plugin.js

@@ -19,13 +19,19 @@ export class PieceOfPiePlugin {
     _pluginOptions = {
         bufferType: "STATIC_DRAW",
         initialCapacity: INITIAL_CAPACITY,
-        defaultAltitude: 0, // Default altitude is ground level
+        opacity: 1.0, // Default opacity is 1.0
+        defaultHeightFromGroundIn3D: 0, // Default altitude is ground level
+        defaultColor: [1, 1, 1, 1], // Default color is white with full opacity
+        variativeColorsOn: false, // Default is to not use variative colors
     };
-    constructor(id, options = {}) {
+    constructor(id, options = null) {
         this.id = id;
-        options.bufferType && (this._pluginOptions.bufferType = options.bufferType);
-        options.initialCapacity && (this._pluginOptions.initialCapacity = options.initialCapacity);
-        options.defaultAltitude && (this._pluginOptions.defaultAltitude = options.defaultAltitude);
+        if (options) {
+            this._pluginOptions = {
+                ...this._pluginOptions,
+                ...options
+            };
+        }
     }
     insertBulk(items) {
         this.bufferOrchestrator.insertBulk(items, this.bufferManagersMap);
@@ -71,7 +77,7 @@ export class PieceOfPiePlugin {
                 }],
             ["centerCoords3d", {
                     bufferManager: new BufferManager(gl, 3, { bufferType, initialCapacity }),
-                    adaptor: (item) => sphereCoord(item.center[0], item.center[1], globe, (item.altitude ?? this._pluginOptions.defaultAltitude) / 1000)
+                    adaptor: (item) => sphereCoord(item.center[0], item.center[1], globe, (item.altitude ?? this._pluginOptions.defaultHeightFromGroundIn3D) / 1000)
                 }],
             ["startAngle2d", {
                     bufferManager: new BufferManager(gl, 1, { bufferType, initialCapacity }),
@@ -113,21 +119,22 @@ export class PieceOfPiePlugin {
                     bufferManager: new BufferManager(gl, 1, { bufferType, initialCapacity }),
                     adaptor: (item) => new Float32Array([item.fillingMode ?? 0])
                 }],
-            ["rgba", {
-                    bufferManager: new BufferManager(gl, 4, { bufferType, initialCapacity }),
-                    adaptor: (item) => {
-                        if (!item.color || item.color.length === 0) {
-                            return new Float32Array([1, 1, 1, 1]); // Default color if none provided
-                        }
-                        return new Float32Array(item.color);
-                    }
-                }
-            ],
             ["radius", {
                     bufferManager: new BufferManager(gl, 1, { bufferType, initialCapacity }),
                     adaptor: (item) => new Float32Array([item.radius])
                 }],
         ]);
+        if (this._pluginOptions.variativeColorsOn) {
+            bufferManagersMap.set("rgba", {
+                bufferManager: new BufferManager(gl, 4, { bufferType, initialCapacity }),
+                adaptor: (item) => {
+                    if (!item.color || item.color.length === 0) {
+                        return new Float32Array([1, 1, 1, 1]); // Default color if none provided
+                    }
+                    return new Float32Array(item.color);
+                }
+            });
+        }
         this.bufferManagersMap = bufferManagersMap;
     }
     init(globe, gl) {
@@ -146,6 +153,9 @@ export class PieceOfPiePlugin {
             'rgba',
             'radius',
             'fillingMode'].map((name) => {
+            if (!this.bufferManagersMap?.has(name)) {
+                return null; // this make vao with default attribute value with no buffer bound to it
+            }
             const buffer = this.bufferManagersMap?.get(name)?.bufferManager.buffer;
             return {
                 buffer: buffer,
@@ -153,6 +163,9 @@ export class PieceOfPiePlugin {
                 offset: 0,
             };
         }));
+        this._uboHandler = this.program.createUBO();
+        this._uboHandler.updateSingle("u_color", new Float32Array(this._pluginOptions.defaultColor));
+        this._uboHandler.updateSingle("u_opacity", new Float32Array([this._pluginOptions.opacity ?? 1.0])); // Default opacity is 1.0
     }
     draw3D() {
         if (!this.gl || !this.program || !this.vao || !this.globe) {

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

@@ -38,8 +38,8 @@ export class ArcOnTerrainPlugin {
     variativeColorsOn = false, defaultColor = [0.1, 0.1, 1, 1], // Default color in RGBA format
     defaultHeightFromGroundIn3D = 30.0, // Default height from ground in
     vertexCount = 70, // Number of vertices per arc
-    cameraAttractionIsOn = true // If true, camera attraction is enabled else evenly distributed arc points are used
-     } = {}) {
+    cameraAttractionIsOn = true, // If true, camera attraction is enabled else evenly distributed arc points are used
+    bufferType = "STREAM_DRAW" } = {}) {
         this.id = id;
         this._arcMap = new Map();
         this._options = {
@@ -49,7 +49,8 @@ export class ArcOnTerrainPlugin {
             defaultColor: defaultColor ? defaultColor : [0.1, 0.1, 1, 1],
             defaultHeightFromGroundIn3D: defaultHeightFromGroundIn3D ? defaultHeightFromGroundIn3D : 30.0,
             vertexCount: vertexCount ? vertexCount : 70,
-            cameraAttractionIsOn: cameraAttractionIsOn ? true : false
+            cameraAttractionIsOn: cameraAttractionIsOn ? true : false,
+            bufferType: bufferType ? bufferType : "STREAM_DRAW"
         };
     }
     insertBulk(arcs) {
@@ -148,6 +149,7 @@ export class ArcOnTerrainPlugin {
             console.warn("Globe or WebGL context is not initialized.");
             return;
         }
+        const globe = this.globe;
         this._staticDynamicStrategy?.updateState();
         this._buildArcs(); // can be async
         const { gl, program, _bufferOrchestrator, _vao, _arcUBOHandler, } = this;
@@ -156,6 +158,9 @@ export class ArcOnTerrainPlugin {
             return;
         }
         gl.disable(gl.DEPTH_TEST);
+        const currentGeometry = globe.api_GetCurrentGeometry();
+        if ((currentGeometry === 0 && !this._options.globeViewOn) || (currentGeometry === 1 && !this._options.flatViewOn))
+            return;
         const drawOptions = {
             drawRange: {
                 first: 0,