diff --git a/compile_linux.sh b/compile_linux.sh index 30b36a4..b077841 100755 --- a/compile_linux.sh +++ b/compile_linux.sh @@ -4,7 +4,7 @@ #g++ main.cpp -Wall -o3 -o ./bin/game -Ilibs/SDL2-linux/include -Llibs/SDL2-linux/lib -lSDL2 -lSDL2main -#g++ main.cpp shader.cpp material.cpp mesh.cpp mesh_instance.cpp mesh_utils.cpp texture.cpp camera.cpp application.cpp scene.cpp game_scene.cpp object_2d.cpp tile_map.cpp sprite.cpp \ +#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 @@ -39,28 +39,28 @@ ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/pool_allocator.cpp 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 -Isfw/core -Isfw -Isfw/application -c sfw/application/application.cpp -o sfw/application/application.o -ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/scene.cpp -o sfw/application/scene.o -ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/window.cpp -o sfw/application/window.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw -Isfw/render_core -c sfw/render_core/application.cpp -o sfw/render_core/application.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/render_core -c sfw/render_core/scene.cpp -o sfw/render_core/scene.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/render_core -c sfw/render_core/window.cpp -o sfw/render_core/window.o -ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/shader.cpp -o sfw/application/shader.o -ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/material.cpp -o sfw/application/material.o -ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/mesh.cpp -o sfw/application/mesh.o -ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/mesh_utils.cpp -o sfw/application/mesh_utils.o -ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/texture.cpp -o sfw/application/texture.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/render_core -c sfw/render_core/shader.cpp -o sfw/render_core/shader.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/render_core -c sfw/render_core/material.cpp -o sfw/render_core/material.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/render_core -c sfw/render_core/mesh.cpp -o sfw/render_core/mesh.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/render_core -c sfw/render_core/mesh_utils.cpp -o sfw/render_core/mesh_utils.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/render_core -c sfw/render_core/texture.cpp -o sfw/render_core/texture.o -ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/camera_3d.cpp -o sfw/application/camera_3d.o -ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/object_3d.cpp -o sfw/application/object_3d.o -ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/mesh_instance_3d.cpp -o sfw/application/mesh_instance_3d.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/render_core -c sfw/render_core/camera_3d.cpp -o sfw/render_core/camera_3d.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/render_core -c sfw/render_core/object_3d.cpp -o sfw/render_core/object_3d.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/render_core -c sfw/render_core/mesh_instance_3d.cpp -o sfw/render_core/mesh_instance_3d.o -ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/camera_2d.cpp -o sfw/application/camera_2d.o -ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/mesh_instance_2d.cpp -o sfw/application/mesh_instance_2d.o -ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/object_2d.cpp -o sfw/application/object_2d.o -ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/sprite.cpp -o sfw/application/sprite.o -ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/tile_map.cpp -o sfw/application/tile_map.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/render_core -c sfw/render_core/camera_2d.cpp -o sfw/render_core/camera_2d.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/render_core -c sfw/render_core/mesh_instance_2d.cpp -o sfw/render_core/mesh_instance_2d.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/render_core -c sfw/render_core/object_2d.cpp -o sfw/render_core/object_2d.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/render_core -c sfw/render_core/sprite.cpp -o sfw/render_core/sprite.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/render_core -c sfw/render_core/tile_map.cpp -o sfw/render_core/tile_map.o -ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c game_scene.cpp -o game_scene.o -ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c main.cpp -o main.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/render_core -c game_scene.cpp -o game_scene.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/render_core -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 \ @@ -70,13 +70,13 @@ ccache g++ -Wall -lm -ldl -lpthread -lX11 -D_REENTRANT -g sfw/core/aabb.o sfw/c sfw/core/ustring.o sfw/core/vector2.o sfw/core/vector2i.o sfw/core/vector3.o \ sfw/core/vector3i.o sfw/core/vector4.o sfw/core/vector4i.o \ sfw/core/pool_vector.o sfw/core/pool_allocator.o sfw/core/mutex.o sfw/core/stime.o \ - sfw/application/application.o sfw/application/scene.o sfw/application/window.o \ - sfw/application/shader.o sfw/application/material.o sfw/application/mesh.o \ - sfw/application/camera_3d.o sfw/application/object_3d.o sfw/application/mesh_instance_3d.o \ - sfw/application/object_2d.o \ - sfw/application/sprite.o sfw/application/tile_map.o sfw/application/texture.o \ - sfw/application/camera_2d.o sfw/application/mesh_instance_2d.o \ - sfw/application/mesh_utils.o \ + sfw/render_core/application.o sfw/render_core/scene.o sfw/render_core/window.o \ + sfw/render_core/shader.o sfw/render_core/material.o sfw/render_core/mesh.o \ + sfw/render_core/camera_3d.o sfw/render_core/object_3d.o sfw/render_core/mesh_instance_3d.o \ + sfw/render_core/object_2d.o \ + sfw/render_core/sprite.o sfw/render_core/tile_map.o sfw/render_core/texture.o \ + sfw/render_core/camera_2d.o sfw/render_core/mesh_instance_2d.o \ + sfw/render_core/mesh_utils.o \ game_scene.o main.o \ -o game diff --git a/sfw/application/3rd_glad.h b/sfw/render_core/3rd_glad.h similarity index 100% rename from sfw/application/3rd_glad.h rename to sfw/render_core/3rd_glad.h diff --git a/sfw/application/3rd_glfw3.h b/sfw/render_core/3rd_glfw3.h similarity index 100% rename from sfw/application/3rd_glfw3.h rename to sfw/render_core/3rd_glfw3.h diff --git a/sfw/application/3rd_stb_image.h b/sfw/render_core/3rd_stb_image.h similarity index 100% rename from sfw/application/3rd_stb_image.h rename to sfw/render_core/3rd_stb_image.h diff --git a/sfw/application/application.cpp b/sfw/render_core/application.cpp similarity index 100% rename from sfw/application/application.cpp rename to sfw/render_core/application.cpp diff --git a/sfw/application/application.h b/sfw/render_core/application.h similarity index 100% rename from sfw/application/application.h rename to sfw/render_core/application.h diff --git a/sfw/application/camera_2d.cpp b/sfw/render_core/camera_2d.cpp similarity index 100% rename from sfw/application/camera_2d.cpp rename to sfw/render_core/camera_2d.cpp diff --git a/sfw/application/camera_2d.h b/sfw/render_core/camera_2d.h similarity index 100% rename from sfw/application/camera_2d.h rename to sfw/render_core/camera_2d.h diff --git a/sfw/application/camera_3d.cpp b/sfw/render_core/camera_3d.cpp similarity index 100% rename from sfw/application/camera_3d.cpp rename to sfw/render_core/camera_3d.cpp diff --git a/sfw/application/camera_3d.h b/sfw/render_core/camera_3d.h similarity index 100% rename from sfw/application/camera_3d.h rename to sfw/render_core/camera_3d.h diff --git a/sfw/application/color_material.h b/sfw/render_core/color_material.h similarity index 100% rename from sfw/application/color_material.h rename to sfw/render_core/color_material.h diff --git a/sfw/application/colored_material.h b/sfw/render_core/colored_material.h similarity index 100% rename from sfw/application/colored_material.h rename to sfw/render_core/colored_material.h diff --git a/sfw/application/fwk_font.c b/sfw/render_core/fwk_font.c similarity index 100% rename from sfw/application/fwk_font.c rename to sfw/render_core/fwk_font.c diff --git a/sfw/application/fwk_font.h b/sfw/render_core/fwk_font.h similarity index 100% rename from sfw/application/fwk_font.h rename to sfw/render_core/fwk_font.h diff --git a/sfw/application/fwk_input.c b/sfw/render_core/fwk_input.c similarity index 100% rename from sfw/application/fwk_input.c rename to sfw/render_core/fwk_input.c diff --git a/sfw/application/fwk_input.h b/sfw/render_core/fwk_input.h similarity index 100% rename from sfw/application/fwk_input.h rename to sfw/render_core/fwk_input.h diff --git a/sfw/application/image.cpp b/sfw/render_core/image.cpp similarity index 100% rename from sfw/application/image.cpp rename to sfw/render_core/image.cpp diff --git a/sfw/application/image.h b/sfw/render_core/image.h similarity index 100% rename from sfw/application/image.h rename to sfw/render_core/image.h diff --git a/sfw/application/input/SCsub b/sfw/render_core/input/SCsub similarity index 100% rename from sfw/application/input/SCsub rename to sfw/render_core/input/SCsub diff --git a/sfw/application/input/default_controller_mappings.gen.cpp b/sfw/render_core/input/default_controller_mappings.gen.cpp similarity index 100% rename from sfw/application/input/default_controller_mappings.gen.cpp rename to sfw/render_core/input/default_controller_mappings.gen.cpp diff --git a/sfw/application/input/default_controller_mappings.h b/sfw/render_core/input/default_controller_mappings.h similarity index 100% rename from sfw/application/input/default_controller_mappings.h rename to sfw/render_core/input/default_controller_mappings.h diff --git a/sfw/application/input/gamecontrollerdb.txt b/sfw/render_core/input/gamecontrollerdb.txt similarity index 100% rename from sfw/application/input/gamecontrollerdb.txt rename to sfw/render_core/input/gamecontrollerdb.txt diff --git a/sfw/application/input/input.cpp b/sfw/render_core/input/input.cpp similarity index 100% rename from sfw/application/input/input.cpp rename to sfw/render_core/input/input.cpp diff --git a/sfw/application/input/input.h b/sfw/render_core/input/input.h similarity index 100% rename from sfw/application/input/input.h rename to sfw/render_core/input/input.h diff --git a/sfw/application/input/input_builders.py b/sfw/render_core/input/input_builders.py similarity index 100% rename from sfw/application/input/input_builders.py rename to sfw/render_core/input/input_builders.py diff --git a/sfw/application/input/input_event.cpp b/sfw/render_core/input/input_event.cpp similarity index 100% rename from sfw/application/input/input_event.cpp rename to sfw/render_core/input/input_event.cpp diff --git a/sfw/application/input/input_event.h b/sfw/render_core/input/input_event.h similarity index 100% rename from sfw/application/input/input_event.h rename to sfw/render_core/input/input_event.h diff --git a/sfw/application/input/input_map.cpp b/sfw/render_core/input/input_map.cpp similarity index 100% rename from sfw/application/input/input_map.cpp rename to sfw/render_core/input/input_map.cpp diff --git a/sfw/application/input/input_map.h b/sfw/render_core/input/input_map.h similarity index 100% rename from sfw/application/input/input_map.h rename to sfw/render_core/input/input_map.h diff --git a/sfw/application/input/pandemoniumcontrollerdb.txt b/sfw/render_core/input/pandemoniumcontrollerdb.txt similarity index 100% rename from sfw/application/input/pandemoniumcontrollerdb.txt rename to sfw/render_core/input/pandemoniumcontrollerdb.txt diff --git a/sfw/application/input/shortcut.cpp b/sfw/render_core/input/shortcut.cpp similarity index 100% rename from sfw/application/input/shortcut.cpp rename to sfw/render_core/input/shortcut.cpp diff --git a/sfw/application/input/shortcut.h b/sfw/render_core/input/shortcut.h similarity index 100% rename from sfw/application/input/shortcut.h rename to sfw/render_core/input/shortcut.h diff --git a/sfw/application/material.cpp b/sfw/render_core/material.cpp similarity index 100% rename from sfw/application/material.cpp rename to sfw/render_core/material.cpp diff --git a/sfw/application/material.h b/sfw/render_core/material.h similarity index 100% rename from sfw/application/material.h rename to sfw/render_core/material.h diff --git a/sfw/application/mesh.cpp b/sfw/render_core/mesh.cpp similarity index 100% rename from sfw/application/mesh.cpp rename to sfw/render_core/mesh.cpp diff --git a/sfw/application/mesh.h b/sfw/render_core/mesh.h similarity index 100% rename from sfw/application/mesh.h rename to sfw/render_core/mesh.h diff --git a/sfw/application/mesh_instance_2d.cpp b/sfw/render_core/mesh_instance_2d.cpp similarity index 100% rename from sfw/application/mesh_instance_2d.cpp rename to sfw/render_core/mesh_instance_2d.cpp diff --git a/sfw/application/mesh_instance_2d.h b/sfw/render_core/mesh_instance_2d.h similarity index 100% rename from sfw/application/mesh_instance_2d.h rename to sfw/render_core/mesh_instance_2d.h diff --git a/sfw/application/mesh_instance_3d.cpp b/sfw/render_core/mesh_instance_3d.cpp similarity index 100% rename from sfw/application/mesh_instance_3d.cpp rename to sfw/render_core/mesh_instance_3d.cpp diff --git a/sfw/application/mesh_instance_3d.h b/sfw/render_core/mesh_instance_3d.h similarity index 100% rename from sfw/application/mesh_instance_3d.h rename to sfw/render_core/mesh_instance_3d.h diff --git a/sfw/application/mesh_utils.cpp b/sfw/render_core/mesh_utils.cpp similarity index 100% rename from sfw/application/mesh_utils.cpp rename to sfw/render_core/mesh_utils.cpp diff --git a/sfw/application/mesh_utils.h b/sfw/render_core/mesh_utils.h similarity index 100% rename from sfw/application/mesh_utils.h rename to sfw/render_core/mesh_utils.h diff --git a/sfw/application/object.cpp b/sfw/render_core/object.cpp similarity index 100% rename from sfw/application/object.cpp rename to sfw/render_core/object.cpp diff --git a/sfw/application/object.h b/sfw/render_core/object.h similarity index 100% rename from sfw/application/object.h rename to sfw/render_core/object.h diff --git a/sfw/application/object_2d.cpp b/sfw/render_core/object_2d.cpp similarity index 100% rename from sfw/application/object_2d.cpp rename to sfw/render_core/object_2d.cpp diff --git a/sfw/application/object_2d.h b/sfw/render_core/object_2d.h similarity index 100% rename from sfw/application/object_2d.h rename to sfw/render_core/object_2d.h diff --git a/sfw/application/object_3d.cpp b/sfw/render_core/object_3d.cpp similarity index 100% rename from sfw/application/object_3d.cpp rename to sfw/render_core/object_3d.cpp diff --git a/sfw/application/object_3d.h b/sfw/render_core/object_3d.h similarity index 100% rename from sfw/application/object_3d.h rename to sfw/render_core/object_3d.h diff --git a/sfw/application/primitive_meshes.cpp b/sfw/render_core/primitive_meshes.cpp similarity index 100% rename from sfw/application/primitive_meshes.cpp rename to sfw/render_core/primitive_meshes.cpp diff --git a/sfw/application/primitive_meshes.h b/sfw/render_core/primitive_meshes.h similarity index 100% rename from sfw/application/primitive_meshes.h rename to sfw/render_core/primitive_meshes.h diff --git a/sfw/application/psignal.cpp b/sfw/render_core/psignal.cpp similarity index 100% rename from sfw/application/psignal.cpp rename to sfw/render_core/psignal.cpp diff --git a/sfw/application/psignal.h b/sfw/render_core/psignal.h similarity index 100% rename from sfw/application/psignal.h rename to sfw/render_core/psignal.h diff --git a/sfw/application/random_number_generator.cpp b/sfw/render_core/random_number_generator.cpp similarity index 100% rename from sfw/application/random_number_generator.cpp rename to sfw/render_core/random_number_generator.cpp diff --git a/sfw/application/random_number_generator.h b/sfw/render_core/random_number_generator.h similarity index 100% rename from sfw/application/random_number_generator.h rename to sfw/render_core/random_number_generator.h diff --git a/sfw/application/reference.cpp b/sfw/render_core/reference.cpp similarity index 100% rename from sfw/application/reference.cpp rename to sfw/render_core/reference.cpp diff --git a/sfw/application/reference.h b/sfw/render_core/reference.h similarity index 100% rename from sfw/application/reference.h rename to sfw/render_core/reference.h diff --git a/sfw/application/scene.cpp b/sfw/render_core/scene.cpp similarity index 100% rename from sfw/application/scene.cpp rename to sfw/render_core/scene.cpp diff --git a/sfw/application/scene.h b/sfw/render_core/scene.h similarity index 100% rename from sfw/application/scene.h rename to sfw/render_core/scene.h diff --git a/sfw/application/shader.cpp b/sfw/render_core/shader.cpp similarity index 100% rename from sfw/application/shader.cpp rename to sfw/render_core/shader.cpp diff --git a/sfw/application/shader.h b/sfw/render_core/shader.h similarity index 100% rename from sfw/application/shader.h rename to sfw/render_core/shader.h diff --git a/sfw/application/sprite.cpp b/sfw/render_core/sprite.cpp similarity index 100% rename from sfw/application/sprite.cpp rename to sfw/render_core/sprite.cpp diff --git a/sfw/application/sprite.h b/sfw/render_core/sprite.h similarity index 100% rename from sfw/application/sprite.h rename to sfw/render_core/sprite.h diff --git a/sfw/application/texture.cpp b/sfw/render_core/texture.cpp similarity index 100% rename from sfw/application/texture.cpp rename to sfw/render_core/texture.cpp diff --git a/sfw/application/texture.h b/sfw/render_core/texture.h similarity index 100% rename from sfw/application/texture.h rename to sfw/render_core/texture.h diff --git a/sfw/application/texture_material.h b/sfw/render_core/texture_material.h similarity index 100% rename from sfw/application/texture_material.h rename to sfw/render_core/texture_material.h diff --git a/sfw/application/texture_material_2d.h b/sfw/render_core/texture_material_2d.h similarity index 100% rename from sfw/application/texture_material_2d.h rename to sfw/render_core/texture_material_2d.h diff --git a/sfw/application/tile_map.cpp b/sfw/render_core/tile_map.cpp similarity index 100% rename from sfw/application/tile_map.cpp rename to sfw/render_core/tile_map.cpp diff --git a/sfw/application/tile_map.h b/sfw/render_core/tile_map.h similarity index 100% rename from sfw/application/tile_map.h rename to sfw/render_core/tile_map.h diff --git a/sfw/application/transparent_texture_material.h b/sfw/render_core/transparent_texture_material.h similarity index 100% rename from sfw/application/transparent_texture_material.h rename to sfw/render_core/transparent_texture_material.h diff --git a/sfw/application/variant.cpp b/sfw/render_core/variant.cpp similarity index 100% rename from sfw/application/variant.cpp rename to sfw/render_core/variant.cpp diff --git a/sfw/application/variant.h b/sfw/render_core/variant.h similarity index 100% rename from sfw/application/variant.h rename to sfw/render_core/variant.h diff --git a/sfw/application/window.cpp b/sfw/render_core/window.cpp similarity index 100% rename from sfw/application/window.cpp rename to sfw/render_core/window.cpp diff --git a/sfw/application/window.h b/sfw/render_core/window.h similarity index 100% rename from sfw/application/window.h rename to sfw/render_core/window.h