weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(drawings): added global drawing lines thickness normalization

Browse Source
This commit is contained in:
MarcoJayUsai 2025-02-28 14:33:31 +01:00
parent 8aac6b7d7e
commit 94fe8488e4
1 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
frontend/react/src/map/drawings/drawingsmanager.ts
View File

@ -7,10 +7,12 @@ import { Circle, DivIcon, Layer, LayerGroup, layerGroup, Marker, Polygon, Polyli
export abstract class DCSDrawing {
#name: string;
#parent: DCSDrawingsContainer;
#weight: number;
constructor(drawingData, parent: DCSDrawingsContainer) {
this.#name = drawingData["name"];
this.#parent = parent;
this.setWeight(drawingData);
}
getName() {
@ -29,6 +31,26 @@ export abstract class DCSDrawing {
};
}
setWeight(drawingData) {
if (!drawingData.thickness) {
return;
}
this.#weight = drawingData.thickness * 0.5;
if (this.#weight === 0) {
this.#weight = 0.1;
}
if (this.#weight > 1) {
this.#weight = 1;
}
}
getWeight() {
return this.#weight;
}
abstract getLayer(): Layer;
abstract setOpacity(opacity: number): void;
abstract getOpacity(): number;
@ -101,12 +123,19 @@ export class DCSPolygon extends DCSDrawing {
fillColor: `${decimalToRGBA(drawingData.fillColorString)}`,
opacity: 1,
fillOpacity: 1,
weight: 1,
weight: this.getWeight(),
dashArray: dashArray,
});
break;
case "arrow":
let weight = this.getWeight();
if (!weight || weight < 1) {
weight = 1;
}
const arrowBounds = [
[drawingData.points["1"].lat, drawingData.points["1"].lng],
[drawingData.points["2"].lat, drawingData.points["2"].lng],
@ -123,7 +152,7 @@ export class DCSPolygon extends DCSDrawing {
fillColor: `${decimalToRGBA(drawingData.fillColorString)}`,
opacity: 1,
fillOpacity: 1,
weight: 1,
weight: weight,
dashArray,
});
break;
@ -180,7 +209,7 @@ export class DCSPolygon extends DCSDrawing {
fillColor: `${decimalToRGBA(drawingData.fillColorString)}`,
opacity: 1,
fillOpacity: 1,
weight: 1,
weight: this.getWeight(),
dashArray: dashArray,
});
break;
@ -230,7 +259,7 @@ export class DCSPolygon extends DCSDrawing {
fillColor: `${decimalToRGBA(drawingData.fillColorString)}`,
opacity: 1,
fillOpacity: 1,
weight: drawingData.thickness,
weight: this.getWeight(),
dashArray: dashArray,
});
@ -242,11 +271,12 @@ export class DCSPolygon extends DCSDrawing {
fillColor: `${decimalToRGBA(drawingData.fillColorString)}`,
opacity: 1,
fillOpacity: 1,
weight: drawingData.thickness,
weight: this.getWeight(),
dashArray: dashArray,
});
break;
default:
default:
break;
}
@ -297,7 +327,7 @@ export class DCSLine extends DCSDrawing {
this.#line = new Polyline(points, {
color: `${decimalToRGBA(drawingData.colorString)}`,
weight: drawingData.thickness,
weight: this.getWeight(),
dashArray: dashArray,
});