diff options
| author | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-02-05 22:45:45 +0100 |
|---|---|---|
| committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-02-05 22:50:18 +0100 |
| commit | ca6ef58b1ee8521e4b940ee4883dee714960e413 (patch) | |
| tree | 8532add455224b07c07a759e3d906f50c0695888 /src/Cuboid.cpp | |
| parent | Merge pull request #2972 from marvinkopf/PlayerAutoComplete (diff) | |
| download | cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.gz cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.bz2 cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.lz cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.xz cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.zst cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Cuboid.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Cuboid.cpp b/src/Cuboid.cpp index 0a454a8f3..1aa1e92e1 100644 --- a/src/Cuboid.cpp +++ b/src/Cuboid.cpp @@ -99,7 +99,7 @@ bool cCuboid::DoesIntersect(const cCuboid & a_Other) const { ASSERT(IsSorted()); ASSERT(a_Other.IsSorted()); - + // In order for cuboids to intersect, each of their coord intervals need to intersect return ( DoIntervalsIntersect(p1.x, p2.x, a_Other.p1.x, a_Other.p2.x) && @@ -116,7 +116,7 @@ bool cCuboid::IsCompletelyInside(const cCuboid & a_Outer) const { ASSERT(IsSorted()); ASSERT(a_Outer.IsSorted()); - + return ( (p1.x >= a_Outer.p1.x) && (p2.x <= a_Outer.p2.x) && @@ -158,7 +158,7 @@ void cCuboid::Expand(int a_SubMinX, int a_AddMaxX, int a_SubMinY, int a_AddMaxY, p2.x -= a_SubMinX; p1.x += a_AddMaxX; } - + if (p1.y < p2.y) { p1.y -= a_SubMinY; @@ -169,7 +169,7 @@ void cCuboid::Expand(int a_SubMinX, int a_AddMaxX, int a_SubMinY, int a_AddMaxY, p2.y -= a_SubMinY; p1.y += a_AddMaxY; } - + if (p1.z < p2.z) { p1.z -= a_SubMinZ; |