feat(console): implement RegisterGxCVars

src/console/CVar.cpp

@@ -17,7 +17,7 @@ CVar* CVar::Lookup(const char* name) {
         : nullptr;
 }
 
-CVar* CVar::Register(const char* name, const char* help, uint32_t flags, const char* value, bool (*fcn)(CVar*, const char*, const char*, void*), uint32_t category, bool a7, void* arg, bool a9) {
+CVar* CVar::Register(const char* name, const char* help, uint32_t flags, const char* value, bool (*fcn)(CVar*, const char*, const char*, void*), uint32_t category, bool setCommand, void* arg, bool a9) {
     CVar* var = CVar::s_registeredCVars.Ptr(name);
 
     if (var) {
@@ -36,7 +36,7 @@ CVar* CVar::Register(const char* name, const char* help, uint32_t flags, const c
 
         var->Set(value, setValue, setReset, setDefault, false);
 
-        if (!a7) {
+        if (!setCommand) {
             var->m_flags |= 0x80000000;
         }
 
@@ -59,7 +59,7 @@ CVar* CVar::Register(const char* name, const char* help, uint32_t flags, const c
         var->m_arg = arg;
         var->m_help.Copy(help);
 
-        if (a7) {
+        if (setCommand) {
             var->Set(value, true, true, false, false);
         } else {
             var->Set(value, true, false, true, false);
@@ -67,7 +67,7 @@ CVar* CVar::Register(const char* name, const char* help, uint32_t flags, const c
 
         var->m_flags = flags | 0x1;
 
-        if (!a7) {
+        if (!setCommand) {
             var->m_flags |= 0x8000000;
         }
 

src/console/CVar.hpp

@@ -6,6 +6,8 @@
 #include <storm/Hash.hpp>
 #include <bc/os/File.hpp>
 
+#include "console/Types.hpp"
+
 class CVar : public TSHashObject<CVar, HASHKEY_STRI> {
     public:
         // Static variables
@@ -14,7 +16,17 @@ class CVar : public TSHashObject<CVar, HASHKEY_STRI> {
 
         // Static functions
         static CVar* Lookup(const char* name);
-        static CVar* Register(const char*, const char*, uint32_t, const char*, bool (*)(CVar*, const char*, const char*, void*), uint32_t, bool, void*, bool);
+        static CVar* Register(
+            const char* name,
+            const char* help,
+            uint32_t flags,
+            const char* value,
+            bool (*fcn)(CVar*, const char*, const char*, void*) = nullptr,
+            uint32_t category = CATEGORY::DEFAULT,
+            bool setCommand = false,
+            void* arg = nullptr,
+            bool a9 = false
+        );
         static void  Initialize(const char* filename);
         static int32_t Load(const char* filename);
         static int32_t Load(HOSFILE fileHandle);

src/console/Device.cpp

@@ -8,6 +8,24 @@
 #include <cstring>
 #include <cstdio>
 
+
+CVar* s_cvGxFixedFunction;
+CVar* s_cvGxWindowResizeLock;
+CVar* s_cvGxVideoOptionsVersion;
+CVar* s_cvGxMaxFPSBk;
+CVar* s_cvGxMaxFPS;
+CVar* s_cvGxOverride;
+CVar* s_cvGxStereoEnabled;
+CVar* s_cvGxFixLag;
+CVar* s_cvGxMultisampleQuality;
+CVar* s_cvGxMultisample;
+CVar* s_cvGxCursor;
+CVar* s_cvGxAspect;
+CVar* s_cvGxVSync;
+CVar* s_cvGxTripleBuffer;
+CVar* s_cvGxRefresh;
+CVar* s_cvGxDepthBits;
+CVar* s_cvGxColorBits;
 CVar* s_cvGxMaximize;
 CVar* s_cvGxResolution;
 CVar* s_cvGxWidescreen;
@@ -44,6 +62,86 @@ EGxApi g_gxApiSupported[] = {
 
 size_t g_numGxApiSupported = sizeof(g_gxApiSupported) / sizeof(EGxApi);
 
+
+bool CVGxWindowResizeLockCallback(CVar*, const char*, const char*, void*) {
+    // TODO
+    return true;
+}
+
+bool GxVideoOptionsVersionCallback(CVar*, const char*, const char*, void*) {
+    return true;
+}
+
+bool CVGxMaxFPSBkCallback(CVar*, const char*, const char*, void*) {
+    // TODO
+    return true;
+}
+
+bool CVGxMaxFPSCallback(CVar*, const char*, const char*, void*) {
+    // TODO
+    return true;
+}
+
+bool CVGxOverrideCallback(CVar*, const char*, const char*, void*) {
+    // TODO
+    return true;
+}
+
+bool CVGxStereoEnabledCallback(CVar*, const char*, const char*, void*) {
+    // TODO
+    return true;
+}
+
+bool CVGxFixLagCallback(CVar*, const char*, const char*, void*) {
+    // TODO
+    return true;
+}
+
+bool CVGxMultisampleQualityCallback(CVar*, const char*, const char*, void*) {
+    // TODO
+    return true;
+}
+
+bool CVGxMultisampleCallback(CVar*, const char*, const char*, void*) {
+    // TODO
+    return true;
+}
+
+bool CVGxCursorCallback(CVar*, const char*, const char*, void*) {
+    // TODO
+    return true;
+}
+
+bool CVGxAspectCallback(CVar*, const char*, const char*, void*) {
+    // TODO
+    return true;
+}
+
+bool CVGxVSyncCallback(CVar*, const char*, const char*, void*) {
+    // TODO
+    return true;
+}
+
+bool CVGxTripleBufferCallback(CVar*, const char*, const char*, void*) {
+    // TODO
+    return true;
+}
+
+bool CVGxRefreshCallback(CVar*, const char*, const char*, void*) {
+    // TODO
+    return true;
+}
+
+bool CVGxDepthBitsCallback(CVar*, const char*, const char*, void*) {
+    // TODO
+    return true;
+}
+
+bool CVGxColorBitsCallback(CVar*, const char*, const char*, void*) {
+    // TODO
+    return true;
+}
+
 bool CVGxMaximizeCallback(CVar*, const char*, const char*, void*) {
     // TODO
     return true;
@@ -107,92 +205,52 @@ EGxApi GxApiDefault() {
 }
 
 void RegisterGxCVars() {
-    auto& format = s_defaults.format;
+    const auto& format = s_defaults.format;
 
-    // TODO CURRENT_LANGUAGE check?
+    // TODO: bool isChinese = s_currentLocaleIndex == 4 (zhCN)
-    auto v1 = true;
+    bool isChinese = false;
 
-    s_cvGxWidescreen = CVar::Register(
+    const uint32_t graphics = CATEGORY::GRAPHICS;
-        "widescreen",
-        "Allow widescreen support",
-        0x0,
-        "1",
-        nullptr,
-        1,
-        false,
-        nullptr,
-        false
-    );
 
-    s_cvGxWindow = CVar::Register(
+    s_cvGxWidescreen = CVar::Register("widescreen", "Allow widescreen support", 0x0, "1", nullptr, graphics);
-        "gxWindow",
+    s_cvGxWindow = CVar::Register("gxWindow", "toggle fullscreen/window", 0x1 | 0x2, isChinese ? "1" : "0", &CVGxWindowCallback, graphics);
-        "toggle fullscreen/window",
+    s_cvGxMaximize = CVar::Register("gxMaximize", "maximize game window", 0x1 | 0x2, isChinese ? "1" : "0", &CVGxMaximizeCallback, graphics);
-        0x1 | 0x2,
-        v1 ? "1" : "0",
-        &CVGxWindowCallback,
-        1,
-        0,
-        0,
-        0
-    );
 
-    s_cvGxMaximize = CVar::Register(
+    char value[260] = {};
-        "gxMaximize",
+    SStrPrintf(value, sizeof(value), "%s", CGxFormat::formatToColorBitsString[format.colorFormat]);
-        "maximize game window",
+    s_cvGxColorBits = CVar::Register("gxColorBits", "color bits", 0x1 | 0x2, value, &CVGxColorBitsCallback, graphics);
-        0x1 | 0x2,
-        v1 ? "1" : "0",
-        &CVGxMaximizeCallback,
-        1,
-        0,
-        0,
-        0
-    );
 
-    // TODO s_cvGxColorBits
+    SStrPrintf(value, sizeof(value), "%s", CGxFormat::formatToColorBitsString[format.depthFormat]);
-    // TODO s_cvGxDepthBits
+    s_cvGxDepthBits = CVar::Register("gxDepthBits", "depth bits", 0x1 | 0x2, value, &CVGxDepthBitsCallback, graphics);
 
-    char resolution[260];
+    SStrPrintf(value, 260, "%dx%d", format.size.x, format.size.y);
-    SStrPrintf(resolution, 260, "%dx%d", format.size.x, format.size.y);
+    s_cvGxResolution = CVar::Register("gxResolution", "resolution", 0x1 | 0x2, value, &CVGxResolutionCallback, graphics);
-    s_cvGxResolution = CVar::Register(
-        "gxResolution",
-        "resolution",
-        0x1 | 0x2,
-        resolution,
-        &CVGxResolutionCallback,
-        1,
-        false,
-        nullptr,
-        false
-    );
 
-    // TODO s_cvGxRefresh
+    s_cvGxRefresh = CVar::Register("gxRefresh", "refresh rate", 0x1 | 0x2, "75", &CVGxRefreshCallback, graphics);
-    // TODO s_cvGxTripleBuffer
+    s_cvGxTripleBuffer = CVar::Register("gxTripleBuffer", "triple buffer", 0x1 | 0x2, "0", &CVGxTripleBufferCallback, graphics);
-    // TODO s_cvGxApi
+    s_cvGxApi = CVar::Register("gxApi", "graphics api", 0x1 | 0x2, g_gxApiNames[GxApiDefault()], &CVGxApiCallback, graphics);
 
-    s_cvGxApi = CVar::Register(
+    s_cvGxVSync = CVar::Register("gxVSync", "vsync on or off", 0x1 | 0x2, "1", &CVGxVSyncCallback, graphics);
-        "gxApi",
+    s_cvGxAspect = CVar::Register("gxAspect", "constrain window aspect", 0x1 | 0x2, "1", &CVGxAspectCallback, graphics);
-        "graphics api",
-        0x1 | 0x2,
-        g_gxApiNames[GxApiDefault()],
-        CVGxApiCallback,
-        1,
-        false,
-        nullptr,
-        false
-    );
 
-    // TODO s_cvGxVSync
+    s_cvGxCursor = CVar::Register("gxCursor", "toggle hardware cursor", 0x1 | 0x2, "1", &CVGxCursorCallback, graphics);
-    // TODO s_cvGxAspect
+
-    // TODO s_cvGxCursor
+    // TODO: v10 = *(_DWORD*)(dword_CABB60 + 84);
-    // TODO s_cvGxMultisample
+    int v10 = 0;
-    // TODO s_cvGxFixLag
+    SStrPrintf(value, sizeof(value), "%d", v10);
-    // TODO s_cvGxStereoEnabled
+    s_cvGxMultisample = CVar::Register("gxMultisample", "multisample", 0x1 | 0x2, value, &CVGxMultisampleCallback, graphics);
-    // TODO s_cvGxOverride
+    s_cvGxMultisampleQuality = CVar::Register("gxMultisampleQuality", "multisample quality", 0x1 | 0x2, "0.0", &CVGxMultisampleQualityCallback, graphics);
-    // TODO s_cvGxAspect
+
-    // TODO s_cvGxMaxFPS
+    // TODO: v10 = *(_DWORD*)(dword_CABB60 + 80);
-    // TODO s_cvGxMaxFPSBk
+    SStrPrintf(value, sizeof(value), "%d", v10);
-    // TODO s_cvWindowResizeLock
+    s_cvGxFixLag = CVar::Register("gxFixLag", "prevent cursor lag", 0x1 | 0x2, value, &CVGxFixLagCallback, graphics);
-    // TODO s_cvFixedFunction
+    s_cvGxStereoEnabled = CVar::Register("gxStereoEnabled", "Enable stereoscopic rendering", 0x1, "0", &CVGxStereoEnabledCallback, graphics);
+    s_cvGxOverride = CVar::Register("gxOverride", "gx overrides", 0x1, "", &CVGxOverrideCallback, graphics);
+    s_cvGxMaxFPS = CVar::Register("maxFPS", "Set FPS limit", 0x1, "200", &CVGxMaxFPSCallback, graphics);
+    s_cvGxMaxFPSBk = CVar::Register("maxFPSBk", "Set background FPS limit", 0x1, "30", &CVGxMaxFPSBkCallback, graphics);
+    s_cvGxVideoOptionsVersion = CVar::Register("videoOptionsVersion", "Video options version", 0x1 | 0x2, "0", &GxVideoOptionsVersionCallback, graphics);
+    s_cvGxWindowResizeLock = CVar::Register("windowResizeLock", "prevent resizing in windowed mode", 1, "0", &CVGxWindowResizeLockCallback, graphics);
+    s_cvGxFixedFunction = CVar::Register("fixedFunction", "Force fixed function rendering", 0x1 | 0x2, "0", 0, graphics);
 }
 
 void UpdateGxCVars() {

src/gx/CGxFormat.cpp

@@ -0,0 +1,3 @@
+#include "gx/CGxFormat.hpp"
+
+const char* CGxFormat::formatToColorBitsString[Formats_Last] = { "16", "24", "24", "30", "16", "24", "24", "32" };

src/gx/CGxFormat.hpp

@@ -19,6 +19,8 @@ class CGxFormat {
             Formats_Last = 8
         };
 
+        static const char* formatToColorBitsString[Formats_Last];
+
         // Member variables
         bool hwTnL;
         bool hwCursor;