@pirireis/webglobeplugins 0.15.2-3.alpha → 0.15.3-alpha

package/semiplugins/lightweight/line-plugin.js

@@ -1,6 +1,5 @@
 import { LineOnGlobeCache } from "../../programs/line-on-globe/naive-accurate-flexible";
-import { BufferOrchestrator } from "../../util/account/single-attribute-buffer-management/buffer-orchestrator";
-import { BufferManager } from "../../util/account/single-attribute-buffer-management/buffer-manager";
+import { BufferMapOrchestrator } from "../../util/account/create-buffermap-orchastration";
 import { sphereCoord } from "../../util/geometry/index";
 import { constraintFloat } from "../../util/check/typecheck";
 export class LinePlugin {
@@ -11,36 +10,33 @@ export class LinePlugin {
     vao = null;
     _options;
     _uboHandler = null;
-    bufferOrchestrator;
-    bufferManagersMap = new Map();
+    _bufferOrchestrator = null;
     _freed = false;
-    constructor(id, { flatViewOn = true, globeViewOn = true, variativeColorsOn = false, defaultColor = [1, 1, 1, 1], dashedLineOpacityVariativeOn = false, dashedLineRatioVariativeOn = false, bufferType = "DYNAMIC_DRAW", opacity = 1.0, initialCapacity = 10 } = {}) {
+    constructor(id, { flatViewOn = true, globeViewOn = true, variativeColorsOn = false, defaultColor = [1, 1, 1, 1], dashedLineOpacityVariativeOn = false, dashedLineRatioVariativeOn = false, bufferType = "DYNAMIC_DRAW", opacity = 1.0 } = {}) {
         this.id = id;
         this._options = {
-            flatViewOn: flatViewOn ?? true,
-            globeViewOn: globeViewOn ?? true,
-            variativeColorsOn: variativeColorsOn ?? false,
-            defaultColor: defaultColor ?? [1, 1, 1, 1],
-            dashedLineOpacityVariativeOn: dashedLineOpacityVariativeOn ?? false,
-            dashedLineRatioVariativeOn: dashedLineRatioVariativeOn ?? false,
-            bufferType: bufferType ?? "DYNAMIC_DRAW",
-            opacity: opacity ?? 1.0,
-            initialCapacity: initialCapacity ?? 10
+            flatViewOn,
+            globeViewOn,
+            variativeColorsOn,
+            defaultColor,
+            dashedLineOpacityVariativeOn,
+            dashedLineRatioVariativeOn,
+            bufferType,
+            opacity
         };
-        this.bufferOrchestrator = new BufferOrchestrator({ capacity: initialCapacity ?? 10 });
     }
     init(globe, gl) {
         this.globe = globe;
         this.gl = gl;
         this.program = LineOnGlobeCache.get(globe);
         this._uboHandler = this.program.createUBO();
-        this.setDefaultColor(this._options.defaultColor);
-        this._fillManagerMap();
+        this._bufferOrchestrator = new BufferMapOrchestrator(gl, this._createBufferDetailsMap(), 10 // initial capacity
+        );
         this.vao = this.program.createVAO(...this._createSelectBufferNames().map((key) => {
             if (key === null) {
                 return null;
             }
-            const bufferManagerComp = this.bufferManagersMap.get(key);
+            const bufferManagerComp = this._bufferOrchestrator?.bufferManagersMap.get(key);
             if (bufferManagerComp === undefined) {
                 throw new Error(`Buffer key ${key} does not exist in bufferManagersMap`);
             }
@@ -53,43 +49,26 @@ export class LinePlugin {
         }));
     }
     // PLUGIN INTERFACE METHODS
-    increaseSpace(amount) {
-        if (this._freed) {
-            console.warn("Plugin is freed, cannot increase space");
-            return;
-        }
-        if (this.globe === null) {
-            console.warn("Globe is not initialized.");
-            return;
-        }
-        if (typeof amount !== "number" || amount <= 0) {
-            console.warn("Invalid amount, must be a positive number");
-            return;
-        }
-        this.bufferOrchestrator.ensureSpace(amount, this.bufferManagersMap);
-    }
     insertBulk(items) {
-        const { bufferOrchestrator, bufferManagersMap, globe } = this;
-        if (!bufferOrchestrator || !globe) {
+        const { _bufferOrchestrator, globe } = this;
+        if (!_bufferOrchestrator || !globe) {
             throw new Error("Buffer orchestrator or globe is not initialized.");
         }
-        bufferOrchestrator.insertBulk(items, bufferManagersMap);
+        _bufferOrchestrator.insertBulk(items);
         this.globe?.DrawRender();
     }
     deleteBulk(keys) {
-        const { bufferOrchestrator, bufferManagersMap, globe } = this;
-        if (!bufferOrchestrator || !globe) {
+        const { _bufferOrchestrator, globe } = this;
+        if (!_bufferOrchestrator || !globe) {
             throw new Error("Buffer orchestrator or globe is not initialized.");
         }
-        bufferOrchestrator.deleteBulk(keys, bufferManagersMap);
+        _bufferOrchestrator.deleteBulk(keys);
         this.globe?.DrawRender();
     }
-    setPluginOpacity(opacity, drawRender = false) {
+    setPluginOpacity(opacity) {
         constraintFloat(opacity, 0, 1);
         this._options.opacity = opacity;
-        if (drawRender) {
-            this.globe?.DrawRender();
-        }
+        this.globe?.DrawRender();
     }
     setPluginDashedLineRatio(ratio) {
         constraintFloat(ratio, 0, 1);
@@ -102,19 +81,14 @@ export class LinePlugin {
         this._options.defaultColor[3] = opacity; // Update the default color's alpha channel
         this.globe?.DrawRender();
     }
-    setDefaultColor(color, drawRender = false) {
+    setDefaultColor(color) {
         if (!this.globe || !this.gl) {
             console.warn("Globe or WebGL context is not initialized.");
             return;
         }
         this._options.defaultColor = color;
         this._uboHandler?.updateSingle("u_color", new Float32Array(color));
-        if (drawRender) {
-            this.globe.DrawRender();
-        }
-    }
-    updateCoordinates(items) {
-        throw new Error("Method not implemented.");
+        this.globe?.DrawRender();
     }
     // GLOBE INTERACTION METHODS
     draw3D() {
@@ -125,10 +99,11 @@ export class LinePlugin {
         if (!this.globe || !this.gl || !this.program || !this.vao) {
             throw new Error("Globe, GL context or program is not initialized.");
         }
-        const { bufferOrchestrator, _options, _uboHandler, vao } = this;
-        if (!bufferOrchestrator || !bufferOrchestrator || !_uboHandler) {
+        const { _bufferOrchestrator, _options, _uboHandler, vao } = this;
+        if (!_bufferOrchestrator || !_bufferOrchestrator || !_uboHandler) {
             throw new Error("Buffer orchestrator is not initialized.");
         }
+        const { bufferOrchestrator } = _bufferOrchestrator;
         const { flatViewOn, globeViewOn, opacity } = _options;
         const drawOptions = {
             drawRange: {
@@ -152,60 +127,67 @@ export class LinePlugin {
         if (this._freed)
             return;
         // TODO: FILL
-        this.bufferManagersMap.forEach((manager) => {
-            manager.bufferManager.free();
-        });
+        this._bufferOrchestrator?.free();
         this._uboHandler?.free();
         LineOnGlobeCache.release(this.globe);
         this._freed = true;
     }
     // IMPLICIT INTERFACE METHODS
-    _fillManagerMap() {
+    _createBufferDetailsMap() {
         const globe = this.globe;
         const { flatViewOn, globeViewOn, variativeColorsOn, dashedLineOpacityVariativeOn, dashedLineRatioVariativeOn, bufferType = "DYNAMIC_DRAW" } = this._options;
-        const m = this.bufferManagersMap;
-        const initialCapacity = this._options.initialCapacity;
+        const m = new Map();
         if (flatViewOn) {
             m.set("start_position", {
-                bufferManager: new BufferManager(globe.gl, 2, { bufferType, initialCapacity: this._options.initialCapacity }),
+                itemSize: 2,
+                bufferType: bufferType, // TODO: Ask User? 
+                buffer: null,
                 adaptor: (item) => {
                     const result = new Float32Array(globe.api_GetMercator2DPoint(item.start[0], item.start[1]));
                     return result;
                 }
             });
             m.set("end_position", {
-                bufferManager: new BufferManager(globe.gl, 2, { bufferType, initialCapacity: this._options.initialCapacity }),
+                itemSize: 2,
+                bufferType: bufferType,
+                buffer: null,
                 adaptor: (item) => new Float32Array(globe.api_GetMercator2DPoint(item.end[0], item.end[1]))
             });
         }
         if (globeViewOn) {
             m.set("start_position_3d", {
-                bufferManager: new BufferManager(globe.gl, 3, { bufferType, initialCapacity: this._options.initialCapacity }),
+                itemSize: 3,
+                bufferType: bufferType,
                 adaptor: (item) => sphereCoord(item.start[0], item.start[1], globe, item.start_altitude || 0)
             });
             m.set("end_position_3d", {
-                bufferManager: new BufferManager(globe.gl, 3, { bufferType, initialCapacity: this._options.initialCapacity }),
+                itemSize: 3,
+                bufferType: bufferType,
                 adaptor: (item) => sphereCoord(item.end[0], item.end[1], globe, item.end_altitude || 0)
             });
         }
         if (variativeColorsOn) {
             m.set("color", {
-                bufferManager: new BufferManager(globe.gl, 4, { bufferType, initialCapacity: this._options.initialCapacity }),
+                itemSize: 4,
+                bufferType: bufferType,
                 adaptor: (item) => new Float32Array(item.color !== undefined ? item.color : [-1, -1, -1, -1])
             });
         }
         if (dashedLineOpacityVariativeOn) {
             m.set("dashed_line_opacity", {
-                bufferManager: new BufferManager(globe.gl, 1, { bufferType, initialCapacity: this._options.initialCapacity }),
+                itemSize: 1,
+                bufferType: bufferType,
                 adaptor: (item) => new Float32Array(item.dashed_line_opacity !== undefined ? [item.dashed_line_opacity] : [-1])
             });
         }
         if (dashedLineRatioVariativeOn) {
             m.set("dashed_line_ratio", {
-                bufferManager: new BufferManager(globe.gl, 1, { bufferType, initialCapacity: this._options.initialCapacity }),
+                itemSize: 1,
+                bufferType: bufferType,
                 adaptor: (item) => new Float32Array(item.dashed_line_ratio !== undefined ? [item.dashed_line_ratio] : [-1])
             });
         }
+        return m;
     }
     _createSelectBufferNames() {
         const { flatViewOn, globeViewOn, variativeColorsOn, dashedLineOpacityVariativeOn, dashedLineRatioVariativeOn } = this._options;

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

@@ -19,19 +19,13 @@ export class PieceOfPiePlugin {
     _pluginOptions = {
         bufferType: "STATIC_DRAW",
         initialCapacity: INITIAL_CAPACITY,
-        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
+        defaultAltitude: 0, // Default altitude is ground level
     };
-    constructor(id, options = null) {
+    constructor(id, options = {}) {
         this.id = id;
-        if (options) {
-            this._pluginOptions = {
-                ...this._pluginOptions,
-                ...options
-            };
-        }
+        options.bufferType && (this._pluginOptions.bufferType = options.bufferType);
+        options.initialCapacity && (this._pluginOptions.initialCapacity = options.initialCapacity);
+        options.defaultAltitude && (this._pluginOptions.defaultAltitude = options.defaultAltitude);
     }
     insertBulk(items) {
         this.bufferOrchestrator.insertBulk(items, this.bufferManagersMap);
@@ -41,12 +35,10 @@ export class PieceOfPiePlugin {
         this.bufferOrchestrator.deleteBulk(keys, this.bufferManagersMap);
         this.globe?.DrawRender();
     }
-    setPluginOpacity(opacity, drawRender = true) {
+    setPluginOpacity(opacity) {
         opacityCheck(opacity);
         this._uboHandler?.updateSingle("u_opacity", new Float32Array([opacity]));
-        if (drawRender) {
-            this.globe?.DrawRender();
-        }
+        this.globe?.DrawRender();
     }
     setDrawMode(drawMode) {
         if (drawMode !== "TRIANGLE_FAN" && drawMode !== "LINE_STRIP" && drawMode !== "BOTH") {
@@ -55,17 +47,6 @@ export class PieceOfPiePlugin {
         this.drawMode = drawMode;
         this.globe?.DrawRender();
     }
-    setDefaultColor(color) {
-        if (this._isFreed) {
-            console.warn("PieceOfPiePlugin is freed, cannot set default color.");
-            return;
-        }
-        if (!Array.isArray(color) || color.length !== 4) {
-            throw new Error("Color must be an array of 4 numbers [R, G, B, A].");
-        }
-        this._uboHandler?.updateSingle("u_color", new Float32Array(color));
-        this.globe?.DrawRender();
-    }
     _createBufferManagersMap() {
         const { gl, globe, _pluginOptions } = this;
         const { bufferType, initialCapacity } = _pluginOptions;
@@ -79,7 +60,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.defaultHeightFromGroundIn3D) / 1000)
+                    adaptor: (item) => sphereCoord(item.center[0], item.center[1], globe, (item.altitude ?? this._pluginOptions.defaultAltitude) / 1000)
                 }],
             ["startAngle2d", {
                     bufferManager: new BufferManager(gl, 1, { bufferType, initialCapacity }),
@@ -121,22 +102,21 @@ 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) {
@@ -155,9 +135,6 @@ 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,
@@ -165,9 +142,6 @@ 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) {