src/Logger/Logger.cpp

@@ -14,10 +14,16 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+#ifdef SAVETOOL_DEBUG_BUILD
 #include <iostream>
+#endif
+#include <mutex>
 
+#include <Corrade/Containers/GrowableArray.h>
 #include <Corrade/Utility/Debug.h>
 
+#include <Magnum/Types.h>
+
 #include "Logger.h"
 
 using Containers::Array;

src/Logger/Logger.h

@@ -19,9 +19,7 @@
 #include <ctime>
 
 #include <mutex>
-#ifndef SAVETOOL_DEBUG_BUILD
 #include <fstream>
-#endif
 
 #include <Corrade/Containers/String.h>
 #include <Corrade/Containers/ArrayView.h>

src/SaveTool/SaveTool.cpp

@@ -167,7 +167,6 @@ SaveTool::~SaveTool() {
     LOG_INFO("Saving the configuration.");
 
     _conf.setValue("cheat_mode"_s, _cheatMode);
-    _conf.setValue("advanced_mode"_s, _advancedMode);
     _conf.setValue("startup_update_check"_s, _checkUpdatesOnStartup);
     _conf.setValue("skip_disclaimer"_s, _skipDisclaimer);
 

src/SaveTool/SaveTool.h

@@ -291,5 +291,4 @@ class SaveTool: public Platform::Sdl2Application, public efsw::FileWatchListener
         bool _eLaunchersDirty{false};
 
         bool _cheatMode{false};
-        bool _advancedMode{false};
 };

src/SaveTool/SaveTool_Initialisation.cpp

@@ -58,13 +58,6 @@ void SaveTool::initialiseConfiguration() {
         _conf.setValue("cheat_mode"_s, _cheatMode);
     }
 
-    if(_conf.hasValue("advanced_mode"_s)) {
-        _advancedMode = _conf.value<bool>("advanced_mode"_s);
-    }
-    else {
-        _conf.setValue("advanced_mode"_s, _advancedMode);
-    }
-
     if(_conf.hasValue("startup_update_check"_s)) {
         _checkUpdatesOnStartup = _conf.value<bool>("startup_update_check"_s);
     }

src/SaveTool/SaveTool_MassViewer.cpp

@@ -394,12 +394,9 @@ auto SaveTool::drawCustomStyle(CustomStyle& style) -> DCSResult {
 void SaveTool::drawDecalEditor(Decal& decal) {
     ImGui::Text("ID: %i", decal.id);
 
-    if(ImGui::BeginTable("##DecalTable", _advancedMode ? 2 : 1, ImGuiTableFlags_BordersInnerV)) {
+    if(ImGui::BeginTable("##DecalTable", 2, ImGuiTableFlags_BordersInnerV)) {
         ImGui::TableSetupColumn("##Normal", ImGuiTableColumnFlags_WidthStretch);
-
+        ImGui::TableSetupColumn("##Advanced", ImGuiTableColumnFlags_WidthStretch);
-        if(_advancedMode) {
-            ImGui::TableSetupColumn("##Advanced", ImGuiTableColumnFlags_WidthStretch);
-        }
 
         ImGui::TableNextRow();
 
@@ -443,53 +440,52 @@ void SaveTool::drawDecalEditor(Decal& decal) {
         ImGui::Checkbox("##Wrap", &decal.wrap);
         ImGui::EndGroup();
 
-        if(_advancedMode) {
-            ImGui::TableNextColumn();
 
-            ImGui::TextColored(ImColor(255, 255, 0), ICON_FA_EXCLAMATION_TRIANGLE);
+        ImGui::TableNextColumn();
-            ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
-            ImGui::TextUnformatted("Advanced settings. Touch these at your own risk.");
 
-            ImGui::BeginGroup();
+        ImGui::TextColored(ImColor(255, 255, 0), ICON_FA_EXCLAMATION_TRIANGLE);
-            drawAlignedText("Position:");
+        ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
-            drawAlignedText("U axis:");
+        ImGui::TextUnformatted("Advanced settings. Touch these at your own risk.");
-            drawAlignedText("V axis:");
-            ImGui::EndGroup();
 
-            ImGui::SameLine();
+        ImGui::BeginGroup();
+        drawAlignedText("Position:");
+        drawAlignedText("U axis:");
+        drawAlignedText("V axis:");
+        ImGui::EndGroup();
 
-            ImGui::BeginGroup();
+        ImGui::SameLine();
-            ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
-            ImGui::DragFloat("##PosX", &decal.position.x(), 1.0f, -FLT_MAX, +FLT_MAX, "X: %.3f");
-            ImGui::PopItemWidth();
-            ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
-            ImGui::DragFloat("##PosY", &decal.position.y(), 1.0f, -FLT_MAX, +FLT_MAX, "Y: %.3f");
-            ImGui::PopItemWidth();
-            ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
-            ImGui::DragFloat("##PosZ", &decal.position.z(), 1.0f, -FLT_MAX, +FLT_MAX, "Z: %.3f");
-            ImGui::PopItemWidth();
 
-            ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
+        ImGui::BeginGroup();
-            ImGui::DragFloat("##UX", &decal.uAxis.x(), 1.0f, -FLT_MAX, +FLT_MAX, "X: %.3f");
+        ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
-            ImGui::PopItemWidth();
+        ImGui::DragFloat("##PosX", &decal.position.x(), 1.0f, -FLT_MAX, +FLT_MAX, "X: %.3f");
-            ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+        ImGui::PopItemWidth();
-            ImGui::DragFloat("##UY", &decal.uAxis.y(), 1.0f, -FLT_MAX, +FLT_MAX, "Y: %.3f");
+        ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
-            ImGui::PopItemWidth();
+        ImGui::DragFloat("##PosY", &decal.position.y(), 1.0f, -FLT_MAX, +FLT_MAX, "Y: %.3f");
-            ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+        ImGui::PopItemWidth();
-            ImGui::DragFloat("##UZ", &decal.uAxis.z(), 1.0f, -FLT_MAX, +FLT_MAX, "Z: %.3f");
+        ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
-            ImGui::PopItemWidth();
+        ImGui::DragFloat("##PosZ", &decal.position.z(), 1.0f, -FLT_MAX, +FLT_MAX, "Z: %.3f");
+        ImGui::PopItemWidth();
 
-            ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
+        ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
-            ImGui::DragFloat("##VX", &decal.vAxis.x(), 1.0f, -FLT_MAX, +FLT_MAX, "X: %.3f");
+        ImGui::DragFloat("##UX", &decal.uAxis.x(), 1.0f, -FLT_MAX, +FLT_MAX, "X: %.3f");
-            ImGui::PopItemWidth();
+        ImGui::PopItemWidth();
-            ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+        ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
-            ImGui::DragFloat("##VY", &decal.vAxis.y(), 1.0f, -FLT_MAX, +FLT_MAX, "Y: %.3f");
+        ImGui::DragFloat("##UY", &decal.uAxis.y(), 1.0f, -FLT_MAX, +FLT_MAX, "Y: %.3f");
-            ImGui::PopItemWidth();
+        ImGui::PopItemWidth();
-            ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+        ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
-            ImGui::DragFloat("##VZ", &decal.vAxis.z(), 1.0f, -FLT_MAX, +FLT_MAX, "Z: %.3f");
+        ImGui::DragFloat("##UZ", &decal.uAxis.z(), 1.0f, -FLT_MAX, +FLT_MAX, "Z: %.3f");
-            ImGui::PopItemWidth();
+        ImGui::PopItemWidth();
-            ImGui::EndGroup();
+
-        }
+        ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
+        ImGui::DragFloat("##VX", &decal.vAxis.x(), 1.0f, -FLT_MAX, +FLT_MAX, "X: %.3f");
+        ImGui::PopItemWidth();
+        ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+        ImGui::DragFloat("##VY", &decal.vAxis.y(), 1.0f, -FLT_MAX, +FLT_MAX, "Y: %.3f");
+        ImGui::PopItemWidth();
+        ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+        ImGui::DragFloat("##VZ", &decal.vAxis.z(), 1.0f, -FLT_MAX, +FLT_MAX, "Z: %.3f");
+        ImGui::PopItemWidth();
+        ImGui::EndGroup();
 
         ImGui::EndTable();
     }
@@ -636,13 +632,9 @@ void SaveTool::drawAccessoryEditor(Accessory& accessory, Containers::ArrayView<C
 
     ImGui::BeginGroup();
     drawAlignedText("Styles:");
-    if(_advancedMode) {
+    drawAlignedText("Base position:");
-        drawAlignedText("Base position:");
-    }
     drawAlignedText("Position offset:");
-    if(_advancedMode) {
+    drawAlignedText("Base rotation:");
-        drawAlignedText("Base rotation:");
-    }
     drawAlignedText("Rotation offset:");
     drawAlignedText("Scale:");
     ImGui::EndGroup();
@@ -673,17 +665,15 @@ void SaveTool::drawAccessoryEditor(Accessory& accessory, Containers::ArrayView<C
     }
     ImGui::PopItemWidth();
 
-    if(_advancedMode) {
+    ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
-        ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
+    ImGui::DragFloat("##PosX", &accessory.relativePosition.x(), 1.0f, -FLT_MAX, +FLT_MAX, "X: %.3f");
-        ImGui::DragFloat("##PosX", &accessory.relativePosition.x(), 1.0f, -FLT_MAX, +FLT_MAX, "X: %.3f");
+    ImGui::PopItemWidth();
-        ImGui::PopItemWidth();
+    ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
-        ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+    ImGui::DragFloat("##PosY", &accessory.relativePosition.y(), 1.0f, -FLT_MAX, +FLT_MAX, "Y: %.3f");
-        ImGui::DragFloat("##PosY", &accessory.relativePosition.y(), 1.0f, -FLT_MAX, +FLT_MAX, "Y: %.3f");
+    ImGui::PopItemWidth();
-        ImGui::PopItemWidth();
+    ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
-        ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+    ImGui::DragFloat("##PosZ", &accessory.relativePosition.z(), 1.0f, -FLT_MAX, +FLT_MAX, "Z: %.3f");
-        ImGui::DragFloat("##PosZ", &accessory.relativePosition.z(), 1.0f, -FLT_MAX, +FLT_MAX, "Z: %.3f");
+    ImGui::PopItemWidth();
-        ImGui::PopItemWidth();
-    }
 
     ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
     ImGui::SliderFloat("##PosOffsetX", &accessory.relativePositionOffset.x(), -500.0f, +500.0f, "X: %.3f");
@@ -697,17 +687,15 @@ void SaveTool::drawAccessoryEditor(Accessory& accessory, Containers::ArrayView<C
     ImGui::SameLine();
     drawHelpMarker("+/-500.0 = +/-250 in-game");
 
-    if(_advancedMode) {
+    ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
-        ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
+    ImGui::DragFloat("##RotX", &accessory.relativeRotation.x(), 1.0f, -FLT_MAX, +FLT_MAX, "Roll: %.3f");
-        ImGui::DragFloat("##RotX", &accessory.relativeRotation.x(), 1.0f, -FLT_MAX, +FLT_MAX, "Roll: %.3f");
+    ImGui::PopItemWidth();
-        ImGui::PopItemWidth();
+    ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
-        ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+    ImGui::DragFloat("##RotY", &accessory.relativeRotation.y(), 1.0f, -FLT_MAX, +FLT_MAX, "Yaw: %.3f");
-        ImGui::DragFloat("##RotY", &accessory.relativeRotation.y(), 1.0f, -FLT_MAX, +FLT_MAX, "Yaw: %.3f");
+    ImGui::PopItemWidth();
-        ImGui::PopItemWidth();
+    ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
-        ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+    ImGui::DragFloat("##RotZ", &accessory.relativeRotation.z(), 1.0f, -FLT_MAX, +FLT_MAX, "Pitch: %.3f");
-        ImGui::DragFloat("##RotZ", &accessory.relativeRotation.z(), 1.0f, -FLT_MAX, +FLT_MAX, "Pitch: %.3f");
+    ImGui::PopItemWidth();
-        ImGui::PopItemWidth();
-    }
 
     ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
     ImGui::SliderFloat("##RotOffsetX", &accessory.relativeRotationOffset.x(), -180.0f, +180.0f, "Roll: %.3f");

src/SaveTool/SaveTool_drawMainMenu.cpp

@@ -86,12 +86,6 @@ void SaveTool::drawMainMenu() {
                 drawHelpMarker("This gives access to save edition features that can be considered cheats.",
                                Float(windowSize().x()) * 0.4f);
 
-                ImGui::Checkbox("Advanced mode", &_advancedMode);
-                ImGui::SameLine();
-                ImGui::AlignTextToFramePadding();
-                drawHelpMarker("This gives access to editing values that have unknown purposes or are undocumented.",
-                               Float(windowSize().x()) * 0.4f);
-
                 ImGui::Checkbox("Check for updates on startup", &_checkUpdatesOnStartup);
                 ImGui::SameLine();
                 if(ImGui::Button(ICON_FA_SYNC_ALT " Check now")) {

src/main.cpp

@@ -36,8 +36,6 @@ int main(int argc, char** argv) {
     Warning warning_intercept{&warning_intercept_stream};
     Error error_intercept{&error_intercept_stream};
 
-    logger().initialise();
-
     LOG_INFO("Initialising M.A.S.S. Builder Save Tool version " SAVETOOL_VERSION ".");
 
     auto str = std::setlocale(LC_ALL, ".utf-8");