No UI #1

Author: ReimousTH

MarathonRecomp/api/Marathon.h

@@ -159,8 +159,6 @@
 #include "Sonicteam/StageSelectMode.h"
 #include "Sonicteam/StdImageFilters/BurnoutBlurFilter.h"
 #include "Sonicteam/StdImageFilters/SingleTechniqueFilter.h"
-#include "Sonicteam/StageMap.h"
-#include "Sonicteam/StageSelectMode.h"
 #include "Sonicteam/System/CreateStatic.h"
 #include "Sonicteam/System/Diagnostics/Performance.h"
 #include "Sonicteam/System/Singleton.h"

MarathonRecomp/api/Sonicteam/StageMap.h

@@ -3,30 +3,7 @@
 #include <Marathon.inl>
 #include <Sonicteam/SoX/Component.h>
 #include <stdx/string.h>
-
-namespace stdx
-{
-    //Gauge PR :|
-    template <typename Type>
-    struct vector
-    {
-        be<uint32_t> _MyProxy;
-        xpointer<Type> _MyFirst;
-        xpointer<Type> _MyLast;
-        xpointer<Type> _MyEnd;
-        
-        Type& operator[](size_t pos)
-        {
-            return _MyFirst.get()[pos];
-        }
-
-        size_t size()
-        {
-            return _MyLast.get() - _MyFirst.get();
-        }
-
-    };
-}
+#include <stdx/vector.h>
 
 namespace Sonicteam
 {

MarathonRecomp/api/Sonicteam/StageSelectMode.h

@@ -12,8 +12,8 @@ namespace Sonicteam
         xpointer<Sonicteam::StageMap> m_StageMap;
         xpointer<Sonicteam::StageMap> m_CurrentStageMap;
         MARATHON_INSERT_PADDING(4);
-        be< uint32_t> m_CurrentStageMapIndex;
-        be< uint32_t> m_Deep;
+        be<uint32_t> m_CurrentStageMapIndex;
+        be<uint32_t> m_Deep;
         MARATHON_INSERT_PADDING(0x1C);
         xpointer<xpointer<const char>> m_StageMapInfo;
         xpointer<uint32_t> m_StageMapType;

MarathonRecomp/ui/devtitle_menu.cpp

@@ -46,11 +46,16 @@ static void DrawBackgroundDev()
 {
     auto& res = ImGui::GetIO().DisplaySize;
     auto drawList = ImGui::GetBackgroundDrawList();
-
-    const uint32_t TOP = IM_COL32(0, 103, 255, 255);
-    const uint32_t BOTTOM = IM_COL32(0, 40, 100, 255);
-
-    drawList->AddRectFilledMultiColor({ 0.0, 0.0 }, res, TOP, TOP, BOTTOM, BOTTOM);
+    if (Config::DevTitle == EDevTitleMenu::Custom)
+    {
+        const uint32_t TOP = IM_COL32(0, 103, 255, 255);
+        const uint32_t BOTTOM = IM_COL32(0, 40, 100, 255);
+        drawList->AddRectFilledMultiColor({ 0.0, 0.0 }, res, TOP, TOP, BOTTOM, BOTTOM);
+    }
+    else
+    {
+        drawList->AddRectFilledMultiColor({ 0.0, 0.0 }, res, 0, 0, 0, 0);
+    }
 }
 
 static void DrawTextDev(const char* text,float posX, float posY,float vfontSize= 24, uint32_t alpha = 255, uint32_t center = CenterFlag::X)
@@ -84,9 +89,9 @@ static void DrawTextDev(const char* text,float posX, float posY,float vfontSize=
 }
 
 //05.08.2025 TODO Kanju Display
+//31.08.2025 CLANG Version
 static std::string ConvertShiftJISToUTF8(const std::string& sjisStr)
 {
-
     int wlen = MultiByteToWideChar(932, 0, sjisStr.c_str(), -1, nullptr, 0);
     std::wstring wstr(wlen, 0);
     MultiByteToWideChar(932, 0, sjisStr.c_str(), -1, &wstr[0], wlen);
@@ -128,7 +133,13 @@ static bool Sonic06Button(ImVec2 pos, const char* label, bool& hovered, const Im
     bool pressed = hovered && ImGui::IsMouseClicked(ImGuiMouseButton_Left);
 
     // Colors
-    const ImU32 col_base IM_COL32(0, 6, 142, 255), col_hover IM_COL32(0, 26, 162, 255);
+    ImU32 col_base = 0;
+    ImU32 col_hover = 0;
+    if (Config::DevTitle == EDevTitleMenu::Custom)
+    {
+        col_base = IM_COL32(0, 6, 142, 255);
+        col_hover =  IM_COL32(0, 26, 162, 255);
+    }
 
     const ImU32 bg[4] =
     {
@@ -174,21 +185,28 @@ static void DrawStageMapSelector()
         return;
 
     DrawBackgroundDev();
-    DrawHUD({ 0, 0 }, res, g_mnewRodinFont, pMode->m_StageMapName.get());
 
-    const float WINDOW_WIDTH = 0.8f * res.x;
-    const float BUTTON_HEIGHT = 0.05f * res.y;
-    const float BUTTON_SPACING = 5.0f;
-    const int VISIBLE_ITEMS = 9;
-    const float ITEMS_SCALE_HEIGHT = 0.05f * Video::s_viewportHeight;
-    const float WINDOW_HEIGHT = (BUTTON_HEIGHT + BUTTON_SPACING) * VISIBLE_ITEMS + ITEMS_SCALE_HEIGHT;
+    if (Config::DevTitle == EDevTitleMenu::Custom) DrawHUD({ 0, 0 }, res, g_mnewRodinFont, pMode->m_StageMapName.get());
+
+   float WINDOW_WIDTH = 0.8f * res.x;
+   float BUTTON_HEIGHT = 0.05f * res.y;
+   float BUTTON_SPACING = 5.0f;
+   int VISIBLE_ITEMS = 9;
+   float ITEMS_SCALE_HEIGHT = 0.05f * Video::s_viewportHeight;
+   float WINDOW_HEIGHT = (BUTTON_HEIGHT + BUTTON_SPACING) * VISIBLE_ITEMS + ITEMS_SCALE_HEIGHT;
 
-    // Calculate base position for the selector
-    const ImVec2 base_pos = {
+   ImVec2 base_pos = {
         (res.x - WINDOW_WIDTH) * 0.15f,
         (res.y - WINDOW_HEIGHT) * 0.45f
-    };
-
+   };
+
+   if (Config::DevTitle == EDevTitleMenu::True)
+   {
+       VISIBLE_ITEMS = 18;
+       base_pos.x = 0;
+       base_pos.y = 0;
+   }
+ 
     auto& items = pMode->m_CurrentStageMap->m_vpStageMap;
     const int itemCount = static_cast<int>(items.size());
     int currentIdx = pMode->m_CurrentStageMapIndex.get();
@@ -224,8 +242,17 @@ static void DrawStageMapSelector()
             base_pos.x + 10,
             base_pos.y + 40 + visible_index * (BUTTON_HEIGHT + BUTTON_SPACING)
         };
+        std::string item_name = item->m_Name.c_str();
+        if (item->m_vpStageMap.size() > 1)
+        {
+            item_name = "[" + item_name + "]"; //mark as group
+        }
+        if (isSelected)
+        {
+            item_name = ">> " + item_name;
+        }
 
-        if (Sonic06Button(button_pos, item->m_Name.c_str(),hovered,
+        if (Sonic06Button(button_pos, item_name.c_str(), hovered,
             ImVec2(WINDOW_WIDTH - 20, BUTTON_HEIGHT), isSelected,CenterFlag::Y))
         {
             currentIdx = i;
@@ -235,7 +262,7 @@ static void DrawStageMapSelector()
         }
 
         // Tooltip with stage information
-        if (hovered && item->m_vpStageMap.size() > 0) {
+        if (hovered && item->m_vpStageMap.size() > 0 && Config::DevTitle == EDevTitleMenu::Custom) {
             ImDrawList* draw_list = ImGui::GetForegroundDrawList();
             const ImVec2 mouse_pos = GetMousePos();
             const float font_size = ImGui::GetFontSize();
@@ -316,10 +343,12 @@ static void DrawStageMapSelector()
                 current_y += line_height + line_spacing;
             }
         }
-     
-     
+
+      
     }
 
+    //Do not draw mouse, if not custom
+    if (Config::DevTitle != EDevTitleMenu::Custom) return;
     // Draw mouse position indicator
     const float dot_radius = 7.5f;
     const ImU32 dot_color = IM_COL32(0, 150, 255, 220);
@@ -506,7 +535,7 @@ void DevTitleMenu::Draw()
     if (!App::s_pApp->m_pDoc->m_pDocMode)
         return;
 
-    if (!EmbeddedPlayer::s_isActive)
+    if (!EmbeddedPlayer::s_isActive && Config::DevTitle == EDevTitleMenu::Custom)
         EmbeddedPlayer::Init();
 
     auto vft = App::s_pApp->m_pDoc->GetDocMode<Sonicteam::SoX::Engine::Task::Object>()->m_pVftable.ptr.get();

MarathonRecomp/user/config.cpp

@@ -373,6 +373,13 @@ CONFIG_DEFINE_ENUM_TEMPLATE(EUIAlignmentMode)
     { "Center",  EUIAlignmentMode::Centre }
 };
 
+CONFIG_DEFINE_ENUM_TEMPLATE(EDevTitleMenu)
+{
+    { "false", EDevTitleMenu::False },
+    { "true",  EDevTitleMenu::True },
+    { "custom",  EDevTitleMenu::Custom }
+};
+
 #undef  CONFIG_DEFINE
 #define CONFIG_DEFINE(section, type, name, defaultValue) \
     ConfigDef<type> Config::name{section, #name, defaultValue};
@@ -381,6 +388,10 @@ CONFIG_DEFINE_ENUM_TEMPLATE(EUIAlignmentMode)
 #define CONFIG_DEFINE_HIDDEN(section, type, name, defaultValue) \
     ConfigDef<type, true> Config::name{section, #name, defaultValue};
 
+#undef  CONFIG_DEFINE_ENUM_HIDDEN
+#define CONFIG_DEFINE_ENUM_HIDDEN(section, type, name, defaultValue) \
+    ConfigDef<type,true> Config::name{section, #name, defaultValue, &g_##type##_template};
+
 #undef  CONFIG_DEFINE_LOCALISED
 #define CONFIG_DEFINE_LOCALISED(section, type, name, defaultValue) \
     extern CONFIG_LOCALE g_##name##_locale; \

MarathonRecomp/user/config.h

@@ -150,6 +150,17 @@ enum class EPlayerCharacter : uint32_t
     Rouge,
     Knuckles
 };
+enum class EDevTitleMenu : uint32_t
+{
+    False,
+    True,
+    Custom
+};
+
+inline uint32_t operator!(EDevTitleMenu value)
+{
+    return (uint32_t)value == 0;
+}
 
 template<typename T, bool isHidden = false>
 class ConfigDef final : public IConfigDef
@@ -219,6 +230,7 @@ class ConfigDef final : public IConfigDef
 #define CONFIG_DEFINE_HIDDEN(section, type, name, defaultValue)                 CONFIG_DECLARE_HIDDEN(type, name)
 #define CONFIG_DEFINE_LOCALISED(section, type, name, defaultValue)              CONFIG_DECLARE(type, name)
 #define CONFIG_DEFINE_ENUM(section, type, name, defaultValue)                   CONFIG_DECLARE(type, name)
+#define CONFIG_DEFINE_ENUM_HIDDEN(section, type, name, defaultValue)            CONFIG_DECLARE_HIDDEN(type, name)
 #define CONFIG_DEFINE_ENUM_LOCALISED(section, type, name, defaultValue)         CONFIG_DECLARE(type, name)
 
 class Config

MarathonRecomp/user/config_def.h

@@ -91,7 +91,7 @@ CONFIG_DEFINE_HIDDEN("Codes", bool, DisableEdgeGrabLeftover, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, TailsGauge, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, EnableDebugMode, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, RestoreDemoCameraMode, false);
-CONFIG_DEFINE_HIDDEN("Codes", bool, DevTitle, false);
+CONFIG_DEFINE_ENUM_HIDDEN("Codes", EDevTitleMenu, DevTitle, EDevTitleMenu::False);
 CONFIG_DEFINE_HIDDEN("Codes", bool, MidairControlForMachSpeed, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, MidairControlForSnowboards, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, ControllableTeleportDash, false);