Refactor

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)

deerith_client/include/deerith/client/world/chunk_render.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <deerith/engine.h>
-#include <deerith/graphics/mesh.h>
+#include <deerith/client/graphics/mesh.h>
 
 namespace deerith
 {

deerith_client/include/deerith/client/world/world_internals.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <deerith/world.h>
+#include <deerith/client/world.h>
 
 namespace deerith
 {

deerith_client/src/engine.cpp

@@ -1,7 +1,5 @@
 #include <deerith/engine.h>
-#include <deerith/core/log.h>
-
-#include <deerith/network/network_internals.h>
+#include <deerith/client/network/network_internals.h>
 
 void deerith::init_engine()
 {

deerith_client/src/graphics/camera.cpp

@@ -1,6 +1,6 @@
-#include <deerith/graphics/camera.h>
-#include <deerith/graphics/shader.h>
-#include <deerith/graphics/window.h>
+#include <deerith/client/graphics/camera.h>
+#include <deerith/client/graphics/shader.h>
+#include <deerith/client/graphics/window.h>
 
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>

deerith_client/src/graphics/input.cpp

@@ -1,5 +1,5 @@
-#include <deerith/graphics/input.h>
-#include <deerith/core/log.h>
+#include <deerith/client/graphics/input.h>
+#include <deerith/engine.h>
 #include <GLFW/glfw3.h>
 
 #include <math.h>

deerith_client/src/graphics/mesh.cpp

@@ -1,4 +1,4 @@
-#include <deerith/graphics/mesh.h>
+#include <deerith/client/graphics/mesh.h>
 #include <glad/gl.h>
 
 deerith::mesh_2d_t::mesh_2d_t(

deerith_client/src/graphics/primitives.cpp

@@ -1,7 +1,7 @@
-#include <deerith/graphics/primitive_internals.h>
-#include <deerith/graphics/primitive.h>
-#include <deerith/graphics/shader.h>
-#include <deerith/graphics/mesh.h>
+#include <deerith/client/graphics/primitive_internals.h>
+#include <deerith/client/graphics/primitive.h>
+#include <deerith/client/graphics/shader.h>
+#include <deerith/client/graphics/mesh.h>
 #include <deerith/engine.h>
 
 #include "glm/glm.hpp"

deerith_client/src/graphics/shader.cpp

@@ -1,4 +1,4 @@
-#include "deerith/graphics/shader.h"
+#include <deerith/client/graphics/shader.h>
 #include <deerith/engine.h>
 
 #include <glad/gl.h>

deerith_client/src/graphics/window.cpp

@@ -1,7 +1,7 @@
-#include "deerith/graphics/window.h"
-#include <deerith/graphics/primitive_internals.h>
-#include <deerith/network/network_internals.h>
-#include <deerith/world.h>
+#include <deerith/client/graphics/window.h>
+#include <deerith/client/graphics/primitive_internals.h>
+#include <deerith/client/network/network_internals.h>
+#include <deerith/client/world.h>
 
 #include <glad/gl.h>
 #include <GLFW/glfw3.h>

deerith_client/src/main.cpp

@@ -1,9 +1,9 @@
 #include <deerith/engine.h>
-#include <deerith/world.h>
+#include <deerith/client/world.h>
 #include <thread>
 #include <args/argh.h>
 
-#include <deerith/graphics/window.h>
+#include <deerith/client/graphics/window.h>
 
 int main(int argc, const char **argv)
 {

deerith_client/src/network/network.cpp

@@ -1,12 +1,12 @@
 #include <deerith/engine.h>
 #include <deerith/network/router.h>
-#include <deerith/world.h>
+#include <deerith/client/world.h>
 
 #include <enet/enet.h>
 #include <thread>
 #include <memory>
 
-#include <deerith/network/network_internals.h>
+#include <deerith/client/network/network_internals.h>
 
 namespace deerith
 {

deerith_client/src/world/player_movment.cpp

@@ -1,11 +1,11 @@
 #include <deerith/engine.h>
-#include <deerith/graphics/input.h>
-#include <deerith/graphics/window.h>
+#include <deerith/client/graphics/input.h>
+#include <deerith/client/graphics/window.h>
 #include <deerith/network/router.h>
 #include <deerith/network/packets.h>
 #include <deerith/world/components.h>
 
-#include <deerith/world/world_internals.h>
+#include <deerith/client/world/world_internals.h>
 
 namespace deerith
 {

deerith_client/src/world/server_communication.cpp

@@ -2,10 +2,10 @@
 #include <deerith/network/router.h>
 #include <deerith/network/packets.h>
 #include <deerith/world/components.h>
-#include <deerith/world.h>
+#include <deerith/client/world.h>
 
-#include <deerith/world/world_internals.h>
-#include <deerith/network/network_internals.h>
+#include <deerith/client/world/world_internals.h>
+#include <deerith/client/network/network_internals.h>
 
 void deerith::setup_base_protocols()
 {

deerith_client/src/world/world.cpp

@@ -1,8 +1,8 @@
 #include <deerith/engine.h>
-#include <deerith/world.h>
+#include <deerith/client/world.h>
 
-#include <deerith/network/network_internals.h>
-#include <deerith/world/world_internals.h>
+#include <deerith/client/network/network_internals.h>
+#include <deerith/client/world/world_internals.h>
 
 #include <thread>
 #include <memory>

deerith_client/src/world/world_render.cpp

@@ -1,10 +1,10 @@
-#include <deerith/world.h>
 #include <deerith/world/components.h>
+#include <deerith/client/world.h>
 
-#include <deerith/graphics/camera.h>
-#include <deerith/graphics/mesh.h>
-#include <deerith/graphics/shader.h>
-#include <deerith/graphics/primitive.h>
+#include <deerith/client/graphics/camera.h>
+#include <deerith/client/graphics/mesh.h>
+#include <deerith/client/graphics/shader.h>
+#include <deerith/client/graphics/primitive.h>
 
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>

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

sandbox/include/voxels.h

@@ -0,0 +1,6 @@
+#pragma once
+
+namespace sandbox
+{
+    void register_voxels();
+}

sandbox/src/define_voxels.cpp

@@ -0,0 +1,18 @@
+#include "voxels.h"
+
+#include <deerith/world/voxels.h>
+
+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);
+}

sandbox/src/main.cpp

@@ -3,6 +3,8 @@
 #include <thread>
 #include <args/argh.h>
 
+#include "voxels.h"
+
 int main(int argc, const char **argv)
 {
     deerith::init_engine();