feat: new method for loading models via SimConnect MSFS2024

Author: tzobler

.github/workflows/build.yml

@@ -22,7 +22,9 @@ env:
   bitrock_version: qt-professional-24.7.0
   bitrock_url:     https://releases.installbuilder.com/installbuilder
   externals: swift-project/externals
-  externals_sha: dfe49bbeb8f0ca664afa293ad3f454cffe751acf
+  externals_sha: e1f1743ba159e11b0c065ea8f1ae1a0e91e3bf39
+                 
+  
   use_externals: ${{ secrets.EXTERNALS_PAT != '' }}
 
 jobs:

.gitignore

@@ -52,3 +52,5 @@ cmake-build-*/
 /dist/
 CMakeUserPresets.json
 /third_party/externals
+/src/plugins/simulator/msfs2024/simulatormsfs2024.cpp_
+/src/plugins/simulator/msfs2024/simulatormsfs2024.h_

src/core/db/databaseutils.cpp

@@ -75,6 +75,7 @@ namespace swift::core::db
             dbModelModified.updateMissingParts(model);
             dbModelModified.setDistributorOrder(distributorOrder);
             dbModelModified.setSimulator(dbModel.getSimulator()); // DB simulator settings have priority
+            dbModelModified.setModelLivery(model.getModelLivery()); // keep local livery settings msfs2024
             return dbModelModified;
         }
 
@@ -88,6 +89,7 @@ namespace swift::core::db
             {
                 if (modified) { *modified = true; }
                 consolidatedModel.setLivery(dbLivery);
+                consolidatedModel.setModelLivery(model.getModelLivery()); // keep local livery settings msfs2024
             }
         }
         if (!consolidatedModel.getAircraftIcaoCode().hasValidDbKey() && consolidatedModel.hasAircraftDesignator())
@@ -99,6 +101,7 @@ namespace swift::core::db
             {
                 if (modified) { *modified = true; }
                 consolidatedModel.setAircraftIcaoCode(dbIcao);
+                consolidatedModel.setModelLivery(model.getModelLivery()); // keep local livery settings msfs2024
             }
         }
 
@@ -108,6 +111,7 @@ namespace swift::core::db
         {
             if (modified) { *modified = true; }
             consolidatedModel.setDistributor(dbDistributor);
+            consolidatedModel.setModelLivery(model.getModelLivery()); // keep local livery settings msfs2024
         }
         consolidatedModel.updateLocalFileNames(model);
         consolidatedModel.setDistributorOrder(distributorOrder);

src/core/modelsetbuilder.cpp

@@ -49,8 +49,9 @@ namespace swift::core
         }
         else
         {
-            // without any information we can not use them
-            modelSet = modelSet.findWithKnownAircraftDesignator();
+            if (!options.testFlag(ShowAllInstalledModells))
+                // without any information we can not use them
+                modelSet = modelSet.findWithKnownAircraftDesignator();
         }
 
         // Include only

src/core/modelsetbuilder.h

@@ -34,7 +34,8 @@ namespace swift::core
             OnlyDbIcaoCodes = 1 << 2,
             Incremental = 1 << 3,
             SortByDistributors = 1 << 4,
-            ConsolidateWithDb = 1 << 5
+            ConsolidateWithDb = 1 << 5,
+            ShowAllInstalledModells = 1 << 6,
         };
         Q_DECLARE_FLAGS(Builder, BuilderFlag)
 

src/gui/components/dbownmodelscomponent.cpp

@@ -280,10 +280,10 @@ namespace swift::gui::components
     {
         QMessageBox msgBox(QMessageBox::Question, "Reload models from disk",
                            QStringLiteral("Completely reload '%1' models from disk?").arg(simulator.toQString(true)),
-                           QMessageBox::Ok | QMessageBox::Cancel, this);
+                           QMessageBox::Yes | QMessageBox::No, this);
         msgBox.setDefaultButton(QMessageBox::Cancel);
         const QMessageBox::StandardButton reply = static_cast<QMessageBox::StandardButton>(msgBox.exec());
-        if (reply != QMessageBox::Ok) { return; }
+        if (reply != QMessageBox::Yes) { return; }
 
         this->requestSimulatorModels(simulator, IAircraftModelLoader::InBackgroundNoCache);
     }
@@ -335,6 +335,21 @@ namespace swift::gui::components
         ui->tvp_OwnAircraftModels->updateContainerMaybeAsync(this->getOwnModels());
     }
 
+    // TODO TZ this is a stub for SimConnect loading
+    void CDbOwnModelsComponent::loadInstalledModelsSimConnect(const CSimulatorInfo &simulator,
+                                                              IAircraftModelLoader::LoadMode mode,
+                                                              const QStringList &modelDirectories)
+    {
+        Q_UNUSED(mode);
+        Q_UNUSED(modelDirectories);
+
+        using namespace std::chrono_literals;
+        const CStatusMessage msg = CLogMessage(this).info(u"Start loading models for %1") << simulator.toQString();
+        this->showOverlayHTMLMessage(msg, 2s);
+
+        return;
+    }
+
     void CDbOwnModelsComponent::loadInstalledModels(const CSimulatorInfo &simulator,
                                                     IAircraftModelLoader::LoadMode mode,
                                                     const QStringList &modelDirectories)
@@ -515,7 +530,11 @@ namespace swift::gui::components
                                                        IAircraftModelLoader::LoadMode mode,
                                                        const QStringList &modelDirectories)
     {
-        this->loadInstalledModels(simulator, mode, modelDirectories);
+        // At this point, we switch how the models should be loaded: SimConnect or classic file search
+        if (simulator.isMSFS2024())
+            this->loadInstalledModelsSimConnect(simulator, mode, modelDirectories);
+        else
+            this->loadInstalledModels(simulator, mode, modelDirectories);
     }
 
     void CDbOwnModelsComponent::requestSimulatorModelsWithCacheInBackground(const CSimulatorInfo &simulator)

src/gui/components/dbownmodelscomponent.h

@@ -153,6 +153,8 @@ namespace swift::gui
             void ownModelsSimulatorChanged(const swift::misc::simulation::CSimulatorInfo &simulator);
 
         private:
+            static constexpr std::chrono::milliseconds OverlayMsgTimeout { 5000 }; //!< how long overlay is displayed
+
             QScopedPointer<Ui::CDbOwnModelsComponent> ui;
             swift::misc::simulation::IAircraftModelLoader *m_modelLoader =
                 nullptr; //!< read own aircraft models, aka models on disk
@@ -167,7 +169,12 @@ namespace swift::gui
             //! Request own models
             void requestOwnModelsUpdate();
 
-            //! Load the models
+            //! Load the models via SimConnect
+            void loadInstalledModelsSimConnect(const swift::misc::simulation::CSimulatorInfo &simulator,
+                                               swift::misc::simulation::IAircraftModelLoader::LoadMode mode,
+                                               const QStringList &modelDirectories = {});
+
+            //! Load the models via disk
             void loadInstalledModels(const swift::misc::simulation::CSimulatorInfo &simulator,
                                      swift::misc::simulation::IAircraftModelLoader::LoadMode mode,
                                      const QStringList &modelDirectories = {});