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

package/programs/rings/partial-ring/piece-of-pie copy.js

@@ -0,0 +1,286 @@
+import { createProgram } from "../../../util/webglobjectbuilders";
+import { CameraUniformBlockTotem, CameraUniformBlockString } from "../../totems/index";
+import { noRegisterGlobeProgramCache, globeProgramCache } from "../../programcache";
+import { POLE, PI, longLatRadToMercator, mercatorXYToGLPosition, longLatRadToCartesian3D, circleLimpFromLongLatRadCenterCartesian3D_accurate, circleLimpFromLongLatRadCenterMercatorCompass_accurate, 
+//circleLimpFromLongLatRadCenterMercatorRealDistanceNew_accurate,
+cartesian3DToGLPosition } from "../../../util/shaderfunctions/geometrytransformations";
+/**
+ * TODO:
+ * 1. Triangle face looks at screen. if rotation angle is positive the last vertex must be the faintest.
+ *
+ */
+const drawModeMap = Object.freeze({
+    LINE_STRIP: 0,
+    TRIANGLE_FAN: 1,
+});
+//${ circleLimpFromLongLatRadCenterMercatorRealDistanceNew_accurate }
+const vertexShaderSource = `#version 300 es
+
+${CameraUniformBlockString} 
+${PI} 
+${longLatRadToMercator}
+${mercatorXYToGLPosition}
+${longLatRadToCartesian3D}
+${circleLimpFromLongLatRadCenterCartesian3D_accurate}
+${circleLimpFromLongLatRadCenterMercatorCompass_accurate}
+${cartesian3DToGLPosition}
+
+uniform float edge_count;
+uniform int draw_mode; // %2 => 0: LINE_STRIP, 1: TRIANGLE_FAN 
+uniform float plugin_alpha_multiplier;
+//, lat, startAngle, tailAngle, ...rgba, radius, rgbaMode
+// in vec2 center; // long, lat in radian
+in vec2 center2d;
+in vec3 center3d;
+in float start_angle2d; 
+in float tail_angle2d;
+
+in float start_angle3d;
+in float tail_angle3d;
+
+in vec4 color;
+in float radius; // in meter
+in float filling_mode; // 0.0: constant, 1.0: fading, 2.0: hide
+// flat out int vid;
+// flat out float v_phase;
+out vec2 v_pos;
+out vec4 v_color;
+// flat out float v_angle;
+
+void main() {
+    // vid = gl_VertexID;
+    if (filling_mode == 2.0 || radius == 0.0) { return; }
+    float start_angle, tail_angle;
+    if (is3D) {
+        start_angle = start_angle3d;
+        tail_angle = tail_angle3d;
+    } else {
+        start_angle = start_angle2d;
+        tail_angle = tail_angle2d;
+    }
+    float filling_mode_ = filling_mode;
+    if ( draw_mode == 0 && filling_mode == 1.0) {filling_mode_ = 0.0;}
+    float vertexID = float(gl_VertexID);
+    float radius_ = radius;
+    float alpha = plugin_alpha_multiplier;
+    if (draw_mode == 1) { // TRIANGLE_FAN
+        if (gl_VertexID == 0) { 
+            radius_ = 0.0; 
+            if ( filling_mode == 1.0 ) { alpha = 0.0; }
+        }
+        vertexID -= 1.0;
+    }
+    float phase = ( vertexID  / (edge_count - 1.0) );
+    // v_angle = tail_angle;
+    
+    if ( filling_mode_ == 1.0 ) {
+        if ( tail_angle < 0.0 ) {
+                v_color = vec4( color.rgb , color.a * ( 1.0 - phase ) * alpha );
+            } else {
+                v_color = vec4( color.rgb , color.a * phase * alpha );
+        }
+    } else {
+        v_color = vec4( color.rgb , color.a * alpha );
+    }
+    if ( filling_mode == 0.0 && draw_mode == 1 ) {
+        v_color.a /= 2.0;
+    }
+    float angle;
+    if ( tail_angle > 0.0 ) { 
+        angle =  tail_angle * (-phase + 1.0) + start_angle;
+        } else {
+        angle = tail_angle * phase + start_angle;
+    }
+    if (is3D) {
+        vec3 pos = circleLimpFromLongLatRadCenterCartesian3D_accurate(center3d, radius_, angle);
+        v_pos = vec2(0.0, 0.0);
+        gl_Position = cartesian3DToGLPosition(pos);
+    }
+    else {
+        vec2 pos2 = circleLimpFromLongLatRadCenterMercatorCompass_accurate(center2d, radius_, angle);
+        v_pos = pos2;
+        gl_Position = mercatorXYToGLPosition(pos2);
+    }
+
+    gl_PointSize = 10.0;
+}`;
+const fragmentShaderSource = `#version 300 es` + POLE + PI + `
+precision highp float;
+// flat in int vid;
+in vec4 v_color;
+in vec2 v_pos;
+// flat in float v_phase;
+// in float v_angle;
+out vec4 outColor;
+void main() {
+    // if( vid % 2 == 0 ) { discard; }
+    // if ( mod(v_angle, PI / 36.0 ) < (PI / 72.0)) { discard; }
+    // if ( mod(v_angle * v_phase,  PI / 90.0 ) < (PI / 180.0)) { discard; }
+    if ( v_pos.x < -POLE || v_pos.x > POLE || v_pos.y < -POLE || v_pos.y > POLE ) { discard; }
+    outColor = v_color;
+}`;
+export const ITEM_SIZE = 10;
+export class Logic {
+    globe;
+    gl;
+    _lastMode;
+    _lastEdgeCount;
+    _lastAlphaMultiplier;
+    program;
+    _edgeCountLocation;
+    _draw_modeLocation;
+    _plugin_alpha_multiplierLocation;
+    cameraBlockBindingPoint;
+    cameraBlockTotem; // Type this based on your CameraUniformBlockTotem implementation
+    constructor(globe) {
+        this.globe = globe;
+        this.gl = globe.gl;
+        this._lastMode = 0;
+        this._lastEdgeCount = 64;
+        this._lastAlphaMultiplier = 1.0;
+        this.program = createProgram(this.gl, vertexShaderSource, fragmentShaderSource);
+        const { gl, program } = this;
+        { // set attributes locations 
+            gl.bindAttribLocation(program, 0, 'center2d');
+            gl.bindAttribLocation(program, 1, 'center3d');
+            gl.bindAttribLocation(program, 2, 'start_angle2d');
+            gl.bindAttribLocation(program, 3, 'tail_angle2d');
+            gl.bindAttribLocation(program, 4, 'start_angle3d');
+            gl.bindAttribLocation(program, 5, 'tail_angle3d');
+            gl.bindAttribLocation(program, 6, 'color');
+            gl.bindAttribLocation(program, 7, 'radius');
+            gl.bindAttribLocation(program, 8, 'filling_mode');
+            // vao
+            // instanced draw read 1 
+        }
+        { // Uniforms
+            this._edgeCountLocation = gl.getUniformLocation(program, 'edge_count');
+            this._draw_modeLocation = gl.getUniformLocation(program, 'draw_mode');
+            this._plugin_alpha_multiplierLocation = gl.getUniformLocation(program, 'plugin_alpha_multiplier');
+            const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+            gl.useProgram(program);
+            gl.uniform1i(this._draw_modeLocation, this._lastMode);
+            gl.uniform1f(this._edgeCountLocation, this._lastEdgeCount);
+            gl.uniform1f(this._plugin_alpha_multiplierLocation, 1.0);
+            this.cameraBlockBindingPoint = 0;
+            this.cameraBlockTotem = globeProgramCache.getProgram(globe, CameraUniformBlockTotem);
+            const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+            gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBindingPoint);
+            gl.useProgram(currentProgram);
+        }
+    }
+    draw(length, vao, edgeCount, alphaMultiplier, drawMode) {
+        const { gl, program, cameraBlockTotem, cameraBlockBindingPoint } = this;
+        // gl.disable(gl.DEPTH_TEST);
+        gl.useProgram(program);
+        if (drawModeMap[drawMode] !== this._lastMode) {
+            gl.uniform1i(this._draw_modeLocation, drawModeMap[drawMode]);
+            this._lastMode = drawModeMap[drawMode];
+        }
+        if (edgeCount !== this._lastEdgeCount) {
+            gl.uniform1f(this._edgeCountLocation, edgeCount);
+            this._lastEdgeCount = edgeCount;
+        }
+        if (alphaMultiplier !== this._lastAlphaMultiplier) {
+            gl.uniform1f(this._plugin_alpha_multiplierLocation, alphaMultiplier);
+            this._lastAlphaMultiplier = alphaMultiplier;
+        }
+        const overdraw = drawModeMap[drawMode];
+        cameraBlockTotem.bind(cameraBlockBindingPoint);
+        gl.bindVertexArray(vao);
+        gl.drawArraysInstanced(gl[drawMode], 0, edgeCount + overdraw, length);
+        cameraBlockTotem.unbind(cameraBlockBindingPoint);
+        gl.bindVertexArray(null);
+        // gl.enable(gl.DEPTH_TEST);
+    }
+    free() {
+        noRegisterGlobeProgramCache.releaseProgram(this.globe, CameraUniformBlockTotem);
+        this.gl.deleteProgram(this.program);
+        this.program = null;
+    }
+    /**
+     * in vec2 center; // long, lat in radian
+    in float start_angle; // the start of partial circle from bearing point
+    in float tail_angle; // the rotation of the partial circle
+    in vec4 color;
+    in float radius; // in meter
+    in float filling_mode; // 0.0: constant, 1.0: fading, 2.0: hide
+     */
+    createVAO(center2dObj, center3dObj, startAngle2DObj, tailAngle2DObj, startAngle3DObj, tailAngle3DObj, colorObj, radiusObj, colorModeObj) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
+        gl.bindVertexArray(vao);
+        {
+            const { buffer, stride, offset } = center2dObj;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(0);
+            gl.vertexAttribPointer(0, 2, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(0, 1);
+        }
+        {
+            const { buffer, stride, offset } = center3dObj;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(1);
+            gl.vertexAttribPointer(1, 3, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(1, 1);
+        }
+        {
+            const { buffer, stride, offset } = startAngle2DObj;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(2);
+            gl.vertexAttribPointer(2, 1, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(2, 1);
+        }
+        {
+            const { buffer, stride, offset } = tailAngle2DObj;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(3);
+            gl.vertexAttribPointer(3, 1, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(3, 1);
+        }
+        {
+            const { buffer, stride, offset } = startAngle3DObj;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(4);
+            gl.vertexAttribPointer(4, 1, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(4, 1);
+        }
+        {
+            const { buffer, stride, offset } = tailAngle3DObj;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(5);
+            gl.vertexAttribPointer(5, 1, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(5, 1);
+        }
+        {
+            const { buffer, stride, offset } = colorObj;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(6);
+            gl.vertexAttribPointer(6, 4, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(6, 1);
+        }
+        {
+            const { buffer, stride, offset } = radiusObj;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(7);
+            gl.vertexAttribPointer(7, 1, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(7, 1);
+        }
+        {
+            const { buffer, stride, offset } = colorModeObj;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(8);
+            gl.vertexAttribPointer(8, 1, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(8, 1);
+        }
+        gl.bindVertexArray(null);
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
+        return vao;
+    }
+    createUBO() {
+    }
+}
+export const PieceOfPieProgramCache = Object.freeze({
+    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, Logic),
+    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
+});

package/programs/totems/camerauniformblock.js

@@ -1,7 +1,6 @@
 import { globeProgramCache } from "../programcache";
 import { fromLongLatToUnitVector } from "../../Math/vec3";
 import { RADIANS } from "../../Math/methods";
-import { GlobeChangeObserver } from "./globe-changes";
 export const CameraUniformBlockString = `
 layout(std140) uniform CameraUniformBlock {
     mat4 view; // 64 bytes           0
@@ -30,7 +29,6 @@ export class CameraUniformBlockTotem {
     _isMovedParams;
     _normalizedCameraVector = [0, 0, 0]; // Normalized camera vector
     // _frustumPlanes: any; // Uncomment and type if used
-    _globeChangeObserver = null;
     constructor() {
         this.id = "CameraUniformBlockTotem";
         this.description =
@@ -53,7 +51,6 @@ export class CameraUniformBlockTotem {
         this.ubo = this._createUBO();
         this.traslateFloat32 = new Float32Array(3);
         this.mapWHFloat32 = new Float32Array(2);
-        this._globeChangeObserver = new GlobeChangeObserver(globe);
         this.setGeometry();
         this.resize();
     }
@@ -89,7 +86,6 @@ export class CameraUniformBlockTotem {
         const ubo = this.ubo;
         const mapWHFloat32 = this.mapWHFloat32;
         const globe = this.globe;
-        this._globeChangeObserver?.checkChanges();
         gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
         {
             // view, projection, translate
@@ -200,9 +196,6 @@ export class CameraUniformBlockTotem {
         fromLongLatToUnitVector(result, [CenterLong * RADIANS, CenterLat * RADIANS]);
         return result;
     }
-    getGlobeChanges() {
-        return this._globeChangeObserver?.getChanges();
-    }
     free() {
         const gl = this.gl;
         const ubo = this.ubo;

package/programs/totems/canvas-webglobe-info.js

@@ -1,13 +1,13 @@
 import { globeProgramCache } from "../programcache";
-export const WebGlobeInfoUniformBlockString = `
-layout(std140) uniform WebGlobeInfo {
-    vec2 canvas_resolution;
-    vec2 mouse_radian_long_lat;
-    vec2 mouse_pixel_xy;
-    float north_angle;
-    float world_tilt;
-    float earth_distance;
-}; 
+export const WebGlobeInfoUniformBlockString = `
+layout(std140) uniform WebGlobeInfo {
+    vec2 canvas_resolution;
+    vec2 mouse_radian_long_lat;
+    vec2 mouse_pixel_xy;
+    float north_angle;
+    float world_tilt;
+    float earth_distance;
+}; 
 `;
 export default class CanvasWebGlobeInfo {
     id;

package/range-tools-on-terrain/bearing-line/adapters.js

@@ -18,7 +18,7 @@ export const flatLinesInputAdapter = (bearingLine) => {
     };
 };
 export const flatLinesBearingInputAdapter = (bearingLine) => {
-    const { long, lat, rgba, key, bearingLat = 0, bearingLong = 0, msl } = bearingLine;
+    const { long, lat, rgba, key, bearingLat = 0, bearingLong = 0 } = bearingLine;
     return {
         key: key,
         start: [long, lat],
@@ -27,7 +27,7 @@ export const flatLinesBearingInputAdapter = (bearingLine) => {
     };
 };
 export const bearingLineToCircleInputAdapter = (globe) => (bearingLine) => {
-    const { long, lat, endLong, endLat, rgba, altitude = 0, msl = null } = bearingLine;
+    const { long, lat, endLong, endLat, rgba, altitude = 0 } = bearingLine;
     if (bearingLine.radius === undefined || bearingLine.radius === null) {
         const radius = globe.Math.GetDist2D(long, lat, endLong, endLat);
         bearingLine.radius = radius;
@@ -38,22 +38,20 @@ export const bearingLineToCircleInputAdapter = (globe) => (bearingLine) => {
         radius: bearingLine.radius,
         height: altitude,
         color: rgba,
-        msl
     };
 };
 export const bearingLineToArcInputAdapter = (bearingLine) => {
-    const { long, lat, endLong, endLat, rgba, altitude = 0, msl } = bearingLine;
+    const { long, lat, endLong, endLat, rgba, altitude = 0 } = bearingLine;
     return {
         key: bearingLine.key,
         start: [long, lat],
         end: [endLong, endLat],
         height: altitude,
         color: rgba,
-        msl: msl
     };
 };
 export const bearingLineToBearingArcInputAdapter = (globe, bearingLine) => {
-    const { long, lat, bearingAngle, rgba, altitude = 0, key, msl } = bearingLine;
+    const { long, lat, bearingAngle, rgba, altitude = 0, key } = bearingLine;
     if (bearingLine.radius === undefined || bearingLine.radius === null) {
         throw new Error("Bearing line radius is not defined. Please calculate it before converting to ArcInput.");
     }
@@ -66,7 +64,6 @@ export const bearingLineToBearingArcInputAdapter = (globe, bearingLine) => {
         end: [endLong, endLat],
         height: altitude,
         color: rgba,
-        msl,
     };
 };
 export const bearingLineToPieceOfPieInputAdapter = (globe, item) => {
@@ -74,7 +71,7 @@ export const bearingLineToPieceOfPieInputAdapter = (globe, item) => {
     const long = radian(item.long);
     const endLat = radian(item.endLat);
     const endLong = radian(item.endLong);
-    const altitude = (item.altitude ?? 0);
+    const altitude = (item.altitude ?? 0) / 1000;
     const radius = item.radius ? item.radius * 0.2 : 10;
     // @ts-ignore 
     const { long: bearingLong, lat: bearingLat } = globe.Math.FindPointByPolar(item.long, item.lat, item.radius, item.bearingAngle);

package/range-tools-on-terrain/bearing-line/plugin.js

@@ -34,18 +34,13 @@ export class BearingLinePlugin {
     _memory = new Map();
     _semiPluginsOptions = {
         circleOnTerrainOptions: {
-            defaultColor: [1, 1, 1, 0.5],
+            defaultColor: [0.1, 0.1, 1, 0.5],
             defaultHeightFromGroundIn3D: 30.0,
             variativeColorsOn: false,
-            isMSL: false
         },
         arcOnTerrainOptions: {
             defaultHeightFromGroundIn3D: 30.0,
             variativeColorsOn: false,
-            defaultColor: [1, 1, 1, 0.5],
-            globeViewOn: true,
-            flatViewOn: false,
-            isMSL: false
         },
         lineOptions: {
             flatViewOn: true,
@@ -55,30 +50,11 @@ export class BearingLinePlugin {
         },
         pieceOfPieOptions: {
             defaultColor: [1, 1, 1, 0.5],
+            defaultHeightFromGroundIn3D: 30.0,
             variativeColorsOn: false,
-            defaultHeightFromGroundIn3D: 1000.0,
         }
     };
-    constructor(id, { textWritersMap, textDataPreAdaptor, opacities, drawOptions, circleOnTerrainOptions = {
-        defaultColor: [1, 1, 1, 0.5],
-        defaultHeightFromGroundIn3D: 30.0,
-        variativeColorsOn: false,
-    }, arcOnTerrainOptions = {
-        globeViewOn: true,
-        flatViewOn: false,
-        defaultColor: [1, 1, 1, 0.5],
-        defaultHeightFromGroundIn3D: 30.0,
-        variativeColorsOn: false,
-    }, lineOptions = {
-        flatViewOn: true,
-        globeViewOn: false,
-        variativeColorsOn: false,
-        defaultColor: [1, 1, 1, 0.5],
-    }, pieceOfPieOptions = {
-        defaultColor: [1, 1, 1, 0.5],
-        variativeColorsOn: false,
-        defaultHeightFromGroundIn3D: 1000.0,
-    } } = {}) {
+    constructor(id, { textWritersMap, textDataPreAdaptor, opacities, drawOptions, } = {}) {
         this.id = id;
         if (!(textWritersMap instanceof Map))
             throw new Error("textWritersMap is not an instance of Map");
@@ -86,49 +62,28 @@ export class BearingLinePlugin {
             if (!(v instanceof ContextTextWriter3))
                 throw new Error("textWritersMap element is not an instance of ContextTextWriter3");
         });
-        if (circleOnTerrainOptions) {
-            this._semiPluginsOptions.circleOnTerrainOptions = {
-                ...this._semiPluginsOptions.circleOnTerrainOptions,
-                ...circleOnTerrainOptions
-            };
-        }
-        if (arcOnTerrainOptions) {
-            this._semiPluginsOptions.arcOnTerrainOptions = {
-                ...this._semiPluginsOptions.arcOnTerrainOptions,
-                ...arcOnTerrainOptions
-            };
-        }
-        if (lineOptions) {
-            this._semiPluginsOptions.lineOptions = {
-                ...this._semiPluginsOptions.lineOptions,
-                ...lineOptions
-            };
-        }
-        if (pieceOfPieOptions)
-            this._semiPluginsOptions.pieceOfPieOptions = {
-                ...this._semiPluginsOptions.pieceOfPieOptions,
-                ...pieceOfPieOptions
-            };
         this._textWritersMap = textWritersMap || new Map();
         this._textWritersMap.forEach((writer) => writer.setKeyAdaptor((item) => item.key));
         this._textDataPreAdaptor = textDataPreAdaptor || ((item) => item);
-        this.circlePlugin = new CircleOnTerrainPlugin(id + "_circle", this._semiPluginsOptions.circleOnTerrainOptions);
+        this.circlePlugin = new CircleOnTerrainPlugin(id + "_circle", {
+            variativeColorsOn: true,
+        });
         this.arcPlugin = new ArcOnTerrainPlugin(id + "_arc", {
-            ...this._semiPluginsOptions.arcOnTerrainOptions,
+            variativeColorsOn: true,
         });
         this.arcPluginBL = new ArcOnTerrainPlugin(id + "_arcBL", {
-            ...this._semiPluginsOptions.arcOnTerrainOptions,
+            variativeColorsOn: true,
         });
         this.pieceOfPiePlugin = new PieceOfPiePlugin(id + "_pieceOfPie", {
             bufferType: "DYNAMIC_DRAW",
-            ...this._semiPluginsOptions.pieceOfPieOptions
         });
         this.linePlugin = new LinePlugin(id + "_line", {
+            variativeColorsOn: true,
             bufferType: "DYNAMIC_DRAW",
-            ...this._semiPluginsOptions.lineOptions
         });
         this.linePluginBL = new LinePlugin(id + "_lineBL", {
-            ...this._semiPluginsOptions.lineOptions // flatViewOn: true,
+            variativeColorsOn: true,
+            bufferType: "DYNAMIC_DRAW",
         });
         if (opacities) {
             this._opacities = {
@@ -143,39 +98,6 @@ export class BearingLinePlugin {
             };
         }
     }
-    setDefaultSemiPluginColor(semiPluginName, color) {
-        if (this._freed) {
-            throw new Error("Plugin has been freed, cannot set default semi plugin color.");
-        }
-        if (!this.globe) {
-            throw new Error("Globe is not set, cannot set default semi plugin color.");
-        }
-        if (semiPluginName === "ALL") {
-            this.circlePlugin.setDefaultColor(color);
-            this.arcPlugin.setDefaultColor(color);
-            this.arcPluginBL.setDefaultColor(color);
-            this.linePlugin.setDefaultColor(color);
-            this.linePluginBL.setDefaultColor(color);
-            this.pieceOfPiePlugin.setDefaultColor(color);
-            return;
-        }
-        switch (semiPluginName) {
-            case "circleOnTerrain":
-                this.circlePlugin.setDefaultColor(color);
-                break;
-            case "arcOnTerrain":
-                this.arcPlugin.setDefaultColor(color);
-                break;
-            case "line":
-                this.linePlugin.setDefaultColor(color);
-                break;
-            case "pieceOfPie":
-                this.pieceOfPiePlugin.setDefaultColor(color);
-                break;
-            default:
-                throw new Error(`Unknown semi plugin name: ${semiPluginName}`);
-        }
-    }
     setDoDrawVRM(drawVRM) {
         if (this._freed) {
             throw new Error("Plugin has been freed, cannot set draw VRM.");
@@ -216,6 +138,7 @@ export class BearingLinePlugin {
         this.drawOptions.drawAngleRing = drawAngleRing;
         this.globe.DrawRender();
     }
+    // TODO:
     updatePartial(items, { textWriterIDs } = {}) {
         if (this._freed) {
             throw new Error("Plugin has been freed, cannot update item.");
@@ -412,11 +335,11 @@ export class BearingLinePlugin {
             throw new Error("Circle and Arc plugins are not initialized.");
         }
         if (this.drawOptions.drawVRM) {
-            this.circlePlugin.setPluginOpacity(this._opacities.circle ?? this._opacities.general, false);
+            this.circlePlugin.setPluginOpacity(this._opacities.circle ?? this._opacities.general);
             this.circlePlugin.draw3D();
         }
         if (this.drawOptions.drawBearingLine) {
-            this.arcPluginBL.setPluginOpacity(this._opacities.bearing ?? this._opacities.general, false);
+            this.arcPluginBL.setPluginOpacity(this._opacities.arc ?? this._opacities.general);
             this.arcPluginBL.draw3D();
         }
         if (this.drawOptions.drawAngleRing) {
@@ -424,19 +347,21 @@ export class BearingLinePlugin {
             const tiltAngle = this.globe.api_GetCurrentLookInfo().Tilt;
             const opacity = pieceOfPieOpacityAdaptor(currentLOD, tiltAngle) * (this._opacities.general ?? 1);
             if (opacity > 0) {
-                this.pieceOfPiePlugin.setPluginOpacity(opacity, false);
+                this.pieceOfPiePlugin.setPluginOpacity(opacity);
                 this.pieceOfPiePlugin.draw3D();
             }
         }
         const currentGeometry = this.globe.api_GetCurrentGeometry();
-        this.arcPlugin.setPluginOpacity(this._opacities.arc ?? this._opacities.general, false);
+        this.arcPlugin.setPluginOpacity(this._opacities.arc ?? this._opacities.general);
         this.arcPlugin.draw3D();
         if (currentGeometry === 1) {
             this.linePlugin.draw3D();
             this.linePluginBL.draw3D();
         }
-        for (const textWriter of this._textWritersMap.values()) {
-            textWriter.draw();
+        if (this.drawOptions.drawAngleRing) {
+            for (const textWriter of this._textWritersMap.values()) {
+                textWriter.draw();
+            }
         }
     }
     free() {

package/range-tools-on-terrain/circle-line-chain/adapters.js

@@ -9,11 +9,12 @@ export const circleDataAdaptor = (globe, chain) => {
     const { chainKey, chainProperties, nodes } = chain;
     for (let i = 0; i < nodes.length - 1; i++) {
         const node = nodes[i];
-        // const circleOn = nodes[i + 1]?.circleOn ?? true; // Default to true if not specified
-        const { key, long, lat, circleProperties, circleOn = true } = node;
-        if (!circleOn)
-            continue; // Skip if circle is not enabled for this node
-        const color = circleProperties?.rgba ?? chainProperties.rgba ?? [1, 1, 1, 1]; // Default color if not specifie
+        const { key, long, lat, circleProperties } = node;
+        const color = circleProperties?.rgba ?? chainProperties.rgba ?? [1, 1, 1, 1]; // Default color if not specified
+        if (key === "Sakarya") {
+            console.log("circleProperties", circleProperties, "chainProperties", chainProperties);
+            console.log("Sakarya color", color);
+        }
         const radius = globe.Math.GetDist2D(long, lat, nodes[i + 1].long, nodes[i + 1].lat);
         const nodeKey = keyMethod(chainKey, key);
         circleInputs.push({
@@ -22,7 +23,6 @@ export const circleDataAdaptor = (globe, chain) => {
             radius,
             height: chainProperties.altitude ?? 0,
             color: color,
-            msl: chainProperties.msl ?? null
         });
     }
     return circleInputs;
@@ -32,11 +32,8 @@ export function arcDataAdaptor(chain) {
     const { chainKey, chainProperties, nodes } = chain;
     for (let i = 0; i < nodes.length - 1; i++) {
         const node = nodes[i];
-        // const arcOn = nodes[i + 1]?.arcOn ?? true; // Default to true if not specified
         const nextNode = nodes[i + 1];
-        const { key, long, lat, lineProperties, arcOn = true } = node;
-        if (!arcOn)
-            continue; // Skip if arc is not enabled for this node
+        const { key, long, lat, lineProperties } = node;
         const nodeKey = keyMethod(chainKey, key);
         const { long: nextLong, lat: nextLat } = nextNode;
         const color = lineProperties?.rgba ?? chainProperties.rgba ?? [1, 1, 1, 1]; // Default color if not specified
@@ -46,7 +43,6 @@ export function arcDataAdaptor(chain) {
             end: [nextLong, nextLat],
             height: chainProperties.altitude ?? 0,
             color: color,
-            msl: chainProperties.msl ?? null
         });
     }
     return arcInputs;
@@ -57,10 +53,7 @@ export function lineDataAdaptor(chain) {
     for (let i = 0; i < nodes.length - 1; i++) {
         const node = nodes[i];
         const nextNode = nodes[i + 1];
-        // const lineOn = nextNode?.lineOn ?? true; // Default to true if not specified
-        const { key, long, lat, lineProperties, lineOn = true } = node;
-        if (!lineOn)
-            continue; // Skip if line is not enabled for this node
+        const { key, long, lat, lineProperties } = node;
         const nodeKey = keyMethod(chainKey, key);
         const { long: nextLong, lat: nextLat } = nextNode;
         const color = lineProperties?.rgba ?? chainProperties.rgba ?? [1, 1, 1, 1]; // Default color if not specified