* Move AABB, HitResult and Vec3 into world/phys

2026-09-23 20:09:46 +03:00 · 2023-08-18 22:33:05 +03:00
parent ac0555c3fb
commit c4b8e48c6c
17 changed files with 38 additions and 35 deletions
--- a/source/client/renderer/Culler.hpp
+++ b/source/client/renderer/Culler.hpp
@@ -8,7 +8,7 @@

 #pragma once

-#include "client/common/AABB.hpp"
+#include "world/phys/AABB.hpp"

 class Culler
 {
--- a/source/client/renderer/Frustum.hpp
+++ b/source/client/renderer/Frustum.hpp
@@ -9,7 +9,7 @@
 #pragma once

 #include "client/common/Matrix.hpp"
-#include "client/common/AABB.hpp"
+#include "world/phys/AABB.hpp"

 class Frustum
 {
--- a/source/client/renderer/FrustumCuller.hpp
+++ b/source/client/renderer/FrustumCuller.hpp
@@ -8,7 +8,7 @@

 #pragma once

-#include "client/common/Vec3.hpp"
+#include "world/phys/Vec3.hpp"
 #include "Culler.hpp"
 #include "Frustum.hpp"

--- a/source/client/renderer/entity/EntityRenderer.hpp
+++ b/source/client/renderer/entity/EntityRenderer.hpp
@@ -8,7 +8,7 @@

 #pragma once

-#include "client/common/AABB.hpp"
+#include "world/phys/AABB.hpp"
 #include "client/model/HumanoidModel.hpp"
 #include "client/renderer/Font.hpp"

--- a/source/world/entity/Entity.hpp
+++ b/source/world/entity/Entity.hpp
@@ -8,8 +8,8 @@

 #pragma once

-#include "client/common/AABB.hpp"
-#include "client/common/Vec3.hpp"
+#include "world/phys/Vec3.hpp"
+#include "world/phys/AABB.hpp"
 #include "world/level/Material.hpp"
 #include "world/tile/Tile.hpp"
 #include "world/item/ItemInstance.hpp"
--- a/source/world/level/Dimension.hpp
+++ b/source/world/level/Dimension.hpp
@@ -8,7 +8,7 @@

 #pragma once

-#include "client/common/Vec3.hpp"
+#include "world/phys/Vec3.hpp"
 #include "world/level/levelgen/biome/BiomeSource.hpp"
 #include "world/level/levelgen/chunk/ChunkSource.hpp"
 #include "Level.hpp"
--- a/source/world/level/levelgen/chunk/LevelChunk.hpp
+++ b/source/world/level/levelgen/chunk/LevelChunk.hpp
@@ -11,9 +11,9 @@
 #include <cstring>
 #include <vector>
 #include <algorithm>
-#include "client/common/AABB.hpp"
 #include "client/common/Utils.hpp"
 #include "client/renderer/LightLayer.hpp"
+#include "world/phys/AABB.hpp"

 class Level;
 class Entity;
--- a/source/world/level/storage/LevelData.hpp
+++ b/source/world/level/storage/LevelData.hpp
@@ -11,7 +11,7 @@
 #include <string>
 #include "BitStream.h"
 #include "client/common/Utils.hpp"
-#include "client/common/Vec3.hpp"
+#include "world/phys/Vec3.hpp"
 #include "world/item/Inventory.hpp"

 struct PlayerData
--- a/source/client/common/AABB.cpp
+++ b/source/client/common/AABB.cpp
--- a/source/client/common/AABB.hpp
+++ b/source/client/common/AABB.hpp
--- a/source/client/common/HitResult.cpp
+++ b/source/client/common/HitResult.cpp
--- a/source/client/common/HitResult.hpp
+++ b/source/client/common/HitResult.hpp
--- a/source/client/common/Vec3.cpp
+++ b/source/client/common/Vec3.cpp
--- a/source/client/common/Vec3.hpp
+++ b/source/client/common/Vec3.hpp
@@ -8,7 +8,7 @@

 #pragma once

-#include "Mth.hpp"
+#include "client/common/Mth.hpp"

 class Vec3
 {
--- a/source/world/tile/Tile.hpp
+++ b/source/world/tile/Tile.hpp
@@ -12,7 +12,7 @@
 #include <vector>

 #include "client/common/Random.hpp"
-#include "client/common/AABB.hpp"
+#include "world/phys/AABB.hpp"
 #include "world/level/storage/LevelSource.hpp"
 #include "world/level/Material.hpp"
 #include "world/entity/Entity.hpp"