more docimentation, add offsets back to console for now, more constexpr

rethesda · Jun 16, 2024 · 607590b · 607590b
1 parent c0b258c
commit 607590b
Show file tree

Hide file tree

Showing 7 changed files with 348 additions and 79 deletions.
diff --git a/betterapi.h b/betterapi.h
diff --git a/src/console.cpp b/src/console.cpp
@@ -324,12 +324,15 @@ extern void setup_console(const BetterAPI* api) {
 }
 
 
-extern const struct console_api_t* GetConsoleAPI() {
-        static const struct console_api_t Console {
-                [](char* command) noexcept -> void {
-                        console_run(NULL, command);
-                }
-        };
+static void run_comand(char* command) {
+        console_run(NULL, command);
+}
+
+
+static constexpr struct console_api_t Console {
+        run_comand
+};
 
+extern constexpr const struct console_api_t* GetConsoleAPI() {
         return &Console;
 }
diff --git a/src/console.h b/src/console.h
@@ -7,4 +7,4 @@
 extern void setup_console(const BetterAPI* api);
 
 // but I still need to send out the console api to other components
-extern const struct console_api_t* GetConsoleAPI();
+extern constexpr const struct console_api_t* GetConsoleAPI();
diff --git a/src/main.cpp b/src/main.cpp
@@ -11,6 +11,7 @@
 #include "broadcast_api.h"
 #include "std_api.h"
 #include "hotkeys.h"
+#include "std_api.h"
 
 #include "d3d11on12ui.h"
 
@@ -73,16 +74,6 @@ extern char* GetPathInDllDir(char* path_max_buffer, const char* filename) {
 }
 
 
-const char* const filename_only(const char* path) {
-        const char* p = path;
-        while (*path) {
-                if (*path == '\\') p = path;
-                ++path;
-        }
-        return ++p;
-}
-
-
 #ifdef MODMENU_DEBUG
 #include <mutex>
 std::mutex logging_mutex;
@@ -106,7 +97,7 @@ static void write_log(const char* const str) noexcept {
         logging_mutex.unlock();
 }
 extern void DebugImpl(const char* const filename, const char* const func, int line, const char* const fmt, ...) noexcept {
-        auto bytes = snprintf(format_buffer, buffer_size, "%s:%s:%d>", filename_only(filename), func, line);
+        auto bytes = snprintf(format_buffer, buffer_size, "%s:%s:%d>", filename, func, line);
         ASSERT(bytes > 0);
         ASSERT(bytes < buffer_size);
 
@@ -132,7 +123,7 @@ extern void AssertImpl [[noreturn]] (const char* const filename, const char* con
                 "In function '%s'\n"
                 "On line     '%d'\n"
                 "Message:    '%s'",
-                filename_only(filename),
+                filename,
                 func,
                 line,
                 text
@@ -146,7 +137,7 @@ extern void AssertImpl [[noreturn]] (const char* const filename, const char* con
 extern void TraceImpl(const char* const filename, const char* const func, int line, const char* const fmt, ...) noexcept {
         static bool init = false;
         static char tracebuff[2048];
-        const auto bytes = snprintf(tracebuff, sizeof(tracebuff), "%s:%s:%d> ", filename_only(filename), func, line);
+        const auto bytes = snprintf(tracebuff, sizeof(tracebuff), "%s:%s:%d> ", filename, func, line);
         ASSERT(bytes > 0 && "trace buffer too small ?");
         va_list args;
         va_start(args, fmt);

diff --git a/src/main.h b/src/main.h
@@ -12,12 +12,29 @@
 #endif // !MODMENU_DEBUG
 
 #ifdef MODMENU_DEBUG
+
+constexpr const char* next_slash(const char* const path) {
+        return (!path)
+                ? nullptr
+                : (*path == '/' || *path == '\\')
+                ? path
+                : (*path == 0)
+                ? nullptr
+                : next_slash(path + 1);
+}
+
+constexpr const char* filename_only(const char* const path) {
+        return (next_slash(path))
+                ? filename_only(next_slash(path + 1))
+                : path;
+}
+
 extern void DebugImpl(const char* const filename, const char* const func, int line, const char* const fmt, ...) noexcept;
 extern void AssertImpl(const char* const filename, const char* const func, int line, const char* const text) noexcept;
 extern void TraceImpl(const char* const filename, const char* const func, int line, const char* const fmt, ...) noexcept;
-#define DEBUG(...) do { DebugImpl(__FILE__, __func__, __LINE__, " " __VA_ARGS__); } while(0)
-#define ASSERT(CONDITION) do { if (!(CONDITION)) { AssertImpl(__FILE__, __func__, __LINE__, " " #CONDITION); } } while(0)
-#define TRACE(...) do { TraceImpl(__FILE__, __func__, __LINE__, " " __VA_ARGS__); } while(0)
+#define DEBUG(...) do { DebugImpl(filename_only(__FILE__), __func__, __LINE__, " " __VA_ARGS__); } while(0)
+#define ASSERT(CONDITION) do { if (!(CONDITION)) { AssertImpl(filename_only(__FILE__), __func__, __LINE__, " " #CONDITION); } } while(0)
+#define TRACE(...) do { TraceImpl(filename_only(__FILE__), __func__, __LINE__, " " __VA_ARGS__); } while(0)
 #define IMGUI_DEBUG_PARANOID
 #else
 #define DEBUG(...) do { } while(0)

diff --git a/src/std_api.cpp b/src/std_api.cpp
@@ -3,13 +3,14 @@
 #include <stdio.h>
 
 
-extern const struct std_api_t* GetStdAPI() {
-        static const struct std_api_t api {
-                &malloc,
-                &free,
-                &snprintf,
-                &memcpy,
-                &memset
-        };
+static constexpr struct std_api_t api {
+        &malloc,
+        &free,
+        &snprintf,
+        &memcpy,
+        &memset
+};
+
+extern constexpr const struct std_api_t* GetStdAPI() {
         return &api;
 }
diff --git a/src/std_api.h b/src/std_api.h
@@ -1,4 +1,4 @@
 #pragma once
 
 #include "../betterapi.h"
-extern const struct std_api_t* GetStdAPI();
+extern constexpr const struct std_api_t* GetStdAPI();