Renamed modules & updated Pipe

muit · muit · commit 9d2315ecb1cc · 2024-11-30T15:13:16.000+01:00
diff --git a/.clang-format b/.clang-format
@@ -26,8 +26,7 @@ BinPackArguments: true
 BinPackParameters: true
 BitFieldColonSpacing: None
 BreakBeforeBinaryOperators: NonAssignment
-BreakBeforeBraces: Custom
-BreakBeforeConceptDeclarations: false
+BreakBeforeConceptDeclarations: true
 BreakConstructorInitializers: BeforeComma
 BreakInheritanceList: AfterComma
 BreakStringLiterals: true
@@ -62,6 +61,7 @@ IndentPPDirectives: BeforeHash
 IndentRequires: true
 IndentWidth: 4
 IndentWrappedFunctionNames: false
+InsertBraces: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 LambdaBodyIndentation: OuterScope
 MaxEmptyLinesToKeep: 2
@@ -78,6 +78,7 @@ PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
 ReferenceAlignment: Left
 ReflowComments: true
+RequiresClausePosition: WithPreceding
 SortIncludes: CaseInsensitive
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
diff --git a/Apps/CLI/CMakeLists.txt b/Apps/CLI/CMakeLists.txt
@@ -1,17 +1,17 @@
 # Copyright 2015-2023 Piperift - All rights reserved
 
-add_executable(RiftCLIExe Src/main.cpp)
+add_executable(RiftCLI Src/main.cpp)
 
-target_include_directories(RiftCLIExe PUBLIC Include)
+target_include_directories(RiftCLI PUBLIC Include)
 file(GLOB_RECURSE CLI_SOURCE_FILES CONFIGURE_DEPENDS Src/*.cpp Src/*.h)
-target_sources(RiftCLIExe PRIVATE ${CLI_SOURCE_FILES})
+target_sources(RiftCLI PRIVATE ${CLI_SOURCE_FILES})
 
-target_link_libraries(RiftCLIExe PUBLIC
+target_link_libraries(RiftCLI PUBLIC
     CLI11
-    RiftAST
+    RiftASTLib
     RiftCompilerModules
 )
 
-rift_module(RiftCLIExe)
-set_target_properties(RiftCLIExe PROPERTIES OUTPUT_NAME "Rift")
-set_icon(RiftCLIExe Icon.ico)
+rift_module(RiftCLI)
+set_target_properties(RiftCLI PROPERTIES OUTPUT_NAME "Rift")
+set_icon(RiftCLI Icon.ico)
diff --git a/Apps/CLI/Src/main.cpp b/Apps/CLI/Src/main.cpp
@@ -12,6 +12,7 @@
 #include <Pipe.h>
 #include <Pipe/Files/Paths.h>
 #include <Pipe/Files/PlatformPaths.h>
+#include <PipeTime.h>
 #include <Rift.h>
 
 #include <chrono>
@@ -44,7 +45,7 @@ namespace rift
 		const Tag def = backends.IsEmpty() ? Tag::None() : backends[0]->GetName();
 		selected      = def.AsString();
 
-		auto stdDesc = Strings::Convert<std::string, TChar>(desc);
+		auto stdDesc = Strings::Convert<std::string, char>(desc);
 		app.add_option("-b,--backend", selected, stdDesc, true);
 	}
 
@@ -64,7 +65,27 @@ namespace rift
 
 int main(int argc, char** argv)
 {
-	p::Initialize("Saved/Logs");
+	p::Logger logger = p::Logger{.infoCallback = [](StringView msg) {
+		String text;
+		auto now = p::DateTime::Now();
+		now.ToString("[%Y/%m/%d %H:%M:%S]", text);
+		p::Strings::FormatTo(text, "[Info] {}\n", msg);
+		std::cout << text;
+	}, .warningCallback = [](StringView msg) {
+		String text;
+		auto now = p::DateTime::Now();
+		now.ToString("[%Y/%m/%d %H:%M:%S]", text);
+		p::Strings::FormatTo(text, "[Warning] {}\n", msg);
+		std::cout << text;
+	}, .errorCallback = [](StringView msg) {
+		String text;
+		auto now = p::DateTime::Now();
+		now.ToString("[%Y/%m/%d %H:%M:%S]", text);
+		p::Strings::FormatTo(text, "[Error] {}\n", msg);
+		std::cout << text;
+	}};
+
+	p::Initialize(&logger);
 	p::Info(p::PlatformPaths::GetUserSettingsPath());
 	EnableModule<ASTModule>();
 	EnableModule<MIRBackendModule>();
diff --git a/Apps/Editor/CMakeLists.txt b/Apps/Editor/CMakeLists.txt
@@ -1,18 +1,17 @@
 # Copyright 2015-2023 Piperift - All rights reserved
 
-add_executable(RiftEditorExe Src/main.cpp)
+add_executable(RiftEditor Src/main.cpp)
 
-target_include_directories(RiftEditorExe PUBLIC Include)
+target_include_directories(RiftEditor PUBLIC Include)
 file(GLOB_RECURSE RiftEditor_SOURCE_FILES CONFIGURE_DEPENDS Src/*.cpp Src/*.h)
-target_sources(RiftEditorExe PRIVATE ${RiftEditor_SOURCE_FILES})
+target_sources(RiftEditor PRIVATE ${RiftEditor_SOURCE_FILES})
 
-target_link_libraries(RiftEditorExe PUBLIC
+target_link_libraries(RiftEditor PUBLIC
     RiftCompilerModules
-    RiftEditor
+    RiftEditorLib
     RiftEditorModules
 )
-target_compile_definitions(RiftEditorExe PUBLIC RIFT_EDITOR=1)
+target_compile_definitions(RiftEditor PUBLIC RIFT_EDITOR=1)
 
-rift_module(RiftEditorExe)
-set_target_properties(RiftEditorExe PROPERTIES OUTPUT_NAME "RiftEditor")
-set_icon(RiftEditorExe Icon.ico)
+rift_module(RiftEditor)
+set_icon(RiftEditor Icon.ico)
diff --git a/Apps/Editor/Src/main.cpp b/Apps/Editor/Src/main.cpp
@@ -8,20 +8,40 @@
 #include <GraphViewModule.h>
 #include <MIRBackendModule.h>
 #include <Pipe.h>
+#include <PipeTime.h>
 
 #include <iostream>
 
 
 using namespace rift;
 
-
 #ifndef RUN_AS_CLI
 	#define RUN_AS_CLI 1
 #endif
 
 int RunEditor(StringView projectPath)
 {
-	p::Initialize("Saved/Logs");
+	p::Logger logger = p::Logger{.infoCallback = [](StringView msg) {
+		String text;
+		auto now = p::DateTime::Now();
+		now.ToString("[%Y/%m/%d %H:%M:%S]", text);
+		p::Strings::FormatTo(text, "[Info] {}\n", msg);
+		std::cout << text;
+	}, .warningCallback = [](StringView msg) {
+		String text;
+		auto now = p::DateTime::Now();
+		now.ToString("[%Y/%m/%d %H:%M:%S]", text);
+		p::Strings::FormatTo(text, "[Warning] {}\n", msg);
+		std::cout << text;
+	}, .errorCallback = [](StringView msg) {
+		String text;
+		auto now = p::DateTime::Now();
+		now.ToString("[%Y/%m/%d %H:%M:%S]", text);
+		p::Strings::FormatTo(text, "[Error] {}\n", msg);
+		std::cout << text;
+	}};
+
+	p::Initialize(&logger);
 	EnableModule<ASTModule>();
 	EnableModule<MIRBackendModule>();
 	EnableModule<GraphViewModule>();
diff --git a/Extern/Pipe b/Extern/Pipe
@@ -1 +1 @@
-Subproject commit c16e8a80a560512ad0ad87bd72eb96947cd79c84
+Subproject commit 1d06d1a2237f7b87504b421fd45596c37ff71ff8
diff --git a/Libs/AST/CMakeLists.txt b/Libs/AST/CMakeLists.txt
@@ -1,16 +1,16 @@
 # Copyright 2015-2023 Piperift - All rights reserved
 
-add_library(RiftAST STATIC)
-target_include_directories(RiftAST PUBLIC Include)
+add_library(RiftASTLib STATIC)
+target_include_directories(RiftASTLib PUBLIC Include)
 
 file(GLOB_RECURSE AST_SOURCE_FILES CONFIGURE_DEPENDS Src/*.cpp Src/*.h)
-target_sources(RiftAST PRIVATE ${AST_SOURCE_FILES})
+target_sources(RiftASTLib PRIVATE ${AST_SOURCE_FILES})
 
-target_link_libraries(RiftAST PUBLIC
+target_link_libraries(RiftASTLib PUBLIC
     Pipe
     Taskflow
-    RiftBindingNative
+    RiftBindingNativeLib
 )
 
-rift_module(RiftAST)
-set_target_properties (RiftAST PROPERTIES FOLDER Rift)
+rift_module(RiftASTLib)
+set_target_properties (RiftASTLib PROPERTIES FOLDER Rift)
diff --git a/Libs/AST/Include/Rift.h b/Libs/AST/Include/Rift.h
@@ -9,6 +9,7 @@
 
 #include <Pipe/Core/Tag.h>
 #include <PipeECS.h>
+#include <PipeReflect.h>
 
 
 namespace rift
@@ -31,7 +32,7 @@ namespace rift
 	template<typename T>
 	p::TPtr<T> GetModule()
 	{
-		return GetModule(p::GetTypeId<T>()).template Cast<T>();
+		return Cast<T>(GetModule(p::GetTypeId<T>()));
 	}
 
 	void RegisterView(View view);
diff --git a/Libs/AST/Src/AST/Components/CNamespace.cpp b/Libs/AST/Src/AST/Components/CNamespace.cpp
@@ -8,13 +8,13 @@ namespace rift::ast
 	Namespace::Namespace(p::StringView value)
 	{
 		p::i32 size          = 0;
-		const p::TChar* last = value.data() + value.size();
-		const p::TChar* curr = value.data();
+		const char* last = value.data() + value.size();
+		const char* curr = value.data();
 
 		if (curr != last && *curr == '@')
 			++curr;
 
-		const p::TChar* scopeStart = curr;
+		const char* scopeStart = curr;
 		while (curr != last && size < scopeCount)
 		{
 			if (*curr == '.')
diff --git a/Libs/Backends/MIR/CMakeLists.txt b/Libs/Backends/MIR/CMakeLists.txt
@@ -1,7 +1,6 @@
 # Copyright 2015-2023 Piperift - All rights reserved
 
-add_library(RiftBackendMIR STATIC)
-target_link_libraries(RiftBackendMIR PUBLIC RiftAST)
-target_link_libraries(RiftBackendMIR PRIVATE RiftBindingNative mir)
-rift_compiler_module(RiftBackendMIR)
-
+add_library(RiftBackendMIRLib STATIC)
+target_link_libraries(RiftBackendMIRLib PUBLIC RiftASTLib)
+target_link_libraries(RiftBackendMIRLib PRIVATE RiftBindingNativeLib mir)
+rift_compiler_module(RiftBackendMIRLib)
diff --git a/Libs/Bindings/Native/CMakeLists.txt b/Libs/Bindings/Native/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Copyright 2015-2023 Piperift - All rights reserved
 
-add_library(RiftBindingNative STATIC)
+add_library(RiftBindingNativeLib STATIC)
 
 
-target_link_libraries(RiftBindingNative PUBLIC RiftAST)
+target_link_libraries(RiftBindingNativeLib PUBLIC RiftASTLib)
 
-rift_compiler_module(RiftBindingNative)
+rift_compiler_module(RiftBindingNativeLib)
 
-add_library(RiftBindingNativeEditor STATIC)
-rift_editor_module(RiftBindingNativeEditor)
-target_link_libraries(RiftBindingNativeEditor PUBLIC RiftEditor RiftBindingNative)
+add_library(RiftBindingNativeEditorLib STATIC)
+rift_editor_module(RiftBindingNativeEditorLib)
+target_link_libraries(RiftBindingNativeEditorLib PUBLIC RiftEditorLib RiftBindingNativeLib)
diff --git a/Libs/Bindings/Native/Compiler/Src/NativeBindingModule.cpp b/Libs/Bindings/Native/Compiler/Src/NativeBindingModule.cpp
@@ -16,9 +16,6 @@
 #include <PipeECS.h>
 
 
-// P_OVERRIDE_NEW_DELETE
-
-
 namespace rift
 {
 	struct ParsedModule
diff --git a/Libs/Editor/CMakeLists.txt b/Libs/Editor/CMakeLists.txt
@@ -1,17 +1,18 @@
 # Copyright 2015-2023 Piperift - All rights reserved
 
-add_library(RiftEditor STATIC)
+add_library(RiftEditorLib STATIC)
 
-target_include_directories(RiftEditor PUBLIC Include)
-file(GLOB_RECURSE RiftEditor_SOURCE_FILES CONFIGURE_DEPENDS Src/*.cpp Src/*.h)
-target_sources(RiftEditor PRIVATE ${RiftEditor_SOURCE_FILES})
+target_include_directories(RiftEditorLib PUBLIC Include)
+file(GLOB_RECURSE RiftEditorLib_SOURCE_FILES CONFIGURE_DEPENDS Src/*.cpp Src/*.h)
+target_sources(RiftEditorLib PRIVATE ${RiftEditorLib_SOURCE_FILES})
 
-target_link_libraries(RiftEditor PUBLIC
-    RiftAST
-    RiftBackendMIR
-    RiftUI
+target_link_libraries(RiftEditorLib PUBLIC
+    RiftASTLib
+    RiftBackendMIRLib
+    RiftUILib
     CLI11
 )
 
-rift_module(RiftEditor)
-rift_enable_module_resources(RiftEditor)
+rift_module(RiftEditorLib)
+rift_enable_module_resources(RiftEditorLib)
+set_target_properties(RiftEditorLib PROPERTIES OUTPUT_NAME "RiftEditor")
diff --git a/Libs/UI/CMakeLists.txt b/Libs/UI/CMakeLists.txt
@@ -1,19 +1,19 @@
 # Copyright 2015-2023 Piperift - All rights reserved
 
-add_library(RiftUI STATIC)
+add_library(RiftUILib STATIC)
 
-target_include_directories(RiftUI PUBLIC Include)
+target_include_directories(RiftUILib PUBLIC Include)
 file(GLOB_RECURSE UI_SOURCE_FILES CONFIGURE_DEPENDS Src/*.cpp Src/*.h)
-target_sources(RiftUI PRIVATE ${UI_SOURCE_FILES})
+target_sources(RiftUILib PRIVATE ${UI_SOURCE_FILES})
 
-target_link_libraries(RiftUI PUBLIC
+target_link_libraries(RiftUILib PUBLIC
     Pipe
     glfw
     gl3w
     imgui
     IconFontCppHeaders
 )
-target_link_libraries(RiftUI PRIVATE stb_image)
-target_compile_definitions(RiftUI PRIVATE NOMINMAX)
+target_link_libraries(RiftUILib PRIVATE stb_image)
+target_compile_definitions(RiftUILib PRIVATE NOMINMAX)
 
-rift_module(RiftUI)
+rift_module(RiftUILib)
diff --git a/Libs/Views/Graph/CMakeLists.txt b/Libs/Views/Graph/CMakeLists.txt
@@ -1,9 +1,9 @@
 # Copyright 2015-2023 Piperift - All rights reserved
 
-add_library(RiftViewGraph STATIC)
-rift_compiler_module(RiftViewGraph)
-target_link_libraries(RiftViewGraph PUBLIC RiftAST)
+add_library(RiftViewGraphLib STATIC)
+rift_compiler_module(RiftViewGraphLib)
+target_link_libraries(RiftViewGraphLib PUBLIC RiftASTLib)
 
-add_library(RiftViewGraphEditor STATIC)
-rift_editor_module(RiftViewGraphEditor)
-target_link_libraries(RiftViewGraphEditor PUBLIC RiftEditor RiftViewGraph)
+add_library(RiftViewGraphEditorLib STATIC)
+rift_editor_module(RiftViewGraphEditorLib)
+target_link_libraries(RiftViewGraphEditorLib PUBLIC RiftEditorLib RiftViewGraphLib)
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
@@ -5,7 +5,7 @@ add_executable(RiftTests ${TESTS_SOURCE_FILES})
 rift_module(RiftTests)
 pipe_target_shared_output_directory(RiftTests)
 target_include_directories(RiftTests PUBLIC .)
-target_link_libraries(RiftTests PUBLIC RiftAST Bandit)
+target_link_libraries(RiftTests PUBLIC RiftASTLib Bandit)
 
 add_test(NAME RiftTests COMMAND $<TARGET_FILE:RiftTests>)
 

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`	`#include <Pipe/Core/Tag.h>`
`11`	`11`	`#include <PipeECS.h>`
	`12`	`+#include <PipeReflect.h>`
`12`	`13`
`13`	`14`
`14`	`15`	`namespace rift`
`@@ -31,7 +32,7 @@ namespace rift`
`31`	`32`	`template<typename T>`
`32`	`33`	`p::TPtr<T> GetModule()`
`33`	`34`	`{`
`34`		`- return GetModule(p::GetTypeId<T>()).template Cast<T>();`
	`35`	`+ return Cast<T>(GetModule(p::GetTypeId<T>()));`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`void RegisterView(View view);`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,6 @@`
`16`	`16`	`#include <PipeECS.h>`
`17`	`17`
`18`	`18`
`19`		`-// P_OVERRIDE_NEW_DELETE`
`20`		`-`
`21`		`-`
`22`	`19`	`namespace rift`
`23`	`20`	`{`
`24`	`21`	`struct ParsedModule`