@pirireis/webglobeplugins 0.6.34 → 0.6.36-a

package/circle-line-chain/plugin.js

@@ -35,8 +35,6 @@ import { ContextTextWriter3 } from '../write-text/context-text3';
  * @property {Array<node>} nodes
  */
 
-const radian = Math.PI / 180;
-
 export class CircleLineChainPlugin {
     /**
      * 

package/package.json

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

package/programs/line-on-globe/lines-color-instanced-flat.js

@@ -34,7 +34,7 @@ void main() {
     if ( gap > 37000000.0) { return; }
     float z_alpha;
     if ( z_alpha_on == 1 ){ 
-        z_alpha =  pow(z_level,3.0) /  ( 37000000.0 / gap);
+        z_alpha =  pow(z_level,3.0) /  ( 20000000.0 / gap);
         if( z_alpha < 0.1 ) {return;}
         if( z_alpha > 1.0 ) {z_alpha = 1.0;}
     } else {

package/rangerings/plugin.js

@@ -49,29 +49,40 @@ import { centerCoords2dflatDataCreatorWithRadius, CircleCache as CircleCache2D }
 import { CircleCache as CircleCache3D } from "../programs/line-on-globe/circle-accurate-3d";
 import { LinesColorInstancedFlatCache } from "../programs/line-on-globe/lines-color-instanced-flat";
 import { BufferOrchestrator, BufferManager } from "../util/account";
+import { mapGetOrThrow } from "../util/check/get";
 import { populateFloat32Array } from "../util/jshelpers/data-filler";
-import { RingAccount, ringKeyMethod, ringBigPaddingKeyMethod } from "./ring-account";
+import { RingAccount, ringBigPaddingKeyMethod } from "./ring-account";
 import { CirclePadding3DCache } from "../programs/line-on-globe/degree-padding-around-circle-3d";
 import { LineOnGlobeCache } from '../programs/line-on-globe/naive-accurate';
 import RangeRingAngleText from "./rangeringangletext";
 import { Z_ALPHA_MODE } from "../programs/line-on-globe/util";
+import { ENUM_HIDE } from "./enum";
 
 const CIRCLE_FLAT_EDGE_COUNT = 362; // 360 + 2 for closing the circle and a cutting point
 
 
 
 
-class RangeRings {
-    constructor(id, { oneDegreePadding = true, showNumbers = true, numbersStyle = null, opacity = 1, zAlphaOnDegreePadding = Z_ALPHA_MODE.ON } = {}) {
 
+class RangeRings {
+    constructor(id,
+        {
+            oneDegreePadding = true, showNumbers = true, numbersStyle = null, opacity = 1, zAlphaOnDegreePadding = Z_ALPHA_MODE.ON
+        } = {},
+        {
+            textDataPreAdaptor = null,
+            textWritersMap = new Map()
+        } = {}) {
         this.id = id;
-
         this._oneDegreePadding = oneDegreePadding;
         this._zAlphaOnDegreePadding = zAlphaOnDegreePadding;
         this._showNumbers = showNumbers;
         this._numbersStyle = numbersStyle;
         this._opacity = opacity;
         this._ringAccount = new RingAccount();
+        this._textWritersMap = textWritersMap;
+        this._textDataPreAdaptor = textDataPreAdaptor;
+        this._textWritersMap.forEach((textWriter) => textWriter.setKeyAdaptor((item) => item.__identity__));
 
     }
 
@@ -83,7 +94,7 @@ class RangeRings {
     /**
      * @method updateCentersCoordinate @param { Array < { centerID, long,lat } >} items 
     */
-    updateCentersCoordinate(items) {
+    updateCentersCoordinate(items, { textWriterIDs = [] } = {}) {
         // Algorithm
         /**
          * 1. ask centerRingAccount for existing rings COORDINATE RELATED KEYS
@@ -98,15 +109,13 @@ class RangeRings {
         } = this;
         for (const { centerID } of items) {
             const datas = this.__reconstructCentralRings(centerID);
-            // TODO add big paddings when when implemented
             bufferOrchestrator.updateBulk(datas, bufferManagersCompMap, ["centerCoords3d", "centerCoords2dflat", "centerCoords2dflatForPadding"]);
             const paddingDatas = this.__reconstructCentralRingsBigPaddings(centerID);
             paddingBufferOrchestrator.updateBulk(paddingDatas, bufferManagersCompMapPadding, ["circlePoint", "paddingPoint", "circlePoint3d", "paddingPoint3d"]);
         }
         this.textPlugin?.updateCentersXY(items);
 
-
-
+        this.__contextTextWriterUpdate(items.map(({ centerID }) => centerID), textWriterIDs);
         globe.DrawRender();
     }
 
@@ -115,17 +124,15 @@ class RangeRings {
      * @typedef { Array < { ringID, radius, padding } >} rings
      * @param { Array < centerID: string, long: number, lat: number, stepAngle: number, rgba: [4 numbers], rings: rings, hide, textHide } items
     */
-    insertBulk(items) {
+    insertBulk(items, { textWriterIDs = [] } = {}) {
         // Algorithm
         /**
          * 1 ask centerRingAccount for existing rings 
-         *  presizely: TODO
          * 2. delete all existing keys with buffer orchestators 
          * 3. insert new centerRings to centerRingAccount
          * 4. insert new keys with buffer orchestators
          */
         const { globe, _ringAccount, bufferOrchestrator, bufferManagersCompMap, paddingBufferOrchestrator, bufferManagersCompMapPadding } = this;
-        // TODO add delete existing for padding
         for (const item of items) {
             const existingKeys = _ringAccount.ringKeys(item.centerID);
             if (existingKeys.length) {
@@ -145,6 +152,7 @@ class RangeRings {
             paddingBufferOrchestrator.insertBulk(paddingDatas, bufferManagersCompMapPadding);
         }
         this.textPlugin?.insertBulk(items);
+        this.__contextTextWriterUpdate(items.map(({ centerID }) => centerID), textWriterIDs);
         globe.DrawRender();
     }
 
@@ -154,7 +162,7 @@ class RangeRings {
     /**
      * @method updateCentersColor @param { Array < { centerID, rgba: [4 numbers] } >} centerColors
     */
-    updateCentersColor(centerColors) {
+    updateCentersColor(centerColors, { textWriterIDs = [] } = {}) {
         // Algorithm
         /**
          * 1. ask centerRingAccount for existing rings COLOR KEYS
@@ -172,6 +180,7 @@ class RangeRings {
             const paddingDatas = this.__reconstructCentralPaddingProperties(centerID)
             paddingBufferOrchestrator.updateBulk(paddingDatas, bufferManagersCompMapPadding, ["rgba"]);
         }
+        this.__contextTextWriterUpdate(centerColors.map(({ centerID }) => centerID), textWriterIDs);
         globe.DrawRender();
     }
 
@@ -179,7 +188,7 @@ class RangeRings {
      * 
      * @method updateCentersHide @param { Array < { centerID, hide, textHide } >} centerHides
     */
-    updateCentersHide(centerHides) {
+    updateCentersHide(centerHides, { textWriterIDs = [] } = {}) {
         // Algorithm
         /**
          * Simple
@@ -196,11 +205,14 @@ class RangeRings {
         for (const { centerID } of centerHides) {
             const datas = this.__reconstructCentralProperties(centerID);
             bufferOrchestrator.updateBulk(datas, bufferManagersCompMap, ["rgba", "rgbaMercator"]);
+            const paddingDatas0 = this.__reconstructCentralRings(centerID);
+            bufferOrchestrator.updateBulk(paddingDatas0, bufferManagersCompMap, ["radius3dsmall", "centerCoords2dflatForPadding"]);
+
             const paddingDatas = this.__reconstructCentralPaddingProperties(centerID)
             paddingBufferOrchestrator.updateBulk(paddingDatas, bufferManagersCompMapPadding, ["rgba"]);
         }
-
         this.textPlugin?.updateCentersHide(centerHides);
+        this.__contextTextWriterUpdate(centerHides.map(({ centerID }) => centerID), textWriterIDs);
         globe.DrawRender();
         /**
          * Complicated
@@ -229,6 +241,7 @@ class RangeRings {
             const existingKeys = _ringAccount.ringKeys(centerID);
             if (existingKeys.length) {
                 bufferOrchestrator.deleteBulk(existingKeys, bufferManagersCompMap);
+                this._textWritersMap.forEach((textWriter) => textWriter.deleteTextBulk(existingKeys));
             }
         }
 
@@ -239,6 +252,9 @@ class RangeRings {
             }
         }
         this.textPlugin?.removeCenters(centerIDs);
+
+        // this.__contextTextWriterUpdate(centerIDs, null);
+
         globe.DrawRender();
     }
 
@@ -249,6 +265,7 @@ class RangeRings {
         if (typeof opacity !== "number" || opacity < 0 || opacity > 1) throw new Error("Invalid opacity value");
         this._opacity = opacity;
         this.textPlugin?.setOpacity(opacity);
+        this._textWritersMap((writer) => writer.setOpacity(opacity));
         this.globe.DrawRender();
     }
 
@@ -302,7 +319,7 @@ class RangeRings {
                 }],
                 ["rgba", {
                     'bufferManager': new BufferManager(gl, 4, { bufferType, initialCapacity }),
-                    'adaptor': (item) => new Float32Array(item.hide === 1 ? [0, 0, 0, 0] : item.rgba)
+                    'adaptor': (item) => new Float32Array(item.hide === ENUM_HIDE.HIDE ? [0, 0, 0, 0] : item.rgba)
                 }],
                 ["radius3d", {
                     'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
@@ -310,7 +327,10 @@ class RangeRings {
                 }],
                 ["radius3dsmall", {
                     'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
-                    'adaptor': (item) => new Float32Array([item.radius - item.padding / 3])
+                    'adaptor': (item) => {
+                        if (item.hide === ENUM_HIDE.HIDE_1_DEGREE_PADDINGS) return new Float32Array([item.radius]);
+                        return new Float32Array([item.radius - item.padding / 3])
+                    }
                 }],
                 ["circleDashAngle", {
                     'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
@@ -332,7 +352,7 @@ class RangeRings {
                 }],
                 ["rgbaMercator", {
                     'bufferManager': new BufferManager(gl, 4 * CIRCLE_FLAT_EDGE_COUNT, { bufferType, initialCapacity }),
-                    'adaptor': (item) => populateFloat32Array.fillWithListData(CIRCLE_FLAT_EDGE_COUNT, item.hide === 1 ? [0, 0, 0, 0] : item.rgba),
+                    'adaptor': (item) => populateFloat32Array.fillWithListData(CIRCLE_FLAT_EDGE_COUNT, item.hide === ENUM_HIDE.HIDE ? [0, 0, 0, 0] : item.rgba),
                 }],
                 ["circleDashAngleMercator", {
                     'bufferManager': new BufferManager(gl, CIRCLE_FLAT_EDGE_COUNT, { bufferType, initialCapacity }),
@@ -451,10 +471,11 @@ class RangeRings {
 
         const result = [];
 
-        for (const { ringID, radius, padding } of rings) {
-            const key = ringKeyMethod(centerID, ringID);
+        for (const { ringID, radius, padding, __identity__ } of rings) {
+            const key = __identity__;
             const centerCoords2dflat = centerCoords2dflatDataCreatorWithRadius(globe, long, lat, radius, { edgeCount: CIRCLE_FLAT_EDGE_COUNT });
-            const centerCoords2dflatForPadding = centerCoords2dflatDataCreatorWithRadius(globe, long, lat, radius - padding / 3, { edgeCount: CIRCLE_FLAT_EDGE_COUNT });
+            const radiusPadding = hide === ENUM_HIDE.HIDE_1_DEGREE_PADDINGS ? radius : radius - padding / 3;
+            const centerCoords2dflatForPadding = centerCoords2dflatDataCreatorWithRadius(globe, long, lat, radiusPadding, { edgeCount: CIRCLE_FLAT_EDGE_COUNT });
             result.push({
                 key,
                 centerCoords3d,
@@ -495,11 +516,11 @@ class RangeRings {
         if (centerItem === undefined) throw new Error("Center not found");
         const { rgba, rings, hide = 0, textHide = 0 } = centerItem;
         const result = [];
-        for (const { ringID } of rings) {
-            const key = ringKeyMethod(centerID, ringID);
+        for (const { ringID, __identity__ } of rings) {
+            const key = __identity__;
             result.push({
                 key,
-                rgba: hide === 1 ? new Float32Array([0, 0, 0, 0]) : rgba,
+                rgba: hide === ENUM_HIDE.HIDE ? new Float32Array([0, 0, 0, 0]) : rgba,
                 textHide
             });
         }
@@ -543,6 +564,7 @@ class RangeRings {
             if (_oneDegreePadding) _padding2dProgram.draw(_oneDegreePaddingVao, bufferOrchestrator.length * CIRCLE_FLAT_EDGE_COUNT, _opacity, _zAlphaOnDegreePadding);
         }
         _bigPadding3dFlatProgram.draw(_bigPadding3dFlatVAO, paddingBufferOrchestrator.length, _opacity);
+        this._textWritersMap.forEach((textWriter) => textWriter.draw());
         gl.enable(gl.DEPTH_TEST);
     }
 
@@ -572,7 +594,21 @@ class RangeRings {
         this._isFreed = true;
     }
 
+
+    __contextTextWriterUpdate(centerIDs, textWriterIDs = null) {
+        let textWriters = null;
+        if (textWriterIDs === null) {
+            textWriters = Array.from(this._textWritersMap.values());
+        } else if (textWriterIDs.length === 0) {
+            return
+        } else {
+            textWriters = textWriterGetOrThrow(this._textWritersMap, textWriterIDs);
+        }
+        centerIDs.forEach((centerID) => { this._ringAccount.textUpdate(centerID, textWriters, this._textDataPreAdaptor); });
+    }
 }
 
 
+const textWriterGetOrThrow = mapGetOrThrow("textWriterIDs is invalid")
+
 export { RangeRings, Z_ALPHA_MODE };

package/rangerings/rangeringangletext.js

@@ -44,9 +44,7 @@ export default class RangeRingAngleText {
         // new inner MAP params
         // hide
         // textHide
-
         this.ObjectArray.Add(this.object);
-
     }
 
     getDefaultStyle() {
@@ -205,7 +203,7 @@ export default class RangeRingAngleText {
             const _hide = hide !== null ? hide : centerMap.get("hide");
             const _textHide = textHide !== null ? textHide : centerMap.get("textHide");
 
-            const show = _hide !== ENUM_HIDE.HIDE && _textHide === ENUM_TEXT_HIDE.SHOW;
+            const show = (_hide !== ENUM_HIDE.HIDE) && (_textHide === ENUM_TEXT_HIDE.SHOW);
             if (!isHidden && !show) {
                 this._fillDeleteBucket(centerID, deleteBucket);
             } else if (isHidden && show) {

package/rangerings/ring-account.js

@@ -4,11 +4,6 @@
  */
 
 
-
-
-import { BufferOrchestrator, BufferManager } from "../util/account";
-
-
 const ringKeyMethod = (centerID, ringID) => `${centerID}_${ringID}`;
 const ringBigPaddingKeyMethod = (centerID, ringID, angle) => `${centerID}_${ringID}_${angle}`;
 
@@ -23,18 +18,22 @@ class RingAccount {
     }
 
     /**
-     * @typedef {centerID, long,lat, rings} centeralItem
+     * @typedef {centerID, long,lat, rings} centralItem
      * 
      */
-    insertCenter(centeralItem) {
-        this._centeralMap.set(centeralItem.centerID, {
-            long: centeralItem.long,
-            lat: centeralItem.lat,
-            rings: centeralItem.rings,
-            rgba: new Float32Array(centeralItem.rgba),
-            hide: centeralItem.hide,
-            textHide: centeralItem.textHide,
-            stepAngle: centeralItem.stepAngle
+    insertCenter(centralItem) {
+        centralItem.rings.forEach((ring) => {
+            ring.__identity__ = ringKeyMethod(centralItem.centerID, ring.ringID);
+        });
+        this._centeralMap.set(centralItem.centerID, {
+            centerID: centralItem.centerID,
+            long: centralItem.long,
+            lat: centralItem.lat,
+            rings: centralItem.rings,
+            rgba: new Float32Array(centralItem.rgba),
+            hide: centralItem.hide,
+            textHide: centralItem.textHide,
+            stepAngle: centralItem.stepAngle,
         });
     }
 
@@ -57,8 +56,8 @@ class RingAccount {
         for (const { centerID, hide = null, textHide = null } of items) {
             const center = this.getCenter(centerID);
             if (center) {
-                if (hide) center.hide = hide;
-                if (textHide) center.textHide = textHide;
+                if (hide !== null) center.hide = hide;
+                if (textHide !== null) center.textHide = textHide;
             }
         }
     }
@@ -83,8 +82,8 @@ class RingAccount {
         const center = this.getCenter(centerID);
         if (center) {
             const rings = center.rings;
-            for (const { ringID } of rings) {
-                result.push(ringKeyMethod(centerID, ringID));
+            for (const { __identity__ } of rings) {
+                result.push(__identity__);
             }
         }
         return result;
@@ -105,6 +104,18 @@ class RingAccount {
         }
         return result;
     }
+
+
+
+    textUpdate(centerID, textWriterObjs, dataPreAdaptor = null) {
+        const center = this.getCenter(centerID);
+        if (!center) return;
+        const data = (dataPreAdaptor) ? dataPreAdaptor(center) : center;
+        textWriterObjs.forEach((writer) => {
+            writer.insertTextBulk(data.rings, data);
+        });
+
+    }
 }
 
 

package/timetracks/plugin-line-strip.js

@@ -89,16 +89,6 @@ export default class TimeTrackMultiColorPlugin {
         this.globe.DrawRender();
     }
 
-    setGlow(isGlow) {
-        this.program.setGlow(isGlow);
-        this.globe.DrawRender();
-    }
-
-    setPremultipliedAlpha(isPremultiplied) {
-        this.program.setPremultipliedAlpha(isPremultiplied);
-        this.globe.DrawRender();
-    }
-
     setBlurWeights(weights) {
         this.program.setBlurWeights(weights);
         this.globe.DrawRender();
@@ -134,10 +124,7 @@ export default class TimeTrackMultiColorPlugin {
         this.globe.DrawRender();
     }
 
-    setAlphaThreshold(alphaThreshold) {
-        this.program.setAlphaThreshold(alphaThreshold);
-        this.globe.DrawRender();
-    }
+
 
     // ---------------point program setters-------------------
 

package/timetracks/program-line-strip.js

@@ -60,7 +60,7 @@ export default class TrackGlowLineProgram {
         gl.uniform1f(_lineProgram.u_route_alpha, options.routeAlpha || 0.025);
 
         gl.useProgram(_blurProgram.program);
-        gl.uniform1fv(_blurProgram.u_weight, options.weights || [1, 0.45045946, 0.2216216, 0.154054, 0.056216]);
+        gl.uniform1fv(_blurProgram.u_weight, options.weights || [0.55, 0.45045946, 0.3216216, 0.254054, 0.056216]);
 
         gl.useProgram(_combineProgram.program);
         gl.uniform1f(_combineProgram.u_exposure, options.exposure || 1.0);
@@ -71,14 +71,6 @@ export default class TrackGlowLineProgram {
 
 
 
-    setPremultipliedAlpha(boolean) {
-        throw new Error("setPremultipliedAlpha method is depricated. Please remove it from your code.");
-    }
-
-
-    setAlphaThreshold(alpha) {
-        throw new Error("setAlphaThreshold method is depricated. Please remove it from your code.");
-    }
 
 
     /**
@@ -163,9 +155,6 @@ export default class TrackGlowLineProgram {
         gl.useProgram(currentProgram);
     }
 
-    setGlow(boolean) {
-        throw new Error("setGlow method is depricated. Please remove it from your code.");
-    }
 
     /**
      * blur uses pingpong effect. This number decides how many times the blur will be applied.

package/write-text/attached-text-writer.js

@@ -0,0 +1,105 @@
+
+import { CSZMode } from "@pirireis/webglobe";
+import { isTextFont, opacityCheck } from "../util/check/typecheck";
+
+/**
+ * Light wight version of context text writer.
+ * The parameters by text are calculated on user side and inserted as items. (ContextTextWriter3 constructs text data from items)
+ * 
+ * Good side of ContextTextWriters pattern is that there is only one way to create text.
+ * The glue is inside the plugin.
+ * This makes the code more readable and maintainable.
+ * 
+ * With AttachedTextWriter the glue is created by user.
+ * I observed that the users generally uses a wrapper around the plugin logic anyway. This wrapper can be used as the glue for plugin and attacked writer.
+ */
+
+export class AttachedTextWriter {
+    constructor(globe, {
+        style = {
+            textFont: {
+                name: 'Arial',
+                textColor: '#FFFFFF', // beyaz
+                hollowColor: '#000000', // siyah
+                size: 12, // piksel
+                hollow: true,
+                bold: true,
+                italic: false,
+            },
+            opacity: 1.0,
+            zMode: CSZMode.Z_GROUND_PERVERTEX,
+        },
+        doDraw = true,
+        angleOnSphere = false,
+        zoomLevelAdaptor = (zoomLevel) => (item) => {
+            return {
+                opacityMultiplier: 1,
+                sizeMultiplier: 1
+            }
+        },
+    } = {}) {
+        this.globe = globe;
+        this._itemMap = new Map();
+        this.doDraw = doDraw;
+        this.angleOnSphere = angleOnSphere;
+        this.zoomLevelAdaptor = zoomLevelAdaptor;
+        this.setStyle(style);
+
+    }
+
+
+    setOpacity(opacity) {
+        opacityCheck(opacity);
+        this._style.opacity = opacity;
+        this.globe.DrawRender();
+    }
+
+    setStyle(style) {
+        isTextFont(style.textFont);
+        this._style = style;
+        this.globe.DrawRender();
+    }
+
+    /**
+     * 
+     * @param {{text, long, lat, z = 0, xOffset = 0, yOffset = 0, isAngleOn = false, Angle = 0 }} item 
+     * @returns 
+     */
+
+    insertItem(item) {
+        const key = this.keyAdaptor ? this.keyAdaptor(item) : item;
+        this._itemMap.set(key, item);
+        this.globe.DrawRender();
+    }
+
+    // TODO: use item style 
+    draw() {
+        if (!this.doDraw) {
+            return;
+        }
+        const { globe, _itemMap, _style } = this;
+        const { zMode, textFont, opacity } = _style;
+        const is3D = globe.api_GetCurrentGeometry() === 0;
+        const angleIsOn = is3D ? true : this.angleOnSphere;
+        const zoomLevel = globe.api_GetCurrentLODWithDecimal();
+        const zoomAdaptor = this.zoomLevelAdaptor(zoomLevel);
+        const theSize = textFont.size;
+        _itemMap.forEach((item, key) => {
+            const { text, long, lat, z = 0, xOffset = 0, yOffset = 0, isAngleOn = false, angle = 0 } = item;
+            const { x, y } = globe.api_GetScreenPointFromGeo(
+                {
+                    long,
+                    lat,
+                    z
+                },
+                zMode
+            );
+            const { opacityMultiplier, sizeMultiplier } = zoomAdaptor(item);
+            textFont.size = sizeMultiplier * theSize;
+            if (x !== null && y !== null) {
+                globe.api_DrawContextText(text, textFont, opacityMultiplier * opacity, { x: x + xOffset, y: y - yOffset }, (isAngleOn && angleIsOn), angle);
+            }
+        });
+        textFont.size = theSize;
+    }
+}

package/write-text/context-text3.js

@@ -81,16 +81,19 @@ export class ContextTextWriter3 {
 
     setDoDraw(bool) {
         this.doDraw = bool;
+        this.globe.DrawRender();
     }
 
     setStyle(style) {
         isTextFont(style.textFont);
         opacityCheck(style.opacity);
         this.style = style;
+        this.globe.DrawRender();
     }
 
     setOpacity(opacity) {
         this.style.opacity = opacity;
+        this.globe.DrawRender();
     }
 
 
@@ -129,7 +132,7 @@ export class ContextTextWriter3 {
     insertTextBulk(container, properties) {
         container.forEach((v, i, c) => {
             this.insertText(v, i, c, properties);
-        })
+        });
     }