summaryrefslogtreecommitdiffstats
path: root/src/Cuboid.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-03-10 23:13:08 +0100
committerMattes D <github@xoft.cz>2014-03-10 23:13:08 +0100
commitb72661681c0676b6977e95a1d58eb8e282582b73 (patch)
tree9d5e7cccb22d13dd15ad015b4765053d528ca58c /src/Cuboid.h
parentMerge pull request #767 from worktycho/envmatrix (diff)
parentRemoved debugging output. (diff)
downloadcuberite-b72661681c0676b6977e95a1d58eb8e282582b73.tar
cuberite-b72661681c0676b6977e95a1d58eb8e282582b73.tar.gz
cuberite-b72661681c0676b6977e95a1d58eb8e282582b73.tar.bz2
cuberite-b72661681c0676b6977e95a1d58eb8e282582b73.tar.lz
cuberite-b72661681c0676b6977e95a1d58eb8e282582b73.tar.xz
cuberite-b72661681c0676b6977e95a1d58eb8e282582b73.tar.zst
cuberite-b72661681c0676b6977e95a1d58eb8e282582b73.zip
Diffstat (limited to 'src/Cuboid.h')
-rw-r--r--src/Cuboid.h11
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