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

refs #445, change livery in XP driver.

Browse Source 
(still work in progress)
This commit is contained in:
Klaus Basan
2015-07-10 20:18:34 +02:00
committed by Mathew Sutcliffe
parent d7bd20dd26
commit 4120608532
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/simulator/xplane/simulator_xplane.cpp
View File

@@ -66,7 +66,7 @@ namespace BlackSimPlugin
"__A319/A319_CFM.obj __A319/DAL.png", "__A319/A319_CFM.obj __A319/DAL.png",
CAircraftModel::TypeModelMatchingDefaultModel, CAircraftModel::TypeModelMatchingDefaultModel,
"A319 CFM DAL", "A319 CFM DAL",
CAircraftIcaoData(CAircraftIcaoCode("A319", "L2J"), CAirlineIcaoCode(), "FFFFFF") CAircraftIcaoData(CAircraftIcaoCode("A319", "L2J"), CAirlineIcaoCode())
)); ));
resetData(); resetData();
@@ -173,8 +173,10 @@ namespace BlackSimPlugin
{ {
using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation;
CAircraftIcaoData icaoData {*icaosIt, *airlinesIt}; CAircraftIcaoData icaoData {*icaosIt, *airlinesIt};
icaoData.setLivery(*liveriesIt); CLivery livery; //! \todo resolve livery
Q_UNUSED(liveriesIt);
CAircraftModel aircraftModel { *modelStringsIt, CAircraftModel::TypeModelMapping, QString(), icaoData }; CAircraftModel aircraftModel { *modelStringsIt, CAircraftModel::TypeModelMapping, QString(), icaoData };
aircraftModel.setLivery(livery);
m_installedModels.push_back(aircraftModel); m_installedModels.push_back(aircraftModel);
} }
@@ -244,14 +246,15 @@ namespace BlackSimPlugin
void CSimulatorXPlane::ps_emitOwnAircraftModelChanged(const QString &path, const QString &filename, const QString &livery, const QString &icao) void CSimulatorXPlane::ps_emitOwnAircraftModelChanged(const QString &path, const QString &filename, const QString &livery, const QString &icao)
{ {
//! \todo XP, change as appropriate //! \todo XP, change as appropriate, add resolution of own livery
// try to set correct model and ICAO values here // try to set correct model and ICAO values here
// thy show up in GUI // thy show up in GUI
CAircraftModel model(getOwnAircraftModel()); CAircraftModel model(getOwnAircraftModel());
CAirlineIcaoCode airlineIcao(model.getAirlineIcaoCode());
model.setModelType(CAircraftModel::TypeOwnSimulatorModel); model.setModelType(CAircraftModel::TypeOwnSimulatorModel);
model.setFileName(path + "/" + filename); model.setFileName(path + "/" + filename);
model.setLivery(CLivery("XPLANE." + livery, airlineIcao, "XP livery", "", "", false));
CAircraftIcaoData aircraftIcao(icao); CAircraftIcaoData aircraftIcao(icao);
aircraftIcao.setLivery(livery);
// updates // updates
updateOwnIcaoData(aircraftIcao); updateOwnIcaoData(aircraftIcao);
@@ -381,7 +384,8 @@ namespace BlackSimPlugin
CSimulatedAircraft aircraftAfterModelApplied(getAircraftInRangeForCallsign(newRemoteAircraft.getCallsign())); CSimulatedAircraft aircraftAfterModelApplied(getAircraftInRangeForCallsign(newRemoteAircraft.getCallsign()));
CAircraftIcaoData icao = newRemoteAircraft.getIcaoInfo(); CAircraftIcaoData icao = newRemoteAircraft.getIcaoInfo();
m_traffic->addPlane(newRemoteAircraft.getCallsign().asString(), aircraftModel.getModelString(), icao.getAircraftDesignator(), icao.getAirlineDesignator(), icao.getLivery()); QString livery = aircraftModel.getLivery().getCombinedCode(); //! \todo livery resolution for XP
m_traffic->addPlane(newRemoteAircraft.getCallsign().asString(), aircraftModel.getModelString(), icao.getAircraftDesignator(), icao.getAirlineDesignator(), livery);
updateAircraftRendered(newRemoteAircraft.getCallsign(), true, identifier()); updateAircraftRendered(newRemoteAircraft.getCallsign(), true, identifier());
CLogMessage(this).info("XP: Added aircraft %1") << newRemoteAircraft.getCallsign().toQString(); CLogMessage(this).info("XP: Added aircraft %1") << newRemoteAircraft.getCallsign().toQString();