@pirireis/webglobeplugins 0.3.3 → 0.3.5

package/bearing-line/plugin.js

@@ -9,6 +9,13 @@ export const RINGPARTIAL_DRAW_MODE = Object.freeze({
     TRIANGLE_FAN: "TRIANGLE_FAN",
 });
 
+const constraintFloat = (x, lowerBound, upperBound) => {
+    if (typeof x !== "number") throw new Error("type must be numberic")
+    if (lowerBound > x || x > upperBound) throw new Error(`input must be between ${lowerBound} - ${upperBound}`)
+}
+
+
+
 
 /**
  * @typedef {Object}textContextInjection
@@ -71,6 +78,7 @@ export default class Plugin {
 
 
     setOpacity(opacity) {
+        constraintFloat(opacity, 0, 1);
         this._opacity = opacity;
         this._textContextInjectionMap.forEach(({ writer }) => writer.setOpacity(opacity));
         this.globe.DrawRender();
@@ -138,9 +146,10 @@ export default class Plugin {
                         'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
                         'adaptor': (item) => new Float32Array([item.dashOpacity])
                     }],
-                    ["circleDashRatio", {
+                    ["circleDashAngle", {
+
                         'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
-                        'adaptor': (item) => new Float32Array([item.circleDashRatio])
+                        'adaptor': (item) => new Float32Array([item.circleDashAngle / 360])
                     }]
                 ]
             );
@@ -166,7 +175,7 @@ export default class Plugin {
         }
         // centerObj, startAngleObj, radiusObj, colorObj, dashRatioObj, dashOpacityObj
         this.circleVao = this.circleProgram.createVAO(
-            ...["centerCoords", "startAngle", "bigRadius", "rgba", "circleDashRatio", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key))));
+            ...["centerCoords", "startAngle", "bigRadius", "rgba", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key))));
     }
 
 
@@ -207,11 +216,9 @@ export default class Plugin {
      * @property {number} dashRatio 0-1
      * @property {number} dashOpacity 0-1
      * @property {number} circleDashAngle 0-360
-     * 
      * @param {Array<item>} items 
      * @param {Array<string>} injectionsSubSetIDs | textContextInjectionMap keys to be used for writing text.
      */
-
     insertBulk(items, injectionsSubSetIDs = []) {
         const { globe, bufferOrchestrator, bufferManagersCompMap } = this;// angleTextContext, distanceTextContext,
         const injectionsSubSet = injectionsSubSetIDs.map((id) => this._textContextInjectionMap.get(id));
@@ -229,7 +236,6 @@ export default class Plugin {
 
     deleteBulk(keys) {
         this.bufferOrchestrator.deleteBulk(keys, this.bufferManagersCompMap, ["radius", "centerCoords", "targetCoords", "rgba"]);
-
         this._deleteTexts(keys);
         this.globe.DrawRender();
     }
@@ -237,16 +243,15 @@ export default class Plugin {
 
     defrag() {
         this.bufferOrchestrator.defrag(this.bufferManagersCompMap);
-        // this.globe.DrawRender();
     }
 
     /**
      * 
      * @param {Array<{key, long, lat, endLong, endLat, bearingAngle}>} items
-     * @param {Array<string>} injectionSubSetIDs | textContextInjectionMap keys to be used for writing text.
+     * @param {Array<string>} textWriterInjectionSubSetIDs | textContextInjectionMap keys to be used for writing text.
      */
-    updateCoordinatesBulk(items, injectionSubSetIDs = []) { //TODO
-        const injectionsSubSet = injectionSubSetIDs.map((id) => this._textContextInjectionMap.get(id));
+    updateCoordinatesBulk(items, textWriterInjectionSubSetIDs = []) { //TODO
+        const injectionsSubSet = textWriterInjectionSubSetIDs.map((id) => this._textContextInjectionMap.get(id));
         const { globe, bufferOrchestrator, bufferManagersCompMap, angleTextContext, distanceTextContext } = this;
         const data = []
         for (let item of items) {
@@ -259,6 +264,22 @@ export default class Plugin {
     }
 
 
+    /**
+     * 
+     * @param {*} items some colums EXCEPT positional ones
+     * @param {*} propertyIDs 
+     * @param {*} textWriterInjectionSubSetIDs 
+     * Do NOT send empty data if property ID of this data is entered or NaN is loaded to the buffer, resulting in an unwanted behaviour.
+     */
+    updatePartial(items, propertyIDs = [], textWriterInjectionSubSetIDs = []) {
+        if (propertyIDs.length === 0) console.warn("updatePartial is called with no target propertyIDs");
+        const { _textContextInjectionMap, bufferOrchestrator, bufferManagersCompMap } = this;
+        const writers = textWriterInjectionSubSetIDs.map((x) => _textContextInjectionMap.get(x));
+        for (let item of items) { this._insertTexts(item, writers) }
+        bufferOrchestrator.updateBulk(items, bufferManagersCompMap, propertyIDs);
+    }
+
+
     __insertAdaptor(item) {
         const lat = radian(item.lat)
         const long = radian(item.long)
@@ -268,7 +289,7 @@ export default class Plugin {
         const rgbaMode = item.rgbaMode !== undefined ? item.rgbaMode : 0;
         const dashRatio = item.dashRatio !== undefined ? item.dashRatio : 1.0;
         const dashOpacity = item.dashOpacity !== undefined ? item.dashOpacity : 0.9;
-        const circleDashRatio = item.circleDashAngle !== undefined ? (item.circleDashAngle / 360) : 1.0;
+        const circleDashAngle = item.circleDashAngle !== undefined ? item.circleDashAngle : 360;
         const bigRadius = item.bigRadius !== undefined ? item.bigRadius : this.globe.Math.GetDist3D(item.long, item.lat, item.endLong, item.endLat);
         const radius = item.radius !== undefined ? item.radius : bigRadius * 0.2;
         const startAngle = calculateStartAngle(long, lat, endLong, endLat);
@@ -291,7 +312,7 @@ export default class Plugin {
             rgba,
             dashRatio,
             dashOpacity,
-            circleDashRatio,
+            circleDashAngle,
             rgbaMode
         };
     }
@@ -301,7 +322,6 @@ export default class Plugin {
         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 radius = item.radius !== undefined ? item.radius : bigRadius * 0.2;
         const startAngle = calculateStartAngle(long, lat, endLong, endLat);
@@ -340,8 +360,9 @@ export default class Plugin {
 
 
 
-    _insertTexts(item, injectionSubSet) {
-        injectionSubSet.forEach((v) => {
+    _insertTexts(item, textWriterInjectionSubSet) {
+        //TODO This method can be more performant if it works horizontally, tabular
+        textWriterInjectionSubSet.forEach((v) => {
             const { coordsAdaptor, textAdaptor, writer } = v
             const { lat, long } = coordsAdaptor(item);
             const text = textAdaptor(item);

package/package.json

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

package/programs/line-on-globe/naive.js

@@ -66,6 +66,7 @@ void main() {
     if (v_limp.x < -POLE || v_limp.x > POLE || v_limp.y < -POLE || v_limp.y > POLE) { discard; }
     color = v_color;
     color.a *= opacity;
+    if ( v_dash_ratio >= 1.0 ) { return; }
     if (interpolation > 0.95) { return; }
     if (fract(interpolation / (2.0 * v_dash_ratio)) < 0.5) { color.a /= 4.0; }