clean up

Ubpa · Sep 22, 2020 · 2a0f3cf · 2a0f3cf
1 parent c9d5c94
commit 2a0f3cf
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/include/UECS/Schedule.h b/include/UECS/Schedule.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "detail/SystemFunc.h"
-#include "detail/SysFuncGraph.h"
 #include "detail/Job.h"
 
 #include <UContainer/Pool.h>
@@ -15,6 +14,7 @@ namespace Ubpa::UECS::detail {
 namespace Ubpa::UECS {
 	class EntityMngr;
 	class SystemMngr;
+	class SysFuncGraph;
 
 	// [description]
 	// system infomation record

diff --git a/src/core/Schedule.cpp b/src/core/Schedule.cpp
@@ -2,7 +2,7 @@
 
 #include <UContainer/Algorithm.h>
 
-#include <UECS/World.h>
+#include "SysFuncGraph.h"
 
 using namespace Ubpa::UECS;
 using namespace std;

diff --git a/src/core/SysFuncGraph.cpp b/src/core/SysFuncGraph.cpp
@@ -1,4 +1,4 @@
-#include <UECS/detail/SysFuncGraph.h>
+#include "SysFuncGraph.h"
 
 #include <unordered_set>
 #include <queue>

diff --git a/include/UECS/detail/SysFuncGraph.h → src/core/SysFuncGraph.h b/include/UECS/detail/SysFuncGraph.h → src/core/SysFuncGraph.h
diff --git a/src/core/World.cpp b/src/core/World.cpp
@@ -2,6 +2,8 @@
 
 #include <UECS/IListener.h>
 
+#include "SysFuncGraph.h"
+
 using namespace Ubpa::UECS;
 using namespace Ubpa;
 using namespace std;

diff --git a/src/test/14_serialize/main.cpp b/src/test/14_serialize/main.cpp
@@ -94,7 +94,7 @@ class Dumper : public IListener {
 		cout << "{" << endl;
 		indent++;
 		PrintIndent();
-		cout << "\"type\" : \"" << w->entityMngr.cmptTraits.Nameof(cmpt->Type()) << "\"";
+		cout << "\"type\" : \"" << w->entityMngr.cmptTraits.Nameof(cmpt.Type()) << "\"";
 		if (cmpt.Type().Is<Velocity>()) {
 			auto v = cmpt.As<Velocity>();
 			cout << "," << endl;