Complete Reorganization of file tree

* Merged ArrayTrans3D with VecUtils
* Add crack textures

.idea/inspectionProfiles/Project_Default.xml

@@ -2,7 +2,7 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="ClangTidyInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="clangTidyChecks" value="*,-android-*,-bugprone-bool-pointer-implicit-conversion,-cert-env33-c,-cert-dcl50-cpp,-cert-dcl59-cpp,-cppcoreguidelines-no-malloc,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-pro-type-cstyle-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-pro-type-vararg,-cppcoreguidelines-special-member-functions,-fuchsia-*,-google-*,google-default-arguments,google-explicit-constructor,google-runtime-member-string-references,google-runtime-operator,-hicpp-braces-around-statements,-hicpp-named-parameter,-hicpp-no-array-decay,-hicpp-no-assembler,-hicpp-no-malloc,-hicpp-function-size,-hicpp-special-member-functions,-hicpp-vararg,-llvm-*,-objc-*,-readability-else-after-return,-readability-implicit-bool-conversion,-readability-named-parameter,-readability-simplify-boolean-expr,-readability-braces-around-statements,-readability-identifier-naming,-readability-function-size,-readability-redundant-member-init,-misc-bool-pointer-implicit-conversion,-misc-definitions-in-headers,-misc-unused-alias-decls,-misc-unused-parameters,-misc-unused-using-decls,-modernize-use-using,-modernize-use-default-member-init,-clang-diagnostic-*,-clang-analyzer-*,-cert-msc30-c,-cert-msc50-cpp" />
+      <option name="clangTidyChecks" value="*,-android-*,-bugprone-bool-pointer-implicit-conversion,-cert-env33-c,-cert-dcl50-cpp,-cert-dcl59-cpp,-cppcoreguidelines-no-malloc,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-pro-type-cstyle-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-pro-type-vararg,-cppcoreguidelines-special-member-functions,-fuchsia-*,-google-*,google-default-arguments,google-explicit-constructor,google-runtime-member-string-references,google-runtime-operator,-hicpp-braces-around-statements,-hicpp-named-parameter,-hicpp-no-array-decay,-hicpp-no-assembler,-hicpp-no-malloc,-hicpp-function-size,-hicpp-special-member-functions,-hicpp-vararg,-llvm-*,-objc-*,-readability-else-after-return,-readability-implicit-bool-conversion,-readability-named-parameter,-readability-simplify-boolean-expr,-readability-braces-around-statements,-readability-identifier-naming,-readability-function-size,-readability-redundant-member-init,-misc-bool-pointer-implicit-conversion,-misc-definitions-in-headers,-misc-unused-alias-decls,-misc-unused-parameters,-misc-unused-using-decls,-modernize-use-using,-modernize-use-default-member-init,-clang-diagnostic-*,-clang-analyzer-*,-cert-msc30-c,-cert-msc50-cpp,-bugprone-integer-division" />
     </inspection_tool>
     <inspection_tool class="OCDFAInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">

src/CMakeLists.txt

@@ -1,115 +1,132 @@
 set(ZEUS_SRC_FILES
-        client/engine/graphics/Mesh.cpp
-        client/engine/graphics/Mesh.h
-        client/engine/Entity.cpp
-        client/engine/Entity.h
-        client/engine/graphics/Shader.cpp
-        client/engine/graphics/Shader.h
-        client/engine/Window.cpp
-        client/engine/Window.h
-        client/engine/Camera.cpp
-        client/engine/Camera.h
-        client/engine/graphics/Texture.cpp
-        client/engine/graphics/Texture.h
-        client/graphics/mesh/MeshGenerator.cpp
-        client/graphics/mesh/MeshGenerator.h
-        client/engine/Timer.cpp
-        client/engine/Timer.h
-        generic/blocks/BlockAtlas.cpp
-        generic/blocks/BlockAtlas.h
-        generic/blocks/BlockDef.cpp
-        generic/blocks/BlockDef.h
-        generic/blocks/MeshPart.cpp
-        generic/blocks/MeshPart.h
-        generic/blocks/MeshMod.h
-        client/graphics/mesh/MeshVertex.h
-        generic/blocks/BlockModel.cpp
-        generic/blocks/BlockModel.h
-        client/game/localworld/LocalWorld.cpp
-        client/game/localworld/LocalWorld.h
-        generic/blocks/BlockChunk.cpp
-        generic/blocks/BlockChunk.h
-        generic/helpers/ArrayTrans3D.h
-        client/graphics/mesh/MeshChunk.cpp
-        client/graphics/mesh/MeshChunk.h
-        client/game/GameScene.cpp
-        client/game/GameScene.h
-        client/engine/graphics/Renderer.cpp
-        client/engine/graphics/Renderer.h
-        client/lua/LuaParser.cpp
-        client/lua/LuaParser.h
-        client/lua/l_register_block.cpp
-        client/lua/l_register_block.h
-        client/engine/graphics/TextBuilder.cpp
-        client/engine/graphics/TextBuilder.h
-        client/engine/graphics/TextBuilder.cpp
-        client/engine/graphics/HudText.cpp
-        client/engine/graphics/HudText.h
-        client/graphics/gui/DebugGui.cpp
-        client/graphics/gui/DebugGui.h
-        client/game/Player.cpp
-        client/game/Player.h
-        client/engine/Ray.cpp
-        client/engine/Ray.h
-        client/lua/l_register_blockmodel.cpp
-        client/lua/l_register_blockmodel.h
-        client/lua/LuaApi.cpp
-        client/lua/LuaApi.h
-        client/Client.cpp
-        client/Client.h
-        client/engine/scene/SceneManager.cpp
-        client/engine/scene/SceneManager.h
-        client/engine/scene/Scene.h
-        client/ClientState.h
-        client/menu/MenuScene.cpp
-        client/menu/MenuScene.h
+        game/graph/Mesh.cpp
+        game/graph/Mesh.h
+        game/entity/Entity.cpp
+        game/entity/Entity.h
+        game/graph/Shader.cpp
+        game/graph/Shader.h
+        game/graph/window/Window.cpp
+        game/graph/window/Window.h
+        game/graph/Camera.cpp
+        game/graph/Camera.h
+        game/graph/Texture.cpp
+        game/graph/Texture.h
+        game/scene/world/graph/MeshGenerator.cpp
+        game/scene/world/graph/MeshGenerator.h
+        util/Timer.cpp
+        util/Timer.h
+        def/block/BlockAtlas.cpp
+        def/block/BlockAtlas.h
+        def/block/BlockDef.cpp
+        def/block/BlockDef.h
+        def/block/graph/MeshPart.cpp
+        def/block/graph/MeshPart.h
+        def/block/graph/MeshMod.h
+        game/scene/world/graph/MeshVertex.h
+        def/block/graph/BlockModel.cpp
+        def/block/graph/BlockModel.h
+        game/scene/world/LocalWorld.cpp
+        game/scene/world/LocalWorld.h
+        world/chunk/BlockChunk.cpp
+        world/chunk/BlockChunk.h
+        game/scene/world/graph/MeshChunk.cpp
+        game/scene/world/graph/MeshChunk.h
+        game/scene/GameScene.cpp
+        game/scene/GameScene.h
+        game/graph/Renderer.cpp
+        game/graph/Renderer.h
+        api/LuaParser.cpp
+        api/LuaParser.h
+        api/func/l_register_block.cpp
+        api/func/l_register_block.h
+        game/entity/hud/TextBuilder.cpp
+        game/entity/hud/TextBuilder.h
+        game/entity/hud/TextBuilder.cpp
+        game/entity/hud/HudText.cpp
+        game/entity/hud/HudText.h
+        game/entity/hud/DebugGui.cpp
+        game/entity/hud/DebugGui.h
+        game/scene/world/Player.cpp
+        game/scene/world/Player.h
+        util/Ray.cpp
+        util/Ray.h
+        api/func/l_register_blockmodel.cpp
+        api/func/l_register_blockmodel.h
+        api/LuaApi.cpp
+        api/LuaApi.h
+        game/Game.cpp
+        game/Game.h
+        game/graph/scene/SceneManager.cpp
+        game/graph/scene/SceneManager.h
+        game/graph/scene/Scene.h
+        game/ClientState.h
+        game/scene/MenuScene.cpp
+        game/scene/MenuScene.h
         server/Server.cpp
         server/Server.h
-        generic/network/Packet.cpp
-        generic/network/Packet.h
-        server/ServerPlayer.cpp
-        server/ServerPlayer.h
-        client/network/ServerConnection.cpp
-        client/network/ServerConnection.h
-        generic/gen/MapGen.cpp
-        generic/gen/MapGen.h
-        generic/network/NetHandler.cpp
-        generic/network/NetHandler.h
-        client/graphics/gui/GameGui.cpp
-        client/graphics/gui/GameGui.h
-        generic/network/Serializer.cpp
-        generic/network/Serializer.h
-        server/ServerState.cpp
-        server/ServerState.h
-        server/ConnectionList.cpp
-        server/ConnectionList.h
-        server/ServerPeer.h
-        generic/network/PacketChannel.h
-        client/game/entity/PlayerEntity.cpp
-        client/game/entity/PlayerEntity.h
-        client/engine/graphics/Histogram.cpp
-        client/engine/graphics/Histogram.h
-        client/engine/graphics/RectEntity.cpp
-        client/engine/graphics/RectEntity.h
-        generic/gen/MapGenJob.h
-        generic/helpers/Interpolation.h
-        generic/gen/NoiseSample.cpp
-        generic/gen/NoiseSample.h
-        client/engine/Frustum.cpp
-        client/engine/Frustum.h
-        client/engine/FrustumPlane.cpp
-        client/engine/FrustumPlane.h
-        client/engine/FrustumAABB.cpp
-        client/engine/FrustumAABB.h
-        server/world/World.cpp
-        server/world/World.h
+        util/net/Packet.cpp
+        util/net/Packet.h
+        server/player/ServerPlayer.cpp
+        server/player/ServerPlayer.h
+        game/scene/net/ServerConnection.cpp
+        game/scene/net/ServerConnection.h
+        def/gen/MapGen.cpp
+        def/gen/MapGen.h
+        util/net/NetHandler.cpp
+        util/net/NetHandler.h
+        game/entity/hud/GameGui.cpp
+        game/entity/hud/GameGui.h
+        util/net/Serializer.cpp
+        util/net/Serializer.h
+        server/conn/ConnectionList.cpp
+        server/conn/ConnectionList.h
+        server/conn/ServerPeer.h
+        util/net/PacketChannel.h
+        game/entity/world/PlayerEntity.cpp
+        game/entity/world/PlayerEntity.h
+        game/entity/hud/Histogram.cpp
+        game/entity/hud/Histogram.h
+        game/entity/hud/RectEntity.cpp
+        game/entity/hud/RectEntity.h
+        def/gen/MapGenJob.h
+        util/Interp.h
+        def/gen/NoiseSample.cpp
+        def/gen/NoiseSample.h
+        game/graph/frustum/Frustum.cpp
+        game/graph/frustum/Frustum.h
+        game/graph/frustum/FrustumPlane.cpp
+        game/graph/frustum/FrustumPlane.h
+        game/graph/frustum/FrustumAABB.cpp
+        game/graph/frustum/FrustumAABB.h
+        world/World.cpp
+        world/World.h
         server/world/WorldGenStream.cpp
         server/world/WorldGenStream.h
-        client/game/localworld/WorldInterpolationStream.cpp
-        client/game/localworld/WorldInterpolationStream.h
-        generic/helpers/TransPos.h
-        client/game/localworld/MeshGenStream.cpp
-        client/game/localworld/MeshGenStream.h
-        generic/helpers/VecUtils.h generic/world/Dimension.cpp generic/world/Dimension.h generic/world/Region.h generic/world/MapBlock.h generic/world/RegionHandler.h client/game/entity/WireframeEntity.cpp client/game/entity/WireframeEntity.h generic/blocks/SelectionBox.h client/engine/Drawable.h client/engine/DrawableGroup.cpp client/engine/DrawableGroup.h client/engine/InputManager.cpp client/engine/InputManager.h client/game/entity/BlockModelEntity.cpp client/game/entity/BlockModelEntity.h client/engine/graphics/TextureAtlas.cpp client/engine/graphics/TextureAtlas.h client/engine/graphics/AtlasRef.cpp client/engine/graphics/AtlasRef.h)
+        game/scene/world/WorldInterpolationStream.cpp
+        game/scene/world/WorldInterpolationStream.h
+        util/TransPos.h
+        game/scene/world/MeshGenStream.cpp
+        game/scene/world/MeshGenStream.h
+        util/Vec.h
+        world/Dimension.cpp
+        world/Dimension.h
+        world/region/Region.h
+        world/region/RegionHandler.h
+        game/entity/world/WireframeEntity.cpp
+        game/entity/world/WireframeEntity.h
+        def/block/graph/SelectionBox.h
+        game/graph/drawable/Drawable.h
+        game/graph/drawable/DrawableGroup.cpp
+        game/graph/drawable/DrawableGroup.h
+        game/graph/window/InputManager.cpp
+        game/graph/window/InputManager.h
+        game/entity/world/BlockModelEntity.cpp
+        game/entity/world/BlockModelEntity.h
+        def/texture/TextureAtlas.cpp
+        def/texture/TextureAtlas.h
+        def/texture/AtlasRef.cpp
+        def/texture/AtlasRef.h
+        world/region/MapBlock.cpp
+        world/region/MapBlock.h)
 
 add_library (zeusCore ${ZEUS_SRC_FILES})

src/Main.cpp

@@ -3,9 +3,9 @@
 #define STB_IMAGE_IMPLEMENTATION
 #pragma clang diagnostic pop
 
-#include "client/Client.h"
+#include "game/Game.h"
 #include "server/Server.h"
-#include "generic/network/Serializer.h"
+#include "util/net/Serializer.h"
 
 int main(int argc, char* argv[]) {
     std::string start = "client";
@@ -14,12 +14,12 @@ int main(int argc, char* argv[]) {
     }
 
     if (start == "client") {
-        Client c(1366, 768);
+        Game c(1366, 768);
         c.start(nullptr);
     }
 
     else if (start == "local") {
-        Client c(1366, 768);
+        Game c(1366, 768);
         c.start(argv[0]); //TODO: Get this to client some other way
     }
 

src/api/LuaApi.h

@@ -6,7 +6,7 @@
 #define ZEUS_LUAAPI_H
 
 #include "LuaParser.h"
-#include "../game/GameScene.h"
+#include "../game/scene/GameScene.h"
 
 class LuaApi {
 public:

src/api/func/l_register_block.h

@@ -5,8 +5,8 @@
 #ifndef ZEUS_LREGISTERBLOCK_H
 #define ZEUS_LREGISTERBLOCK_H
 
-#include "LuaApi.h"
-#include "../../generic/blocks/SelectionBox.h"
+#include "../LuaApi.h"
+#include "../../def/block/graph/SelectionBox.h"
 
 class l_register_block : LuaApi {
 public:

src/api/func/l_register_blockmodel.h

@@ -5,7 +5,7 @@
 #ifndef ZEUS_LREGISTERMODEL_H
 #define ZEUS_LREGISTERMODEL_H
 
-#include "LuaApi.h"
+#include "../LuaApi.h"
 
 class l_register_blockmodel : LuaApi {
 public:

src/def/block/BlockAtlas.h

@@ -8,7 +8,7 @@
 
 #include <vector>
 #include "BlockDef.h"
-#include "../../client/engine/graphics/TextureAtlas.h"
+#include "../texture/TextureAtlas.h"
 
 class BlockAtlas {
 public:

src/def/block/BlockDef.h

@@ -6,8 +6,8 @@
 #define GLPROJECT_BLOCKDEF_H
 
 #include <string>
-#include "BlockModel.h"
-#include "SelectionBox.h"
+#include "graph/BlockModel.h"
+#include "graph/SelectionBox.h"
 
 class BlockDef {
 

src/def/block/graph/BlockModel.h

@@ -8,7 +8,7 @@
 #include <vector>
 #include <sol.hpp>
 #include "MeshPart.h"
-#include "../../client/graphics/mesh/MeshVertex.h"
+#include "../../../game/scene/world/graph/MeshVertex.h"
 
 using namespace std; //Just to preserve my sanity
 

src/def/block/graph/MeshPart.h

@@ -15,8 +15,8 @@
 #include <gtx/normal.hpp>
 
 #include "MeshMod.h"
-#include "../../client/graphics/mesh/MeshVertex.h"
-#include "../../client/engine/graphics/TextureAtlas.h"
+#include "../../../game/scene/world/graph/MeshVertex.h"
+#include "../../texture/TextureAtlas.h"
 
 struct MeshPart {
     MeshPart(std::vector<MeshVertex> vertices, std::vector<unsigned int> indices, std::string texture, DynamicAtlas& atlas);

src/def/gen/MapGen.cpp

@@ -5,8 +5,9 @@
 //
 
 #include "MapGen.h"
-#include "../../client/engine/Timer.h"
+#include "../../util/Timer.h"
 #include "NoiseSample.h"
+#include "../../util/Vec.h"
 
 MapGen::MapGen(unsigned int seed) {
     this->seed = seed;
@@ -83,14 +84,14 @@ void MapGen::getElevation(MapGenJob &job) {
 
         int knownDepth = 16;
 
-        if (job.density[ArrayTrans3D::vecToInd(x, 15, z)] > 0) {
+        if (job.density[VecUtils::vecToInd(x, 15, z)] > 0) {
             if (otherJob == nullptr) {
                 otherJob = new MapGenJob(glm::vec3(job.pos.x, job.pos.y + 1, job.pos.z));
                 getDensityMap(*otherJob);
             }
 
             for (int j = 0; j < 16; j++) {
-                int otherInd = ArrayTrans3D::vecToInd(x, j, z);
+                int otherInd = VecUtils::vecToInd(x, j, z);
 
                 if (otherJob->density[otherInd] <= 0) {
                     knownDepth = j;
@@ -101,7 +102,7 @@ void MapGen::getElevation(MapGenJob &job) {
         else knownDepth = 0;
 
         for (int y = 15; y >= 0; y--) {
-            int ind = ArrayTrans3D::vecToInd(x, y, z);
+            int ind = VecUtils::vecToInd(x, y, z);
 
             if (job.density[ind] > 0) {
                 knownDepth = min(knownDepth + 1, 16);
@@ -121,7 +122,7 @@ void MapGen::getDensityMap(MapGenJob &job) {
     glm::vec3 lp;
 
     for (int m = 0; m < 4096; m++) {
-        ArrayTrans3D::indAssignVec(m, lp);
+        VecUtils::indAssignVec(m, lp);
         job.density[m] = terrain_2d_sample.get(lp) * 24.0f - (lp.y + job.pos.y * 16);
     }
 }
@@ -136,7 +137,7 @@ void MapGen::fillChunk(MapGenJob &job) {
     glm::vec3 lp;
 
     for (int m = 0; m < 4096; m++) {
-        ArrayTrans3D::indAssignVec(m, lp);
+        VecUtils::indAssignVec(m, lp);
         int d = job.depth[m];
 
         int grass = 1, dirt = 2, stone = 3;

src/def/gen/MapGen.h

@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "MapGenJob.h"
-#include "../blocks/BlockChunk.h"
+#include "../../world/chunk/BlockChunk.h"
 
 #include <noise/noise.h>
 

src/def/gen/NoiseSample.cpp

@@ -4,7 +4,7 @@
 
 #include <cmath>
 #include "NoiseSample.h"
-#include "../helpers/Interpolation.h"
+#include "../../util/Interp.h"
 
 NoiseSample::NoiseSample(int hPrecision, int vPrecision) {
     this->hPrecision = hPrecision;
@@ -61,14 +61,14 @@ float NoiseSample::get(glm::vec3& pos) {
         auto p011 = data[xBase][yBase + 1][zBase + 1];
         auto p111 = data[xBase + 1][yBase + 1][zBase + 1];
 
-        return Interpolation::trilerp(
+        return Interp::trilerp(
                 p000, p100, p001, p101,
                 p010, p110, p011, p111,
                 xFac, zFac, yFac
         );
     }
     else {
-        return Interpolation::bilerp(
+        return Interp::bilerp(
                 p000, p100, p001, p101, xFac, zFac
         );
     }

src/def/texture/TextureAtlas.h

@@ -11,7 +11,7 @@
 #include <tgmath.h>
 #include <memory>
 #include <map>
-#include "Texture.h"
+#include "../../game/graph/Texture.h"
 #include "AtlasRef.h"
 
 class DynamicAtlas {

src/game/ClientState.h

@@ -5,7 +5,7 @@
 #ifndef ZEUS_CLIENTSTATE_H
 #define ZEUS_CLIENTSTATE_H
 
-#include "engine/graphics/Renderer.h"
+#include "graph/Renderer.h"
 
 struct ClientState {
     Renderer* renderer;

src/game/Game.cpp

@@ -6,15 +6,15 @@
 #include <zconf.h>
 #include <signal.h>
 
-#include "Client.h"
+#include "Game.h"
 
-Client::Client() = default;
+Game::Game() = default;
 
-Client::Client(int width, int height) {
+Game::Game(int width, int height) {
     renderer = new Renderer(width, height);
 }
 
-void Client::start(char* path) {
+void Game::start(char* path) {
     //Start Local Server
     if (path != nullptr) {
         int pid = fork();
@@ -47,11 +47,11 @@ void Client::start(char* path) {
     while (!renderer->getWindow()->getShouldClose()) loop();
 }
 
-void Client::loop() {
+void Game::loop() {
     //VSync 1 = On, 0 = Off
     glfwSwapInterval(1);
 
-    Timer t("Client Loop");
+    Timer t("Game Loop");
 
     double now = glfwGetTime();
     state->deltaTime = now - timeElapsed;
@@ -74,7 +74,7 @@ void Client::loop() {
     state->fps = 1000 / (t.elapsedNs() / 1000000.0);
 }
 
-void Client::cleanup() {
+void Game::cleanup() {
     if (local_server_pid != 0) {
         kill(local_server_pid, SIGKILL);
     }
@@ -83,6 +83,6 @@ void Client::cleanup() {
     delete renderer;
 }
 
-Client::~Client() {
+Game::~Game() {
     cleanup();
 }

src/game/Game.h

@@ -6,22 +6,22 @@
 #define ZEUS_CLIENT_H
 
 #include "ClientState.h"
-#include "engine/graphics/Renderer.h"
-#include "engine/scene/SceneManager.h"
+#include "graph/Renderer.h"
+#include "graph/scene/SceneManager.h"
 
-#include "game/GameScene.h"
-#include "menu/MenuScene.h"
+#include "scene/GameScene.h"
+#include "scene/MenuScene.h"
 
-#include "engine/Timer.h"
+#include "../util/Timer.h"
 
-class Client {
+class Game {
 public:
-    Client();
-    Client(int width, int height);
+    Game();
+    Game(int width, int height);
 
     void start(char* path);
 
-    ~Client();
+    ~Game();
 
 private:
     void loop();

src/game/entity/Entity.h

@@ -9,9 +9,9 @@
 #include <iostream>
 #include <gtc/matrix_transform.hpp>
 
-#include "graphics/Mesh.h"
-#include "graphics/Texture.h"
-#include "Drawable.h"
+#include "../graph/Mesh.h"
+#include "../graph/Texture.h"
+#include "../graph/drawable/Drawable.h"
 
 class Entity : public Drawable {
 public:

src/game/entity/hud/DebugGui.cpp

@@ -3,7 +3,7 @@
 //
 
 #include "DebugGui.h"
-#include "../../../generic/helpers/TransPos.h"
+#include "../../../util/TransPos.h"
 
 DebugGui::DebugGui(glm::vec2 bufferSize) {
     displayMode = 0;

src/game/entity/hud/DebugGui.h

@@ -5,12 +5,12 @@
 #ifndef ZEUS_DEBUGGUI_H
 #define ZEUS_DEBUGGUI_H
 
-#include "../../engine/graphics/Histogram.h"
-#include "../../engine/graphics/HudText.h"
-#include "../../engine/Window.h"
-#include "../../engine/Ray.h"
-#include "../../engine/graphics/RectEntity.h"
-#include "../../engine/DrawableGroup.h"
+#include "Histogram.h"
+#include "HudText.h"
+#include "../../graph/window/Window.h"
+#include "../../../util/Ray.h"
+#include "RectEntity.h"
+#include "../../graph/drawable/DrawableGroup.h"
 #include <sstream>
 
 class DebugGui : public DrawableGroup {

src/game/entity/hud/GameGui.h

@@ -5,10 +5,10 @@
 #ifndef ZEUS_GAMEGUI_H
 #define ZEUS_GAMEGUI_H
 
-#include "../../engine/graphics/RectEntity.h"
-#include "../../engine/Entity.h"
+#include "RectEntity.h"
+#include "../Entity.h"
 #include "../../ClientState.h"
-#include "../../engine/DrawableGroup.h"
+#include "../../graph/drawable/DrawableGroup.h"
 
 class GameGui : public DrawableGroup {
 public:

src/game/entity/hud/TextBuilder.h

@@ -6,7 +6,7 @@
 #define ZEUS_TEXTBUILDER_H
 
 #include <string>
-#include "Mesh.h"
+#include "../../graph/Mesh.h"
 
 class TextBuilder {
 public:

src/game/entity/world/BlockModelEntity.h

@@ -6,8 +6,8 @@
 #define ZEUS_BLOCKMODELENTITY_H
 
 
-#include "../../engine/Entity.h"
-#include "../../../generic/blocks/BlockModel.h"
+#include "../../../game/entity/Entity.h"
+#include "../../../def/block/graph/BlockModel.h"
 
 class BlockModelEntity : public Entity {
 public:

src/game/entity/world/PlayerEntity.h

@@ -6,7 +6,7 @@
 #define ZEUS_PLAYERENTITY_H
 
 
-#include "../../engine/Entity.h"
+#include "../../../game/entity/Entity.h"
 
 class PlayerEntity : public Entity {
 public:

src/game/entity/world/WireframeEntity.h

@@ -6,9 +6,9 @@
 #define ZEUS_WIREFRAMEGENERATOR_H
 
 
-#include "../../engine/graphics/Mesh.h"
+#include "../../graph/Mesh.h"
 #include <vec3.hpp>
-#include "../../../client/engine/Entity.h"
+#include "../Entity.h"
 
 class WireframeEntity : public Entity {
 public:

src/game/graph/Camera.h

@@ -9,7 +9,7 @@
 #include <glm.hpp>
 #include <gtc/matrix_transform.hpp>
 #include <GLFW/glfw3.h>
-#include "Frustum.h"
+#include "frustum/Frustum.h"
 
 class Camera {
 public:

src/game/graph/Renderer.h

@@ -7,8 +7,8 @@
 
 #include "Mesh.h"
 #include "Shader.h"
-#include "../Window.h"
-#include "../Camera.h"
+#include "window/Window.h"
+#include "Camera.h"
 #include "Texture.h"
 #include <ext.hpp>
 

src/game/graph/drawable/Drawable.h

@@ -6,7 +6,7 @@
 #define ZEUS_DRAWABLE_H
 
 
-#include "graphics/Renderer.h"
+#include "../Renderer.h"
 
 class Drawable {
 public:

src/game/graph/scene/Scene.h

@@ -5,7 +5,7 @@
 #ifndef ZEUS_SCENE_H
 #define ZEUS_SCENE_H
 
-#include "../../ClientState.h"
+#include "../../../game/ClientState.h"
 #include <iostream>
 
 class Scene {

src/game/scene/GameScene.cpp

@@ -4,10 +4,10 @@
 
 #include "GameScene.h"
 
-#include "../lua/l_register_block.h"
-#include "../lua/l_register_blockmodel.h"
-#include "entity/WireframeEntity.h"
-#include "entity/BlockModelEntity.h"
+#include "../../api/func/l_register_block.h"
+#include "../../api/func/l_register_blockmodel.h"
+#include "../entity/world/WireframeEntity.h"
+#include "../entity/world/BlockModelEntity.h"
 
 GameScene::GameScene(ClientState* state) :
         Scene(state),

src/game/scene/GameScene.h

@@ -6,15 +6,15 @@
 #define SRC_GAMEWORLD_H
 
 
-#include "../engine/scene/Scene.h"
-#include "../engine/graphics/Renderer.h"
-#include "../graphics/gui/DebugGui.h"
-#include "../graphics/gui/GameGui.h"
-#include "../lua/LuaParser.h"
-#include "localworld/LocalWorld.h"
-#include "Player.h"
-#include "../network/ServerConnection.h"
-#include "entity/PlayerEntity.h"
+#include "../graph/scene/Scene.h"
+#include "../graph/Renderer.h"
+#include "../entity/hud/DebugGui.h"
+#include "../entity/hud/GameGui.h"
+#include "../../api/LuaParser.h"
+#include "world/LocalWorld.h"
+#include "world/Player.h"
+#include "net/ServerConnection.h"
+#include "../entity/world/PlayerEntity.h"
 
 class GameScene : public Scene {
 public:

src/game/scene/MenuScene.h

@@ -6,9 +6,9 @@
 #define ZEUS_MENUSCENE_H
 
 
-#include "../ClientState.h"
-#include "../engine/scene/Scene.h"
-#include "../engine/graphics/HudText.h"
+#include "../../game/ClientState.h"
+#include "../../game/graph/scene/Scene.h"
+#include "../../game/entity/hud/HudText.h"
 
 class MenuScene : public Scene {
 public:

src/game/scene/net/ServerConnection.h

@@ -9,12 +9,12 @@
 #include <iostream>
 #include <vec3.hpp>
 
-#include "../engine/Timer.h"
-#include "../../generic/network/Packet.h"
-#include "../../generic/network/NetHandler.h"
-#include "../game/Player.h"
-#include "../game/entity/PlayerEntity.h"
-#include "../engine/DrawableGroup.h"
+#include "../../../util/Timer.h"
+#include "../../../util/net/Packet.h"
+#include "../../../util/net/NetHandler.h"
+#include "../world/Player.h"
+#include "../../entity/world/PlayerEntity.h"
+#include "../../graph/drawable/DrawableGroup.h"
 
 class ServerConnection {
 public:

src/game/scene/world/LocalWorld.cpp

@@ -6,7 +6,7 @@
 #pragma clang diagnostic ignored "-Wmissing-noreturn"
 
 #include "LocalWorld.h"
-#include "../../../generic/helpers/VecUtils.h"
+#include "../../../util/Vec.h"
 
 LocalWorld::LocalWorld(BlockAtlas *atlas) :
     meshGenStream(*atlas, dimension),

src/game/scene/world/LocalWorld.h

@@ -13,16 +13,15 @@
 #include <vec3.hpp>
 #include <gtc/type_ptr.hpp>
 
-#include "../../../generic/helpers/ArrayTrans3D.h"
-#include "../../../generic/blocks/BlockAtlas.h"
-#include "../../../generic/blocks/BlockChunk.h"
-#include "../../../generic/gen/MapGen.h"
-#include "../../graphics/mesh/MeshChunk.h"
-#include "../../../generic/helpers/TransPos.h"
+#include "../../../def/block/BlockAtlas.h"
+#include "../../../world/chunk/BlockChunk.h"
+#include "../../../def/gen/MapGen.h"
+#include "graph/MeshChunk.h"
+#include "../../../util/TransPos.h"
 #include "WorldInterpolationStream.h"
 #include "MeshGenStream.h"
-#include "../../../generic/helpers/VecUtils.h"
-#include "../../../generic/world/Dimension.h"
+#include "../../../util/Vec.h"
+#include "../../../world/Dimension.h"
 
 class LocalWorld {
 public:

src/game/scene/world/MeshGenStream.h

@@ -9,11 +9,11 @@
 #include <vec3.hpp>
 #include <thread>
 #include <unordered_set>
-#include "../../../generic/blocks/BlockChunk.h"
-#include "../../../generic/blocks/BlockAtlas.h"
-#include "../../graphics/mesh/MeshGenerator.h"
-#include "../../../generic/helpers/VecUtils.h"
-#include "../../../generic/world/Dimension.h"
+#include "../../../world/chunk/BlockChunk.h"
+#include "../../../def/block/BlockAtlas.h"
+#include "graph/MeshGenerator.h"
+#include "../../../util/Vec.h"
+#include "../../../world/Dimension.h"
 
 class MeshGenStream {
 public:

src/game/scene/world/Player.cpp

@@ -3,7 +3,7 @@
 //
 
 #include "Player.h"
-#include "../engine/Ray.h"
+#include "../../../util/Ray.h"
 
 Player::Player() {
     pos = glm::vec3(0, 0, 0);

src/game/scene/world/Player.h

@@ -8,11 +8,11 @@
 
 #include <iostream>
 
-#include "localworld/LocalWorld.h"
-#include "../engine/Camera.h"
-#include "../engine/Timer.h"
-#include "entity/WireframeEntity.h"
-#include "entity/BlockModelEntity.h"
+#include "LocalWorld.h"
+#include "../../graph/Camera.h"
+#include "../../../util/Timer.h"
+#include "../../entity/world/WireframeEntity.h"
+#include "../../entity/world/BlockModelEntity.h"
 
 class Player {
 public: