Updated Pipe: Combined ecs into PipeECS.h

Libs/Backends/LLVM/Compiler/Src/LLVMBackend/IRGeneration.cpp

@@ -17,7 +17,6 @@
 #include <llvm/IR/Function.h>
 #include <llvm/IR/Module.h>
 #include <llvm/IR/Verifier.h>
-#include <Pipe/ECS/Utils/Hierarchy.h>
 
 
 namespace rift::LLVM
@@ -52,14 +51,14 @@ namespace rift::LLVM
 
 		// Get all rift types from the module
 		TArray<AST::Id> typeIds;
-		ecs::GetChildren(ast, moduleId, typeIds);
+		GetChildren(ast, moduleId, typeIds);
 		ExcludeIdsWithout<AST::CDeclType>(ast, typeIds);
 
 		{    // Native declarations
 			TArray<AST::Id> cStructIds = FindIdsWith<CDeclCStruct>(ast, typeIds);
 			TArray<AST::Id> cStaticIds = FindIdsWith<CDeclCStatic>(ast, typeIds);
 			TArray<AST::Id> cFunctionIds;
-			p::ecs::GetChildren(ast, cStaticIds, cFunctionIds);
+			p::GetChildren(ast, cStaticIds, cFunctionIds);
 			ExcludeIdsWithout<AST::CDeclFunction>(ast, cFunctionIds);
 			DeclareStructs(gen, ast, cStructIds);
 			DeclareFunctions(gen, ast, cFunctionIds, false);
@@ -71,8 +70,8 @@ namespace rift::LLVM
 			TArray<AST::Id> classIds  = FindIdsWith<AST::CDeclClass>(ast, typeIds);
 			TArray<AST::Id> staticFunctionIds;
 			TArray<AST::Id> classFunctionIds;
-			p::ecs::GetChildren(ast, staticIds, staticFunctionIds);
-			p::ecs::GetChildren(ast, classIds, classFunctionIds);
+			p::GetChildren(ast, staticIds, staticFunctionIds);
+			p::GetChildren(ast, classIds, classFunctionIds);
 			ExcludeIdsWithout<AST::CDeclFunction>(ast, staticFunctionIds);
 			ExcludeIdsWithout<AST::CDeclFunction>(ast, classFunctionIds);
 			TArray<AST::Id> functionIds;
@@ -168,7 +167,7 @@ namespace rift::LLVM
 			// Add members
 			memberIds.Clear(false);
 			memberTypes.Clear(false);
-			p::ecs::GetChildren(access, id, memberIds);
+			p::GetChildren(access, id, memberIds);
 			ExcludeIdsWithout<AST::CDeclVariable>(access, memberIds);
 			for (AST::Id memberId : memberIds)
 			{

Libs/Editor/Include/Tools/ASTDebugger.h

@@ -8,16 +8,13 @@
 #include <AST/Components/CNamespace.h>
 #include <Pipe/Core/Platform.h>
 #include <Pipe/Core/StringView.h>
-#include <Pipe/ECS/Components/CChild.h>
-#include <Pipe/ECS/Components/CParent.h>
 #include <Pipe/Math/Vector.h>
 #include <Pipe/Memory/BigBestFitArena.h>
 #include <Pipe/Memory/Block.h>
 #include <Pipe/PipeECS.h>
 #include <UI/UI.h>
 
 
-
 namespace rift::Editor
 {
 	struct ASTDebugger

Libs/Editor/Include/Utils/DetailsPanel.h

@@ -14,7 +14,6 @@
 #include <AST/Tree.h>
 #include <AST/Utils/TransactionUtils.h>
 #include <Pipe/Core/StringView.h>
-#include <Pipe/ECS/Components/CParent.h>
 #include <Pipe/PipeECS.h>
 
 

Libs/Editor/Include/Utils/ElementsPanel.h

@@ -14,7 +14,6 @@
 #include <AST/Tree.h>
 #include <AST/Utils/TransactionUtils.h>
 #include <Pipe/Core/StringView.h>
-#include <Pipe/ECS/Components/CParent.h>
 #include <Pipe/PipeECS.h>
 
 

Libs/Editor/Src/Panels/FileExplorerPanel.cpp

@@ -21,7 +21,6 @@
 #include <Pipe/Core/PlatformProcess.h>
 #include <Pipe/Core/Profiler.h>
 #include <Pipe/Core/StringView.h>
-#include <Pipe/ECS/Utils/Hierarchy.h>
 #include <Pipe/Files/FileDialog.h>
 #include <Pipe/Files/Files.h>
 #include <Pipe/Files/Paths.h>
@@ -402,7 +401,7 @@ namespace rift::Editor
 				const StringView parsedNewName = Strings::RemoveFromEnd(renameBuffer, ".rf");
 				const bool nameIsEmpty         = parsedNewName.empty();
 				const Id sameNameFuncId =
-				    AST::FindChildByName(ast, p::ecs::GetParent(ast, item.id), Tag{parsedNewName});
+				    AST::FindChildByName(ast, p::GetParent(ast, item.id), Tag{parsedNewName});
 				if (nameIsEmpty || (!IsNone(sameNameFuncId) && item.id != sameNameFuncId))
 				{
 					UI::PushTextColor(LinearColor::Red());

Libs/Editor/Src/Tools/ASTDebugger.cpp

@@ -8,7 +8,6 @@
 #include <AST/Utils/Namespaces.h>
 #include <AST/Utils/Paths.h>
 #include <IconsFontAwesome5.h>
-#include <Pipe/ECS/Utils/Hierarchy.h>
 #include <Pipe/Reflect/TypeRegistry.h>
 #include <UI/Inspection.h>
 #include <UI/UI.h>
@@ -157,7 +156,7 @@ namespace rift::Editor
 				if (showHierarchy && !filter.IsActive())
 				{
 					TArray<AST::Id> roots;
-					p::ecs::GetRoots(access, roots);
+					p::GetRoots(access, roots);
 					for (auto root : roots)
 					{
 						DrawNode(access, root, true);

Libs/Editor/Src/Utils/DetailsPanel.cpp

@@ -18,12 +18,10 @@
 #include <GLFW/glfw3.h>
 #include <IconsFontAwesome5.h>
 #include <Pipe/Core/EnumFlags.h>
-#include <Pipe/ECS/Utils/Hierarchy.h>
 #include <Pipe/PipeECS.h>
 #include <UI/UI.h>
 
 
-
 namespace rift::Editor
 {
 	void EditFunctionPin(AST::Tree& ast, AST::Id ownerId, AST::Id id)

Libs/Editor/Src/Utils/ElementsPanel.cpp

@@ -18,7 +18,6 @@
 #include <GLFW/glfw3.h>
 #include <IconsFontAwesome5.h>
 #include <Pipe/Core/EnumFlags.h>
-#include <Pipe/ECS/Utils/Hierarchy.h>
 #include <Pipe/PipeECS.h>
 #include <UI/UI.h>
 
@@ -179,7 +178,7 @@ namespace rift::Editor
 		{
 			UI::Indent(10.f);
 			TArray<AST::Id> variableIds;
-			p::ecs::GetChildren(access, typeId, variableIds);
+			p::GetChildren(access, typeId, variableIds);
 			ExcludeIdsWithout<AST::CDeclVariable>(access, variableIds);
 
 			UI::PushStyleVar(ImGuiStyleVar_CellPadding, {1.f, 3.f});
@@ -224,7 +223,7 @@ namespace rift::Editor
 			UI::Indent(10.f);
 
 			TArray<AST::Id> functionIds;
-			p::ecs::GetChildren(ast, typeId, functionIds);
+			p::GetChildren(ast, typeId, functionIds);
 			ExcludeIdsWithout<AST::CDeclFunction>(ast, functionIds);
 			for (AST::Id functionId : functionIds)
 			{
@@ -281,7 +280,7 @@ namespace rift::Editor
 			// If pin has not been marked for removal, destroy the entity
 			if (!removedPin)
 			{
-				p::ecs::Remove(ast, editor.pendingDeletePropertyId, true);
+				p::Remove(ast, editor.pendingDeletePropertyId, true);
 				editor.pendingDeletePropertyId = AST::NoId;
 			}
 		}

Libs/Editor/Src/Utils/FunctionGraph.cpp

@@ -34,7 +34,6 @@
 #include <AST/Utils/Statements.h>
 #include <AST/Utils/TransactionUtils.h>
 #include <GLFW/glfw3.h>
-#include <Pipe/ECS/Utils/Hierarchy.h>
 #include <Pipe/PipeECS.h>
 #include <UI/Style.h>
 #include <Utils/Nodes.h>
@@ -700,7 +699,7 @@ namespace rift::Editor::Graph
 			BeginNode(access, id);
 			{
 				pinIds.Clear(false);
-				p::ecs::GetChildren(access, id, pinIds);
+				p::GetChildren(access, id, pinIds);
 				if (!Ensure(pinIds.Size() >= 2))
 				{
 					continue;
@@ -853,7 +852,7 @@ namespace rift::Editor::Graph
 			}
 
 			TArray<AST::Id> children;
-			p::ecs::GetChildren(ast, typeId, children);
+			p::GetChildren(ast, typeId, children);
 
 			// Nodes
 			DrawFunctionDecls(ast, FindIdsWith<AST::CDeclFunction>(ast, children));

Libs/Editor/Src/Utils/FunctionGraphContextMenu.cpp

@@ -23,7 +23,6 @@
 #include <AST/Utils/TransactionUtils.h>
 #include <GLFW/glfw3.h>
 #include <IconsFontAwesome5.h>
-#include <Pipe/ECS/Utils/Hierarchy.h>
 #include <UI/UI.h>
 
 
@@ -196,7 +195,7 @@ namespace rift::Editor::Graph
 			{
 				Tag name = access.Get<const AST::CNamespace>(functionId).name;
 				label.clear();
-				AST::Id funcTypeId = ecs::GetParent(access, functionId);
+				AST::Id funcTypeId = GetParent(access, functionId);
 				if (!IsNone(funcTypeId) && access.Has<AST::CDeclType, AST::CNamespace>(funcTypeId))
 				{
 					Strings::FormatTo(label, "{}   ({})", name,
@@ -223,7 +222,7 @@ namespace rift::Editor::Graph
 			{
 				Tag name = access.Get<const AST::CNamespace>(variableId).name;
 				label.clear();
-				AST::Id typeId = p::ecs::GetParent(access, variableId);
+				AST::Id typeId = p::GetParent(access, variableId);
 				if (!IsNone(typeId) && access.Has<AST::CDeclType, AST::CNamespace>(typeId))
 				{
 					Strings::FormatTo(

Libs/Framework/Include/AST/Id.h

@@ -3,8 +3,6 @@
 
 #include <Pipe/Core/Platform.h>
 #include <Pipe/Core/TypeList.h>
-#include <Pipe/ECS/Components/CChild.h>
-#include <Pipe/ECS/Components/CParent.h>
 #include <Pipe/PipeECS.h>
 #include <Pipe/Reflect/Builders/NativeTypeBuilder.h>
 #include <Pipe/Serialize/SerializationFwd.h>
@@ -16,6 +14,6 @@ namespace rift::AST
 	using Id          = p::Id;
 	constexpr Id NoId = p::NoId;
 
-	using CParent = p::ecs::CParent;
-	using CChild  = p::ecs::CChild;
+	using CParent = p::CParent;
+	using CChild  = p::CChild;
 }    // namespace rift::AST

Libs/Framework/Include/AST/Utils/Namespaces.h

@@ -6,8 +6,6 @@
 #include "AST/Id.h"
 
 #include <Pipe/Core/GenericEnums.h>
-#include <Pipe/ECS/Components/CChild.h>
-#include <Pipe/ECS/Utils/Hierarchy.h>
 #include <Pipe/Math/Math.h>
 #include <Pipe/PipeECS.h>
 #include <Pipe/Reflect/EnumType.h>

Libs/Framework/Include/AST/Utils/TransactionUtils.h

@@ -6,7 +6,6 @@
 #include "AST/Components/Tags/CChanged.h"
 #include "AST/Components/Tags/CDirty.h"
 
-#include <Pipe/ECS/Components/CChild.h>
 #include <Pipe/PipeECS.h>
 
 

Libs/Framework/Include/AST/Utils/TypeUtils.h

@@ -18,8 +18,6 @@
 #include "AST/Tree.h"
 #include "AST/TypeRef.h"
 
-#include <Pipe/ECS/Components/CChild.h>
-#include <Pipe/ECS/Components/CParent.h>
 #include <Pipe/PipeECS.h>
 
 

Libs/Framework/Src/AST/Systems/FunctionsSystem.cpp

@@ -10,7 +10,6 @@
 #include "AST/Utils/Namespaces.h"
 #include "AST/Utils/TypeUtils.h"
 
-#include <Pipe/ECS/Utils/Hierarchy.h>
 #include <Pipe/PipeECS.h>
 
 
@@ -170,7 +169,7 @@ namespace rift::AST::FunctionsSystem
 				{
 					Id id = ast.Create();
 					access.Add<CNamespace>(id, *name);
-					p::ecs::Attach(ast, call.id, id);
+					p::Attach(ast, call.id, id);
 					callOutputs.Add(id);
 				}
 				else
@@ -189,7 +188,7 @@ namespace rift::AST::FunctionsSystem
 					{
 						Id id = ast.Create();
 						access.Add<CNamespace>(id, *name);
-						p::ecs::Attach(ast, call.id, id);
+						p::Attach(ast, call.id, id);
 						callOutputs.Insert(i, id);
 					}
 					else if (callPinIdx > i)
@@ -241,7 +240,7 @@ namespace rift::AST::FunctionsSystem
 				{
 					Id id = ast.Create();
 					access.Add<CNamespace>(id, *name);
-					p::ecs::Attach(ast, call.id, id);
+					p::Attach(ast, call.id, id);
 					callInputs.Add(id);
 				}
 				else
@@ -260,7 +259,7 @@ namespace rift::AST::FunctionsSystem
 					{
 						Id id = ast.Create();
 						access.Add<CNamespace>(id, *name);
-						p::ecs::Attach(ast, call.id, id);
+						p::Attach(ast, call.id, id);
 						callInputs.Insert(i, id);
 					}
 					else if (callPinIdx > i)
@@ -330,7 +329,7 @@ namespace rift::AST::FunctionsSystem
 
 		TArray<Id> pinsToRemove = FindAllIdsWith<CInvalid>(access);
 		ExcludeIdsWith<CTmpInvalidKeep>(access, pinsToRemove);
-		p::ecs::Remove(access, pinsToRemove);
+		p::Remove(access, pinsToRemove);
 
 		access.GetPool<CTmpInvalidKeep>()->Clear();
 	}

Libs/Framework/Src/AST/Systems/LoadSystem.cpp

@@ -19,7 +19,6 @@
 #include "Pipe/Files/Paths.h"
 
 #include <Pipe/Core/Profiler.h>
-#include <Pipe/ECS/Utils/Hierarchy.h>
 #include <Pipe/Files/Files.h>
 #include <Pipe/Serialize/Formats/JsonFormat.h>
 
@@ -155,7 +154,7 @@ namespace rift::AST::LoadSystem
 
 		// Link modules to the project
 		const Id projectId = GetProjectId(access);
-		p::ecs::Attach(access, projectId, ids);
+		p::Attach(access, projectId, ids);
 	}
 
 	void CreateTypesFromPaths(Tree& ast, TSpan<ModuleTypePaths> pathsByModule, TArray<Id>& ids)
@@ -192,7 +191,7 @@ namespace rift::AST::LoadSystem
 				ast.Add(id, CFileRef{Move(path)});
 			}
 
-			p::ecs::Attach(ast, modulePaths.moduleId, typeIds);
+			p::Attach(ast, modulePaths.moduleId, typeIds);
 			ids.Append(typeIds);
 		}
 	}

Libs/Framework/Src/AST/Systems/TypeSystem.cpp

@@ -10,7 +10,6 @@
 #include "AST/Utils/Namespaces.h"
 #include "AST/Utils/TypeUtils.h"
 
-#include <Pipe/ECS/Utils/Hierarchy.h>
 #include <Pipe/PipeECS.h>
 
 
@@ -91,7 +90,7 @@ namespace rift::AST::TypeSystem
 		TArray<Id> dirtyTypeIds = FindAllIdsWith<CDeclType, CChanged>(access);
 
 		TArray<Id> dirtyNodeIds;
-		p::ecs::GetChildren(access, dirtyTypeIds, dirtyNodeIds);
+		p::GetChildren(access, dirtyTypeIds, dirtyNodeIds);
 
 		// Make sure the nodes have inputs and outputs
 		ExcludeIdsWithout<CExprInputs, CExprOutputs>(access, dirtyNodeIds);

Libs/Framework/Src/AST/Utils/Expressions.cpp

@@ -4,8 +4,6 @@
 
 #include "AST/Id.h"
 
-#include <Pipe/ECS/Utils/Hierarchy.h>
-
 
 namespace rift::AST
 {
@@ -173,7 +171,7 @@ namespace rift::AST
 		input.nodeId = pinId;
 		if (!IsNone(input.nodeId) && !access.Has<CExprInputs>(input.nodeId))
 		{
-			input.nodeId = p::ecs::GetParent(access, pinId);
+			input.nodeId = p::GetParent(access, pinId);
 		}
 		return input;
 	}
@@ -186,7 +184,7 @@ namespace rift::AST
 		output.nodeId = pinId;
 		if (!IsNone(output.nodeId) && !access.Has<CExprOutputs>(output.nodeId))
 		{
-			output.nodeId = p::ecs::GetParent(access, pinId);
+			output.nodeId = p::GetParent(access, pinId);
 		}
 		return output;
 	}