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

clang-format src

Browse Source
This commit is contained in:
Lars Toenning
2023-04-13 14:20:16 +02:00
parent ba41d4887b
commit 970b7c3650
1501 changed files with 20326 additions and 17820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.cpp
View File

@@ -14,11 +14,12 @@ namespace BlackMisc::Simulation::Flightgear
bool CAircraftModelLoaderFlightgear::isLoadingFinished() const
{
return !m_parserWorker || m_parserWorker->isFinished();;
return !m_parserWorker || m_parserWorker->isFinished();
;
}
CAircraftModelLoaderFlightgear::CAircraftModelLoaderFlightgear(QObject *parent) : Simulation::IAircraftModelLoader(Simulation::CSimulatorInfo::fg(), parent)
{ }
{}
CAircraftModelLoaderFlightgear::~CAircraftModelLoaderFlightgear()
{
@@ -95,7 +96,7 @@ namespace BlackMisc::Simulation::Flightgear
void CAircraftModelLoaderFlightgear::addUniqueModel(const CAircraftModel &model, CAircraftModelList &models)
{
//TODO Add check
// TODO Add check
models.push_back(model);
}
@@ -105,11 +106,13 @@ namespace BlackMisc::Simulation::Flightgear
for (const QString &rootDirectory : rootDirectories)
{
QString dir = rootDirectory;
dir.replace('\\','/');
dir.replace('\\', '/');
if (dir.contains("/AI/Aircraft"))
{
allModels.push_back(parseAIAirplanes(dir, excludeDirectories));
} else {
}
else
{
allModels.push_back(parseFlyableAirplanes(dir, excludeDirectories));
}
}
@@ -123,21 +126,18 @@ namespace BlackMisc::Simulation::Flightgear
const QStringList modelDirs = this->getInitializedModelDirectories(modelDirectories, simulator);
const QStringList excludedDirectoryPatterns(m_settings.getModelExcludeDirectoryPatternsOrDefault(simulator)); // copy
if (mode.testFlag(LoadInBackground))
{
if (m_parserWorker && !m_parserWorker->isFinished()) { return; }
emit this->diskLoadingStarted(simulator, mode);
m_parserWorker = CWorker::fromTask(this, "CAircraftModelLoaderFlightgear::performParsing",
[this, modelDirs, excludedDirectoryPatterns, modelConsolidation]()
{
auto models = this->performParsing(modelDirs, excludedDirectoryPatterns);
if (modelConsolidation) { modelConsolidation(models, true); }
return models;
});
m_parserWorker->thenWithResult<CAircraftModelList>(this, [ = ](const auto & models)
{
[this, modelDirs, excludedDirectoryPatterns, modelConsolidation]() {
auto models = this->performParsing(modelDirs, excludedDirectoryPatterns);
if (modelConsolidation) { modelConsolidation(models, true); }
return models;
});
m_parserWorker->thenWithResult<CAircraftModelList>(this, [=](const auto &models) {
this->updateInstalledModels(models);
m_loadingMessages.freezeOrder();
emit this->loadingFinished(m_loadingMessages, simulator, ParsedData);
@@ -149,7 +149,6 @@ namespace BlackMisc::Simulation::Flightgear
CAircraftModelList models(this->performParsing(modelDirs, excludedDirectoryPatterns));
this->updateInstalledModels(models);
}
}
QString CAircraftModelLoaderFlightgear::getModelString(const QString &fileName, bool ai)
@@ -172,4 +171,3 @@ namespace BlackMisc::Simulation::Flightgear
return modelString;
}
}

9
src/blackmisc/simulation/flightgear/flightgearutil.cpp
View File

@@ -27,14 +27,14 @@ namespace BlackMisc::Simulation::Flightgear
const QString &CFlightgearUtil::flightgearRootDir()
{
static QString flightgearRootDir;
if (CBuildConfig::isRunningOnWindowsNtPlatform()){
if (CBuildConfig::isRunningOnWindowsNtPlatform())
{
QSettings flightgearRegistry("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\FlightGear_is1", QSettings::NativeFormat);
flightgearRootDir = flightgearRegistry.value("InstallLocation").toString().trimmed();
}
return flightgearRootDir;
}
bool CFlightgearUtil::isFlightgearRootDirExisting()
{
static const bool exists = QDir(flightgearRootDir()).exists();
@@ -44,9 +44,10 @@ namespace BlackMisc::Simulation::Flightgear
QStringList CFlightgearUtil::modelDirectoriesFromSimDir(const QString &simulatorDir)
{
QStringList dirs;
if (CBuildConfig::isRunningOnWindowsNtPlatform() && !simulatorDir.isEmpty()){
if (CBuildConfig::isRunningOnWindowsNtPlatform() && !simulatorDir.isEmpty())
{
QString terraSyncFolder = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/Flightgear/Aircraft";
if(QDir(terraSyncFolder).exists()){ dirs.append(terraSyncFolder); }
if (QDir(terraSyncFolder).exists()) { dirs.append(terraSyncFolder); }
QString fgdataAIFolder = simulatorDir + "data/AI/Aircraft";
if (QDir(fgdataAIFolder).exists()) { dirs.append(fgdataAIFolder); }
}