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

feat(radar state): initial scaffolding

Browse Source
This commit is contained in:
MarcoJayUsai
2025-03-18 14:42:46 +01:00
parent 16e77087f5
commit ee15106be1
8 changed files with 244 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/core/include/datatypes.h
View File

@@ -7,6 +7,7 @@ namespace DataIndex {
startOfData = 0,
category,
alive,
radarState,
human,
controlled,
coalition,

3
backend/core/include/unit.h
View File

@@ -112,10 +112,12 @@ public:
virtual void setRacetrackLength(double newValue) { updateValue(racetrackLength, newValue, DataIndex::racetrackLength); }
virtual void setRacetrackAnchor(Coords newValue) { updateValue(racetrackAnchor, newValue, DataIndex::racetrackAnchor); }
virtual void setRacetrackBearing(double newValue) { updateValue(racetrackBearing, newValue, DataIndex::racetrackBearing); }
virtual void setRadarState(string newValue) { updateValue(radarState, newValue, DataIndex::radarState); }
/********** Getters **********/
virtual string getCategory() { return category; };
virtual bool getAlive() { return alive; }
virtual string getRadarState() { return radarState; }
virtual bool getHuman() { return human; }
virtual bool getControlled() { return controlled; }
virtual unsigned char getCoalition() { return coalition; }
@@ -178,6 +180,7 @@ protected:
string callsign = "";
string groupName = "";
unsigned char state = State::NONE;
string radarState = "";
string task = "";
bool hasTask = false;
Coords position = Coords(NULL);

1
backend/core/src/server.cpp
View File

@@ -152,7 +152,6 @@ void Server::handle_get(http_request request)
}
/* Drawings data*/
else if (URI.compare(DRAWINGS_URI) == 0 && drawingsByLayer.has_object_field(L"drawings")) {
log("Trying to answer with drawings...");
answer[L"drawings"] = drawingsByLayer[L"drawings"];
}

7
backend/core/src/unit.cpp
View File

@@ -83,6 +83,11 @@ void Unit::update(json::value json, double dt)
if (json.has_boolean_field(L"isAlive"))
setAlive(json[L"isAlive"].as_bool());
if (json.has_string_field(L"radarState")) {
log("Unit " + to_string(json[L"unitName"]) + " has radarState: " + to_string(json[L"radarState"]));
setRadarState(to_string(json[L"radarState"]));
}
if (json.has_boolean_field(L"isHuman"))
setHuman(json[L"isHuman"].as_bool());
@@ -208,6 +213,7 @@ void Unit::refreshLeaderData(unsigned long long time) {
case DataIndex::operateAs: updateValue(operateAs, leader->operateAs, datumIndex); break;
case DataIndex::shotsScatter: updateValue(shotsScatter, leader->shotsScatter, datumIndex); break;
case DataIndex::shotsIntensity: updateValue(shotsIntensity, leader->shotsIntensity, datumIndex); break;
case DataIndex::radarState: updateValue(radarState, leader->radarState, datumIndex); break;
}
}
}
@@ -251,6 +257,7 @@ void Unit::getData(stringstream& ss, unsigned long long time)
switch (datumIndex) {
case DataIndex::category: appendString(ss, datumIndex, category); break;
case DataIndex::alive: appendNumeric(ss, datumIndex, alive); break;
case DataIndex::radarState: appendNumeric(ss, datumIndex, radarState); break;
case DataIndex::human: appendNumeric(ss, datumIndex, human); break;
case DataIndex::controlled: appendNumeric(ss, datumIndex, controlled); break;
case DataIndex::coalition: appendNumeric(ss, datumIndex, coalition); break;