weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move threat zones out of MapModel.

Browse Source
This commit is contained in:
Dan Albert
2022-02-22 19:59:29 -08:00
parent 1c543666b5
commit b1356551c6
10 changed files with 62 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
resources/ui/map/map.js
View File

@@ -383,7 +383,6 @@ new QWebChannel(qt.webChannelTransport, function (channel) {
game.supplyRoutesChanged.connect(drawSupplyRoutes);
game.frontLinesChanged.connect(drawFrontLines);
game.flightsChanged.connect(drawAircraft);
game.threatZonesChanged.connect(drawThreatZones);
game.mapZonesChanged.connect(drawMapZones);
game.selectedFlightChanged.connect(updateSelectedFlight);
});
@@ -404,6 +403,9 @@ function handleStreamedEvents(events) {
if (events.unculled_zones_updated) {
drawUnculledZones();
}
if (events.threat_zones_updated) {
drawThreatZones();
}
}
function recenterMap(center) {
@@ -1063,39 +1065,21 @@ function drawThreatZones() {
redAirDefenseThreatZones.clearLayers();
redRadarSamThreatZones.clearLayers();
_drawThreatZones(game.threatZones.blue.full, blueFullThreatZones, true);
_drawThreatZones(
game.threatZones.blue.aircraft,
blueAircraftThreatZones,
true
);
_drawThreatZones(
game.threatZones.blue.airDefenses,
blueAirDefenseThreatZones,
true
);
_drawThreatZones(
game.threatZones.blue.radarSams,
blueRadarSamThreatZones,
true
);
getJson("/map-zones/threats").then((threats) => {
_drawThreatZones(threats.blue.full, blueFullThreatZones, true);
_drawThreatZones(threats.blue.aircraft, blueAircraftThreatZones, true);
_drawThreatZones(
threats.blue.air_defenses,
blueAirDefenseThreatZones,
true
);
_drawThreatZones(threats.blue.radar_sams, blueRadarSamThreatZones, true);
_drawThreatZones(game.threatZones.red.full, redFullThreatZones, false);
_drawThreatZones(
game.threatZones.red.aircraft,
redAircraftThreatZones,
false
);
_drawThreatZones(
game.threatZones.red.airDefenses,
redAirDefenseThreatZones,
false
);
_drawThreatZones(
game.threatZones.red.radarSams,
redRadarSamThreatZones,
false
);
_drawThreatZones(threats.red.full, redFullThreatZones, false);
_drawThreatZones(threats.red.aircraft, redAircraftThreatZones, false);
_drawThreatZones(threats.red.air_defenses, redAirDefenseThreatZones, false);
_drawThreatZones(threats.red.radar_sams, redRadarSamThreatZones, false);
});
}
function drawNavmesh(player) {