Make ExperimentFlags a singleton, remove inheritance relationships

src/app/editor/dungeon/dungeon_editor.cc

@@ -77,7 +77,7 @@ absl::Status DungeonEditor::Initialize() {
     rooms_.emplace_back(zelda3::Room(/*room_id=*/i));
     rooms_[i].LoadHeader();
     rooms_[i].LoadRoomFromROM();
-    if (flags()->kDrawDungeonRoomGraphics) {
+    if (core::ExperimentFlags::get().kDrawDungeonRoomGraphics) {
       rooms_[i].LoadRoomGraphics();
     }
 

src/app/editor/dungeon/dungeon_editor.h

@@ -1,11 +1,11 @@
 #ifndef YAZE_APP_EDITOR_DUNGEONEDITOR_H
 #define YAZE_APP_EDITOR_DUNGEONEDITOR_H
 
-#include "app/core/common.h"
 #include "absl/container/flat_hash_map.h"
+#include "app/core/common.h"
+#include "app/editor/editor.h"
 #include "app/editor/graphics/gfx_group_editor.h"
 #include "app/editor/graphics/palette_editor.h"
-#include "app/editor/editor.h"
 #include "app/gui/canvas.h"
 #include "app/rom.h"
 #include "imgui/imgui.h"
@@ -39,9 +39,7 @@ constexpr ImGuiTableFlags kDungeonTableFlags =
  * tile selector, and object renderer. Additionally, it handles loading room
  * entrances, calculating usage statistics, and rendering set usage.
  */
-class DungeonEditor : public Editor,
-                      public SharedRom,
-                      public core::ExperimentFlags {
+class DungeonEditor : public Editor, public SharedRom {
  public:
   DungeonEditor() { type_ = EditorType::kDungeon; }
 

src/app/editor/editor_manager.cc

@@ -683,7 +683,7 @@ void EditorManager::LoadRom() {
 }
 
 void EditorManager::SaveRom() {
-  if (flags()->kSaveDungeonMaps) {
+  if (core::ExperimentFlags::get().kSaveDungeonMaps) {
     status_ = screen_editor_.SaveDungeonMaps();
     RETURN_VOID_IF_ERROR(status_);
   }

src/app/editor/editor_manager.h

@@ -35,7 +35,7 @@ namespace editor {
  * variable points to the currently active editor in the tab view.
  *
  */
-class EditorManager : public SharedRom, public core::ExperimentFlags {
+class EditorManager : public SharedRom {
  public:
   EditorManager() {
     current_editor_ = &overworld_editor_;

src/app/editor/overworld/overworld_editor.cc

@@ -621,7 +621,7 @@ void OverworldEditor::CheckForMousePan() {
 
 void OverworldEditor::DrawOverworldCanvas() {
   if (all_gfx_loaded_) {
-    if (flags()->overworld.kLoadCustomOverworld) {
+    if (core::ExperimentFlags::get().overworld.kLoadCustomOverworld) {
       DrawCustomOverworldMapSettings();
     } else {
       DrawOverworldMapSettings();
@@ -1009,22 +1009,22 @@ void OverworldEditor::DrawOverworldSprites() {
 }
 
 absl::Status OverworldEditor::Save() {
-  if (flags()->overworld.kSaveOverworldMaps) {
+  if (core::ExperimentFlags::get().overworld.kSaveOverworldMaps) {
     RETURN_IF_ERROR(overworld_.CreateTile32Tilemap());
     RETURN_IF_ERROR(overworld_.SaveMap32Tiles());
     RETURN_IF_ERROR(overworld_.SaveMap16Tiles());
     RETURN_IF_ERROR(overworld_.SaveOverworldMaps());
   }
-  if (flags()->overworld.kSaveOverworldEntrances) {
+  if (core::ExperimentFlags::get().overworld.kSaveOverworldEntrances) {
     RETURN_IF_ERROR(overworld_.SaveEntrances());
   }
-  if (flags()->overworld.kSaveOverworldExits) {
+  if (core::ExperimentFlags::get().overworld.kSaveOverworldExits) {
     RETURN_IF_ERROR(overworld_.SaveExits());
   }
-  if (flags()->overworld.kSaveOverworldItems) {
+  if (core::ExperimentFlags::get().overworld.kSaveOverworldItems) {
     RETURN_IF_ERROR(overworld_.SaveItems());
   }
-  if (flags()->overworld.kSaveOverworldProperties) {
+  if (core::ExperimentFlags::get().overworld.kSaveOverworldProperties) {
     RETURN_IF_ERROR(overworld_.SaveMapProperties());
   }
   return absl::OkStatus();
@@ -1082,7 +1082,7 @@ absl::Status OverworldEditor::LoadGraphics() {
         overworld_.current_map_bitmap_data(), maps_bmp_[i], palette));
   }
 
-  if (flags()->overworld.kDrawOverworldSprites) {
+  if (core::ExperimentFlags::get().overworld.kDrawOverworldSprites) {
     RETURN_IF_ERROR(LoadSpriteGraphics());
   }
 

src/app/editor/overworld/overworld_editor.h

@@ -72,9 +72,7 @@ constexpr absl::string_view kOWMapTable = "#MapSettingsTable";
  * Provides access to the GfxGroupEditor and Tile16Editor through popup windows.
  *
  */
-class OverworldEditor : public Editor,
-                        public gfx::GfxContext,
-                        public core::ExperimentFlags {
+class OverworldEditor : public Editor, public gfx::GfxContext {
  public:
   OverworldEditor(Rom& rom) : rom_(rom) { type_ = EditorType::kOverworld; }
 

src/app/editor/system/flags.h

@@ -7,51 +7,53 @@
 namespace yaze {
 namespace editor {
 
+using core::ExperimentFlags;
 using ImGui::BeginMenu;
 using ImGui::Checkbox;
 using ImGui::EndMenu;
 using ImGui::MenuItem;
 using ImGui::Separator;
 
-struct FlagsMenu : public core::ExperimentFlags {
+struct FlagsMenu {
   void Draw() {
     if (BeginMenu("Overworld Flags")) {
       Checkbox("Enable Overworld Sprites",
-               &mutable_flags()->overworld.kDrawOverworldSprites);
+               &ExperimentFlags::get().overworld.kDrawOverworldSprites);
       Separator();
       Checkbox("Save Overworld Maps",
-               &mutable_flags()->overworld.kSaveOverworldMaps);
+               &ExperimentFlags::get().overworld.kSaveOverworldMaps);
       Checkbox("Save Overworld Entrances",
-               &mutable_flags()->overworld.kSaveOverworldEntrances);
+               &ExperimentFlags::get().overworld.kSaveOverworldEntrances);
       Checkbox("Save Overworld Exits",
-               &mutable_flags()->overworld.kSaveOverworldExits);
+               &ExperimentFlags::get().overworld.kSaveOverworldExits);
       Checkbox("Save Overworld Items",
-               &mutable_flags()->overworld.kSaveOverworldItems);
+               &ExperimentFlags::get().overworld.kSaveOverworldItems);
       Checkbox("Save Overworld Properties",
-               &mutable_flags()->overworld.kSaveOverworldProperties);
+               &ExperimentFlags::get().overworld.kSaveOverworldProperties);
       Checkbox("Load Custom Overworld",
-               &mutable_flags()->overworld.kLoadCustomOverworld);
+               &ExperimentFlags::get().overworld.kLoadCustomOverworld);
       ImGui::EndMenu();
     }
 
     if (BeginMenu("Dungeon Flags")) {
       Checkbox("Draw Dungeon Room Graphics",
-               &mutable_flags()->kDrawDungeonRoomGraphics);
+               &ExperimentFlags::get().kDrawDungeonRoomGraphics);
       Separator();
-      Checkbox("Save Dungeon Maps", &mutable_flags()->kSaveDungeonMaps);
+      Checkbox("Save Dungeon Maps", &ExperimentFlags::get().kSaveDungeonMaps);
       ImGui::EndMenu();
     }
 
     Checkbox("Use built-in file dialog",
-             &mutable_flags()->kNewFileDialogWrapper);
-    Checkbox("Enable Console Logging", &mutable_flags()->kLogToConsole);
+             &ExperimentFlags::get().kNewFileDialogWrapper);
+    Checkbox("Enable Console Logging", &ExperimentFlags::get().kLogToConsole);
     Checkbox("Enable Texture Streaming",
-             &mutable_flags()->kLoadTexturesAsStreaming);
+             &ExperimentFlags::get().kLoadTexturesAsStreaming);
     Checkbox("Log Instructions to Debugger",
-             &mutable_flags()->kLogInstructions);
-    Checkbox("Save All Palettes", &mutable_flags()->kSaveAllPalettes);
-    Checkbox("Save Gfx Groups", &mutable_flags()->kSaveGfxGroups);
-    Checkbox("Save Graphics Sheets", &mutable_flags()->kSaveGraphicsSheet);
+             &ExperimentFlags::get().kLogInstructions);
+    Checkbox("Save All Palettes", &ExperimentFlags::get().kSaveAllPalettes);
+    Checkbox("Save Gfx Groups", &ExperimentFlags::get().kSaveGfxGroups);
+    Checkbox("Save Graphics Sheets",
+             &ExperimentFlags::get().kSaveGraphicsSheet);
   }
 };