Use include paths relative to the lib's folder to simplify the build setup.

compile_linux.sh

@@ -7,65 +7,65 @@
 #g++ main.cpp shader.cpp material.cpp mesh.cpp mesh_instance.cpp mesh_utils.cpp texture.cpp camera.cpp render_core.cpp scene.cpp game_scene.cpp object_2d.cpp tile_map.cpp sprite.cpp \
 #    -g -Wall -o3 -o ./bin/game $(pkg-config --cflags --libs sdl2 glew)
 
-#g++ -Wall -fexceptions -I/usr/include/SDL2 -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/aabb.cpp -o sfw/core/aabb.o
+#g++ -Wall -fexceptions -I/usr/include/SDL2 -D_REENTRANT -g -Isfw -c sfw/core/aabb.cpp -o sfw/core/aabb.o
 
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/aabb.cpp -o sfw/core/aabb.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/basis.cpp -o sfw/core/basis.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/color.cpp -o sfw/core/color.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/face3.cpp -o sfw/core/face3.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/logger.cpp -o sfw/core/logger.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/math_funcs.cpp -o sfw/core/math_funcs.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/memory.cpp -o sfw/core/memory.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/pcg.cpp -o sfw/core/pcg.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/plane.cpp -o sfw/core/plane.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/projection.cpp -o sfw/core/projection.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/quaternion.cpp -o sfw/core/quaternion.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/random_pcg.cpp -o sfw/core/random_pcg.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/rect2.cpp -o sfw/core/rect2.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/rect2i.cpp -o sfw/core/rect2i.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/safe_refcount.cpp -o sfw/core/safe_refcount.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/transform_2d.cpp -o sfw/core/transform_2d.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/transform.cpp -o sfw/core/transform.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/ustring.cpp -o sfw/core/ustring.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/string_name.cpp -o sfw/core/string_name.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/vector2.cpp -o sfw/core/vector2.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/vector2i.cpp -o sfw/core/vector2i.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/vector3.cpp -o sfw/core/vector3.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/vector3i.cpp -o sfw/core/vector3i.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/vector4.cpp -o sfw/core/vector4.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/vector4i.cpp -o sfw/core/vector4i.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/aabb.cpp -o sfw/core/aabb.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/basis.cpp -o sfw/core/basis.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/color.cpp -o sfw/core/color.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/face3.cpp -o sfw/core/face3.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/logger.cpp -o sfw/core/logger.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/math_funcs.cpp -o sfw/core/math_funcs.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/memory.cpp -o sfw/core/memory.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/pcg.cpp -o sfw/core/pcg.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/plane.cpp -o sfw/core/plane.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/projection.cpp -o sfw/core/projection.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/quaternion.cpp -o sfw/core/quaternion.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/random_pcg.cpp -o sfw/core/random_pcg.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/rect2.cpp -o sfw/core/rect2.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/rect2i.cpp -o sfw/core/rect2i.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/safe_refcount.cpp -o sfw/core/safe_refcount.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/transform_2d.cpp -o sfw/core/transform_2d.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/transform.cpp -o sfw/core/transform.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/ustring.cpp -o sfw/core/ustring.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/string_name.cpp -o sfw/core/string_name.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/vector2.cpp -o sfw/core/vector2.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/vector2i.cpp -o sfw/core/vector2i.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/vector3.cpp -o sfw/core/vector3.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/vector3i.cpp -o sfw/core/vector3i.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/vector4.cpp -o sfw/core/vector4.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/vector4i.cpp -o sfw/core/vector4i.o
 
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/pool_vector.cpp -o sfw/core/pool_vector.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/pool_allocator.cpp -o sfw/core/pool_allocator.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/mutex.cpp -o sfw/core/mutex.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/stime.cpp -o sfw/core/stime.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/pool_vector.cpp -o sfw/core/pool_vector.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/pool_allocator.cpp -o sfw/core/pool_allocator.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/mutex.cpp -o sfw/core/mutex.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/core/stime.cpp -o sfw/core/stime.o
 
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/object/object.cpp -o sfw/object/object.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/object/reference.cpp -o sfw/object/reference.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/object/object.cpp -o sfw/object/object.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/object/reference.cpp -o sfw/object/reference.o
 
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -c sfw/render_core/application.cpp -o sfw/render_core/application.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -c sfw/render_core/scene.cpp -o sfw/render_core/scene.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -c sfw/render_core/window.cpp -o sfw/render_core/window.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_core/application.cpp -o sfw/render_core/application.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_core/scene.cpp -o sfw/render_core/scene.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_core/window.cpp -o sfw/render_core/window.o
 
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -c sfw/render_core/shader.cpp -o sfw/render_core/shader.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -c sfw/render_core/material.cpp -o sfw/render_core/material.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -c sfw/render_core/mesh.cpp -o sfw/render_core/mesh.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -c sfw/render_core/mesh_utils.cpp -o sfw/render_core/mesh_utils.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -c sfw/render_core/texture.cpp -o sfw/render_core/texture.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -c sfw/render_core/image.cpp -o sfw/render_core/image.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_core/shader.cpp -o sfw/render_core/shader.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_core/material.cpp -o sfw/render_core/material.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_core/mesh.cpp -o sfw/render_core/mesh.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_core/mesh_utils.cpp -o sfw/render_core/mesh_utils.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_core/texture.cpp -o sfw/render_core/texture.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_core/image.cpp -o sfw/render_core/image.o
 
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -Isfw/render_core -Isfw/render_objects -c sfw/render_objects/camera_3d.cpp -o sfw/render_objects/camera_3d.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -Isfw/render_core -Isfw/render_objects -c sfw/render_objects/object_3d.cpp -o sfw/render_objects/object_3d.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -Isfw/render_core -Isfw/render_objects -c sfw/render_objects/mesh_instance_3d.cpp -o sfw/render_objects/mesh_instance_3d.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_objects/camera_3d.cpp -o sfw/render_objects/camera_3d.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_objects/object_3d.cpp -o sfw/render_objects/object_3d.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_objects/mesh_instance_3d.cpp -o sfw/render_objects/mesh_instance_3d.o
 
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -Isfw/render_core -Isfw/render_objects -c sfw/render_objects/camera_2d.cpp -o sfw/render_objects/camera_2d.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -Isfw/render_core -Isfw/render_objects -c sfw/render_objects/mesh_instance_2d.cpp -o sfw/render_objects/mesh_instance_2d.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -Isfw/render_core -Isfw/render_objects -c sfw/render_objects/object_2d.cpp -o sfw/render_objects/object_2d.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -Isfw/render_core -Isfw/render_objects -c sfw/render_objects/sprite.cpp -o sfw/render_objects/sprite.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -Isfw/render_core -Isfw/render_objects -c sfw/render_objects/tile_map.cpp -o sfw/render_objects/tile_map.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_objects/camera_2d.cpp -o sfw/render_objects/camera_2d.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_objects/mesh_instance_2d.cpp -o sfw/render_objects/mesh_instance_2d.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_objects/object_2d.cpp -o sfw/render_objects/object_2d.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_objects/sprite.cpp -o sfw/render_objects/sprite.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_objects/tile_map.cpp -o sfw/render_objects/tile_map.o
 
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -Isfw/render_core -Isfw/render_objects -c game_scene.cpp -o game_scene.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/object -Isfw/render_core -Isfw/render_objects -c main.cpp -o main.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c game_scene.cpp -o game_scene.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -c main.cpp -o main.o
 
 
 ccache g++ -Wall -lm -ldl -lpthread -lX11  -D_REENTRANT -g sfw/core/aabb.o sfw/core/basis.o sfw/core/color.o \

game_application.h

@@ -1,7 +1,7 @@
 #ifndef GAME_APPLICATION_H
 #define GAME_APPLICATION_H
 
-#include "application.h"
+#include "render_core/application.h"
 
 #include "game_scene.h"
 

game_scene.cpp

@@ -1,10 +1,10 @@
 #include "game_scene.h"
 
-#include "application.h"
+#include "render_core/application.h"
 
-#include "3rd_glad.h"
-#include "memory.h"
-#include "mesh_utils.h"
+#include "render_core/3rd_glad.h"
+#include "core/memory.h"
+#include "render_core/mesh_utils.h"
 
 void GameScene::event() {
 	/*

game_scene.h

@@ -1,20 +1,20 @@
 #ifndef GAME_SCENE_H
 #define GAME_SCENE_H
 
-#include "scene.h"
+#include "render_core/scene.h"
 
-#include "tile_map.h"
-#include "mesh_instance_3d.h"
-#include "camera_3d.h"
-#include "camera_2d.h"
-#include "color_material.h"
-#include "colored_material.h"
-#include "mesh.h"
-#include "sprite.h"
-#include "texture.h"
-#include "texture_material.h"
-#include "texture_material_2d.h"
-#include "image.h"
+#include "render_objects/tile_map.h"
+#include "render_objects/mesh_instance_3d.h"
+#include "render_objects/camera_3d.h"
+#include "render_objects/camera_2d.h"
+#include "render_core/color_material.h"
+#include "render_core/colored_material.h"
+#include "render_core/mesh.h"
+#include "render_objects/sprite.h"
+#include "render_core/texture.h"
+#include "render_core/texture_material.h"
+#include "render_core/texture_material_2d.h"
+#include "render_core/image.h"
 
 class GameScene : public Scene {
 public:

main.cpp

@@ -2,11 +2,11 @@
 #include <emscripten.h>
 #endif // __EMSCRIPTEN__
 
-#include "application.h"
-#include "window.h"
+#include "render_core/application.h"
+#include "render_core/window.h"
 
 #include "game_application.h"
-#include "window.h"
+#include "render_core/window.h"
 
 Application *application = NULL;
 

sfw/core/aabb.cpp

@@ -3,7 +3,7 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "aabb.h"
+#include "core/aabb.h"
 
 real_t AABB::get_volume() const {
 	return size.x * size.y * size.z;

sfw/core/aabb.h

@@ -6,9 +6,9 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "math_defs.h"
-#include "plane.h"
-#include "vector3.h"
+#include "core/math_defs.h"
+#include "core/plane.h"
+#include "core/vector3.h"
 
 /**
  * AABB / AABB (Axis Aligned Bounding Box)

sfw/core/basis.cpp

@@ -3,9 +3,9 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "basis.h"
+#include "core/basis.h"
 
-#include "math_funcs.h"
+#include "core/math_funcs.h"
 
 #define cofac(row1, col1, row2, col2) \
 	(rows[row1][col1] * rows[row2][col2] - rows[row1][col2] * rows[row2][col1])

sfw/core/basis.h

@@ -6,9 +6,9 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "quaternion.h"
-#include "vector3.h"
-#include "vector3i.h"
+#include "core/quaternion.h"
+#include "core/vector3.h"
+#include "core/vector3i.h"
 
 struct _NO_DISCARD_CLASS_ Basis {
 	Vector3 rows[3] = {

sfw/core/char_range.inc

@@ -6,7 +6,7 @@
 #ifndef CHAR_RANGE_INC
 #define CHAR_RANGE_INC
 
-#include "typedefs.h"
+#include "core/typedefs.h"
 
 struct CharRange {
 	char32_t start;

sfw/core/char_utils.h

@@ -6,9 +6,9 @@
 #ifndef CHAR_UTILS_H
 #define CHAR_UTILS_H
 
-#include "typedefs.h"
+#include "core/typedefs.h"
 
-#include "char_range.inc"
+#include "core/char_range.inc"
 
 static _FORCE_INLINE_ bool is_unicode_identifier_start(char32_t c) {
 	for (int i = 0; xid_start[i].start != 0; i++) {

sfw/core/color.cpp

@@ -3,9 +3,9 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "color.h"
+#include "core/color.h"
 
-#include "math_funcs.h"
+#include "core/math_funcs.h"
 
 uint32_t Color::to_argb32() const {
 	uint32_t c = (uint8_t)Math::round(a * 255);

sfw/core/color.h

@@ -6,8 +6,8 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "math_funcs.h"
-#include "ustring.h"
+#include "core/math_funcs.h"
+#include "core/ustring.h"
 
 struct _NO_DISCARD_CLASS_ Color {
 	union {

sfw/core/cowdata.h

@@ -8,10 +8,10 @@
 
 #include <string.h>
 
-#include "error_list.h"
-#include "error_macros.h"
-#include "memory.h"
-#include "safe_refcount.h"
+#include "core/error_list.h"
+#include "core/error_macros.h"
+#include "core/memory.h"
+#include "core/safe_refcount.h"
 
 template <class T>
 class Vector;

sfw/core/error_macros.h

@@ -1,8 +1,8 @@
 #ifndef ERROR_MACROS_H
 #define ERROR_MACROS_H
 
-#include "logger.h"
-#include "typedefs.h"
+#include "core/logger.h"
+#include "core/typedefs.h"
 
 // Based on Godot Engine's error_macros.h
 // MIT License

sfw/core/face3.h

@@ -6,10 +6,10 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "aabb.h"
-#include "plane.h"
-#include "transform.h"
-#include "vector3.h"
+#include "core/aabb.h"
+#include "core/plane.h"
+#include "core/transform.h"
+#include "core/vector3.h"
 
 struct _NO_DISCARD_CLASS_ Face3 {
 	enum Side {

sfw/core/hash_map.h

@@ -6,11 +6,11 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "hashfuncs.h"
+#include "core/hashfuncs.h"
 #include "paged_allocator.h"
 #include "pair.h"
-#include "math_funcs.h"
-#include "memory.h"
+#include "core/math_funcs.h"
+#include "core/memory.h"
 #include "list.h"
 
 /**

sfw/core/hash_set.h

@@ -6,10 +6,10 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "hash_map.h"
-#include "hashfuncs.h"
-#include "math_funcs.h"
-#include "memory.h"
+#include "core/hash_map.h"
+#include "core/hashfuncs.h"
+#include "core/math_funcs.h"
+#include "core/memory.h"
 
 /**
  * Implementation of Set using a bidi indexed hash map.

sfw/core/hashfuncs.h

@@ -6,19 +6,19 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "aabb.h"
-#include "math_defs.h"
-#include "math_funcs.h"
-#include "rect2.h"
-#include "rect2i.h"
-#include "vector2.h"
-#include "vector2i.h"
-#include "vector3.h"
-#include "vector3i.h"
-#include "vector4.h"
-#include "vector4i.h"
-#include "string_name.h"
-#include "ustring.h"
+#include "core/aabb.h"
+#include "core/math_defs.h"
+#include "core/math_funcs.h"
+#include "core/rect2.h"
+#include "core/rect2i.h"
+#include "core/vector2.h"
+#include "core/vector2i.h"
+#include "core/vector3.h"
+#include "core/vector3i.h"
+#include "core/vector4.h"
+#include "core/vector4i.h"
+#include "core/string_name.h"
+#include "core/ustring.h"
 #include "core/typedefs.h"
 
 /**

sfw/core/list.h

@@ -6,9 +6,9 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "sort_array.h"
-#include "error_macros.h"
-#include "memory.h"
+#include "core/sort_array.h"
+#include "core/error_macros.h"
+#include "core/memory.h"
 
 /**
  * Generic Templatized Linked List Implementation.

sfw/core/local_vector.h

@@ -6,11 +6,11 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "pool_vector.h"
-#include "sort_array.h"
-#include "vector.h"
-#include "error_macros.h"
-#include "memory.h"
+#include "core/pool_vector.h"
+#include "core/sort_array.h"
+#include "core/vector.h"
+#include "core/error_macros.h"
+#include "core/memory.h"
 
 template <class T, class U = uint32_t, bool force_trivial = false>
 class LocalVector {

sfw/core/logger.cpp

@@ -1,13 +1,10 @@
 
-#include "logger.h"
+#include "core/logger.h"
 
-#include "ustring.h"
+#include "core/ustring.h"
 #include <cstdio>
 
-#include "logger.h"
 #include <stdio.h>
-#include <thread>
-
 
 void RLogger::print_trace(const String &str) {
 	print_trace(str.utf8().get_data());

sfw/core/math_funcs.cpp

@@ -3,9 +3,9 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "math_funcs.h"
+#include "core/math_funcs.h"
 
-#include "error_macros.h"
+#include "core/error_macros.h"
 
 RandomPCG Math::default_rand(RandomPCG::DEFAULT_SEED, RandomPCG::DEFAULT_INC);
 

sfw/core/math_funcs.h

@@ -6,12 +6,12 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "error_macros.h"
-#include "math_defs.h"
-#include "random_pcg.h"
-#include "typedefs.h"
+#include "core/error_macros.h"
+#include "core/math_defs.h"
+#include "core/random_pcg.h"
+#include "core/typedefs.h"
 
-#include "pcg.h"
+#include "core/pcg.h"
 
 #include <float.h>
 #include <math.h>

sfw/core/memory.cpp

@@ -3,10 +3,10 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "memory.h"
+#include "core/memory.h"
 
-#include "error_macros.h"
-#include "safe_refcount.h"
+#include "core/error_macros.h"
+#include "core/safe_refcount.h"
 
 #include <stdio.h>
 #include <stdlib.h>

sfw/core/memory.h

@@ -6,8 +6,8 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "error_macros.h"
-#include "safe_refcount.h"
+#include "core/error_macros.h"
+#include "core/safe_refcount.h"
 
 #include <stddef.h>
 

sfw/core/mutex.cpp

@@ -3,7 +3,7 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "mutex.h"
+#include "core/mutex.h"
 
 static Mutex _global_mutex;
 

sfw/core/mutex.h

@@ -6,8 +6,8 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "error_list.h"
-#include "typedefs.h"
+#include "core/error_list.h"
+#include "core/typedefs.h"
 
 #if !defined(NO_THREADS)
 

sfw/core/old/old/string.cpp

@@ -1,7 +1,7 @@
 #include "string.h"
 
 #include "math.h"
-#include "error_macros.h"
+#include "core/error_macros.h"
 #include "variant.h"
 #include <stdlib.h>
 #include <cstdio>

sfw/core/paged_allocator.h

@@ -6,7 +6,7 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "memory.h"
+#include "core/memory.h"
 #include "spin_lock.h"
 #include "core/typedefs.h"
 

sfw/core/pair.h

@@ -6,7 +6,7 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "hashfuncs.h"
+#include "core/hashfuncs.h"
 #include "core/typedefs.h"
 
 template <class F, class S>

sfw/core/pcg.cpp

@@ -1,7 +1,7 @@
 // *Really* minimal PCG32 code / (c) 2014 M.E. O'Neill / pcg-random.org
 // Licensed under Apache License 2.0 (NO WARRANTY, etc. see website)
 
-#include "pcg.h"
+#include "core/pcg.h"
 
 uint32_t pcg32_random_r(pcg32_random_t* rng)
 {

sfw/core/pcg.h

@@ -4,7 +4,7 @@
 #ifndef RANDOM_H
 #define RANDOM_H
 
-#include "typedefs.h"
+#include "core/typedefs.h"
 
 #define PCG_DEFAULT_INC_64 1442695040888963407ULL
 

sfw/core/plane.cpp

@@ -3,9 +3,9 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "plane.h"
+#include "core/plane.h"
 
-#include "math_funcs.h"
+#include "core/math_funcs.h"
 
 void Plane::set_normal(const Vector3 &p_normal) {
 	normal = p_normal;

sfw/core/plane.h

@@ -6,7 +6,7 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "vector3.h"
+#include "core/vector3.h"
 
 struct _NO_DISCARD_CLASS_ Plane {
 	Vector3 normal;

sfw/core/pool_allocator.cpp

@@ -5,8 +5,8 @@
 
 #include "pool_allocator.h"
 
-#include "error_macros.h"
-#include "memory.h"
+#include "core/error_macros.h"
+#include "core/memory.h"
 
 #define COMPACT_CHUNK(m_entry, m_to_pos)                      \
 	do {                                                      \

sfw/core/pool_allocator.h

@@ -6,7 +6,7 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "typedefs.h"
+#include "core/typedefs.h"
 
 /**
 	@author Juan Linietsky <reduzio@gmail.com>

sfw/core/pool_vector.cpp

@@ -3,7 +3,7 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "pool_vector.h"
+#include "core/pool_vector.h"
 
 Mutex pool_vector_lock;
 

sfw/core/pool_vector.h

@@ -6,12 +6,12 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "memory.h"
-#include "mutex.h"
+#include "core/memory.h"
+#include "core/mutex.h"
 #include "pool_allocator.h"
 #include "rw_lock.h"
-#include "safe_refcount.h"
-#include "ustring.h"
+#include "core/safe_refcount.h"
+#include "core/ustring.h"
 
 struct MemoryPool {
 	//avoid accessing these directly, must be public for template access

sfw/core/projection.cpp

@@ -3,13 +3,13 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "projection.h"
+#include "core/projection.h"
 
-#include "aabb.h"
-#include "math_funcs.h"
-#include "plane.h"
-#include "rect2.h"
-#include "transform.h"
+#include "core/aabb.h"
+#include "core/math_funcs.h"
+#include "core/plane.h"
+#include "core/rect2.h"
+#include "core/transform.h"
 
 float Projection::determinant() const {
 	return matrix[0][3] * matrix[1][2] * matrix[2][1] * matrix[3][0] - matrix[0][2] * matrix[1][3] * matrix[2][1] * matrix[3][0] -

sfw/core/projection.h

@@ -6,10 +6,10 @@
 #ifndef PROJECTION_H
 #define PROJECTION_H
 
-#include "vector.h"
-#include "math_defs.h"
-#include "vector3.h"
-#include "vector4.h"
+#include "core/vector.h"
+#include "core/math_defs.h"
+#include "core/vector3.h"
+#include "core/vector4.h"
 
 struct AABB;
 struct Plane;

sfw/core/quaternion.cpp

@@ -3,9 +3,9 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "quaternion.h"
+#include "core/quaternion.h"
 
-#include "basis.h"
+#include "core/basis.h"
 
 real_t Quaternion::angle_to(const Quaternion &p_to) const {
 	real_t d = dot(p_to);

sfw/core/quaternion.h

@@ -6,10 +6,10 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "math_defs.h"
-#include "math_funcs.h"
-#include "vector3.h"
-#include "ustring.h"
+#include "core/math_defs.h"
+#include "core/math_funcs.h"
+#include "core/vector3.h"
+#include "core/ustring.h"
 
 struct _NO_DISCARD_CLASS_ Quaternion {
 	union {

sfw/core/queue.h

@@ -3,7 +3,7 @@
 
 #include "core/error_macros.h"
 
-#include "vector.h"
+#include "core/vector.h"
 
 template<class T>
 class Queue

sfw/core/random_pcg.cpp

@@ -3,10 +3,10 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "random_pcg.h"
+#include "core/random_pcg.h"
 
 //#include "os/os.h"
-#include "error_macros.h"
+#include "core/error_macros.h"
 
 RandomPCG::RandomPCG(uint64_t p_seed, uint64_t p_inc) :
 		pcg(),

sfw/core/random_pcg.h

@@ -8,9 +8,9 @@
 
 #include <math.h>
 
-#include "math_defs.h"
+#include "core/math_defs.h"
 
-#include "pcg.h"
+#include "core/pcg.h"
 
 #if defined(__GNUC__) || (_llvm_has_builtin(__builtin_clz))
 #define CLZ32(x) __builtin_clz(x)

sfw/core/rb_map.h

@@ -6,8 +6,8 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "error_macros.h"
-#include "memory.h"
+#include "core/error_macros.h"
+#include "core/memory.h"
 
 // based on the very nice implementation of rb-trees by:
 // https://web.archive.org/web/20120507164830/http://web.mit.edu/~emin/www/source_code/red_black_tree/index.html

sfw/core/rb_set.h

@@ -6,7 +6,7 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "memory.h"
+#include "core/memory.h"
 #include "core/typedefs.h"
 
 // based on the very nice implementation of rb-trees by:

sfw/core/rect2.cpp

@@ -3,9 +3,9 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "transform_2d.h" // Includes rect2.h but Rect2 needs Transform2D
+#include "core/transform_2d.h" // Includes rect2.h but Rect2 needs Transform2D
 
-#include "rect2i.h"
+#include "core/rect2i.h"
 
 bool Rect2::is_equal_approx(const Rect2 &p_rect) const {
 	return position.is_equal_approx(p_rect.position) && size.is_equal_approx(p_rect.size);

sfw/core/rect2.h

@@ -6,8 +6,8 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "vector2.h" // also includes math_funcs and ustring
-#include "vector2i.h"
+#include "core/vector2.h" // also includes math_funcs and ustring
+#include "core/vector2i.h"
 
 struct Transform2D;
 struct Rect2i;

sfw/core/rect2i.cpp

@@ -3,7 +3,7 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "transform_2d.h" // Includes rect2.h but Rect2 needs Transform2D
+#include "core/transform_2d.h" // Includes rect2.h but Rect2 needs Transform2D
 
 Rect2i::operator String() const {
 	return "[P: " + position.operator String() + ", S: " + size + "]";

sfw/core/rect2i.h

@@ -6,7 +6,7 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "vector2i.h" // also includes math_funcs and ustring
+#include "core/vector2i.h" // also includes math_funcs and ustring
 
 struct _NO_DISCARD_CLASS_ Rect2i {
 	Point2i position;

sfw/core/ring_buffer.h

@@ -6,7 +6,7 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "vector.h"
+#include "core/vector.h"
 
 template <typename T>
 class RingBuffer {

sfw/core/rw_lock.h

@@ -6,7 +6,7 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "error_list.h"
+#include "core/error_list.h"
 
 #if !defined(NO_THREADS)
 

sfw/core/safe_refcount.cpp

@@ -5,7 +5,7 @@
 
 #if defined(DEBUG_ENABLED) && !defined(NO_THREADS)
 
-#include "safe_refcount.h"
+#include "core/safe_refcount.h"
 
 #include "core/error/error_macros.h"
 

sfw/core/safe_refcount.h

@@ -6,7 +6,7 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "typedefs.h"
+#include "core/typedefs.h"
 
 #if !defined(NO_THREADS)
 

sfw/core/sort_array.h

@@ -6,8 +6,8 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "error_macros.h"
-#include "typedefs.h"
+#include "core/error_macros.h"
+#include "core/typedefs.h"
 
 #define ERR_BAD_COMPARE(cond)                                         \
 	if (unlikely(cond)) {                                             \

sfw/core/stime.cpp

@@ -1,7 +1,7 @@
 // ----------------------------------------------------------------------------
 // time
 
-#include "stime.h"
+#include "core/stime.h"
 
 #include <sys/time.h>
 #include <time.h>

sfw/core/stime.h

@@ -5,7 +5,7 @@
 // time framework utils
 // - originally by rlyeh, public domain.
 
-#include "int_types.h"
+#include "core/int_types.h"
 
 class STime {
 public:

sfw/core/string_name.cpp

@@ -3,7 +3,7 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "string_name.h"
+#include "core/string_name.h"
 
 StaticCString StaticCString::create(const char *p_ptr) {
 	StaticCString scs;

sfw/core/string_name.h

@@ -6,9 +6,9 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "mutex.h"
-#include "safe_refcount.h"
-#include "ustring.h"
+#include "core/mutex.h"
+#include "core/safe_refcount.h"
+#include "core/ustring.h"
 
 struct StaticCString {
 	const char *ptr;

sfw/core/tight_local_vector.h

@@ -6,11 +6,11 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "pool_vector.h"
-#include "sort_array.h"
-#include "vector.h"
-#include "error_macros.h"
-#include "memory.h"
+#include "core/pool_vector.h"
+#include "core/sort_array.h"
+#include "core/vector.h"
+#include "core/error_macros.h"
+#include "core/memory.h"
 
 // It grows strictly as much as needed. (The vanilla LocalVector is what you want in most cases).
 template <class T, class U = uint32_t, bool force_trivial = false>

sfw/core/transform.cpp

@@ -3,9 +3,9 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "transform.h"
+#include "core/transform.h"
 
-#include "math_funcs.h"
+#include "core/math_funcs.h"
 
 void Transform::invert() {
 	basis.transpose();

sfw/core/transform.h

@@ -6,11 +6,11 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "aabb.h"
-#include "basis.h"
-#include "plane.h"
-#include "vector3i.h"
-#include "pool_vector.h"
+#include "core/aabb.h"
+#include "core/basis.h"
+#include "core/plane.h"
+#include "core/vector3i.h"
+#include "core/pool_vector.h"
 
 struct _NO_DISCARD_CLASS_ Transform {
 	Basis basis;

sfw/core/transform_2d.cpp

@@ -3,7 +3,7 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "transform_2d.h"
+#include "core/transform_2d.h"
 
 void Transform2D::invert() {
 	// FIXME: this function assumes the basis is a rotation matrix, with no scaling.

sfw/core/transform_2d.h

@@ -6,9 +6,9 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "pool_vector.h"
-#include "rect2.h" // also includes vector2, math_funcs, and ustring
-#include "rect2i.h" // also includes vector2i, math_funcs, and ustring
+#include "core/pool_vector.h"
+#include "core/rect2.h" // also includes vector2, math_funcs, and ustring
+#include "core/rect2i.h" // also includes vector2i, math_funcs, and ustring
 
 struct _NO_DISCARD_CLASS_ Transform2D {
 	// Warning #1: basis of Transform2D is stored differently from Basis. In terms of columns array, the basis matrix looks like "on paper":

sfw/core/typedefs.h

@@ -120,9 +120,9 @@ T *_nullptr() {
 #undef CONNECT_DEFERRED // override from Windows SDK, clashes with Object enum
 #endif
 
-#include "int_types.h"
+#include "core/int_types.h"
 
-#include "error_list.h"
+#include "core/error_list.h"
 
 /** Generic ABS function, for math uses please use Math::abs */
 

sfw/core/ustring.cpp

@@ -7,11 +7,11 @@
 #define _CRT_SECURE_NO_WARNINGS // to disable build-time warning which suggested to use strcpy_s instead strcpy
 #endif
 
-#include "ustring.h"
+#include "core/ustring.h"
 
-#include "color.h"
-#include "math_funcs.h"
-#include "memory.h"
+#include "core/color.h"
+#include "core/math_funcs.h"
+#include "core/memory.h"
 #include "ucaps.h"
 
 #include <wchar.h>

sfw/core/ustring.h

@@ -7,9 +7,9 @@
 /*************************************************************************/
 
 #include "cowdata.h"
-#include "vector.h"
+#include "core/vector.h"
 #include "char_utils.h"
-#include "typedefs.h"
+#include "core/typedefs.h"
 
 /*************************************************************************/
 /*  CharProxy                                                            */

sfw/core/vector.h

@@ -13,9 +13,9 @@
  */
 
 #include "cowdata.h"
-#include "sort_array.h"
-#include "error_macros.h"
-#include "memory.h"
+#include "core/sort_array.h"
+#include "core/error_macros.h"
+#include "core/memory.h"
 
 template <class T>
 class VectorWriteProxy {

sfw/core/vector2.cpp

@@ -3,9 +3,9 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "vector2.h"
+#include "core/vector2.h"
 
-#include "ustring.h"
+#include "core/ustring.h"
 
 real_t Vector2::angle() const {
 	return Math::atan2(y, x);

sfw/core/vector2.h

@@ -6,9 +6,9 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "math_funcs.h"
+#include "core/math_funcs.h"
 
-#include "error_macros.h"
+#include "core/error_macros.h"
 
 class String;
 

sfw/core/vector2i.cpp

@@ -3,9 +3,9 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "vector2i.h"
+#include "core/vector2i.h"
 
-#include "ustring.h"
+#include "core/ustring.h"
 
 Vector2i Vector2i::clamp(const Vector2i &p_min, const Vector2i &p_max) const {
 	return Vector2i(

sfw/core/vector2i.h

@@ -6,10 +6,10 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "error_macros.h"
-#include "math_funcs.h"
+#include "core/error_macros.h"
+#include "core/math_funcs.h"
 
-#include "vector2.h"
+#include "core/vector2.h"
 
 class String;
 

sfw/core/vector3.cpp

@@ -3,9 +3,9 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "vector3.h"
+#include "core/vector3.h"
 
-#include "basis.h"
+#include "core/basis.h"
 
 void Vector3::rotate(const Vector3 &p_axis, real_t p_phi) {
 	*this = Basis(p_axis, p_phi).xform(*this);

sfw/core/vector3.h

@@ -6,8 +6,8 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "math_funcs.h"
-#include "ustring.h"
+#include "core/math_funcs.h"
+#include "core/ustring.h"
 
 struct Basis;
 

sfw/core/vector3i.cpp

@@ -3,10 +3,10 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "vector3i.h"
+#include "core/vector3i.h"
 
-#include "vector3.h"
-#include "ustring.h"
+#include "core/vector3.h"
+#include "core/ustring.h"
 
 void Vector3i::set_axis(const int p_axis, const int32_t p_value) {
 	ERR_FAIL_INDEX(p_axis, 3);

sfw/core/vector3i.h

@@ -6,8 +6,8 @@
 #ifndef VECTOR3I_H
 #define VECTOR3I_H
 
-#include "error_macros.h"
-#include "math_funcs.h"
+#include "core/error_macros.h"
+#include "core/math_funcs.h"
 
 class String;
 struct Vector3;

sfw/core/vector4.cpp

@@ -3,9 +3,9 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "vector4.h"
+#include "core/vector4.h"
 
-#include "basis.h"
+#include "core/basis.h"
 
 void Vector4::set_axis(const int p_axis, const real_t p_value) {
 	ERR_FAIL_INDEX(p_axis, 4);

sfw/core/vector4.h

@@ -6,9 +6,9 @@
 #ifndef VECTOR4_H
 #define VECTOR4_H
 
-#include "math_defs.h"
-#include "math_funcs.h"
-#include "ustring.h"
+#include "core/math_defs.h"
+#include "core/math_funcs.h"
+#include "core/ustring.h"
 
 struct _NO_DISCARD_CLASS_ Vector4 {
 	enum Axis {

sfw/core/vector4i.cpp

@@ -3,10 +3,10 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "vector4i.h"
+#include "core/vector4i.h"
 
-#include "vector4.h"
-#include "ustring.h"
+#include "core/vector4.h"
+#include "core/ustring.h"
 
 void Vector4i::set_axis(const int p_axis, const int32_t p_value) {
 	ERR_FAIL_INDEX(p_axis, 4);

sfw/core/vector4i.h

@@ -6,8 +6,8 @@
 #ifndef VECTOR4I_H
 #define VECTOR4I_H
 
-#include "error_macros.h"
-#include "math_funcs.h"
+#include "core/error_macros.h"
+#include "core/math_funcs.h"
 
 class String;
 struct Vector4;

sfw/core/vset.h

@@ -6,7 +6,7 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "vector.h"
+#include "core/vector.h"
 #include "core/typedefs.h"
 
 template <class T>

sfw/object/object.cpp

@@ -1,4 +1,4 @@
-#include "object.h"
+#include "object/object.h"
 
 Object::Object() {
 }

sfw/object/object.h

@@ -1,8 +1,8 @@
 #ifndef OBJECT_H
 #define OBJECT_H
 
-#include "ustring.h"
-#include "vector.h"
+#include "core/ustring.h"
+#include "core/vector.h"
 
 /*************************************************************************/
 /*  object.h                                                             */

sfw/object/psignal.h

@@ -5,7 +5,7 @@
 #include "core/string.h"
 #include "core/variant.h"
 
-#include "reference.h"
+#include "object/reference.h"
 
 class Signal {
 public:

sfw/object/reference.cpp

@@ -1,4 +1,4 @@
-#include "reference.h"
+#include "object/reference.h"
 
 /*************************************************************************/
 /*  reference.cpp                                                        */

sfw/object/reference.h

@@ -6,9 +6,9 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "memory.h"
-#include "object.h"
-#include "safe_refcount.h"
+#include "core/memory.h"
+#include "object/object.h"
+#include "core/safe_refcount.h"
 
 class Reference : public Object {
 	SFW_OBJECT(Reference, Object);

sfw/object/resource.h

@@ -1,7 +1,7 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#include "reference.h"
+#include "object/reference.h"
 
 #include "psignal.h"
 

sfw/object/variant.h

@@ -6,21 +6,21 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "pool_vector.h"
-#include "aabb.h"
-#include "basis.h"
-#include "color.h"
+#include "core/pool_vector.h"
+#include "core/aabb.h"
+#include "core/basis.h"
+#include "core/color.h"
 #include "face3.h"
-#include "plane.h"
-#include "projection.h"
-#include "quaternion.h"
-#include "transform.h"
-#include "transform_2d.h"
-#include "vector3.h"
-#include "vector3i.h"
-#include "vector4.h"
-#include "vector4i.h"
-#include "ustring.h"
+#include "core/plane.h"
+#include "core/projection.h"
+#include "core/quaternion.h"
+#include "core/transform.h"
+#include "core/transform_2d.h"
+#include "core/vector3.h"
+#include "core/vector3i.h"
+#include "core/vector4.h"
+#include "core/vector4i.h"
+#include "core/ustring.h"
 #include "array.h"
 #include "dictionary.h"
 

sfw/render_core/application.cpp

@@ -1,8 +1,8 @@
-#include "application.h"
+#include "render_core/application.h"
 
 #include <chrono>
 
-#include "window.h"
+#include "render_core/window.h"
 
 void Application::event() {
     scene->event();

sfw/render_core/application.h

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 
-#include "scene.h"
+#include "render_core/scene.h"
 
 class AppWindow;
 

sfw/render_core/color_material.h

@@ -1,9 +1,9 @@
 #ifndef COLOR_MATERIAL_H
 #define COLOR_MATERIAL_H
 
-#include "material.h"
+#include "render_core/material.h"
 
-#include "camera_3d.h"
+#include "render_objects/camera_3d.h"
 
 class ColorMaterial : public Material {
 public:

sfw/render_core/colored_material.h

@@ -1,11 +1,11 @@
 #ifndef COLORED_MATERIAL_H
 #define COLORED_MATERIAL_H
 
-#include "material.h"
+#include "render_core/material.h"
 
-#include "color.h"
+#include "core/color.h"
 
-#include "camera_3d.h"
+#include "render_objects/camera_3d.h"
 
 class ColoredMaterial : public Material {
 public:

sfw/render_core/image.cpp

@@ -3,13 +3,13 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "image.h"
+#include "render_core/image.h"
 
-#include "error_macros.h"
-#include "hash_map.h"
+#include "core/error_macros.h"
+#include "core/hash_map.h"
 #include "math.h"
-#include "memory.h"
-#include "vector3.h"
+#include "core/memory.h"
+#include "core/vector3.h"
 #include <memory.h>
 #include <stdio.h>
 

sfw/render_core/image.h

@@ -6,12 +6,12 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
-#include "color.h"
-#include "rect2.h"
-#include "rect2i.h"
-#include "reference.h"
-#include "vector.h"
-#include "vector2i.h"
+#include "core/color.h"
+#include "core/rect2.h"
+#include "core/rect2i.h"
+#include "object/reference.h"
+#include "core/vector.h"
+#include "core/vector2i.h"
 
 class Image : public Reference {
 	SFW_OBJECT(Image, Reference);

sfw/render_core/material.cpp

@@ -1,4 +1,4 @@
-#include "material.h"
+#include "render_core/material.h"
 
 #include <stdio.h>
 

sfw/render_core/material.h

@@ -1,10 +1,10 @@
 #ifndef MATERIAL_H
 #define MATERIAL_H
 
-#include "projection.h"
-#include "shader.h"
-#include "transform.h"
-#include "transform_2d.h"
+#include "core/projection.h"
+#include "render_core/shader.h"
+#include "core/transform.h"
+#include "core/transform_2d.h"
 
 class Material {
 public:

sfw/render_core/mesh.cpp

@@ -1,6 +1,6 @@
-#include "mesh.h"
+#include "render_core/mesh.h"
 
-#include "shader.h"
+#include "render_core/shader.h"
 
 void Mesh::add_vertex2(float x, float y) {
     vertices.push_back(x);

sfw/render_core/mesh.h

@@ -1,10 +1,10 @@
 #ifndef MESH_H
 #define MESH_H
 
-#include "vector.h"
+#include "core/vector.h"
 #include <inttypes.h>
 
-#include "3rd_glad.h"
+#include "render_core/3rd_glad.h"
 
 class Mesh {
 public: