From 5a1b126f1f6d55226c2b5068d0c17c428fd29ba8 Mon Sep 17 00:00:00 2001 From: Mel Date: Sun, 6 Aug 2023 04:27:07 +0200 Subject: Create separate Player entity and add bad collision system --- src/GFX/Util/Primitives.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/GFX/Util/Primitives.cpp') 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()}}; -- cgit 1.4.1