replace pak file and tile map compiler feature flags with pak file runtime setting

Author: moritz-h

map/src/MapWindow/DataView/DataView.cpp

@@ -96,7 +96,9 @@ Satisfactory3DMap::DataView::DataView(std::shared_ptr<Configuration> config)
     : config_(std::move(config)),
       selectedObject_(nullptr) {
 
+    usePakSetting_ = BoolSetting::create("UsePakFiles", false);
     gameDirSetting_ = PathSetting::create("GameDirectory", PathSetting::PathType::Directory);
+    config_->registerSetting(usePakSetting_);
     config_->registerSetting(gameDirSetting_);
 
     if (gameDirSetting_->getVal().empty()) {
@@ -105,19 +107,19 @@ Satisfactory3DMap::DataView::DataView(std::shared_ptr<Configuration> config)
             gameDirSetting_->setVal(gameDirs[0]);
         }
     }
-#ifdef FEATURE_PAK_FILE
-    if (!gameDirSetting_->getVal().empty()) {
-        try {
-            pakManager_ = SatisfactorySave::PakManager::create(gameDirSetting_->getVal());
-        } catch (const std::exception& ex) {
-            spdlog::error("Error init PakManager: {}", ex.what());
-            showErrors_.push_back(std::string("Error reading game dir: ") + ex.what());
+    if (usePakSetting_->getVal()) {
+        if (!gameDirSetting_->getVal().empty()) {
+            try {
+                pakManager_ = SatisfactorySave::PakManager::create(gameDirSetting_->getVal());
+            } catch (const std::exception& ex) {
+                spdlog::error("Error init PakManager: {}", ex.what());
+                showErrors_.push_back(std::string("Error reading game dir: ") + ex.what());
+            }
+        } else {
+            spdlog::warn("No game dir set!");
+            showErrors_.emplace_back("No game dir found! Please go to File > Settings and select a game dir.");
         }
-    } else {
-        spdlog::warn("No game dir set!");
-        showErrors_.emplace_back("No game dir found! Please go to File > Settings and select a game dir.");
     }
-#endif
 
     manager_ = std::make_unique<ModelManager>(pakManager_);
 }

map/src/MapWindow/DataView/DataView.h

@@ -12,6 +12,7 @@
 #include "SatisfactorySave/GameTypes/Save/SaveGame.h"
 #include "SatisfactorySave/Pak/PakManager.h"
 
+#include "../Config/BoolSetting.h"
 #include "../Config/Configuration.h"
 #include "../Config/PathSetting.h"
 #include "ModelManager.h"
@@ -142,6 +143,7 @@ namespace Satisfactory3DMap {
         void addToNode(const ObjectProxyPtr& proxy, SaveNode& rootNode);
 
         std::shared_ptr<Configuration> config_;
+        std::shared_ptr<BoolSetting> usePakSetting_;
         std::shared_ptr<PathSetting> gameDirSetting_;
 
         std::shared_ptr<SatisfactorySave::PakManager> pakManager_;

map/src/MapWindow/MapWindow.cpp

@@ -58,22 +58,8 @@ Satisfactory3DMap::MapWindow::MapWindow()
             std::vector<float>{0.25f, 0.5f, 1.0f, 1.5f, 2.0f, 2.5f, 3.0f, 4.0f}, 4);
     metallicSetting_ = FloatSetting::create("Metallic", 0.0f);
     roughnessSetting_ = FloatSetting::create("Roughness", 0.5f);
-    worldRenderModeSetting_ = EnumSetting<WorldRenderMode>::create("World Mode",
-        {"None", "HeightMap",
-#ifdef FEATURE_TILEMAP
-            "TileMap"
-#else
-            "HeightMap (temp. replacement for TileMap)"
-#endif
-        },
-        {WorldRenderMode::None, WorldRenderMode::HeightMap,
-#ifdef FEATURE_TILEMAP
-            WorldRenderMode::TileMap
-#else
-            WorldRenderMode::HeightMap
-#endif
-        },
-        2);
+    worldRenderModeSetting_ = EnumSetting<WorldRenderMode>::create("World Mode", {"None", "HeightMap", "TileMap"},
+        {WorldRenderMode::None, WorldRenderMode::HeightMap, WorldRenderMode::TileMap}, 2);
     showSelectionMarkerSetting_ = BoolSetting::create("Selection marker", false);
     showSaveTreePerLevelSetting_ = BoolSetting::create("Show save tree per level", false);