From 985aa8e2fb4369827e5831076353d7de45363cac Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 31 Dec 2023 15:04:17 +0100 Subject: [PATCH] Use include paths relative to the lib's folder to simplify the build setup. --- compile_linux.sh | 102 +++++++++--------- game_application.h | 2 +- game_scene.cpp | 8 +- game_scene.h | 26 ++--- main.cpp | 6 +- sfw/core/aabb.cpp | 2 +- sfw/core/aabb.h | 6 +- sfw/core/basis.cpp | 4 +- sfw/core/basis.h | 6 +- sfw/core/char_range.inc | 2 +- sfw/core/char_utils.h | 4 +- sfw/core/color.cpp | 4 +- sfw/core/color.h | 4 +- sfw/core/cowdata.h | 8 +- sfw/core/error_macros.h | 4 +- sfw/core/face3.h | 8 +- sfw/core/hash_map.h | 6 +- sfw/core/hash_set.h | 8 +- sfw/core/hashfuncs.h | 26 ++--- sfw/core/list.h | 6 +- sfw/core/local_vector.h | 10 +- sfw/core/logger.cpp | 7 +- sfw/core/math_funcs.cpp | 4 +- sfw/core/math_funcs.h | 10 +- sfw/core/memory.cpp | 6 +- sfw/core/memory.h | 4 +- sfw/core/mutex.cpp | 2 +- sfw/core/mutex.h | 4 +- sfw/core/old/old/string.cpp | 2 +- sfw/core/paged_allocator.h | 2 +- sfw/core/pair.h | 2 +- sfw/core/pcg.cpp | 2 +- sfw/core/pcg.h | 2 +- sfw/core/plane.cpp | 4 +- sfw/core/plane.h | 2 +- sfw/core/pool_allocator.cpp | 4 +- sfw/core/pool_allocator.h | 2 +- sfw/core/pool_vector.cpp | 2 +- sfw/core/pool_vector.h | 8 +- sfw/core/projection.cpp | 12 +-- sfw/core/projection.h | 8 +- sfw/core/quaternion.cpp | 4 +- sfw/core/quaternion.h | 8 +- sfw/core/queue.h | 2 +- sfw/core/random_pcg.cpp | 4 +- sfw/core/random_pcg.h | 4 +- sfw/core/rb_map.h | 4 +- sfw/core/rb_set.h | 2 +- sfw/core/rect2.cpp | 4 +- sfw/core/rect2.h | 4 +- sfw/core/rect2i.cpp | 2 +- sfw/core/rect2i.h | 2 +- sfw/core/ring_buffer.h | 2 +- sfw/core/rw_lock.h | 2 +- sfw/core/safe_refcount.cpp | 2 +- sfw/core/safe_refcount.h | 2 +- sfw/core/sort_array.h | 4 +- sfw/core/stime.cpp | 2 +- sfw/core/stime.h | 2 +- sfw/core/string_name.cpp | 2 +- sfw/core/string_name.h | 6 +- sfw/core/tight_local_vector.h | 10 +- sfw/core/transform.cpp | 4 +- sfw/core/transform.h | 10 +- sfw/core/transform_2d.cpp | 2 +- sfw/core/transform_2d.h | 6 +- sfw/core/typedefs.h | 4 +- sfw/core/ustring.cpp | 8 +- sfw/core/ustring.h | 4 +- sfw/core/vector.h | 6 +- sfw/core/vector2.cpp | 4 +- sfw/core/vector2.h | 4 +- sfw/core/vector2i.cpp | 4 +- sfw/core/vector2i.h | 6 +- sfw/core/vector3.cpp | 4 +- sfw/core/vector3.h | 4 +- sfw/core/vector3i.cpp | 6 +- sfw/core/vector3i.h | 4 +- sfw/core/vector4.cpp | 4 +- sfw/core/vector4.h | 6 +- sfw/core/vector4i.cpp | 6 +- sfw/core/vector4i.h | 4 +- sfw/core/vset.h | 2 +- sfw/object/object.cpp | 2 +- sfw/object/object.h | 4 +- sfw/object/psignal.h | 2 +- sfw/object/reference.cpp | 2 +- sfw/object/reference.h | 6 +- sfw/object/resource.h | 2 +- sfw/object/variant.h | 28 ++--- sfw/render_core/application.cpp | 4 +- sfw/render_core/application.h | 2 +- sfw/render_core/color_material.h | 4 +- sfw/render_core/colored_material.h | 6 +- sfw/render_core/image.cpp | 10 +- sfw/render_core/image.h | 12 +-- sfw/render_core/material.cpp | 2 +- sfw/render_core/material.h | 8 +- sfw/render_core/mesh.cpp | 4 +- sfw/render_core/mesh.h | 4 +- sfw/render_core/mesh_utils.cpp | 2 +- sfw/render_core/mesh_utils.h | 2 +- sfw/render_core/scene.cpp | 2 +- sfw/render_core/shader.cpp | 2 +- sfw/render_core/shader.h | 4 +- sfw/render_core/texture.cpp | 6 +- sfw/render_core/texture.h | 4 +- sfw/render_core/texture_material.h | 6 +- sfw/render_core/texture_material_2d.h | 6 +- .../transparent_texture_material.h | 6 +- sfw/render_core/window.cpp | 14 +-- sfw/render_core/window.h | 6 +- sfw/render_immediate/renderer.h | 4 +- sfw/render_objects/camera_2d.cpp | 4 +- sfw/render_objects/camera_2d.h | 10 +- sfw/render_objects/camera_3d.cpp | 4 +- sfw/render_objects/camera_3d.h | 8 +- sfw/render_objects/mesh_instance_2d.cpp | 4 +- sfw/render_objects/mesh_instance_2d.h | 8 +- sfw/render_objects/mesh_instance_3d.cpp | 4 +- sfw/render_objects/mesh_instance_3d.h | 10 +- sfw/render_objects/object_2d.cpp | 2 +- sfw/render_objects/object_2d.h | 2 +- sfw/render_objects/object_3d.cpp | 2 +- sfw/render_objects/object_3d.h | 2 +- sfw/render_objects/sprite.cpp | 2 +- sfw/render_objects/sprite.h | 6 +- sfw/render_objects/tile_map.cpp | 4 +- sfw/render_objects/tile_map.h | 6 +- 129 files changed, 379 insertions(+), 382 deletions(-) diff --git a/compile_linux.sh b/compile_linux.sh index 53262cd..7d1178e 100755 --- a/compile_linux.sh +++ b/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 \ diff --git a/game_application.h b/game_application.h index 5e7fff4..41421d7 100644 --- a/game_application.h +++ b/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" diff --git a/game_scene.cpp b/game_scene.cpp index fd6eaec..9a3e110 100644 --- a/game_scene.cpp +++ b/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() { /* diff --git a/game_scene.h b/game_scene.h index 624e898..06b9cbb 100644 --- a/game_scene.h +++ b/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: diff --git a/main.cpp b/main.cpp index 28aff15..8ca110e 100644 --- a/main.cpp +++ b/main.cpp @@ -2,11 +2,11 @@ #include #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; diff --git a/sfw/core/aabb.cpp b/sfw/core/aabb.cpp index f994c88..e318889 100644 --- a/sfw/core/aabb.cpp +++ b/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; diff --git a/sfw/core/aabb.h b/sfw/core/aabb.h index e1eaf03..525983a 100644 --- a/sfw/core/aabb.h +++ b/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) diff --git a/sfw/core/basis.cpp b/sfw/core/basis.cpp index 59e49f1..12e40f7 100644 --- a/sfw/core/basis.cpp +++ b/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]) diff --git a/sfw/core/basis.h b/sfw/core/basis.h index ad7e45f..999abbd 100644 --- a/sfw/core/basis.h +++ b/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] = { diff --git a/sfw/core/char_range.inc b/sfw/core/char_range.inc index 87613c4..9eddc66 100644 --- a/sfw/core/char_range.inc +++ b/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; diff --git a/sfw/core/char_utils.h b/sfw/core/char_utils.h index 8367f64..3af012d 100644 --- a/sfw/core/char_utils.h +++ b/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++) { diff --git a/sfw/core/color.cpp b/sfw/core/color.cpp index 3672cdf..8f4c0b5 100644 --- a/sfw/core/color.cpp +++ b/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); diff --git a/sfw/core/color.h b/sfw/core/color.h index b008636..3c12fda 100644 --- a/sfw/core/color.h +++ b/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 { diff --git a/sfw/core/cowdata.h b/sfw/core/cowdata.h index 3bf9d14..9cadcbe 100644 --- a/sfw/core/cowdata.h +++ b/sfw/core/cowdata.h @@ -8,10 +8,10 @@ #include -#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 Vector; diff --git a/sfw/core/error_macros.h b/sfw/core/error_macros.h index 925cf37..fa3e1c3 100644 --- a/sfw/core/error_macros.h +++ b/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 diff --git a/sfw/core/face3.h b/sfw/core/face3.h index b4f4a28..29b0973 100644 --- a/sfw/core/face3.h +++ b/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 { diff --git a/sfw/core/hash_map.h b/sfw/core/hash_map.h index fe69ce1..effe7c5 100644 --- a/sfw/core/hash_map.h +++ b/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" /** diff --git a/sfw/core/hash_set.h b/sfw/core/hash_set.h index da16889..1b49e4e 100644 --- a/sfw/core/hash_set.h +++ b/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. diff --git a/sfw/core/hashfuncs.h b/sfw/core/hashfuncs.h index a6a287a..5b9fd9a 100644 --- a/sfw/core/hashfuncs.h +++ b/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" /** diff --git a/sfw/core/list.h b/sfw/core/list.h index ad29f85..08178c7 100644 --- a/sfw/core/list.h +++ b/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. diff --git a/sfw/core/local_vector.h b/sfw/core/local_vector.h index cbec9e3..a1e6e10 100644 --- a/sfw/core/local_vector.h +++ b/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 LocalVector { diff --git a/sfw/core/logger.cpp b/sfw/core/logger.cpp index f9d45a8..0ba16d0 100644 --- a/sfw/core/logger.cpp +++ b/sfw/core/logger.cpp @@ -1,13 +1,10 @@ -#include "logger.h" +#include "core/logger.h" -#include "ustring.h" +#include "core/ustring.h" #include -#include "logger.h" #include -#include - void RLogger::print_trace(const String &str) { print_trace(str.utf8().get_data()); diff --git a/sfw/core/math_funcs.cpp b/sfw/core/math_funcs.cpp index c06c2d5..7483323 100644 --- a/sfw/core/math_funcs.cpp +++ b/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); diff --git a/sfw/core/math_funcs.h b/sfw/core/math_funcs.h index 9363317..37b2ccd 100644 --- a/sfw/core/math_funcs.h +++ b/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 #include diff --git a/sfw/core/memory.cpp b/sfw/core/memory.cpp index f276a50..ca6edc9 100644 --- a/sfw/core/memory.cpp +++ b/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 #include diff --git a/sfw/core/memory.h b/sfw/core/memory.h index 85bb17a..97bfb54 100644 --- a/sfw/core/memory.h +++ b/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 diff --git a/sfw/core/mutex.cpp b/sfw/core/mutex.cpp index 931cbe2..868b59f 100644 --- a/sfw/core/mutex.cpp +++ b/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; diff --git a/sfw/core/mutex.h b/sfw/core/mutex.h index 0f63c62..1bb9ced 100644 --- a/sfw/core/mutex.h +++ b/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) diff --git a/sfw/core/old/old/string.cpp b/sfw/core/old/old/string.cpp index 696e018..c511b63 100644 --- a/sfw/core/old/old/string.cpp +++ b/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 #include diff --git a/sfw/core/paged_allocator.h b/sfw/core/paged_allocator.h index 8052a34..799448c 100644 --- a/sfw/core/paged_allocator.h +++ b/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" diff --git a/sfw/core/pair.h b/sfw/core/pair.h index 8ebe037..4814501 100644 --- a/sfw/core/pair.h +++ b/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 diff --git a/sfw/core/pcg.cpp b/sfw/core/pcg.cpp index 914a353..4eac733 100644 --- a/sfw/core/pcg.cpp +++ b/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) { diff --git a/sfw/core/pcg.h b/sfw/core/pcg.h index a3cfe2f..0faab73 100644 --- a/sfw/core/pcg.h +++ b/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 diff --git a/sfw/core/plane.cpp b/sfw/core/plane.cpp index 51f3a77..ff1b501 100644 --- a/sfw/core/plane.cpp +++ b/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; diff --git a/sfw/core/plane.h b/sfw/core/plane.h index 87c895e..4f4bde3 100644 --- a/sfw/core/plane.h +++ b/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; diff --git a/sfw/core/pool_allocator.cpp b/sfw/core/pool_allocator.cpp index 339a75d..4250835 100644 --- a/sfw/core/pool_allocator.cpp +++ b/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 { \ diff --git a/sfw/core/pool_allocator.h b/sfw/core/pool_allocator.h index 4d03afb..d69a4b1 100644 --- a/sfw/core/pool_allocator.h +++ b/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 diff --git a/sfw/core/pool_vector.cpp b/sfw/core/pool_vector.cpp index dca7f61..68acfc6 100644 --- a/sfw/core/pool_vector.cpp +++ b/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; diff --git a/sfw/core/pool_vector.h b/sfw/core/pool_vector.h index d5584ea..dc8d8d1 100644 --- a/sfw/core/pool_vector.h +++ b/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 diff --git a/sfw/core/projection.cpp b/sfw/core/projection.cpp index baa85c5..3da66de 100644 --- a/sfw/core/projection.cpp +++ b/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] - diff --git a/sfw/core/projection.h b/sfw/core/projection.h index dc0b8c1..d7a0bb8 100644 --- a/sfw/core/projection.h +++ b/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; diff --git a/sfw/core/quaternion.cpp b/sfw/core/quaternion.cpp index 3fdc389..28a8ea4 100644 --- a/sfw/core/quaternion.cpp +++ b/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); diff --git a/sfw/core/quaternion.h b/sfw/core/quaternion.h index 07b46c5..05ffc69 100644 --- a/sfw/core/quaternion.h +++ b/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 { diff --git a/sfw/core/queue.h b/sfw/core/queue.h index b7f82a0..2592344 100644 --- a/sfw/core/queue.h +++ b/sfw/core/queue.h @@ -3,7 +3,7 @@ #include "core/error_macros.h" -#include "vector.h" +#include "core/vector.h" template class Queue diff --git a/sfw/core/random_pcg.cpp b/sfw/core/random_pcg.cpp index 3426dab..af9ced0 100644 --- a/sfw/core/random_pcg.cpp +++ b/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(), diff --git a/sfw/core/random_pcg.h b/sfw/core/random_pcg.h index fde46b2..c7804d0 100644 --- a/sfw/core/random_pcg.h +++ b/sfw/core/random_pcg.h @@ -8,9 +8,9 @@ #include -#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) diff --git a/sfw/core/rb_map.h b/sfw/core/rb_map.h index 60a75d3..bce974b 100644 --- a/sfw/core/rb_map.h +++ b/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 diff --git a/sfw/core/rb_set.h b/sfw/core/rb_set.h index 54ee034..ae56cc5 100644 --- a/sfw/core/rb_set.h +++ b/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: diff --git a/sfw/core/rect2.cpp b/sfw/core/rect2.cpp index 1c5ad57..089ab69 100644 --- a/sfw/core/rect2.cpp +++ b/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); diff --git a/sfw/core/rect2.h b/sfw/core/rect2.h index 2fa7508..bc039b5 100644 --- a/sfw/core/rect2.h +++ b/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; diff --git a/sfw/core/rect2i.cpp b/sfw/core/rect2i.cpp index 5a03ea7..33f80ea 100644 --- a/sfw/core/rect2i.cpp +++ b/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 + "]"; diff --git a/sfw/core/rect2i.h b/sfw/core/rect2i.h index 997a00a..fd1100f 100644 --- a/sfw/core/rect2i.h +++ b/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; diff --git a/sfw/core/ring_buffer.h b/sfw/core/ring_buffer.h index 0072fae..51f4b6a 100644 --- a/sfw/core/ring_buffer.h +++ b/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 class RingBuffer { diff --git a/sfw/core/rw_lock.h b/sfw/core/rw_lock.h index 8de0816..68e4aa9 100644 --- a/sfw/core/rw_lock.h +++ b/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) diff --git a/sfw/core/safe_refcount.cpp b/sfw/core/safe_refcount.cpp index 2458559..18990d7 100644 --- a/sfw/core/safe_refcount.cpp +++ b/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" diff --git a/sfw/core/safe_refcount.h b/sfw/core/safe_refcount.h index 295cf6c..4aebe0d 100644 --- a/sfw/core/safe_refcount.h +++ b/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) diff --git a/sfw/core/sort_array.h b/sfw/core/sort_array.h index 6afb214..93c1b0a 100644 --- a/sfw/core/sort_array.h +++ b/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)) { \ diff --git a/sfw/core/stime.cpp b/sfw/core/stime.cpp index e07be44..67a7729 100644 --- a/sfw/core/stime.cpp +++ b/sfw/core/stime.cpp @@ -1,7 +1,7 @@ // ---------------------------------------------------------------------------- // time -#include "stime.h" +#include "core/stime.h" #include #include diff --git a/sfw/core/stime.h b/sfw/core/stime.h index 6a2cc5d..f4274a1 100644 --- a/sfw/core/stime.h +++ b/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: diff --git a/sfw/core/string_name.cpp b/sfw/core/string_name.cpp index b501088..1bae56b 100644 --- a/sfw/core/string_name.cpp +++ b/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; diff --git a/sfw/core/string_name.h b/sfw/core/string_name.h index 5359bb0..eb55a8c 100644 --- a/sfw/core/string_name.h +++ b/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; diff --git a/sfw/core/tight_local_vector.h b/sfw/core/tight_local_vector.h index f5c8e5e..84ab78f 100644 --- a/sfw/core/tight_local_vector.h +++ b/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 diff --git a/sfw/core/transform.cpp b/sfw/core/transform.cpp index d8e9fdb..8e99e77 100644 --- a/sfw/core/transform.cpp +++ b/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(); diff --git a/sfw/core/transform.h b/sfw/core/transform.h index 8d2567a..bedfe12 100644 --- a/sfw/core/transform.h +++ b/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; diff --git a/sfw/core/transform_2d.cpp b/sfw/core/transform_2d.cpp index bc6c677..48ff3f8 100644 --- a/sfw/core/transform_2d.cpp +++ b/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. diff --git a/sfw/core/transform_2d.h b/sfw/core/transform_2d.h index a0cb090..3cefb45 100644 --- a/sfw/core/transform_2d.h +++ b/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": diff --git a/sfw/core/typedefs.h b/sfw/core/typedefs.h index 819836c..6be82bf 100644 --- a/sfw/core/typedefs.h +++ b/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 */ diff --git a/sfw/core/ustring.cpp b/sfw/core/ustring.cpp index 9a9591e..d6a72ad 100644 --- a/sfw/core/ustring.cpp +++ b/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 diff --git a/sfw/core/ustring.h b/sfw/core/ustring.h index a72667d..9188b7e 100644 --- a/sfw/core/ustring.h +++ b/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 */ diff --git a/sfw/core/vector.h b/sfw/core/vector.h index 2524d3b..d125dbe 100644 --- a/sfw/core/vector.h +++ b/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 VectorWriteProxy { diff --git a/sfw/core/vector2.cpp b/sfw/core/vector2.cpp index 41457b6..532a0e7 100644 --- a/sfw/core/vector2.cpp +++ b/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); diff --git a/sfw/core/vector2.h b/sfw/core/vector2.h index 537446c..52fc7ab 100644 --- a/sfw/core/vector2.h +++ b/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; diff --git a/sfw/core/vector2i.cpp b/sfw/core/vector2i.cpp index 604a1f9..c1b11e9 100644 --- a/sfw/core/vector2i.cpp +++ b/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( diff --git a/sfw/core/vector2i.h b/sfw/core/vector2i.h index 5031801..bdaf6ca 100644 --- a/sfw/core/vector2i.h +++ b/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; diff --git a/sfw/core/vector3.cpp b/sfw/core/vector3.cpp index c2f03fa..0614375 100644 --- a/sfw/core/vector3.cpp +++ b/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); diff --git a/sfw/core/vector3.h b/sfw/core/vector3.h index 9804c71..66519ec 100644 --- a/sfw/core/vector3.h +++ b/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; diff --git a/sfw/core/vector3i.cpp b/sfw/core/vector3i.cpp index f8b8f90..e4f7946 100644 --- a/sfw/core/vector3i.cpp +++ b/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); diff --git a/sfw/core/vector3i.h b/sfw/core/vector3i.h index 747cb7e..a988dd3 100644 --- a/sfw/core/vector3i.h +++ b/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; diff --git a/sfw/core/vector4.cpp b/sfw/core/vector4.cpp index d714a54..d985895 100644 --- a/sfw/core/vector4.cpp +++ b/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); diff --git a/sfw/core/vector4.h b/sfw/core/vector4.h index 95f9b09..f5e835b 100644 --- a/sfw/core/vector4.h +++ b/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 { diff --git a/sfw/core/vector4i.cpp b/sfw/core/vector4i.cpp index d375814..8a9ada5 100644 --- a/sfw/core/vector4i.cpp +++ b/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); diff --git a/sfw/core/vector4i.h b/sfw/core/vector4i.h index 4a30ab2..e1a5249 100644 --- a/sfw/core/vector4i.h +++ b/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; diff --git a/sfw/core/vset.h b/sfw/core/vset.h index 5af5480..6e38c7a 100644 --- a/sfw/core/vset.h +++ b/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 diff --git a/sfw/object/object.cpp b/sfw/object/object.cpp index d79d0bc..194e03d 100644 --- a/sfw/object/object.cpp +++ b/sfw/object/object.cpp @@ -1,4 +1,4 @@ -#include "object.h" +#include "object/object.h" Object::Object() { } diff --git a/sfw/object/object.h b/sfw/object/object.h index dda195e..ead8220 100644 --- a/sfw/object/object.h +++ b/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 */ diff --git a/sfw/object/psignal.h b/sfw/object/psignal.h index 32a3cb7..7845c06 100644 --- a/sfw/object/psignal.h +++ b/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: diff --git a/sfw/object/reference.cpp b/sfw/object/reference.cpp index 733bd0f..85a3ec9 100644 --- a/sfw/object/reference.cpp +++ b/sfw/object/reference.cpp @@ -1,4 +1,4 @@ -#include "reference.h" +#include "object/reference.h" /*************************************************************************/ /* reference.cpp */ diff --git a/sfw/object/reference.h b/sfw/object/reference.h index f132eb1..f72b127 100644 --- a/sfw/object/reference.h +++ b/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); diff --git a/sfw/object/resource.h b/sfw/object/resource.h index f82c228..0312401 100644 --- a/sfw/object/resource.h +++ b/sfw/object/resource.h @@ -1,7 +1,7 @@ #ifndef RESOURCE_H #define RESOURCE_H -#include "reference.h" +#include "object/reference.h" #include "psignal.h" diff --git a/sfw/object/variant.h b/sfw/object/variant.h index 9a3fc95..e9312c2 100644 --- a/sfw/object/variant.h +++ b/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" diff --git a/sfw/render_core/application.cpp b/sfw/render_core/application.cpp index 86dfbbe..db8b421 100644 --- a/sfw/render_core/application.cpp +++ b/sfw/render_core/application.cpp @@ -1,8 +1,8 @@ -#include "application.h" +#include "render_core/application.h" #include -#include "window.h" +#include "render_core/window.h" void Application::event() { scene->event(); diff --git a/sfw/render_core/application.h b/sfw/render_core/application.h index 6f1d379..7369ed9 100644 --- a/sfw/render_core/application.h +++ b/sfw/render_core/application.h @@ -3,7 +3,7 @@ #include -#include "scene.h" +#include "render_core/scene.h" class AppWindow; diff --git a/sfw/render_core/color_material.h b/sfw/render_core/color_material.h index 4c19f6f..7b620cb 100644 --- a/sfw/render_core/color_material.h +++ b/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: diff --git a/sfw/render_core/colored_material.h b/sfw/render_core/colored_material.h index 4fee84d..aa1fd63 100644 --- a/sfw/render_core/colored_material.h +++ b/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: diff --git a/sfw/render_core/image.cpp b/sfw/render_core/image.cpp index f4e7d00..55c796c 100644 --- a/sfw/render_core/image.cpp +++ b/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 #include diff --git a/sfw/render_core/image.h b/sfw/render_core/image.h index 1c7604e..0634b37 100644 --- a/sfw/render_core/image.h +++ b/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); diff --git a/sfw/render_core/material.cpp b/sfw/render_core/material.cpp index 6ee3bef..ccc58e1 100644 --- a/sfw/render_core/material.cpp +++ b/sfw/render_core/material.cpp @@ -1,4 +1,4 @@ -#include "material.h" +#include "render_core/material.h" #include diff --git a/sfw/render_core/material.h b/sfw/render_core/material.h index c73cce9..7282165 100644 --- a/sfw/render_core/material.h +++ b/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: diff --git a/sfw/render_core/mesh.cpp b/sfw/render_core/mesh.cpp index c83fe5d..785fdb2 100644 --- a/sfw/render_core/mesh.cpp +++ b/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); diff --git a/sfw/render_core/mesh.h b/sfw/render_core/mesh.h index b94331f..1b69d71 100644 --- a/sfw/render_core/mesh.h +++ b/sfw/render_core/mesh.h @@ -1,10 +1,10 @@ #ifndef MESH_H #define MESH_H -#include "vector.h" +#include "core/vector.h" #include -#include "3rd_glad.h" +#include "render_core/3rd_glad.h" class Mesh { public: diff --git a/sfw/render_core/mesh_utils.cpp b/sfw/render_core/mesh_utils.cpp index 2533df7..ca5e28c 100644 --- a/sfw/render_core/mesh_utils.cpp +++ b/sfw/render_core/mesh_utils.cpp @@ -1,4 +1,4 @@ -#include "mesh_utils.h" +#include "render_core/mesh_utils.h" void MeshUtils::create_cone(Mesh *mesh) { if (!mesh) diff --git a/sfw/render_core/mesh_utils.h b/sfw/render_core/mesh_utils.h index 5516e72..f62c24f 100644 --- a/sfw/render_core/mesh_utils.h +++ b/sfw/render_core/mesh_utils.h @@ -1,7 +1,7 @@ #ifndef MESH_UTILS_H #define MESH_UTILS_H -#include "mesh.h" +#include "render_core/mesh.h" class MeshUtils { public: diff --git a/sfw/render_core/scene.cpp b/sfw/render_core/scene.cpp index e1be32c..92ab994 100644 --- a/sfw/render_core/scene.cpp +++ b/sfw/render_core/scene.cpp @@ -1,4 +1,4 @@ -#include "scene.h" +#include "render_core/scene.h" Scene::Scene() { } diff --git a/sfw/render_core/shader.cpp b/sfw/render_core/shader.cpp index 6f08268..187068e 100644 --- a/sfw/render_core/shader.cpp +++ b/sfw/render_core/shader.cpp @@ -1,4 +1,4 @@ -#include "shader.h" +#include "render_core/shader.h" #include #include diff --git a/sfw/render_core/shader.h b/sfw/render_core/shader.h index a032a27..5c2c52b 100644 --- a/sfw/render_core/shader.h +++ b/sfw/render_core/shader.h @@ -1,8 +1,8 @@ #ifndef SHADER_H #define SHADER_H -#include "3rd_glad.h" -#include "hash_map.h" +#include "render_core/3rd_glad.h" +#include "core/hash_map.h" class Shader { public: diff --git a/sfw/render_core/texture.cpp b/sfw/render_core/texture.cpp index 4f8651e..65547b5 100644 --- a/sfw/render_core/texture.cpp +++ b/sfw/render_core/texture.cpp @@ -1,9 +1,9 @@ -#include "texture.h" +#include "render_core/texture.h" -#include "memory.h" +#include "core/memory.h" #include -#include "window.h" +#include "render_core/window.h" void Texture::create_from_image(const Ref &img) { if (_image == img) { diff --git a/sfw/render_core/texture.h b/sfw/render_core/texture.h index 1d9c024..372b59c 100644 --- a/sfw/render_core/texture.h +++ b/sfw/render_core/texture.h @@ -1,8 +1,8 @@ #ifndef TEXTURE_H #define TEXTURE_H -#include "3rd_glad.h" -#include "image.h" +#include "render_core/3rd_glad.h" +#include "render_core/image.h" class Texture { public: diff --git a/sfw/render_core/texture_material.h b/sfw/render_core/texture_material.h index f569053..1eed664 100644 --- a/sfw/render_core/texture_material.h +++ b/sfw/render_core/texture_material.h @@ -1,10 +1,10 @@ #ifndef TEXTURE_MATERIAL_H #define TEXTURE_MATERIAL_H -#include "material.h" -#include "texture.h" +#include "render_core/material.h" +#include "render_core/texture.h" -#include "camera_3d.h" +#include "render_objects/camera_3d.h" class TextureMaterial : public Material { public: diff --git a/sfw/render_core/texture_material_2d.h b/sfw/render_core/texture_material_2d.h index f06cc3b..bd62431 100644 --- a/sfw/render_core/texture_material_2d.h +++ b/sfw/render_core/texture_material_2d.h @@ -1,10 +1,10 @@ #ifndef TEXTURE_MATERIAL_2D_H #define TEXTURE_MATERIAL_2D_H -#include "material.h" -#include "texture.h" +#include "render_core/material.h" +#include "render_core/texture.h" -#include "camera_2d.h" +#include "render_objects/camera_2d.h" class TextureMaterial2D : public Material { public: diff --git a/sfw/render_core/transparent_texture_material.h b/sfw/render_core/transparent_texture_material.h index d4759e5..0356890 100644 --- a/sfw/render_core/transparent_texture_material.h +++ b/sfw/render_core/transparent_texture_material.h @@ -1,13 +1,13 @@ #ifndef TRANSPARENT_TEXTURE_MATERIAL_H #define TRANSPARENT_TEXTURE_MATERIAL_H -#include "material.h" -#include "texture.h" +#include "render_core/material.h" +#include "render_core/texture.h" #include "./libs/glm/vec4.hpp" #include "./libs/glm/gtc/type_ptr.hpp" -#include "camera_3d.h" +#include "render_objects/camera_3d.h" class TransparentTextureMaterial : public Material { public: diff --git a/sfw/render_core/window.cpp b/sfw/render_core/window.cpp index e6974da..8b5284d 100644 --- a/sfw/render_core/window.cpp +++ b/sfw/render_core/window.cpp @@ -1,10 +1,10 @@ //----------------------------------------------------------------------------- // fps locking -#include "window.h" +#include "render_core/window.h" #define GLAD_GL_IMPLEMENTATION // glad -#include "3rd_glad.h" +#include "render_core/3rd_glad.h" #define _GLFW_IMPLEMENTATION // glfw337 #define GLFW_INCLUDE_NONE // glfw337 @@ -23,11 +23,11 @@ #undef timeGetTime #undef Time -#include "error_macros.h" -#include "stime.h" -#include "ustring.h" -#include "vector4.h" -#include "application.h" +#include "core/error_macros.h" +#include "core/stime.h" +#include "core/ustring.h" +#include "core/vector4.h" +#include "render_core/application.h" /* static volatile float framerate = 0; diff --git a/sfw/render_core/window.h b/sfw/render_core/window.h index 827e5ba..b4f3a4d 100644 --- a/sfw/render_core/window.h +++ b/sfw/render_core/window.h @@ -9,9 +9,9 @@ // @todo: if WINDOW_PORTRAIT && exist portrait monitor, use that instead of primary one // @todo: WINDOW_TRAY -#include "color.h" -#include "int_types.h" -#include "vector2.h" +#include "core/color.h" +#include "core/int_types.h" +#include "core/vector2.h" struct GLFWwindow; struct GLFWcursor; diff --git a/sfw/render_immediate/renderer.h b/sfw/render_immediate/renderer.h index 516e553..a699554 100644 --- a/sfw/render_immediate/renderer.h +++ b/sfw/render_immediate/renderer.h @@ -3,8 +3,8 @@ #include "core/color.h" #include "core/rect2.h" -#include "sprite.h" -#include "texture.h" +#include "render_objects/sprite.h" +#include "render_core/texture.h" #include diff --git a/sfw/render_objects/camera_2d.cpp b/sfw/render_objects/camera_2d.cpp index 2de2f7d..1237b5e 100644 --- a/sfw/render_objects/camera_2d.cpp +++ b/sfw/render_objects/camera_2d.cpp @@ -1,6 +1,6 @@ -#include "camera_2d.h" +#include "render_objects/camera_2d.h" -#include "math_funcs.h" +#include "core/math_funcs.h" void Camera2D::bind() { make_current(); diff --git a/sfw/render_objects/camera_2d.h b/sfw/render_objects/camera_2d.h index 0f4b931..38c0686 100644 --- a/sfw/render_objects/camera_2d.h +++ b/sfw/render_objects/camera_2d.h @@ -1,13 +1,13 @@ #ifndef CAMERA_2D_H #define CAMERA_2D_H -#include "3rd_glad.h" +#include "render_core/3rd_glad.h" -#include "object_2d.h" +#include "render_objects/object_2d.h" -#include "transform.h" -#include "transform_2d.h" -#include "vector2.h" +#include "core/transform.h" +#include "core/transform_2d.h" +#include "core/vector2.h" class Camera2D : Object2D { public: diff --git a/sfw/render_objects/camera_3d.cpp b/sfw/render_objects/camera_3d.cpp index 2be6131..b941d8c 100644 --- a/sfw/render_objects/camera_3d.cpp +++ b/sfw/render_objects/camera_3d.cpp @@ -1,6 +1,6 @@ -#include "camera_3d.h" +#include "render_objects/camera_3d.h" -#include "math_funcs.h" +#include "core/math_funcs.h" void Camera3D::bind() { make_current(); diff --git a/sfw/render_objects/camera_3d.h b/sfw/render_objects/camera_3d.h index b9564e2..cf36bf3 100644 --- a/sfw/render_objects/camera_3d.h +++ b/sfw/render_objects/camera_3d.h @@ -1,11 +1,11 @@ #ifndef CAMERA_3D_H #define CAMERA_3D_H -#include "3rd_glad.h" +#include "render_core/3rd_glad.h" -#include "projection.h" -#include "transform.h" -#include "vector3.h" +#include "core/projection.h" +#include "core/transform.h" +#include "core/vector3.h" class Camera3D { public: diff --git a/sfw/render_objects/mesh_instance_2d.cpp b/sfw/render_objects/mesh_instance_2d.cpp index 13b89dc..8311a5f 100644 --- a/sfw/render_objects/mesh_instance_2d.cpp +++ b/sfw/render_objects/mesh_instance_2d.cpp @@ -1,6 +1,6 @@ -#include "mesh_instance_2d.h" +#include "render_objects/mesh_instance_2d.h" -#include "camera_2d.h" +#include "render_objects/camera_2d.h" void MeshInstance2D::render() { if (!mesh) { diff --git a/sfw/render_objects/mesh_instance_2d.h b/sfw/render_objects/mesh_instance_2d.h index edd5b1a..49dcbfa 100644 --- a/sfw/render_objects/mesh_instance_2d.h +++ b/sfw/render_objects/mesh_instance_2d.h @@ -1,12 +1,12 @@ #ifndef MESH_INSTACE_2D_H #define MESH_INSTACE_2D_H -#include "vector.h" +#include "core/vector.h" -#include "material.h" -#include "mesh.h" +#include "render_core/material.h" +#include "render_core/mesh.h" -#include "transform.h" +#include "core/transform.h" class MeshInstance2D { public: diff --git a/sfw/render_objects/mesh_instance_3d.cpp b/sfw/render_objects/mesh_instance_3d.cpp index 7067994..993e7ee 100644 --- a/sfw/render_objects/mesh_instance_3d.cpp +++ b/sfw/render_objects/mesh_instance_3d.cpp @@ -1,6 +1,6 @@ -#include "mesh_instance_3d.h" +#include "render_objects/mesh_instance_3d.h" -#include "camera_3d.h" +#include "render_objects/camera_3d.h" void MeshInstance3D::render() { if (!mesh) { diff --git a/sfw/render_objects/mesh_instance_3d.h b/sfw/render_objects/mesh_instance_3d.h index afc67ca..24d0b6d 100644 --- a/sfw/render_objects/mesh_instance_3d.h +++ b/sfw/render_objects/mesh_instance_3d.h @@ -1,14 +1,14 @@ #ifndef MESH_INSTACE_3D_H #define MESH_INSTACE_3D_H -#include "vector.h" +#include "core/vector.h" -#include "object_3d.h" +#include "render_objects/object_3d.h" -#include "material.h" -#include "mesh.h" +#include "render_core/material.h" +#include "render_core/mesh.h" -#include "transform.h" +#include "core/transform.h" class MeshInstance3D : public Object3D { public: diff --git a/sfw/render_objects/object_2d.cpp b/sfw/render_objects/object_2d.cpp index 21570bf..24cd893 100644 --- a/sfw/render_objects/object_2d.cpp +++ b/sfw/render_objects/object_2d.cpp @@ -1,4 +1,4 @@ -#include "object_2d.h" +#include "render_objects/object_2d.h" Object2D::Object2D() { diff --git a/sfw/render_objects/object_2d.h b/sfw/render_objects/object_2d.h index ecdaa2c..6f3cbe1 100644 --- a/sfw/render_objects/object_2d.h +++ b/sfw/render_objects/object_2d.h @@ -1,7 +1,7 @@ #ifndef OBJECT_2D_H #define OBJECT_2D_H -#include "transform_2d.h" +#include "core/transform_2d.h" class Object2D { public: diff --git a/sfw/render_objects/object_3d.cpp b/sfw/render_objects/object_3d.cpp index 502e7de..6892082 100644 --- a/sfw/render_objects/object_3d.cpp +++ b/sfw/render_objects/object_3d.cpp @@ -1,4 +1,4 @@ -#include "object_3d.h" +#include "render_objects/object_3d.h" Object3D::Object3D() { diff --git a/sfw/render_objects/object_3d.h b/sfw/render_objects/object_3d.h index 0f8ec56..8e9ac51 100644 --- a/sfw/render_objects/object_3d.h +++ b/sfw/render_objects/object_3d.h @@ -1,7 +1,7 @@ #ifndef OBJECT_3D_H #define OBJECT_3D_H -#include "transform.h" +#include "core/transform.h" class Object3D { public: diff --git a/sfw/render_objects/sprite.cpp b/sfw/render_objects/sprite.cpp index d41e7e2..6ddc4fa 100644 --- a/sfw/render_objects/sprite.cpp +++ b/sfw/render_objects/sprite.cpp @@ -1,4 +1,4 @@ -#include "sprite.h" +#include "render_objects/sprite.h" void Sprite::render() { /* diff --git a/sfw/render_objects/sprite.h b/sfw/render_objects/sprite.h index 41c27b5..23434f0 100644 --- a/sfw/render_objects/sprite.h +++ b/sfw/render_objects/sprite.h @@ -1,10 +1,10 @@ #ifndef SPRITE_H #define SPRITE_H -#include "object_2d.h" +#include "render_objects/object_2d.h" -#include "transform_2d.h" -#include "mesh_instance_2d.h" +#include "core/transform_2d.h" +#include "render_objects/mesh_instance_2d.h" class Sprite : public Object2D { public: diff --git a/sfw/render_objects/tile_map.cpp b/sfw/render_objects/tile_map.cpp index f05864d..6a1bab5 100644 --- a/sfw/render_objects/tile_map.cpp +++ b/sfw/render_objects/tile_map.cpp @@ -1,6 +1,6 @@ -#include "tile_map.h" +#include "render_objects/tile_map.h" -#include "camera_2d.h" +#include "render_objects/camera_2d.h" void TileMap::build_mesh() { if (!mesh) { diff --git a/sfw/render_objects/tile_map.h b/sfw/render_objects/tile_map.h index cb67ce9..bb6d8da 100644 --- a/sfw/render_objects/tile_map.h +++ b/sfw/render_objects/tile_map.h @@ -1,11 +1,11 @@ #ifndef TILE_MAP_H #define TILE_MAP_H -#include "object_2d.h" +#include "render_objects/object_2d.h" -#include "mesh.h" +#include "render_core/mesh.h" -#include "material.h" +#include "render_core/material.h" class TileMap : public Object2D { public: