summaryrefslogtreecommitdiffstats
path: root/src/BoundingBox.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2016-06-05 21:18:52 +0200
committerMattes D <github@xoft.cz>2016-06-05 21:18:52 +0200
commit456ffa5bd608c88f5c9b75297fd505b29d0a02e7 (patch)
treeece066d1c1f8e5ebe4a0da9cf918e06094002188 /src/BoundingBox.cpp
parentMerge pull request #3219 from QUSpilPrgm/master (diff)
parentBindings: Fixed cBoundingBox API. (diff)
downloadcuberite-456ffa5bd608c88f5c9b75297fd505b29d0a02e7.tar
cuberite-456ffa5bd608c88f5c9b75297fd505b29d0a02e7.tar.gz
cuberite-456ffa5bd608c88f5c9b75297fd505b29d0a02e7.tar.bz2
cuberite-456ffa5bd608c88f5c9b75297fd505b29d0a02e7.tar.lz
cuberite-456ffa5bd608c88f5c9b75297fd505b29d0a02e7.tar.xz
cuberite-456ffa5bd608c88f5c9b75297fd505b29d0a02e7.tar.zst
cuberite-456ffa5bd608c88f5c9b75297fd505b29d0a02e7.zip
Diffstat (limited to '')
-rw-r--r--src/BoundingBox.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/BoundingBox.cpp b/src/BoundingBox.cpp
index 8e3bb29a9..bd236bbd7 100644
--- a/src/BoundingBox.cpp
+++ b/src/BoundingBox.cpp
@@ -261,7 +261,7 @@ bool cBoundingBox::IsInside(const Vector3d & a_Min, const Vector3d & a_Max, doub
-bool cBoundingBox::CalcLineIntersection(const Vector3d & a_Line1, const Vector3d & a_Line2, double & a_LineCoeff, eBlockFace & a_Face)
+bool cBoundingBox::CalcLineIntersection(const Vector3d & a_Line1, const Vector3d & a_Line2, double & a_LineCoeff, eBlockFace & a_Face) const
{
return CalcLineIntersection(m_Min, m_Max, a_Line1, a_Line2, a_LineCoeff, a_Face);
}
@@ -336,7 +336,7 @@ bool cBoundingBox::CalcLineIntersection(const Vector3d & a_Min, const Vector3d &
-bool cBoundingBox::Intersect(const cBoundingBox & a_Other, cBoundingBox & a_Intersection)
+bool cBoundingBox::Intersect(const cBoundingBox & a_Other, cBoundingBox & a_Intersection) const
{
a_Intersection.m_Min.x = std::max(m_Min.x, a_Other.m_Min.x);
a_Intersection.m_Max.x = std::min(m_Max.x, a_Other.m_Max.x);