diff options
author | Tycho <work.tycho+git@gmail.com> | 2014-03-11 20:33:26 +0100 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2014-03-11 20:33:26 +0100 |
commit | 80d7c88e007c6dd3af629aad7a01fbf911a00d67 (patch) | |
tree | f60467bca973ef34b355b53e2d0dbb5554f71ad7 /src/Cuboid.h | |
parent | Merge branch 'master' into Werror (diff) | |
parent | Merge pull request #791 from mc-server/PieceGenerator (diff) | |
download | cuberite-80d7c88e007c6dd3af629aad7a01fbf911a00d67.tar cuberite-80d7c88e007c6dd3af629aad7a01fbf911a00d67.tar.gz cuberite-80d7c88e007c6dd3af629aad7a01fbf911a00d67.tar.bz2 cuberite-80d7c88e007c6dd3af629aad7a01fbf911a00d67.tar.lz cuberite-80d7c88e007c6dd3af629aad7a01fbf911a00d67.tar.xz cuberite-80d7c88e007c6dd3af629aad7a01fbf911a00d67.tar.zst cuberite-80d7c88e007c6dd3af629aad7a01fbf911a00d67.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Cuboid.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/Cuboid.h b/src/Cuboid.h index 51ccf799b..b95517f69 100644 --- a/src/Cuboid.h +++ b/src/Cuboid.h @@ -34,7 +34,8 @@ public: Works on unsorted cuboids, too. */ int GetVolume(void) const; - /** Returns true if the cuboids have at least one voxel in common. Both coords are considered inclusive. */ + /** Returns true if the cuboids have at least one voxel in common. Both coords are considered inclusive. + Assumes both cuboids are sorted. */ bool DoesIntersect(const cCuboid & a_Other) const; bool IsInside(const Vector3i & v) const @@ -64,7 +65,8 @@ public: ); } - /** Returns true if this cuboid is completely inside the specifie cuboid (in all 6 coords) */ + /** Returns true if this cuboid is completely inside the specifie cuboid (in all 6 coords). + Assumes both cuboids are sorted. */ bool IsCompletelyInside(const cCuboid & a_Outer) const; /** Moves the cuboid by the specified offsets in each direction */ @@ -72,7 +74,7 @@ public: /** Expands the cuboid by the specified amount in each direction. Works on unsorted cuboids as well. - Note that this function doesn't check for underflows. */ + Note that this function doesn't check for underflows when using negative amounts. */ void Expand(int a_SubMinX, int a_AddMaxX, int a_SubMinY, int a_AddMaxY, int a_SubMinZ, int a_AddMaxZ); /** Clamps both X coords to the specified range. Works on unsorted cuboids, too. */ @@ -86,6 +88,9 @@ public: /** Returns true if the coords are properly sorted (lesser in p1, greater in p2) */ bool IsSorted(void) const; + + /** If needed, expands the cuboid so that it contains the specified point. Assumes sorted. Doesn't contract. */ + void Engulf(const Vector3i & a_Point); } ; // tolua_end |