@pirireis/webglobeplugins 0.8.10 → 0.8.12

package/bearing-line/plugin.js

@@ -7,7 +7,7 @@ import { mapGetOrThrow } from "../util/check/get";
 import { populateFloat32Array } from "../util/jshelpers/data-filler";
 import { ContextTextWriter3 } from '../write-text/context-text3'
 import { constraintFloat, isBoolean } from '../util/check/typecheck';
-import { normalize } from '../util/geometry';
+import { sphereCoord } from '../util/geometry';
 import { createBufferAndReadInfo } from '../util/gl-util/buffer/integrate-buffer';
 
 export const RINGPARTIAL_DRAW_MODE = Object.freeze({
@@ -261,7 +261,8 @@ export default class BearingLinePlugin {
         const long = radian(item.long)
         const endLat = radian(item.endLat)
         const endLong = radian(item.endLong)
-        const bigRadius = item.bigRadius !== undefined ? item.bigRadius : globe.Math.GetDist3D(item.long, item.lat, item.endLong, item.endLat);
+        const altitude = (item.altitude ?? 0) / 1000;
+        const bigRadius = 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 } = globe.Math.FindPointByPolar(item.long, item.lat, bigRadius, item.bearingAngle)
         const startAngle2d = calculateStartAngle(long, lat, endLong, endLat);
@@ -285,6 +286,7 @@ export default class BearingLinePlugin {
             long: item.long,
             endLat: item.endLat,
             endLong: item.endLong,
+            altitude,
             bearingAngle,
             radius,
             bigRadius,
@@ -322,9 +324,7 @@ export default class BearingLinePlugin {
         this.circle3DProgram = Circle3DCache.get(globe);
         const circleFlatEdgeCount = this.circleFlatEdgeCount
         {
-            const sphereCoord = (long, lat) => {
-                return normalize(globe.api_GetCartesian3DPoint(long, lat, 0, 0), 6378.137);
-            }
+
             // createBuffers
             const bufferType = "DYNAMIC_DRAW";
             const initialCapacity = this.bufferOrchestrator.capacity;
@@ -340,7 +340,7 @@ export default class BearingLinePlugin {
                     }],
                     ["centerCoords3d", {
                         'bufferManager': new BufferManager(gl, 3, { bufferType, initialCapacity }),
-                        'adaptor': (item) => sphereCoord(item.long, item.lat, 0, 0),
+                        'adaptor': (item) => sphereCoord(item.long, item.lat, globe, item.altitude),
                     }],
                     ["targetCoords2d", {
                         'bufferManager': new BufferManager(gl, 2, { bufferType, initialCapacity }),
@@ -348,8 +348,7 @@ export default class BearingLinePlugin {
                     }],
                     ["targetCoords3d", {
                         'bufferManager': new BufferManager(gl, 3, { bufferType, initialCapacity }),
-                        'adaptor': (item) => new Float32Array(
-                            globe.api_GetCartesian3DPoint(item.endLong, item.endLat, 0, 0))
+                        'adaptor': (item) => sphereCoord(item.endLong, item.endLat, globe, item.altitude)
                     }],
                     ["bearingTargetCoords2d", {
                         'bufferManager': new BufferManager(gl, 2, { bufferType, initialCapacity }),
@@ -357,7 +356,7 @@ export default class BearingLinePlugin {
                     }],
                     ["bearingTargetCoords3d", {
                         'bufferManager': new BufferManager(gl, 3, { bufferType, initialCapacity }),
-                        'adaptor': (item) => new Float32Array(globe.api_GetCartesian3DPoint(item.bearingLong, item.bearingLat, 0, 0))
+                        'adaptor': (item) => sphereCoord(item.bearingLong, item.bearingLat, globe, item.altitude)
                     }],
                     ["startAngle2d", {
                         'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),

package/circle-line-chain/plugin.js

@@ -9,7 +9,7 @@ import { populateFloat32Array } from "../util/jshelpers/data-filler";
 import { ContextTextWriter3 } from '../write-text/context-text3';
 import { isBoolean, constraintFloat, opacityCheck } from '../util/check/typecheck';
 import { createBufferAndReadInfo } from '../util/gl-util/buffer/integrate-buffer';
-import { normalize } from '../util/geometry/index';
+import { sphereCoord } from '../util/geometry/index';
 /**
  * Insert info to chain list map (nodes and properties)
  * 
@@ -264,9 +264,6 @@ export class CircleLineChainPlugin {
 
         const _circleFlatEdgeCount = this._circleFlatEdgeCount;
         {
-            const sphereCoord = (long, lat) => {
-                return normalize(globe.api_GetCartesian3DPoint(long, lat, 0, 0), 6378.137);
-            }
 
             // createBuffers
             const bufferType = "DYNAMIC_DRAW";
@@ -279,7 +276,7 @@ export class CircleLineChainPlugin {
                     }],
                     ["centerCoords3d", {
                         'bufferManager': new BufferManager(gl, 3, { bufferType, initialCapacity }),
-                        'adaptor': (item) => new sphereCoord(item.long, item.lat, 0, 0),
+                        'adaptor': (item) => sphereCoord(item.long, item.lat, globe, item.altitude),
                     }],
                     ["targetCoords2d", {
                         'bufferManager': new BufferManager(gl, 2, { bufferType, initialCapacity }),
@@ -287,7 +284,7 @@ export class CircleLineChainPlugin {
                     }],
                     ["targetCoords3d", {
                         'bufferManager': new BufferManager(gl, 3, { bufferType, initialCapacity }),
-                        'adaptor': (item) => sphereCoord(item.long, item.lat, 0, 0),
+                        'adaptor': (item) => sphereCoord(item.targetLong, item.targetLat, globe, item.altitude),
                     }],
                     ["rgba", {
                         'bufferManager': new BufferManager(gl, 4, { bufferType, initialCapacity }),
@@ -385,12 +382,13 @@ export class CircleLineChainPlugin {
             if (i === array.length - 1) return null;
 
             const centerCoords2dflat = centerCoords2dflatDataCreator(globe, v.long, v.lat, array[i + 1].long, array[i + 1].lat, { edgeCount: this._circleFlatEdgeCount });
-
+            const altitude = (v.altitude ?? chainProperties.altitude ?? 0) / 1000;
             return {
                 chainProperties: chainProperties,
                 // bigRadius: radiusM(v, i, array),
                 targetLong: array[i + 1].long,
                 targetLat: array[i + 1].lat,
+                altitude: altitude,
                 long: v.long,
                 lat: v.lat,
                 lineProperties: v.lineProperties,

package/package.json

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

package/rangerings/plugin.js

@@ -1,22 +1,3 @@
-/**
- * Re implementation of rangering plugin.
- */
-
-
-/**
- * Circlelari cizen programlar
- * Circlelari cizen bufferlarin muhasevesi. 
- * 
- * 1 derecelikler çok masraflı.
- * bir dereceklikler için ayrı buffer orchastrator oluşturulmalı.
- * 
- * 
- * A Range Ring {
- *  rings: [ ring, ]
- * }
- */
-
-
 /**
  * @typedef RangeRingData
  * @property {number} centerX
@@ -61,9 +42,9 @@ import { normalize } from "../util/geometry"
 const CIRCLE_FLAT_EDGE_COUNT = 362; // 360 + 2 for closing the circle and a cutting point
 
 
-const coordOnSphere = (long, lat, globe) => {
+const coordOnSphere = (long, lat, globe, altitude = 0) => {
     const coord = globe.api_GetCartesian3DPoint(long, lat, 0, 0);
-    return normalize(coord, 6378.137);
+    return normalize(coord, 6378.137 + altitude);
 }
 
 class RangeRings {
@@ -460,10 +441,10 @@ class RangeRings {
         const { globe } = this;
         const centerItem = this._ringAccount.getCenter(centerID);
         if (centerItem === undefined) throw new Error("Center not found");
-        const { long, lat, stepAngle, rgba, rings, hide = 0, textHide = 0 } = centerItem;
+        const { long, lat, stepAngle, rgba, rings, hide = 0, textHide = 0, altitude: centerAltitude = 0 } = centerItem;
         const result = [];
         const color = hide === 1 ? new Float32Array([0, 0, 0, 0]) : new Float32Array(rgba)
-        for (const { ringID, radius, padding } of rings) {
+        for (const { ringID, radius, padding, altitude = centerAltitude } of rings) {
             let azimuthAngle = 0;
             while (azimuthAngle < 360) {
                 const circlePoint = globe.Math.FindPointByPolar(long, lat, radius, azimuthAngle); // long lat
@@ -472,8 +453,8 @@ class RangeRings {
                     key: ringBigPaddingKeyMethod(centerID, ringID, azimuthAngle),
                     circlePoint2d: new Float32Array(globe.api_GetMercator2DPoint(circlePoint.long, circlePoint.lat)),
                     paddingPoint2d: new Float32Array(globe.api_GetMercator2DPoint(paddingPoint.long, paddingPoint.lat)),
-                    circlePoint3d: coordOnSphere(circlePoint.long, circlePoint.lat, globe),
-                    paddingPoint3d: coordOnSphere(paddingPoint.long, paddingPoint.lat, globe),
+                    circlePoint3d: coordOnSphere(circlePoint.long, circlePoint.lat, globe, altitude / 1000),
+                    paddingPoint3d: coordOnSphere(paddingPoint.long, paddingPoint.lat, globe, altitude / 1000),
                     rgba: color,
                     hide,
                     textHide
@@ -491,17 +472,18 @@ class RangeRings {
         const centerItem = this._ringAccount.getCenter(centerID);
         if (centerItem === undefined) throw new Error("Center not found");
 
-        const { long, lat, rgba, rings, hide = 0, textHide = 0 } = centerItem;
-        const centerCoords3d = coordOnSphere(long, lat, globe);
+        const { long, lat, rgba, rings, hide = 0, textHide = 0, altitude: centralAltitude = 0 } = centerItem;
+        const centerCoords3d = coordOnSphere(long, lat, globe, centralAltitude / 1000);
 
         const result = [];
 
-        for (const { ringID, radius, padding, __identity__ } of rings) {
+        for (const { ringID, radius, padding, __identity__, altitude = centralAltitude } of rings) {
             const key = __identity__;
+
             const centerCoords2dflat = centerCoords2dflatDataCreatorWithRadius(globe, long, lat, radius, { edgeCount: CIRCLE_FLAT_EDGE_COUNT });
             const radiusPadding = hide === ENUM_HIDE.HIDE_1_DEGREE_PADDINGS ? radius : radius - padding / 3;
             const targetPoint = globe.Math.FindPointByPolar(long, lat, radius, 0); // long lat
-            const targetCoords3d = coordOnSphere(targetPoint.long, targetPoint.lat, globe);
+            const targetCoords3d = coordOnSphere(targetPoint.long, targetPoint.lat, globe, altitude / 1000);
             const centerCoords2dflatForPadding = centerCoords2dflatDataCreatorWithRadius(globe, long, lat, radiusPadding, { edgeCount: CIRCLE_FLAT_EDGE_COUNT });
             result.push({
                 key,

package/util/geometry/index.js

@@ -43,3 +43,8 @@ export function normalize(array, newLength = 1) {
     }
     return result;
 }
+
+
+export function sphereCoord(long, lat, globe, height = 0) {
+    return normalize(globe.api_GetCartesian3DPoint(long, lat, 0, 0), 6378.137 + height);
+}

package/write-text/context-text3.js

@@ -6,6 +6,8 @@ import { isTextFont, opacityCheck } from "../util/check/typecheck";
  * 1) update all if initials change (propably need a context and a callback to iterate over zPayload)
  * 2) expose a mechanic to update text on zoom change
  * 3) extend the mechanic on 2 to other events
+ * 
+ * TODO: key check and raise error if doesnt exist
  */
 export class ContextTextWriter3 {
     constructor(globe, {