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

fix: magvar used for BE calls

Browse Source 
fix: unit summary labels
This commit is contained in:
Davide Passoni
2024-12-12 16:43:24 +01:00
parent 89abcb3330
commit 8006d639ae
19 changed files with 159 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/react/src/map/map.ts
View File

@@ -243,7 +243,7 @@ export class Map extends L.Map {
}, 500); // DCS does not always apply the altitude correctly at the first set when changing map type
}
if (options.AWACSMode && this.#layerName !== "AWACS") this.setLayerName("AWACS");
//TODO if (options.AWACSMode && this.#layerName !== "AWACS") this.setLayerName("AWACS");
this.updateMinimap();
});

2
frontend/react/src/map/markers/stylesheets/airbase.css
View File

@@ -29,7 +29,7 @@
filter: drop-shadow(0px 2px 0px white) drop-shadow(0px -2px 0px white) drop-shadow(2px 0px 0px white) drop-shadow(-2px 0px 0px white);
}
[data-awacs-mode] .airbase-icon svg * {
[todo-todo-data-awacs-mode] .airbase-icon svg * {
fill: transparent !important;
}

2
frontend/react/src/map/markers/stylesheets/bullseye.css
View File

@@ -21,6 +21,6 @@
stroke: var(--unit-background-neutral);
}
[data-awacs-mode] .bullseye-icon svg * {
[todo-todo-data-awacs-mode] .bullseye-icon svg * {
fill: transparent !important;
}

104
frontend/react/src/map/markers/stylesheets/units.css
View File

@@ -34,11 +34,11 @@
cursor: url("/images/cursors/simulate-fire-fight.svg"), auto !important;
}
[data-awacs-mode] .unit-short-label {
[todo-data-awacs-mode] .unit-short-label {
color: transparent !important;
}
[data-awacs-mode] [data-object|="unit"] svg {
[todo-data-awacs-mode] [data-object|="unit"] svg {
scale: 0.5;
}
@@ -54,19 +54,19 @@
width: var(--unit-vvi-width);
}
[data-awacs-mode] .unit-vvi {
[todo-data-awacs-mode] .unit-vvi {
width: var(--unit-vvi-width-awacs);
}
[data-awacs-mode] [data-coalition="blue"] .unit-vvi {
[todo-data-awacs-mode] [data-coalition="blue"] .unit-vvi {
background: var(--unit-background-blue) !important;
}
[data-awacs-mode] [data-coalition="red"] .unit-vvi {
[todo-data-awacs-mode] [data-coalition="red"] .unit-vvi {
background: var(--unit-background-red) !important;
}
[data-awacs-mode] [data-coalition="neutral"] .unit-vvi {
[todo-data-awacs-mode] [data-coalition="neutral"] .unit-vvi {
background: var(--unit-background-neutral) !important;
}
@@ -114,7 +114,7 @@
z-index: -1;
}
[data-awacs-mode] [data-is-selected] .unit-icon::before {
[todo-data-awacs-mode] [data-is-selected] .unit-icon::before {
display: none;
}
@@ -139,34 +139,34 @@
stroke: white;
}
[data-awacs-mode] [data-coalition="blue"] .unit-icon svg {
[todo-data-awacs-mode] [data-coalition="blue"] .unit-icon svg {
fill: transparent !important;
stroke: var(--unit-background-blue) !important;
}
[data-awacs-mode] [data-coalition="red"] .unit-icon svg {
[todo-data-awacs-mode] [data-coalition="red"] .unit-icon svg {
fill: transparent !important;
stroke: var(--unit-background-red) !important;
}
[data-awacs-mode] [data-coalition="neutral"] .unit-icon svg {
[todo-data-awacs-mode] [data-coalition="neutral"] .unit-icon svg {
fill: transparent !important;
stroke: var(--unit-background-neutral) !important;
}
[data-awacs-mode] [data-is-selected] .unit-icon svg {
[todo-data-awacs-mode] [data-is-selected] .unit-icon svg {
stroke: #ff0 !important;
}
[data-awacs-mode] [data-is-selected] .unit-vvi {
[todo-data-awacs-mode] [data-is-selected] .unit-vvi {
background-color: #ff0 !important;
}
[data-awacs-mode] [data-is-selected] .unit-summary {
[todo-data-awacs-mode] [data-is-selected] .unit-summary {
color: #ff0 !important;
}
[data-awacs-mode] [data-is-selected] .unit-summary::after {
[todo-data-awacs-mode] [data-is-selected] .unit-summary::after {
background-color: #ff0 !important;
}
@@ -244,12 +244,11 @@
/*** Unit summary ***/
[data-object|="unit"] .unit-summary {
color: white;
column-gap: 6px;
display: flex;
flex-wrap: wrap;
font-size: 11px;
font-weight: bold;
justify-content: start;
align-content: center;
line-height: 12px;
pointer-events: none;
position: absolute;
@@ -259,43 +258,44 @@
1px -1px 0 #000,
-1px 1px 0 #000,
1px 1px 0 #000;
width: 100px;
translate: 80px 10px;
width: 80px;
height: 45px;
translate: 60px 2px;
}
[data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-north {
[todo-data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-north {
translate: 50px -45px;
}
[data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-north-east {
[todo-data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-north-east {
translate: 76px -32px;
}
[data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-east {
[todo-data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-east {
translate: 95px 7px;
}
[data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-south-east {
[todo-data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-south-east {
translate: 79px 50px;
}
[data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-south {
[todo-data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-south {
translate: 50px 63px;
}
[data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-south-west {
[todo-data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-south-west {
translate: -68px 50px;
}
[data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-west {
[todo-data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-west {
translate: -80px 7px;
}
[data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-north-west {
[todo-data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-north-west {
translate: -69px -35px;
}
[data-awacs-mode] .unit-summary::after {
[todo-data-awacs-mode] .unit-summary::after {
content: " ";
background-color: white;
width: 40px;
@@ -306,40 +306,40 @@
top: 30px;
}
[data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-north::after {
[todo-data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-north::after {
transform: rotate(90deg);
}
[data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-north-east::after {
[todo-data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-north-east::after {
transform: rotate(135deg);
translate: 2px;
}
[data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-east::after {
[todo-data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-east::after {
transform: rotate(180deg);
translate: -5px -12px;
}
[data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-south-east::after {
[todo-data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-south-east::after {
transform: rotate(225deg);
translate: -2px -28px;
}
[data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-south::after {
[todo-data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-south::after {
transform: rotate(270deg);
translate: -0px -28px;
}
[data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-south-west::after {
[todo-data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-south-west::after {
transform: rotate(315deg);
translate: 90px -28px;
}
[data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-west::after {
[todo-data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-west::after {
translate: 90px -12px;
}
[data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-north-west::after {
[todo-data-awacs-mode] [data-object|="unit"] .unit-summary.cluster-north-west::after {
transform: rotate(45deg);
translate: 90px;
}
@@ -355,10 +355,10 @@
[data-object|="unit"] .unit-summary .unit-callsign {
color: white;
overflow: hidden;
text-align: right;
text-align: left;
transform-origin: right;
white-space: nowrap;
width: 80px;
width: 100%;
text-overflow: ellipsis;
}
@@ -367,6 +367,14 @@
overflow: visible;
}
[data-object|="unit"] .unit-summary .unit-altitude {
width: 50%;
}
[data-object|="unit"] .unit-summary .unit-speed {
width: 50%;
}
/*** Common ***/
[data-object|="unit"]:hover .unit-ammo,
[data-object|="unit"]:hover .unit-health,
@@ -552,21 +560,17 @@
.unit-bullseye,
.unit-braa {
display: none;
}
[data-awacs-mode] .unit-bullseye,
[data-awacs-mode] .unit-braa {
width: 50%;
display: inline;
}
[data-awacs-mode] [data-object|="unit"] .unit-selected-spotlight,
[data-awacs-mode] [data-object|="unit"] .unit-short-label,
[data-awacs-mode] [data-object|="unit"] .unit-state,
[data-awacs-mode] [data-object|="unit"] .unit-fuel,
[data-awacs-mode] [data-object|="unit"] .unit-health,
[data-awacs-mode] [data-object|="unit"] .unit-ammo,
[data-awacs-mode] [data-object|="unit"]:hover .unit-fuel,
[data-awacs-mode] [data-object|="unit"]:hover .unit-ammo {
[todo-data-awacs-mode] [data-object|="unit"] .unit-selected-spotlight,
[todo-data-awacs-mode] [data-object|="unit"] .unit-short-label,
[todo-data-awacs-mode] [data-object|="unit"] .unit-state,
[todo-data-awacs-mode] [data-object|="unit"] .unit-fuel,
[todo-data-awacs-mode] [data-object|="unit"] .unit-health,
[todo-data-awacs-mode] [data-object|="unit"] .unit-ammo,
[todo-data-awacs-mode] [data-object|="unit"]:hover .unit-fuel,
[todo-data-awacs-mode] [data-object|="unit"]:hover .unit-ammo {
display: none;
}

2
frontend/react/src/map/markers/temporaryunitmarker.ts
View File

@@ -56,7 +56,7 @@ export class TemporaryUnitMarker extends CustomMarker {
var unitIcon = document.createElement("div");
unitIcon.classList.add("unit-icon");
var img = document.createElement("img");
img.src = `./images/units/map/${getApp().getMap().getOptions().AWACSMode ? "awacs" : "normal"}/${this.#coalition}/${blueprint.markerFile ?? blueprint.category}.svg`;
img.src = `./images/units/map/${/*TODO getApp().getMap().getOptions().AWACSMode ? "awacs" :*/ "normal"}/${this.#coalition}/${blueprint.markerFile ?? blueprint.category}.svg`;
img.onload = () => SVGInjector(img);
unitIcon.appendChild(img);
unitIcon.toggleAttribute("data-rotate-to-heading", false);