Removed unaccessary workarounds to export preprocessor variables.

dodecai · Oct 15, 2023 · e968a5a · e968a5a
1 parent 324750c
commit e968a5a
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 39 deletions.
diff --git a/Source/Library/Ultra/Core/Core.ixx b/Source/Library/Ultra/Core/Core.ixx
@@ -1,8 +1,6 @@
 export module Ultra.Core;
 
 // Custom Library
-export import "Core.h";
-export import "Platform.h";
 export import Ultra.Core.Helpers;
 export import Ultra.Core.Types;
 

diff --git a/Source/Library/Ultra/Core/Logger.h b/Source/Library/Ultra/Core/Logger.h
diff --git a/Source/Library/Ultra/Core/Logger.ixx b/Source/Library/Ultra/Core/Logger.ixx
@@ -1,4 +1,8 @@
-export module Ultra.Logger;
+module;
+
+#include <Ultra/Core/Core.h>
+
+export module Ultra.Logger;
 
 // Library
 import Ultra.Core;
@@ -541,13 +545,15 @@ template<typename ...Args> void LogDelimiter(const LogRecord &record, Args &&...
     template<typename T, typename ...Args> bool AppAssert(T *object, const LogRecord &record, Args &&...args) {
         if (!object) {
             logger(LogLevel::Fatal, record, args...); logger << "\n";
+            //APP_DEBUGBREAK();
             return true;
         }
         return false;
     }
     template<typename T, typename ...Args> bool AppAssert(T object, const LogRecord &record, Args &&...args) {
         if (!object) {
             logger(LogLevel::Fatal, record, args...); logger << "\n";
+            //APP_DEBUGBREAK();
             return true;
         }
         return false;
@@ -609,6 +615,3 @@ struct formatter<Ultra::LogLevel> {
 };
 
 }
-
-// Preprocessor Macro Extensions
-export import "Logger.h";
diff --git a/Source/Library/Ultra/Core/Types.ixx b/Source/Library/Ultra/Core/Types.ixx
@@ -81,11 +81,11 @@ using std::format;
 using std::ofstream;
 using std::ostream;
 using std::ostringstream;
-using std::wostringstream;
 using std::stringstream;
 using std::vformat;
 using std::wofstream;
 using std::wostream;
+using std::wostringstream;
 
 // Types
 using std::int8_t;

diff --git a/Source/Library/Ultra/Graphics/Context.cxx b/Source/Library/Ultra/Graphics/Context.cxx
@@ -1,6 +1,5 @@
 module;
 
-// Hack: The included header unit in the Core module doesn't work here.
 #include "Ultra/Core/Core.h"
 
 module Ultra.Graphics.Context;
@@ -35,7 +34,7 @@ Reference<Context> Context::Create(void *window) {
         }
     }
 #else
-    AppAssert(false, "This platform is currently not supported!");
+    AppAssert(false, "The selected platform is currently not supported!");
     return nullptr;
 #endif
 }

diff --git a/Source/Library/Ultra/Platform/Graphics/Vulkan/VKInstance.cxx b/Source/Library/Ultra/Platform/Graphics/Vulkan/VKInstance.cxx
@@ -1,6 +1,5 @@
 module;
 
-// Hack: The included header unit in the Core module doesn't work here.
 #include "Ultra/Core/Core.h"
 
 #if defined(APP_PLATFORM_WINDOWS)

diff --git a/Source/Library/Ultra/System/Event.cxx b/Source/Library/Ultra/System/Event.cxx
@@ -1,6 +1,5 @@
 module;
 
-// Hack: The included header unit in the Core module doesn't work here.
 #include "Ultra/Core/Core.h"
 
 module Ultra.System.Event;
@@ -14,12 +13,12 @@ import Ultra.Logger;
 namespace Ultra {
 
 Scope<EventListener> EventListener::Create() {
-    #ifdef APP_PLATFORM_WINDOWS
-        return CreateScope<WinEventListener>();
-    #else
-        AppAssert(nullptr, "The current platform isn't supported!");
-        return nullptr;
-    #endif
+#ifdef APP_PLATFORM_WINDOWS
+    return CreateScope<WinEventListener>();
+#else
+    AppAssert(nullptr, "The current platform isn't supported!");
+    return nullptr;
+#endif
 }
 
 }
diff --git a/Source/Library/Ultra/System/Input.cxx b/Source/Library/Ultra/System/Input.cxx
@@ -1,6 +1,5 @@
 module;
 
-// Hack: The included header unit in the Core module doesn't work here.
 #include "Ultra/Core/Core.h"
 
 module Ultra.System.Input;
@@ -17,11 +16,11 @@ namespace Ultra {
 Scope<Input> Input::Instance = Input::Create();
 
 Scope<Input> Input::Create() {
-    #if defined(APP_PLATFORM_WINDOWS)
-        return CreateScope<WinInput>();
-    #else
-        return nullptr;
-    #endif
+#if defined(APP_PLATFORM_WINDOWS)
+    return CreateScope<WinInput>();
+#else
+    return nullptr;
+#endif
 }
 
 bool Input::GetKeyState(KeyCode code) {

diff --git a/Source/Library/Ultra/UI/Dialog.cxx b/Source/Library/Ultra/UI/Dialog.cxx
@@ -1,6 +1,5 @@
 module;
 
-// Hack: The included header unit in the Core module doesn't work here.
 #include "Ultra/Core/Core.h"
 
 module Ultra.UI.Dialog;
@@ -14,12 +13,12 @@ import Ultra.Logger;
 namespace Ultra {
 
 Scope<Dialog> Dialog::Create() {
-    #ifdef APP_PLATFORM_WINDOWS
-        return CreateScope<WinDialog>();
-    #else
-        AppAssert(nullptr, "The current platform isn't supported!");
-        return nullptr;
-    #endif
+#ifdef APP_PLATFORM_WINDOWS
+    return CreateScope<WinDialog>();
+#else
+    AppAssert(nullptr, "The current platform isn't supported!");
+    return nullptr;
+#endif
 }
 
 }
diff --git a/Source/Library/Ultra/UI/ImGui/GUIBuilder.cxx b/Source/Library/Ultra/UI/ImGui/GUIBuilder.cxx
@@ -1,6 +1,5 @@
 module;
 
-// Hack: The included header unit in the Core module doesn't work here.
 #include "Ultra/Core/Core.h"
 
 // Properties

diff --git a/Source/Library/Ultra/UI/ImGui/GUIBuilder.ixx b/Source/Library/Ultra/UI/ImGui/GUIBuilder.ixx
@@ -1,6 +1,4 @@
 module;
-
-// Hack: The included header unit in the Core module doesn't work here.
 #include "Ultra/Core/Core.h"
 
 ///

diff --git a/Source/Library/Ultra/UI/Window.cxx b/Source/Library/Ultra/UI/Window.cxx
@@ -1,6 +1,5 @@
 module;
 
-// Hack: The included header unit in the Core module doesn't work here.
 #include "Ultra/Core/Core.h"
 
 module Ultra.UI.Window;

diff --git a/Source/Settings.h b/Source/Settings.h
@@ -5,7 +5,7 @@
 ///
 
 // Application Information (the solution name will be replaced by preprocessor!)
-namespace SOLUTION_NAME {
+export namespace SOLUTION_NAME {
 
 // Information
 constexpr auto AppCaption        = "Ultra Spectra";