Refactor ExperimentFlags to FeatureFlags for consistency across the codebase

src/app/editor/dungeon/dungeon_editor.cc

@@ -1,6 +1,7 @@
 #include "dungeon_editor.h"
 
 #include "absl/container/flat_hash_map.h"
+#include "app/core/features.h"
 #include "app/core/platform/renderer.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gui/canvas.h"
@@ -78,7 +79,7 @@ absl::Status DungeonEditor::Initialize() {
     rooms_.emplace_back(zelda3::Room(/*room_id=*/i));
     rooms_[i].LoadHeader();
     rooms_[i].LoadRoomFromROM();
-    if (core::ExperimentFlags::get().kDrawDungeonRoomGraphics) {
+    if (core::FeatureFlags::get().kDrawDungeonRoomGraphics) {
       rooms_[i].LoadRoomGraphics();
     }
 

src/app/editor/editor_manager.cc

@@ -2,6 +2,7 @@
 
 #include "absl/status/status.h"
 #include "absl/strings/match.h"
+#include "app/core/features.h"
 #include "app/core/platform/file_dialog.h"
 #include "app/core/project.h"
 #include "app/editor/code/assembly_editor.h"
@@ -732,7 +733,7 @@ void EditorManager::LoadRom() {
 }
 
 void EditorManager::SaveRom() {
-  if (core::ExperimentFlags::get().kSaveDungeonMaps) {
+  if (core::FeatureFlags::get().kSaveDungeonMaps) {
     status_ = screen_editor_.SaveDungeonMaps();
     RETURN_VOID_IF_ERROR(status_);
   }
@@ -740,7 +741,7 @@ void EditorManager::SaveRom() {
   status_ = overworld_editor_.Save();
   RETURN_VOID_IF_ERROR(status_);
 
-  if (core::ExperimentFlags::get().kSaveGraphicsSheet)
+  if (core::FeatureFlags::get().kSaveGraphicsSheet)
     PRINT_IF_ERROR(SaveAllGraphicsData(
         *rom(), GraphicsSheetManager::GetInstance().gfx_sheets()));
 

src/app/editor/overworld/overworld_editor.cc

@@ -7,6 +7,7 @@
 
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
+#include "app/core/features.h"
 #include "app/core/platform/clipboard.h"
 #include "app/core/platform/renderer.h"
 #include "app/editor/graphics/palette_editor.h"
@@ -27,7 +28,6 @@
 #include "util/log.h"
 #include "util/macro.h"
 
-
 namespace yaze {
 namespace editor {
 
@@ -623,7 +623,7 @@ void OverworldEditor::CheckForMousePan() {
 
 void OverworldEditor::DrawOverworldCanvas() {
   if (all_gfx_loaded_) {
-    if (core::ExperimentFlags::get().overworld.kLoadCustomOverworld) {
+    if (core::FeatureFlags::get().overworld.kLoadCustomOverworld) {
       DrawCustomOverworldMapSettings();
     } else {
       DrawOverworldMapSettings();
@@ -967,7 +967,7 @@ void OverworldEditor::DrawOverworldSprites() {
           current_sprite_ = sprite;
         }
       }
-      if (core::ExperimentFlags::get().overworld.kDrawOverworldSprites) {
+      if (core::FeatureFlags::get().overworld.kDrawOverworldSprites) {
         if (sprite_previews_[sprite.id()].is_active()) {
           ow_map_canvas_.DrawBitmap(sprite_previews_[sprite.id()], map_x, map_y,
                                     2.0f);
@@ -999,22 +999,22 @@ void OverworldEditor::DrawOverworldSprites() {
 }
 
 absl::Status OverworldEditor::Save() {
-  if (core::ExperimentFlags::get().overworld.kSaveOverworldMaps) {
+  if (core::FeatureFlags::get().overworld.kSaveOverworldMaps) {
     RETURN_IF_ERROR(overworld_.CreateTile32Tilemap());
     RETURN_IF_ERROR(overworld_.SaveMap32Tiles());
     RETURN_IF_ERROR(overworld_.SaveMap16Tiles());
     RETURN_IF_ERROR(overworld_.SaveOverworldMaps());
   }
-  if (core::ExperimentFlags::get().overworld.kSaveOverworldEntrances) {
+  if (core::FeatureFlags::get().overworld.kSaveOverworldEntrances) {
     RETURN_IF_ERROR(overworld_.SaveEntrances());
   }
-  if (core::ExperimentFlags::get().overworld.kSaveOverworldExits) {
+  if (core::FeatureFlags::get().overworld.kSaveOverworldExits) {
     RETURN_IF_ERROR(overworld_.SaveExits());
   }
-  if (core::ExperimentFlags::get().overworld.kSaveOverworldItems) {
+  if (core::FeatureFlags::get().overworld.kSaveOverworldItems) {
     RETURN_IF_ERROR(overworld_.SaveItems());
   }
-  if (core::ExperimentFlags::get().overworld.kSaveOverworldProperties) {
+  if (core::FeatureFlags::get().overworld.kSaveOverworldProperties) {
     RETURN_IF_ERROR(overworld_.SaveMapProperties());
   }
   return absl::OkStatus();
@@ -1078,7 +1078,7 @@ absl::Status OverworldEditor::LoadGraphics() {
     }
   }
 
-  if (core::ExperimentFlags::get().overworld.kDrawOverworldSprites) {
+  if (core::FeatureFlags::get().overworld.kDrawOverworldSprites) {
     RETURN_IF_ERROR(LoadSpriteGraphics());
   }
 

src/app/editor/system/flags.h

@@ -1,13 +1,14 @@
 #ifndef YAZE_APP_EDITOR_UTILS_FLAGS_H
 #define YAZE_APP_EDITOR_UTILS_FLAGS_H
 
+#include "app/core/features.h"
 #include "core/common.h"
 #include "imgui/imgui.h"
 
 namespace yaze {
 namespace editor {
 
-using core::ExperimentFlags;
+using core::FeatureFlags;
 using ImGui::BeginMenu;
 using ImGui::Checkbox;
 using ImGui::EndMenu;
@@ -17,40 +18,39 @@ using ImGui::Separator;
 struct FlagsMenu {
   void DrawOverworldFlags() {
     Checkbox("Enable Overworld Sprites",
-      &ExperimentFlags::get().overworld.kDrawOverworldSprites);
+             &FeatureFlags::get().overworld.kDrawOverworldSprites);
     Separator();
     Checkbox("Save Overworld Maps",
-      &ExperimentFlags::get().overworld.kSaveOverworldMaps);
+             &FeatureFlags::get().overworld.kSaveOverworldMaps);
     Checkbox("Save Overworld Entrances",
-      &ExperimentFlags::get().overworld.kSaveOverworldEntrances);
+             &FeatureFlags::get().overworld.kSaveOverworldEntrances);
     Checkbox("Save Overworld Exits",
-      &ExperimentFlags::get().overworld.kSaveOverworldExits);
+             &FeatureFlags::get().overworld.kSaveOverworldExits);
     Checkbox("Save Overworld Items",
-      &ExperimentFlags::get().overworld.kSaveOverworldItems);
+             &FeatureFlags::get().overworld.kSaveOverworldItems);
     Checkbox("Save Overworld Properties",
-      &ExperimentFlags::get().overworld.kSaveOverworldProperties);
+             &FeatureFlags::get().overworld.kSaveOverworldProperties);
     Checkbox("Load Custom Overworld",
-      &ExperimentFlags::get().overworld.kLoadCustomOverworld);
+             &FeatureFlags::get().overworld.kLoadCustomOverworld);
   }
 
-	void DrawDungeonFlags() {
+  void DrawDungeonFlags() {
     Checkbox("Draw Dungeon Room Graphics",
-      &ExperimentFlags::get().kDrawDungeonRoomGraphics);
+             &FeatureFlags::get().kDrawDungeonRoomGraphics);
     Separator();
-    Checkbox("Save Dungeon Maps", &ExperimentFlags::get().kSaveDungeonMaps);
-	}
+    Checkbox("Save Dungeon Maps", &FeatureFlags::get().kSaveDungeonMaps);
+  }
 
   void DrawResourceFlags() {
-    Checkbox("Save All Palettes", &ExperimentFlags::get().kSaveAllPalettes);
-    Checkbox("Save Gfx Groups", &ExperimentFlags::get().kSaveGfxGroups);
-    Checkbox("Save Graphics Sheets",
-      &ExperimentFlags::get().kSaveGraphicsSheet);
+    Checkbox("Save All Palettes", &FeatureFlags::get().kSaveAllPalettes);
+    Checkbox("Save Gfx Groups", &FeatureFlags::get().kSaveGfxGroups);
+    Checkbox("Save Graphics Sheets", &FeatureFlags::get().kSaveGraphicsSheet);
   }
 
   void DrawSystemFlags() {
-    Checkbox("Enable Console Logging", &ExperimentFlags::get().kLogToConsole);
+    Checkbox("Enable Console Logging", &FeatureFlags::get().kLogToConsole);
     Checkbox("Log Instructions to Emulator Debugger",
-             &ExperimentFlags::get().kLogInstructions);
+             &FeatureFlags::get().kLogInstructions);
   }
 };