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: added backend ability to set spawn heading

Browse Source
This commit is contained in:
Davide Passoni 2025-01-24 15:01:25 +01:00
parent d1d4116e66
commit 96415fd087
8 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,6 +155,7 @@ struct SpawnOptions {
string loadout;
string skill;
string liveryID;
double heading;
};
struct CloneOptions {

8
backend/core/src/airunit.cpp
View File

@ -170,7 +170,8 @@ void AirUnit::AIloop()
if (isActiveTanker) {
taskSS << "{ [1] = { id = 'Tanker' }, [2] = { id = 'Orbit', pattern = 'Race-Track', altitude = " <<
desiredAltitude << ", speed = " << desiredSpeed << ", altitudeType = '" <<
(desiredAltitudeType ? "AGL" : "ASL") << "', speedType = '" << (desiredSpeedType ? "GS" : "CAS") << "' }}";
(desiredAltitudeType ? "AGL" : "ASL") << "', speedType = '" << (desiredSpeedType ? "GS" : "CAS") << "', heading = " <<
heading << ", length = " << (50000 * 1.852) << " }}";
}
else if (isActiveAWACS) {
taskSS << "{ [1] = { id = 'AWACS' }, [2] = { id = 'Orbit', pattern = 'Circle', altitude = " <<
@ -178,9 +179,10 @@ void AirUnit::AIloop()
(desiredAltitudeType ? "AGL" : "ASL") << "', speedType = '" << (desiredSpeedType ? "GS" : "CAS") << "' }}";
}
else {
taskSS << "{ id = 'Orbit', pattern = 'Circle', altitude = " <<
taskSS << "{ id = 'Orbit', pattern = 'Race-Track', altitude = " <<
desiredAltitude << ", speed = " << desiredSpeed << ", altitudeType = '" <<
(desiredAltitudeType ? "AGL" : "ASL") << "', speedType = '" << (desiredSpeedType ? "GS" : "CAS") << "'}";
(desiredAltitudeType ? "AGL" : "ASL") << "', speedType = '" << (desiredSpeedType ? "GS" : "CAS") << "', heading = " <<
heading << ", length = " << desiredSpeed * 30 << " }";
}
Command* command = dynamic_cast<Command*>(new SetTask(groupName, taskSS.str(), [this]() { this->setHasTaskAssigned(true); }));
scheduler->appendCommand(command);

4
backend/core/src/commands.cpp
View File

@ -46,6 +46,7 @@ string SpawnGroundUnits::getString()
<< "unitType = " << "\"" << spawnOptions[i].unitType << "\"" << ", "
<< "lat = " << spawnOptions[i].location.lat << ", "
<< "lng = " << spawnOptions[i].location.lng << ", "
<< "heading = " << spawnOptions[i].heading << ", "
<< "liveryID = " << "\"" << spawnOptions[i].liveryID << "\"" << ", "
<< "skill = \"" << spawnOptions[i].skill << "\"" << "}, ";
@ -72,6 +73,7 @@ string SpawnNavyUnits::getString()
<< "unitType = " << "\"" << spawnOptions[i].unitType << "\"" << ", "
<< "lat = " << spawnOptions[i].location.lat << ", "
<< "lng = " << spawnOptions[i].location.lng << ", "
<< "heading = " << spawnOptions[i].heading << ", "
<< "liveryID = " << "\"" << spawnOptions[i].liveryID << "\"" << ", "
<< "skill = \"" << spawnOptions[i].skill << "\"" << "}, ";
}
@ -97,6 +99,7 @@ string SpawnAircrafts::getString()
<< "lat = " << spawnOptions[i].location.lat << ", "
<< "lng = " << spawnOptions[i].location.lng << ", "
<< "alt = " << spawnOptions[i].location.alt << ", "
<< "heading = " << spawnOptions[i].heading << ", "
<< "loadout = \"" << spawnOptions[i].loadout << "\"" << ", "
<< "liveryID = " << "\"" << spawnOptions[i].liveryID << "\"" << ", "
<< "skill = \"" << spawnOptions[i].skill << "\"" << "}, ";
@ -125,6 +128,7 @@ string SpawnHelicopters::getString()
<< "lat = " << spawnOptions[i].location.lat << ", "
<< "lng = " << spawnOptions[i].location.lng << ", "
<< "alt = " << spawnOptions[i].location.alt << ", "
<< "heading = " << spawnOptions[i].heading << ", "
<< "loadout = \"" << spawnOptions[i].loadout << "\"" << ", "
<< "liveryID = " << "\"" << spawnOptions[i].liveryID << "\"" << ", "
<< "skill = \"" << spawnOptions[i].skill << "\"" << "}, ";

12
backend/core/src/scheduler.cpp
View File

@ -202,12 +202,16 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
double lat = unit[L"location"][L"lat"].as_double();
double lng = unit[L"location"][L"lng"].as_double();
double alt = unit[L"altitude"].as_double();
double heading = 0;
if (unit.has_number_field(L"heading"))
heading = unit[L"heading"].as_double();
Coords location; location.lat = lat; location.lng = lng; location.alt = alt;
string loadout = to_string(unit[L"loadout"]);
string liveryID = to_string(unit[L"liveryID"]);
string skill = to_string(unit[L"skill"]);
spawnOptions.push_back({unitType, location, loadout, skill, liveryID});
spawnOptions.push_back({unitType, location, loadout, skill, liveryID, heading});
log(username + " spawned a " + coalition + " " + unitType , true);
}
@ -231,11 +235,15 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
string unitType = to_string(unit[L"unitType"]);
double lat = unit[L"location"][L"lat"].as_double();
double lng = unit[L"location"][L"lng"].as_double();
double heading = 0;
if (unit.has_number_field(L"heading"))
heading = unit[L"heading"].as_double();
Coords location; location.lat = lat; location.lng = lng;
string liveryID = to_string(unit[L"liveryID"]);
string skill = to_string(unit[L"skill"]);
spawnOptions.push_back({ unitType, location, "", skill, liveryID});
spawnOptions.push_back({ unitType, location, "", skill, liveryID, heading});
log(username + " spawned a " + coalition + " " + unitType, true);
}

1
frontend/react/src/constants/constants.ts
View File

@ -446,6 +446,7 @@ export enum DataIndexes {
country,
name,
unitName,
callsign,
groupName,
state,
task,

1
frontend/react/src/interfaces.ts
View File

@ -210,6 +210,7 @@ export interface UnitData {
country: number;
name: string;
unitName: string;
callsign: string;
groupName: string;
state: string;
task: string;

8
frontend/react/src/unit/unit.ts
View File

@ -88,6 +88,7 @@ export abstract class Unit extends CustomMarker {
#country: number = 0;
#name: string = "";
#unitName: string = "";
#callsign: string = "";
#groupName: string = "";
#state: string = states[0];
#task: string = "";
@ -197,6 +198,9 @@ export abstract class Unit extends CustomMarker {
getUnitName() {
return this.#unitName;
}
getCallsign() {
return this.#callsign;
}
getGroupName() {
return this.#groupName;
}
@ -459,6 +463,9 @@ export abstract class Unit extends CustomMarker {
case DataIndexes.unitName:
this.#unitName = dataExtractor.extractString();
break;
case DataIndexes.callsign:
this.#callsign = dataExtractor.extractString();
break;
case DataIndexes.groupName:
this.#groupName = dataExtractor.extractString();
updateMarker = true;
@ -646,6 +653,7 @@ export abstract class Unit extends CustomMarker {
country: this.#country,
name: this.#name,
unitName: this.#unitName,
callsign: this.#callsign,
groupName: this.#groupName,
state: this.#state,
task: this.#task,

10
scripts/lua/backend/OlympusCommand.lua
View File

@ -181,6 +181,16 @@ function Olympus.buildTask(groupName, options)
}
}
if options['pattern'] == 'Race-Track' then
local heading = options['heading'] or 0
local length = options['length'] or 20000
if group ~= nil then
local groupPos = mist.getLeadPos(group)
task['params']['point'] = {x = groupPos.x, y = groupPos.z}
task['params']['point2'] = {x = groupPos.x + math.cos(heading) * length, y = groupPos.z + math.sin(heading) * length}
end
end
-- Compute the altitude depending on the altitude type
if options['altitude'] then
if options ['altitudeType'] then