Cleanup

engine/lua/lua_world.cpp

@@ -26,11 +26,13 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "lua_stack.h"
 #include "lua_environment.h"
-#include "world.h"
-#include "gui.h"
-#include "temp_allocator.h"
 #include "array.h"
+#include "gui.h"
 #include "lua_assert.h"
+#include "temp_allocator.h"
+#include "world.h"
+#include "device.h"
+#include "resource_manager.h"
 
 namespace crown
 {

engine/resource/font_resource.cpp

@@ -32,7 +32,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "bundle.h"
 #include "types.h"
 
-
 namespace crown
 {
 namespace font_resource

engine/resource/font_resource.h

@@ -26,13 +26,10 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-#include "types.h"
 #include "resource.h"
-#include "bundle.h"
-#include "allocator.h"
-#include "file.h"
-#include "assert.h"
-#include "log.h"
+#include "memory_types.h"
+#include "resource_types.h"
+#include "filesystem_types.h"
 
 namespace crown
 {

engine/resource/level_resource.h

@@ -26,14 +26,11 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-#include "allocator.h"
-#include "assert.h"
-#include "bundle.h"
-#include "file.h"
 #include "resource.h"
-#include "types.h"
-#include "vector3.h"
-#include "quaternion.h"
+#include "memory_types.h"
+#include "resource_types.h"
+#include "filesystem_types.h"
+#include "math_types.h"
 
 namespace crown
 {

engine/resource/lua_resource.h

@@ -26,11 +26,10 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-#include "types.h"
 #include "resource.h"
-#include "bundle.h"
-#include "allocator.h"
-#include "file.h"
+#include "memory_types.h"
+#include "resource_types.h"
+#include "filesystem_types.h"
 
 namespace crown
 {

engine/resource/material_resource.cpp

@@ -31,7 +31,9 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "json_parser.h"
 #include "filesystem.h"
 #include "reader_writer.h"
-#include "os.h"
+#include "resource_manager.h"
+#include "vector.h"
+#include <bgfx.h>
 
 namespace crown
 {

engine/resource/material_resource.h

@@ -26,17 +26,11 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-#include "types.h"
 #include "resource.h"
-#include "vector3.h"
-#include "color4.h"
-#include "bundle.h"
-#include "allocator.h"
-#include "blob.h"
-#include "device.h"
-#include "file.h"
-#include "resource_manager.h"
-#include "material_manager.h"
+#include "memory_types.h"
+#include "resource_types.h"
+#include "filesystem_types.h"
+#include "math_types.h"
 
 namespace crown
 {

engine/resource/mesh_resource.h

@@ -26,11 +26,10 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-#include "types.h"
 #include "resource.h"
-#include "allocator.h"
-#include "bundle.h"
-#include "file.h"
+#include "memory_types.h"
+#include "resource_types.h"
+#include "filesystem_types.h"
 #include <bgfx.h>
 
 namespace crown

engine/resource/package_resource.h

@@ -26,11 +26,10 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-#include "types.h"
 #include "resource.h"
-#include "bundle.h"
-#include "allocator.h"
-#include "file.h"
+#include "memory_types.h"
+#include "resource_types.h"
+#include "filesystem_types.h"
 
 namespace crown
 {

engine/resource/physics_resource.h

@@ -26,13 +26,11 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-#include <algorithm>
-#include "types.h"
-#include "allocator.h"
-#include "file.h"
-#include "bundle.h"
-#include "resource_manager.h"
-#include "vector3.h"
+#include "resource.h"
+#include "memory_types.h"
+#include "resource_types.h"
+#include "filesystem_types.h"
+#include "math_types.h"
 
 namespace crown
 {

engine/resource/resource.h

@@ -96,10 +96,4 @@ struct ResourceId
 	uint64_t name;
 };
 
-class Allocator;
-class Bundle;
-class ResourceManager;
-class Filesystem;
-class File;
-
 } // namespace crown

engine/resource/resource_package.h

@@ -30,7 +30,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "resource_manager.h"
 #include "package_resource.h"
 #include "resource.h"
-#include "log.h"
 
 namespace crown
 {

engine/resource/resource_registry.h

@@ -27,6 +27,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #pragma once
 
 #include "resource.h"
+#include "resource_types.h"
 
 namespace crown
 {

engine/resource/resource_types.h

@@ -26,6 +26,8 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 namespace crown
 {
+	class ResourceManager;
+
 	struct LevelResource;
 	struct UnitResource;
 	struct SoundResource;

engine/resource/sound_resource.h

@@ -26,12 +26,10 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-#include "types.h"
 #include "resource.h"
-#include "bundle.h"
-#include "allocator.h"
-#include "file.h"
-#include "device.h"
+#include "memory_types.h"
+#include "resource_types.h"
+#include "filesystem_types.h"
 
 namespace crown
 {

engine/resource/sprite_resource.cpp

@@ -35,6 +35,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "reader_writer.h"
 #include "vector2.h"
 #include "vector4.h"
+#include "resource_manager.h"
 #include <cfloat>
 #include <cstring>
 #include <inttypes.h>

engine/resource/sprite_resource.h

@@ -26,16 +26,10 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-#include "allocator.h"
-#include "bundle.h"
-#include "container_types.h"
-#include "device.h"
-#include "file.h"
-#include "os.h"
-#include "reader_writer.h"
-#include "resource_manager.h"
-#include "string_utils.h"
-#include "types.h"
+#include "resource.h"
+#include "memory_types.h"
+#include "resource_types.h"
+#include "filesystem_types.h"
 #include <cstring>
 #include <inttypes.h>
 #include <bgfx.h>

engine/resource/texture_resource.cpp

@@ -30,6 +30,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "reader_writer.h"
 #include "json_parser.h"
 #include "math_utils.h"
+#include "resource_manager.h"
 #include "log.h"
 
 namespace crown

engine/resource/texture_resource.h

@@ -26,12 +26,10 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-#include "types.h"
 #include "resource.h"
-#include "bundle.h"
-#include "allocator.h"
-#include "file.h"
-#include "resource_manager.h"
+#include "memory_types.h"
+#include "resource_types.h"
+#include "filesystem_types.h"
 #include "memory.h"
 #include <bgfx.h>
 

engine/resource/unit_resource.h

@@ -26,14 +26,11 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-#include "types.h"
 #include "resource.h"
-#include "bundle.h"
-#include "allocator.h"
-#include "file.h"
-#include "physics_types.h"
-#include "matrix4x4.h"
-#include "camera.h"
+#include "memory_types.h"
+#include "resource_types.h"
+#include "filesystem_types.h"
+#include "math_types.h"
 
 namespace crown
 {