flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-04 08:36:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: Implementation of the msfs2024 model mapping is ready for testing

Browse Source
This commit is contained in:
tzobler
2025-11-07 22:09:24 +01:00
parent 6700f66e1c
commit f034d31694
12 changed files with 136 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/simulator/msfs2024/simconnectdatadefinitionmsfs2024.h
View File

@@ -86,7 +86,7 @@ namespace swift::simplugin::msfs2024common
struct DataDefinitionOwnAircraftModel
{
char title[256]; //!< Aircraft model string
char livery[256]; //!< Aircraft model string
char livery[256]; //!< Aircraft livery string msfs2024
};
//! Data struct of aircraft model data
@@ -107,6 +107,7 @@ namespace swift::simplugin::msfs2024common
char atcAirlineNumber[64]; //!< airline number
char atcFlightNumber[8]; //!< flight number (168)
char title[256]; //!< Aircraft model string
char livery[256]; //!< Aircraft livery string msfs2024
};
//! Data struct of aircraft data (setable)

43
src/plugins/simulator/msfs2024/simulatormsfs2024common.cpp
View File

@@ -430,20 +430,16 @@ namespace swift::simplugin::msfs2024common
// TODO TZ a message should be displayed here because the gui freezes during loading
// better: move to the background (e.g., use CWorker::fromTask(...)), avoid GUI freeze.
this->createNewModelList();
CLogMessage(this).info(u"%1 SimObjects and Liveries in vSimObjectsAndLiveries")
<< vSimObjectsAndLiveries.size();
// Cannot create children for a parent that is in a different thread.
// owner = this (QObject in main thread)
// auto *worker = CWorker::fromTask(this, "createNewModelList", [=]() {
// this->createNewModelList();
// return QVariant(); // void-Result
//});
// TODO TZ where to place this message?
// worker->then(this, [=] { CLogMessage(this).info(u"SimObjects and Liveries in vSimObjectsAndLiveries ready");
// });
auto *worker = CWorker::fromTask(this, "createNewModelList", [=]() {
this->createNewModelList();
return QVariant(); // void-Result
});
// TODO TZ where to place this message better?
worker->then(this, [=] { CLogMessage(this).info(u"SimObjects and Liveries in vSimObjectsAndLiveries ready"); });
}
void CSimulatorMsfs2024::createNewModelList()
@@ -475,6 +471,7 @@ namespace swift::simplugin::msfs2024common
model.setModelString(modelLivery.szSimObjectCombinedTitle);
model.setModelLivery(modelLivery.szLiveryName);
model.setModelType(CAircraftModel::TypeOwnSimulatorModel);
if (!modelkey) model.setModelType(CAircraftModel::TypeManuallySet);
model.setSimulator(this->getSimulatorInfo());
bool excluded = false;
@@ -528,7 +525,7 @@ namespace swift::simplugin::msfs2024common
// for (const QString &name : distributorNames) { distributorList.push_back(CDistributor(name)); }
CDistributorList distributorList = sGui->getWebDataServices()->getDistributors();
const CModelSetBuilder builder(this);
CModelSetBuilder builder(nullptr);
CModelSetBuilder::Builder options =
givenDistributorsOnly ? CModelSetBuilder::GivenDistributorsOnly : CModelSetBuilder::NoOptions;
if (dbDataOnly) { options |= CModelSetBuilder::OnlyDbData; }
@@ -1118,6 +1115,7 @@ namespace swift::simplugin::msfs2024common
});
}
// called decoupled from simconnect event queue very fast
void CSimulatorMsfs2024::updateRemoteAircraftFromSimulator(const CSimConnectObject &simObject,
const DataDefinitionPosData &remoteAircraftData)
{
@@ -1170,6 +1168,7 @@ namespace swift::simplugin::msfs2024common
}
}
// called decoupled from simconnect event queue
void
CSimulatorMsfs2024::updateRemoteAircraftFromSimulator(const CSimConnectObject &simObject,
const DataDefinitionRemoteAircraftModel &remoteAircraftModel)
@@ -1179,7 +1178,11 @@ namespace swift::simplugin::msfs2024common
CSimConnectObject &so = m_simConnectObjects[cs];
if (so.isPendingRemoved()) { return; }
const QString modelString(remoteAircraftModel.title);
// TODO TZ verify model and livery
QString combinedModelstring =
QString::fromUtf8(remoteAircraftModel.title) + " " + QString::fromUtf8(remoteAircraftModel.livery);
const QString modelString(combinedModelstring.trimmed());
const CLength cg(remoteAircraftModel.cgToGroundFt, CLengthUnit::ft());
so.setAircraftCG(cg);
so.setAircraftModelString(modelString);
@@ -1230,7 +1233,7 @@ namespace swift::simplugin::msfs2024common
this->updateCockpit(myAircraft.getCom1System(), myAircraft.getCom2System(), myXpdr, this->identifier());
}
void CSimulatorMsfs2024::updateMSFSTransponderMode(const DataDefinitionMSFSTransponderMode transponderMode)
void CSimulatorMsfs2024::updateMSFS2024TransponderMode(const DataDefinitionMSFSTransponderMode transponderMode)
{
auto mode = CTransponder::StateIdent;
if (!transponderMode.ident)
@@ -1390,9 +1393,10 @@ namespace swift::simplugin::msfs2024common
CLogMessage(this).warning(u"Model failed to be added: '%1' details: %2")
<< simObject.getAircraftModelString() << simObject.getAircraft().toQString(true);
CStatusMessage verifyMsg;
const bool verifiedAircraft = this->verifyFailedAircraftInfo(simObject, verifyMsg); // aircraft.cfg existing?
if (!verifyMsg.isEmpty()) { CLogMessage::preformatted(verifyMsg); }
// CStatusMessage verifyMsg;
// const bool verifiedAircraft = this->verifyFailedAircraftInfo(simObject, verifyMsg); // aircraft.cfg existing?
const bool verifiedAircraft = true;
// if (!verifyMsg.isEmpty()) { CLogMessage::preformatted(verifyMsg); }
CSimConnectObject simObjAddAgain(simObject);
simObjAddAgain.increaseAddingExceptions();
@@ -1411,6 +1415,7 @@ namespace swift::simplugin::msfs2024common
<< simObjAddAgain.getAddingExceptions() :
CLogMessage(this).warning(u"Model '%1' %2 failed verification and will be disabled")
<< simObjAddAgain.getAircraftModelString() << simObjAddAgain.toQString();
this->updateAircraftEnabled(simObjAddAgain.getCallsign(), false); // disable
emit this->physicallyAddingRemoteModelFailed(simObjAddAgain.getAircraft(), true, true,
msg); // verify failed
@@ -2007,8 +2012,8 @@ namespace swift::simplugin::msfs2024common
.arg(fsxPositionToString(initialPosition)));
}
const QByteArray modelStringBa = toFsxChar(modelString);
const QByteArray modelLiveryBa = toFsxChar(modelLiveryString);
const QByteArray modelStringBa = toFsxChar(modelString).trimmed();
const QByteArray modelLiveryBa = toFsxChar(modelLiveryString).trimmed();
const QByteArray csBa = toFsxChar(callsign.toQString().left(12));
CSimConnectObject::SimObjectType type = CSimConnectObject::AircraftNonAtc;

2
src/plugins/simulator/msfs2024/simulatormsfs2024common.h
View File

@@ -553,7 +553,7 @@ namespace swift::simplugin::msfs2024common
void updateTransponderMode(const misc::aviation::CTransponder::TransponderMode xpdrMode);
//! Update transponder mode from MSFS
void updateMSFSTransponderMode(const DataDefinitionMSFSTransponderMode transponderMode);
void updateMSFS2024TransponderMode(const DataDefinitionMSFSTransponderMode transponderMode);
//! An AI aircraft was added in the simulator
bool simulatorReportedObjectAdded(DWORD objectId);

4
src/plugins/simulator/msfs2024/simulatormsfs2024simconnectproc.cpp
View File

@@ -297,7 +297,7 @@ namespace swift::simplugin::msfs2024common
{
const DataDefinitionMSFSTransponderMode *transponderMode =
reinterpret_cast<const DataDefinitionMSFSTransponderMode *>(&pObjData->dwData);
simulatorMsfs2024->updateMSFSTransponderMode(*transponderMode);
simulatorMsfs2024->updateMSFS2024TransponderMode(*transponderMode);
break;
}
default:
@@ -325,7 +325,7 @@ namespace swift::simplugin::msfs2024common
} // position
else if (subRequest == CSimConnectDefinitions::SimObjectModel)
{
static_assert(sizeof(DataDefinitionRemoteAircraftModel) == sizeof(double) + 168 + 256,
static_assert(sizeof(DataDefinitionRemoteAircraftModel) == sizeof(double) + 168 + 256 + 256,
"DataDefinitionRemoteAircraftModel has an incorrect size.");
const DataDefinitionRemoteAircraftModel *remoteAircraftModel =
reinterpret_cast<const DataDefinitionRemoteAircraftModel *>(&pObjData->dwData);