summaryrefslogtreecommitdiff
path: root/src/GFX
diff options
context:
space:
mode:
authorMel <einebeere@gmail.com>2023-08-06 04:27:07 +0200
committerMel <einebeere@gmail.com>2023-08-06 04:27:07 +0200
commit5a1b126f1f6d55226c2b5068d0c17c428fd29ba8 (patch)
tree3acc0240cd8dedd0764eeae6df04e134b04584c8 /src/GFX
parente6f5f9e03f673db796f1babb308609ca2576db2f (diff)
downloadmeowcraft-5a1b126f1f6d55226c2b5068d0c17c428fd29ba8.tar.zst
meowcraft-5a1b126f1f6d55226c2b5068d0c17c428fd29ba8.zip
Create separate Player entity and add bad collision system
Diffstat (limited to 'src/GFX')
-rw-r--r--src/GFX/Util/Primitives.cpp6
-rw-r--r--src/GFX/Util/Primitives.hpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/GFX/Util/Primitives.cpp b/src/GFX/Util/Primitives.cpp
index d2c3690..4b44864 100644
--- a/src/GFX/Util/Primitives.cpp
+++ b/src/GFX/Util/Primitives.cpp
@@ -2,7 +2,7 @@
namespace MC::GFX::Util::Primitives {
-PlanePrimitive plane(Math::AABB aabb, FaceSet face) {
+PlanePrimitive plane(AABB aabb, FaceSet face) {
decltype(PlanePrimitive::positions) positions;
auto [min, max] = aabb;
@@ -55,7 +55,7 @@ PlanePrimitive plane(Math::AABB aabb, FaceSet face) {
return {positions, {normal, normal, normal, normal}, {0, 1, 2, 2, 3, 0}};
}
-BoxPrimitive box(Math::AABB aabb, FaceSet faces) {
+BoxPrimitive box(AABB aabb, FaceSet faces) {
BoxPrimitive box{};
auto [min, max] = aabb;
@@ -65,7 +65,7 @@ BoxPrimitive box(Math::AABB aabb, FaceSet faces) {
FaceSet face = (FaceSet::Value)face_value;
if ((faces & face) == 0) continue;
- Math::AABB face_aabb;
+ AABB face_aabb;
switch (face) {
case FaceSet::Front:
face_aabb = {min, {max.x(), max.y(), min.z()}};
diff --git a/src/GFX/Util/Primitives.hpp b/src/GFX/Util/Primitives.hpp
index b96bc00..a267130 100644
--- a/src/GFX/Util/Primitives.hpp
+++ b/src/GFX/Util/Primitives.hpp
@@ -39,9 +39,9 @@ struct Primitive {
};
using PlanePrimitive = Primitive<4>;
-PlanePrimitive plane(Math::AABB aabb, FaceSet face);
+PlanePrimitive plane(AABB aabb, FaceSet face);
using BoxPrimitive = Primitive<4 * 6>;
-BoxPrimitive box(Math::AABB aabb, FaceSet faces = FaceSet::all());
+BoxPrimitive box(AABB aabb, FaceSet faces = FaceSet::all());
}