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

Ref T292, Ref T285 model loader and cache improvements

Browse Source 
* multi caches also emit when values are set and synchronized
* model loader detects cache changed
* added CCentralMultiSimulatorModelCachesAware
This commit is contained in:
Klaus Basan
2018-07-26 02:27:48 +02:00
parent 2838e90e75
commit 94e3b89479
6 changed files with 100 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/blackmisc/simulation/data/modelcaches.cpp
View File

@@ -184,18 +184,19 @@ namespace BlackMisc
CStatusMessage CModelCaches::setCachedModels(const CAircraftModelList &models, const CSimulatorInfo &simulator)
{
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
CStatusMessage msg;
switch (simulator.getSimulator())
{
case CSimulatorInfo::FS9: return m_modelCacheFs9.set(models);
case CSimulatorInfo::FSX: return m_modelCacheFsx.set(models);
case CSimulatorInfo::P3D: return m_modelCacheP3D.set(models);
case CSimulatorInfo::XPLANE: return m_modelCacheXP.set(models);
case CSimulatorInfo::FS9: msg = m_modelCacheFs9.set(models); break;
case CSimulatorInfo::FSX: msg = m_modelCacheFsx.set(models); break;
case CSimulatorInfo::P3D: msg = m_modelCacheP3D.set(models); break;
case CSimulatorInfo::XPLANE: msg = m_modelCacheXP.set(models); break;
default:
Q_ASSERT_X(false, Q_FUNC_INFO, "wrong simulator");
return CStatusMessage();
}
this->emitCacheChanged(simulator);
this->emitCacheChanged(simulator); // set
return msg;
}
CStatusMessage IMultiSimulatorModelCaches::clearCachedModels(const CSimulatorInfo &simulator)
@@ -307,6 +308,7 @@ namespace BlackMisc
Q_ASSERT_X(false, Q_FUNC_INFO, "wrong simulator");
break;
}
this->emitCacheChanged(simulator); // sync
}
void CModelCaches::admitCacheImpl(const CSimulatorInfo &simulator)
@@ -375,18 +377,19 @@ namespace BlackMisc
orderedModels.sortAscendingByOrder();
}
CStatusMessage msg;
switch (simulator.getSimulator())
{
case CSimulatorInfo::FS9: return m_modelCacheFs9.set(orderedModels);
case CSimulatorInfo::FSX: return m_modelCacheFsx.set(orderedModels);
case CSimulatorInfo::P3D: return m_modelCacheP3D.set(orderedModels);
case CSimulatorInfo::XPLANE: return m_modelCacheXP.set(orderedModels);
case CSimulatorInfo::FS9: msg = m_modelCacheFs9.set(orderedModels); break;
case CSimulatorInfo::FSX: msg = m_modelCacheFsx.set(orderedModels); break;
case CSimulatorInfo::P3D: msg = m_modelCacheP3D.set(orderedModels); break;
case CSimulatorInfo::XPLANE: msg = m_modelCacheXP.set(orderedModels); break;
default:
Q_ASSERT_X(false, Q_FUNC_INFO, "wrong simulator");
return CStatusMessage();
}
this->emitCacheChanged(simulator);
this->emitCacheChanged(simulator); // set
return msg;
}
QDateTime CModelSetCaches::getCacheTimestamp(const CSimulatorInfo &simulator) const
@@ -476,6 +479,7 @@ namespace BlackMisc
Q_ASSERT_X(false, Q_FUNC_INFO, "Wrong simulator");
break;
}
this->emitCacheChanged(simulator); // sync
}
void CModelSetCaches::admitCacheImpl(const CSimulatorInfo &simulator)