diff --git a/CMakeLists.txt b/CMakeLists.txt index 2545480..bb5dadf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,6 @@ set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) add_subdirectory(deerith_engine_core) -add_subdirectory(deerith_engine_client) add_subdirectory(deerith_engine_server) +add_subdirectory(deerith_client) add_subdirectory(sandbox) \ No newline at end of file diff --git a/deerith_engine_client/CMakeLists.txt b/deerith_client/CMakeLists.txt similarity index 100% rename from deerith_engine_client/CMakeLists.txt rename to deerith_client/CMakeLists.txt diff --git a/deerith_engine_client/include/deerith/graphics/camera.h b/deerith_client/include/deerith/client/graphics/camera.h similarity index 100% rename from deerith_engine_client/include/deerith/graphics/camera.h rename to deerith_client/include/deerith/client/graphics/camera.h diff --git a/deerith_engine_client/include/deerith/graphics/input.h b/deerith_client/include/deerith/client/graphics/input.h similarity index 100% rename from deerith_engine_client/include/deerith/graphics/input.h rename to deerith_client/include/deerith/client/graphics/input.h diff --git a/deerith_engine_client/include/deerith/graphics/mesh.h b/deerith_client/include/deerith/client/graphics/mesh.h similarity index 100% rename from deerith_engine_client/include/deerith/graphics/mesh.h rename to deerith_client/include/deerith/client/graphics/mesh.h diff --git a/deerith_engine_client/include/deerith/graphics/primitive.h b/deerith_client/include/deerith/client/graphics/primitive.h similarity index 100% rename from deerith_engine_client/include/deerith/graphics/primitive.h rename to deerith_client/include/deerith/client/graphics/primitive.h diff --git a/deerith_engine_client/include/deerith/graphics/primitive_internals.h b/deerith_client/include/deerith/client/graphics/primitive_internals.h similarity index 100% rename from deerith_engine_client/include/deerith/graphics/primitive_internals.h rename to deerith_client/include/deerith/client/graphics/primitive_internals.h diff --git a/deerith_engine_client/include/deerith/graphics/shader.h b/deerith_client/include/deerith/client/graphics/shader.h similarity index 100% rename from deerith_engine_client/include/deerith/graphics/shader.h rename to deerith_client/include/deerith/client/graphics/shader.h diff --git a/deerith_engine_client/include/deerith/graphics/window.h b/deerith_client/include/deerith/client/graphics/window.h similarity index 100% rename from deerith_engine_client/include/deerith/graphics/window.h rename to deerith_client/include/deerith/client/graphics/window.h diff --git a/deerith_engine_client/include/deerith/network/network_internals.h b/deerith_client/include/deerith/client/network/network_internals.h similarity index 100% rename from deerith_engine_client/include/deerith/network/network_internals.h rename to deerith_client/include/deerith/client/network/network_internals.h diff --git a/deerith_engine_client/include/deerith/world.h b/deerith_client/include/deerith/client/world.h similarity index 100% rename from deerith_engine_client/include/deerith/world.h rename to deerith_client/include/deerith/client/world.h diff --git a/deerith_engine_client/include/deerith/world/chunk_render.h b/deerith_client/include/deerith/client/world/chunk_render.h similarity index 80% rename from deerith_engine_client/include/deerith/world/chunk_render.h rename to deerith_client/include/deerith/client/world/chunk_render.h index d0e70fb..c3a4d29 100644 --- a/deerith_engine_client/include/deerith/world/chunk_render.h +++ b/deerith_client/include/deerith/client/world/chunk_render.h @@ -1,6 +1,6 @@ #pragma once #include -#include +#include namespace deerith { diff --git a/deerith_engine_client/include/deerith/world/world_internals.h b/deerith_client/include/deerith/client/world/world_internals.h similarity index 79% rename from deerith_engine_client/include/deerith/world/world_internals.h rename to deerith_client/include/deerith/client/world/world_internals.h index aae1ad7..c97d079 100644 --- a/deerith_engine_client/include/deerith/world/world_internals.h +++ b/deerith_client/include/deerith/client/world/world_internals.h @@ -1,5 +1,5 @@ #pragma once -#include +#include namespace deerith { diff --git a/deerith_engine_client/include/glad/gl.h b/deerith_client/include/glad/gl.h similarity index 100% rename from deerith_engine_client/include/glad/gl.h rename to deerith_client/include/glad/gl.h diff --git a/deerith_engine_client/shaders/lit.frag.glsl b/deerith_client/shaders/lit.frag.glsl similarity index 100% rename from deerith_engine_client/shaders/lit.frag.glsl rename to deerith_client/shaders/lit.frag.glsl diff --git a/deerith_engine_client/shaders/lit.vert.glsl b/deerith_client/shaders/lit.vert.glsl similarity index 100% rename from deerith_engine_client/shaders/lit.vert.glsl rename to deerith_client/shaders/lit.vert.glsl diff --git a/deerith_engine_client/shaders/primitive.frag.glsl b/deerith_client/shaders/primitive.frag.glsl similarity index 100% rename from deerith_engine_client/shaders/primitive.frag.glsl rename to deerith_client/shaders/primitive.frag.glsl diff --git a/deerith_engine_client/shaders/primitive.vert.glsl b/deerith_client/shaders/primitive.vert.glsl similarity index 100% rename from deerith_engine_client/shaders/primitive.vert.glsl rename to deerith_client/shaders/primitive.vert.glsl diff --git a/deerith_engine_client/src/engine.cpp b/deerith_client/src/engine.cpp similarity index 78% rename from deerith_engine_client/src/engine.cpp rename to deerith_client/src/engine.cpp index 1ec2de1..a2e9ad1 100644 --- a/deerith_engine_client/src/engine.cpp +++ b/deerith_client/src/engine.cpp @@ -1,7 +1,5 @@ #include -#include - -#include +#include void deerith::init_engine() { diff --git a/deerith_engine_client/src/graphics/camera.cpp b/deerith_client/src/graphics/camera.cpp similarity index 89% rename from deerith_engine_client/src/graphics/camera.cpp rename to deerith_client/src/graphics/camera.cpp index 4625182..10576e1 100644 --- a/deerith_engine_client/src/graphics/camera.cpp +++ b/deerith_client/src/graphics/camera.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include #include diff --git a/deerith_engine_client/src/graphics/core.cpp b/deerith_client/src/graphics/core.cpp similarity index 100% rename from deerith_engine_client/src/graphics/core.cpp rename to deerith_client/src/graphics/core.cpp diff --git a/deerith_engine_client/src/graphics/gl.cpp b/deerith_client/src/graphics/gl.cpp similarity index 100% rename from deerith_engine_client/src/graphics/gl.cpp rename to deerith_client/src/graphics/gl.cpp diff --git a/deerith_engine_client/src/graphics/input.cpp b/deerith_client/src/graphics/input.cpp similarity index 89% rename from deerith_engine_client/src/graphics/input.cpp rename to deerith_client/src/graphics/input.cpp index bb59c7a..8888caf 100644 --- a/deerith_engine_client/src/graphics/input.cpp +++ b/deerith_client/src/graphics/input.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include diff --git a/deerith_engine_client/src/graphics/mesh.cpp b/deerith_client/src/graphics/mesh.cpp similarity index 98% rename from deerith_engine_client/src/graphics/mesh.cpp rename to deerith_client/src/graphics/mesh.cpp index 3f0b6b1..6ecb6c1 100644 --- a/deerith_engine_client/src/graphics/mesh.cpp +++ b/deerith_client/src/graphics/mesh.cpp @@ -1,4 +1,4 @@ -#include +#include #include deerith::mesh_2d_t::mesh_2d_t( diff --git a/deerith_engine_client/src/graphics/primitives.cpp b/deerith_client/src/graphics/primitives.cpp similarity index 95% rename from deerith_engine_client/src/graphics/primitives.cpp rename to deerith_client/src/graphics/primitives.cpp index 5ad5425..9dd10dd 100644 --- a/deerith_engine_client/src/graphics/primitives.cpp +++ b/deerith_client/src/graphics/primitives.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include #include "glm/glm.hpp" diff --git a/deerith_engine_client/src/graphics/shader.cpp b/deerith_client/src/graphics/shader.cpp similarity index 99% rename from deerith_engine_client/src/graphics/shader.cpp rename to deerith_client/src/graphics/shader.cpp index 2a1c22d..c40dec9 100644 --- a/deerith_engine_client/src/graphics/shader.cpp +++ b/deerith_client/src/graphics/shader.cpp @@ -1,4 +1,4 @@ -#include "deerith/graphics/shader.h" +#include #include #include diff --git a/deerith_engine_client/src/graphics/window.cpp b/deerith_client/src/graphics/window.cpp similarity index 95% rename from deerith_engine_client/src/graphics/window.cpp rename to deerith_client/src/graphics/window.cpp index 289cd9a..7485f87 100644 --- a/deerith_engine_client/src/graphics/window.cpp +++ b/deerith_client/src/graphics/window.cpp @@ -1,7 +1,7 @@ -#include "deerith/graphics/window.h" -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/deerith_engine_client/src/main.cpp b/deerith_client/src/main.cpp similarity index 92% rename from deerith_engine_client/src/main.cpp rename to deerith_client/src/main.cpp index 033eba8..298c057 100644 --- a/deerith_engine_client/src/main.cpp +++ b/deerith_client/src/main.cpp @@ -1,9 +1,9 @@ #include -#include +#include #include #include -#include +#include int main(int argc, const char **argv) { diff --git a/deerith_engine_client/src/network/network.cpp b/deerith_client/src/network/network.cpp similarity index 95% rename from deerith_engine_client/src/network/network.cpp rename to deerith_client/src/network/network.cpp index 23c37e9..6400472 100644 --- a/deerith_engine_client/src/network/network.cpp +++ b/deerith_client/src/network/network.cpp @@ -1,12 +1,12 @@ #include #include -#include +#include #include #include #include -#include +#include namespace deerith { diff --git a/deerith_engine_client/src/world/player_movment.cpp b/deerith_client/src/world/player_movment.cpp similarity index 88% rename from deerith_engine_client/src/world/player_movment.cpp rename to deerith_client/src/world/player_movment.cpp index 21d6cdd..0c69a5a 100644 --- a/deerith_engine_client/src/world/player_movment.cpp +++ b/deerith_client/src/world/player_movment.cpp @@ -1,11 +1,11 @@ #include -#include -#include +#include +#include #include #include #include -#include +#include namespace deerith { diff --git a/deerith_engine_client/src/world/server_communication.cpp b/deerith_client/src/world/server_communication.cpp similarity index 94% rename from deerith_engine_client/src/world/server_communication.cpp rename to deerith_client/src/world/server_communication.cpp index f6dddac..8ed73a8 100644 --- a/deerith_engine_client/src/world/server_communication.cpp +++ b/deerith_client/src/world/server_communication.cpp @@ -2,10 +2,10 @@ #include #include #include -#include +#include -#include -#include +#include +#include void deerith::setup_base_protocols() { diff --git a/deerith_engine_client/src/world/world.cpp b/deerith_client/src/world/world.cpp similarity index 90% rename from deerith_engine_client/src/world/world.cpp rename to deerith_client/src/world/world.cpp index c4ff50a..ae9c891 100644 --- a/deerith_engine_client/src/world/world.cpp +++ b/deerith_client/src/world/world.cpp @@ -1,8 +1,8 @@ #include -#include +#include -#include -#include +#include +#include #include #include diff --git a/deerith_engine_client/src/world/world_render.cpp b/deerith_client/src/world/world_render.cpp similarity index 90% rename from deerith_engine_client/src/world/world_render.cpp rename to deerith_client/src/world/world_render.cpp index 585f753..c56f1eb 100644 --- a/deerith_engine_client/src/world/world_render.cpp +++ b/deerith_client/src/world/world_render.cpp @@ -1,10 +1,10 @@ -#include #include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/sandbox/CMakeLists.txt b/sandbox/CMakeLists.txt index 9e13fa2..3629ebe 100644 --- a/sandbox/CMakeLists.txt +++ b/sandbox/CMakeLists.txt @@ -10,6 +10,7 @@ add_executable(Sandbox target_include_directories(Sandbox PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src + ${CMAKE_CURRENT_SOURCE_DIR}/include ) target_link_libraries(Sandbox diff --git a/sandbox/include/voxels.h b/sandbox/include/voxels.h new file mode 100644 index 0000000..e4e4c5d --- /dev/null +++ b/sandbox/include/voxels.h @@ -0,0 +1,6 @@ +#pragma once + +namespace sandbox +{ + void register_voxels(); +} \ No newline at end of file diff --git a/sandbox/src/define_voxels.cpp b/sandbox/src/define_voxels.cpp index e69de29..f292569 100644 --- a/sandbox/src/define_voxels.cpp +++ b/sandbox/src/define_voxels.cpp @@ -0,0 +1,18 @@ +#include "voxels.h" + +#include + +void sandbox::register_voxels() +{ + deerith::voxel_type_t air_voxel_type; + air_voxel_type.is_air = true; + air_voxel_type.id = "air"; + + deerith::register_voxel_type(air_voxel_type); + + deerith::voxel_type_t rock_voxel_type; + air_voxel_type.is_air = false; + air_voxel_type.id = "rock"; + + deerith::register_voxel_type(air_voxel_type); +} \ No newline at end of file diff --git a/sandbox/src/main.cpp b/sandbox/src/main.cpp index a7d3abd..b3a83ca 100644 --- a/sandbox/src/main.cpp +++ b/sandbox/src/main.cpp @@ -3,6 +3,8 @@ #include #include +#include "voxels.h" + int main(int argc, const char **argv) { deerith::init_engine();