@pirireis/webglobeplugins 0.6.18 → 0.6.20

package/bearing-line/plugin.js

@@ -1,10 +1,14 @@
 import { pieceOfPieProgramCache } from '../programs/rings/partial-ring/piece-of-pie';
 import { LineOnGlobeCache } from '../programs/line-on-globe/naive-accurate';
-import { CircleCache } from '../programs/line-on-globe/circle-accurate';
+import { CircleCache as Circle3DCache } from '../programs/line-on-globe/circle-accurate-3d';
+import { CircleCache, EDGE_COUNT as flatCircleEdgeCount } from '../programs/line-on-globe/circle-accurate-flat';
 import { BufferOrchestrator, BufferManager } from '../util/account';
 import { AngledLineProgramCache } from '../programs/line-on-globe/angled-line'; // TODO calculate the bearing target for 2d and 3d and use lineOnGlobeProgram
 import { mapGetOrThrow } from "../util/check/get";
+import { populateFloat32Array } from "../util/jshelpers/data-filler";
 import { ContextTextWriter } from '../write-text/context-text'
+
+
 export const RINGPARTIAL_DRAW_MODE = Object.freeze({
     LINE_STRIP: "LINE_STRIP",
     TRIANGLE_FAN: "TRIANGLE_FAN",
@@ -30,6 +34,8 @@ const constraintFloat = (x, lowerBound, upperBound) => {
  * 
  */
 
+
+
 export default class Plugin {
     /**
      * 
@@ -113,6 +119,7 @@ export default class Plugin {
         this.ringProgram = pieceOfPieProgramCache.get(globe);
         this.angledLineProgram = AngledLineProgramCache.get(globe);
         this.circleProgram = CircleCache.get(globe);
+        this.circle3DProgram = Circle3DCache.get(globe);
         // this.angleTextContext = new ContextTextWriter(globe);
         // this.distanceTextContext = new ContextTextWriter(globe);
         {
@@ -126,6 +133,10 @@ export default class Plugin {
                         'bufferManager': new BufferManager(gl, 2, { bufferType, initialCapacity }),
                         'adaptor': (item) => new Float32Array(globe.api_GetMercator2DPoint(item.long, item.lat)),
                     }],
+                    ["centerCoords2dflat", {
+                        'bufferManager': new BufferManager(gl, flatCircleEdgeCount * 2, { bufferType, initialCapacity }),
+                        'adaptor': (item) => item.centerCoords2dflat,
+                    }],
                     ["centerCoords3d", {
                         'bufferManager': new BufferManager(gl, 3, { bufferType, initialCapacity }),
                         'adaptor': (item) => new Float32Array(globe.api_GetCartesian3DPoint(item.long, item.lat, 0, 0)),
@@ -200,19 +211,35 @@ export default class Plugin {
                     }],
                     ["dashOpacity", {
                         'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
-                        'adaptor': (item) => new Float32Array([item.dashOpacity])
+                        'adaptor': (item) => new Float32Array([item.dashOpacity]),
                     }],
+
+                    // normal circle
                     ["circleDashAngle", {
-                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
-                        'adaptor': (item) => new Float32Array([item.circleDashAngle / 360])
-                    }]
+                        'bufferManager': new BufferManager(gl, flatCircleEdgeCount, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array(item.rgba),
+                    }],
+                    // CIRCLE Mercator
+                    ["rgbaMercator", {
+                        'bufferManager': new BufferManager(gl, 4 * flatCircleEdgeCount, { bufferType, initialCapacity }),
+                        'adaptor': (item) => populateFloat32Array.fillWithListData(flatCircleEdgeCount, item.rgba),
+                    }],
+                    ["circleDashAngleMercator", {
+                        'bufferManager': new BufferManager(gl, flatCircleEdgeCount, { bufferType, initialCapacity }),
+                        'adaptor': (item) => populateFloat32Array.fillFloat32Array(flatCircleEdgeCount, item.circleDashAngle / 360),
+                    }],
+                    ["dashOpacityMercator", {
+                        'bufferManager': new BufferManager(gl, flatCircleEdgeCount, { bufferType, initialCapacity }),
+                        'adaptor': (item) => populateFloat32Array.fillFloat32Array(flatCircleEdgeCount, item.dashOpacity),
+                    }],
+
                 ]
             );
         }
 
 
-        const obj = function (bufferManagerComp) {
-            return { 'buffer': bufferManagerComp.bufferManager.buffer, 'stride': 0, 'offset': 0 }
+        const obj = function (bufferManagerComp, divisor = 1) {
+            return { 'buffer': bufferManagerComp.bufferManager.buffer, 'stride': 0, 'offset': 0, divisor }
 
         };
 
@@ -233,7 +260,12 @@ export default class Plugin {
         }
         // centerObj, startAngleObj, radiusObj, colorObj, dashRatioObj, dashOpacityObj
         this.circleVao = this.circleProgram.createVAO(
-            ...["centerCoords2d", "centerCoords3d", "bigRadius", "rgba", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key))));
+            ...["centerCoords2dflat", "rgbaMercator", "circleDashAngleMercator", "dashOpacityMercator"].map(key => obj(this.bufferManagersCompMap.get(key)))
+        );
+        this.circle3DVao = this.circle3DProgram.createVAO(
+            ...["centerCoords3d", "bigRadius", "rgba", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key)))
+        );
+
     }
 
 
@@ -241,7 +273,7 @@ export default class Plugin {
     draw3D() {
         const { gl } = this;
         gl.disable(gl.DEPTH_TEST);
-
+        const is3D = this.globe.api_GetCurrentGeometry() === 0;
         this.lineProgram.draw(this.lineVao, this.bufferOrchestrator.length, this._opacity);
         if (this.drawAngleRing) {
             this.ringProgram.draw(this.bufferOrchestrator.length, this.ringVao, 360, this._opacity * 0.8, RINGPARTIAL_DRAW_MODE.TRIANGLE_FAN);
@@ -251,7 +283,11 @@ export default class Plugin {
             this.lineProgram.draw(this.bearingLineVAO, this.bufferOrchestrator.length, this._opacity * 0.8);
         }
         if (this.drawVRM) {
-            this.circleProgram.draw(this.circleVao, this.bufferOrchestrator.length, this._opacity);
+            if (is3D) {
+                this.circle3DProgram.draw(this.circle3DVao, this.bufferOrchestrator.length, this._opacity);
+            } else {
+                this.circleProgram.draw(this.circleVao, this.bufferOrchestrator.length, this._opacity);
+            }
         }
         if (this.drawText) {
             this._textContextInjectionMap.forEach((e) => { e.writer.draw(); });
@@ -323,7 +359,7 @@ export default class Plugin {
         }
 
         bufferOrchestrator.updateBulk(data, bufferManagersCompMap, ["centerCoords2d", "centerCoords3d", "targetCoords2d", "targetCoords3d", "startAngle", "tailAngle",
-            "startAngle2d", "tailAngle2d", "startAngle3d", "tailAngle3d", "bearingTargetCoords2d", "bearingTargetCoords3d",
+            "startAngle2d", "tailAngle2d", "startAngle3d", "tailAngle3d", "bearingTargetCoords2d", "bearingTargetCoords3d", "centerCoords2dflat",
             "bearingAngle", "bigRadius", "radius"]);
         globe.DrawRender();
     }
@@ -338,12 +374,13 @@ export default class Plugin {
      */
     updatePartial(items, propertyIDs = [], textWriterInjectionSubSetIDs = []) { // textWriterInjectionSubSetIDs = []
         if (propertyIDs.length === 0) console.warn("updatePartial is called with no target propertyIDs");
+        const fixedPropertyIDs = this.__fixPartialProperties(propertyIDs)
         const { _textContextInjectionMap, bufferOrchestrator, bufferManagersCompMap } = this;
         const writers = textWriterGetOrThrow(this._textContextInjectionMap, textWriterInjectionSubSetIDs);
         for (let item of items) { this._insertTexts(item, writers) }
-        bufferOrchestrator.updateBulk(items, bufferManagersCompMap, propertyIDs);
+        bufferOrchestrator.updateBulk(items, bufferManagersCompMap, fixedPropertyIDs);
         // patch to update text opacity
-        for (const property of propertyIDs) {
+        for (const property of fixedPropertyIDs) {
             if (property === "rgba") {
                 _textContextInjectionMap.forEach((v) => {
                     const { writer } = v;
@@ -375,31 +412,46 @@ export default class Plugin {
         };
     }
 
+
     __updateCoordsAdaptor(item) {
+        const { globe } = this;
         const lat = radian(item.lat)
         const long = radian(item.long)
         const endLat = radian(item.endLat)
         const endLong = radian(item.endLong)
-        const bigRadius = item.bigRadius !== undefined ? item.bigRadius : this.globe.Math.GetDist3D(item.long, item.lat, item.endLong, item.endLat);
+        const bigRadius = item.bigRadius !== undefined ? item.bigRadius : globe.Math.GetDist3D(item.long, item.lat, item.endLong, item.endLat);
         const radius = item.radius !== undefined ? item.radius : bigRadius * 0.2;
-
-
-        const { long: bearingLong, lat: bearingLat } = this.globe.Math.FindPointByPolar(item.long, item.lat, bigRadius, item.bearingAngle)
-
+        const { long: bearingLong, lat: bearingLat } = globe.Math.FindPointByPolar(item.long, item.lat, bigRadius, item.bearingAngle)
         const startAngle2d = calculateStartAngle(long, lat, endLong, endLat);
         const bearingAngle2d = calculateStartAngle(long, lat, radian(bearingLong), radian(bearingLat))
         let tailAngle2d = bearingAngle2d - startAngle2d;
         if (tailAngle2d > 0) {
             tailAngle2d -= Math.PI * 2;
         }
-
         const bearingAngle = radian(item.bearingAngle - 90);
-        const startAngle3d = radian(this.globe.Math.GetAzimuthAngle(item.long, item.lat, item.endLong, item.endLat)) - radian(90);
+        const startAngleOfCircle = globe.Math.GetAzimuthAngle(item.long, item.lat, item.endLong, item.endLat) //startAngle2d * 180 / Math.PI;
+        const startAngle3d = radian(startAngleOfCircle) - radian(90);
         let tailAngle3d = bearingAngle - startAngle3d;
         if (tailAngle3d > 0) {
             tailAngle3d -= Math.PI * 2;
         }
 
+        const centerCoords2dflat = new Float32Array(flatCircleEdgeCount * 2);
+        const radius2d = globe.Math.GetDist2D(item.long, item.lat, item.endLong, item.endLat);
+        const pointsLongLat = globe.Math.GetEllipseGeo(
+            item.long,
+            item.lat,
+            radius2d,
+            radius2d,
+            startAngleOfCircle,
+            360 / (flatCircleEdgeCount - 2), // 1 for return to start point, 1 for cutting circles
+        );
+
+        for (let i = 1; i < flatCircleEdgeCount; i++) {
+            const { long: lg, lat: lt } = pointsLongLat[i - 1];
+            centerCoords2dflat.set(globe.api_GetMercator2DPoint(lg, lt), i * 2);
+        }
+
         return {
             key: item.key,
             lat: item.lat,
@@ -414,11 +466,25 @@ export default class Plugin {
             startAngle3d,
             tailAngle3d,
             bearingLong,
-            bearingLat
+            bearingLat,
+            centerCoords2dflat
         };
     }
 
 
+    __fixPartialProperties(propertyIDs) {
+        const s = new Set(["rgba", "dashOpacity", "circleDashAngle"]);
+        const result = []
+        for (const item of propertyIDs) {
+            result.push(item);
+            console.log(item + " is processing")
+            if (s.has(item)) {
+                console.log(item + "Mercator is added")
+                result.push(item + "Mercator");
+            }
+        }
+        return result;
+    }
 
     //TODO free
     free() {
@@ -426,10 +492,18 @@ export default class Plugin {
         this.bufferManagersCompMap.forEach(({ bufferManager, adaptor }) => {
             bufferManager.free();
         });
-        LineOnGlobeCache.release(this.globe);
-        pieceOfPieProgramCache.release(this.globe);
-        CircleCache.release(this.globe);
-        AngledLineProgramCache.release(this.globe);
+
+        const { gl, globe } = this;
+        gl.deleteVertexArray(this.lineVao);
+        gl.deleteVertexArray(this.ringVao);
+        gl.deleteVertexArray(this.bearingLineVAO);
+        gl.deleteVertexArray(this.circleVao);
+        gl.deleteVertexArray(this.circle3DVao);
+        LineOnGlobeCache.release(globe);
+        pieceOfPieProgramCache.release(globe);
+        CircleCache.release(globe);
+        AngledLineProgramCache.release(globe);
+        Circle3DCache.release(globe)
         this.isFreed = true;
     }
 

package/circle-line-chain/plugin.js

@@ -1,10 +1,12 @@
 import { LineOnGlobeCache } from '../programs/line-on-globe/naive-accurate';
-import { CircleCache } from '../programs/line-on-globe/circle-accurate';
+import { CircleCache, EDGE_COUNT as EDGE_COUNT_2D_CIRCLE, centerCoords2dflatDataCreator } from '../programs/line-on-globe/circle-accurate-flat';
+import { CircleCache as Circle3DCache } from '../programs/line-on-globe/circle-accurate-3d';
 import { LineToTheOriginCache } from "../programs/line-on-globe/to-the-origin"
 import { BufferOrchestrator, BufferManager } from "../util/account";
 import { ChainListMap } from "./chain-list-map";
 import { mapGetOrThrow } from "../util/check/get";
 import { keyMethod } from "./util";
+import { populateFloat32Array } from "../util/jshelpers/data-filler";
 import { ContextTextWriter3 } from '../write-text/context-text3';
 // TODO: Add update buffer and update text mehods on add, delete, update methods
 
@@ -76,7 +78,9 @@ export class CircleLineChainPlugin {
     _initOrchestrations() {
         const { gl, globe } = this;
         this.lineProgram = LineOnGlobeCache.get(globe);
-        this.circleProgram = CircleCache.get(globe);
+        this.circleProgram2d = CircleCache.get(globe);
+        this.circle3DProgram = Circle3DCache.get(globe);
+
         this.lineToTheOriginProgram = LineToTheOriginCache.get(globe);
         {
             // createBuffers
@@ -133,7 +137,30 @@ export class CircleLineChainPlugin {
                             if (item.circleProperties?.rgba) return new Float32Array(item.circleProperties.rgba);
                             return new Float32Array(item.chainProperties.rgba);
                         }
-                    }]
+                    }],
+                    // Mercator buffers
+                    ["circleDashAngleMercator", {
+                        'bufferManager': new BufferManager(gl, 1 * EDGE_COUNT_2D_CIRCLE, { bufferType, initialCapacity }),
+                        'adaptor': (item) => {
+                            if (item.circleProperties?.circleDashAngle) return new Float32Array([item.circleProperties.circleDashAngle / 360]);
+                            return new populateFloat32Array.fillFloat32Array(EDGE_COUNT_2D_CIRCLE, item.chainProperties.circleDashAngle / 360);
+                        }
+                    }],
+                    ["rgbaCircleMercator", {                            // 62
+                        "bufferManager": new BufferManager(gl, 4 * EDGE_COUNT_2D_CIRCLE, { bufferType, initialCapacity }),
+                        "adaptor": (item) => {
+                            if (item.circleProperties?.rgba) return populateFloat32Array.fillWithListData(EDGE_COUNT_2D_CIRCLE, item.circleProperties.rgba);
+                            return populateFloat32Array.fillWithListData(EDGE_COUNT_2D_CIRCLE, item.chainProperties.rgba);
+                        }
+                    }],
+                    ["dashOpacityMercator", {
+                        'bufferManager': new BufferManager(gl, 1 * EDGE_COUNT_2D_CIRCLE, { bufferType, initialCapacity }),
+                        'adaptor': (item) => populateFloat32Array.fillFloat32Array(EDGE_COUNT_2D_CIRCLE, item.chainProperties.dashOpacity)
+                    }],
+                    ["centerCoords2dMercator", {
+                        'bufferManager': new BufferManager(gl, 2 * EDGE_COUNT_2D_CIRCLE, { bufferType, initialCapacity }),
+                        'adaptor': (item) => item.centerCoords2dflat,
+                    }],
                 ]
             );
             // (startPotisionBufferObj, endPositionBufferObj, dashRatioBufferObj, colorBufferObj)
@@ -142,10 +169,14 @@ export class CircleLineChainPlugin {
             };
             this.lineVao = this.lineProgram.createVAO(
                 ...['centerCoords2d', 'centerCoords3d', 'targetCoords2d', 'targetCoords3d', 'dashRatio', 'dashOpacity', 'rgba'].map(key => obj(this.bufferManagersCompMap.get(key))));
-            this.circleVao = this.circleProgram.createVAO(
-                ...["centerCoords2d", "centerCoords3d", "bigRadius", "rgbaCircle", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key))));
+            this.circleVao2d = this.circleProgram2d.createVAO(
+                ...["centerCoords2dMercator", "rgbaCircleMercator", "circleDashAngleMercator", "dashOpacityMercator"].map(key => obj(this.bufferManagersCompMap.get(key))));
             this.toOriginVao = this.lineToTheOriginProgram.createVAO(
                 ...["targetCoords3d", "rgba"].map(key => obj(this.bufferManagersCompMap.get(key))));
+            this.circle3DVao = this.circle3DProgram.createVAO(
+                ...["centerCoords3d", "bigRadius", "rgbaCircle", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key)))
+            );
+
         }
 
     }
@@ -338,13 +369,16 @@ export class CircleLineChainPlugin {
         const { globe } = this;
         //     this.lineVao = this.lineProgram.createVAO(
         //         ...['centerCoords', 'targetCoords', 'dashRatio', 'dashOpacity', 'rgba'].map(key => obj(this.bufferManagersCompMap.get(key))));
-        //     this.circleVao = this.circleProgram.createVAO(
+        //     this.circleVao2d = this.circleProgram2d.createVAO(
         //         ...["centerCoords", "bigRadius", "rgba", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key))));
         // }   
 
         const radiusM = radiusMethod(globe);
         const callback = (v, i, array, chainProperties) => {
             if (i == array.length - 1) return null;
+
+            const centerCoords2dflat = centerCoords2dflatDataCreator(globe, v.long, v.lat, array[i + 1].long, array[i + 1].lat);
+
             return {
                 chainProperties: chainProperties,
                 bigRadius: radiusM(v, i, array),
@@ -354,7 +388,9 @@ export class CircleLineChainPlugin {
                 lat: v.lat,
                 lineProperties: v.lineProperties,
                 circleProperties: v.circleProperties,
+                centerCoords2dflat,
                 key: v.__identity__
+
             }
         }
         const bulkData = [];
@@ -381,8 +417,15 @@ export class CircleLineChainPlugin {
         })
         LineOnGlobeCache.release(this.globe);
         CircleCache.release(this.globe);
+        Circle3DCache.release(this.globe);
+        LineToTheOriginCache.release(this.globe);
+        this._textContextWriterInjectionMap.forEach((writer) => writer.free());
+        const { gl } = this;
+        gl.deleteVertexArray(this.lineVao);
+        gl.deleteVertexArray(this.circleVao2d);
+        gl.deleteVertexArray(this.toOriginVao);
         this.lineProgram = null;
-        this.circleProgram = null;
+        this.circleProgram2d = null;
         this.isFreed = true;
     }
 
@@ -390,9 +433,16 @@ export class CircleLineChainPlugin {
         const { gl, globe } = this;
         gl.disable(gl.DEPTH_TEST);
         this.lineProgram.draw(this.lineVao, this.bufferOrchestrator.length, this._opacity);
-        if (this._drawCircleOn) this.circleProgram.draw(this.circleVao, this.bufferOrchestrator.length, this._opacity);
         this._textContextWriterInjectionMap.forEach((writer) => writer.draw());
         this.lineToTheOriginProgram.draw(this.toOriginVao, this.bufferOrchestrator.length, this._opacity);
+        const is3D = globe.api_GetCurrentGeometry() === 0;
+        if (this._drawCircleOn) {
+            if (is3D) {
+                this.circle3DProgram.draw(this.circle3DVao, this.bufferOrchestrator.length, this._opacity);
+            } else {
+                this.circleProgram2d.draw(this.circleVao2d, this.bufferOrchestrator.length, this._opacity);
+            }
+        }
         gl.enable(gl.DEPTH_TEST);
     }
 }