sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(Box|Rect) Fixed Contains method excluding edge vectors 

Former-commit-id: f3281ad9f7af268fceccfdb9d4f67ac0ac76b445
This commit is contained in:
Lynix 2015-03-19 12:49:08 +01:00
parent efa75ba349
commit 0363a1a8fa
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/Math/Box.inl
View File

@ -56,9 +56,9 @@ NzBox<T>::NzBox(const NzBox<U>& box)
template<typename T> template<typename T>
bool NzBox<T>::Contains(T X, T Y, T Z) const bool NzBox<T>::Contains(T X, T Y, T Z) const
{ {
return X >= x && X < x+width && return X >= x && X <= x+width &&
Y >= y && Y < y+height && Y >= y && Y <= y+height &&
Z >= z && Z < z+depth; Z >= z && Z <= z+depth;
} }
template<typename T> template<typename T>

4
include/Nazara/Math/Rect.inl
View File

@ -50,8 +50,8 @@ NzRect<T>::NzRect(const NzRect<U>& rect)
template<typename T> template<typename T>
bool NzRect<T>::Contains(T X, T Y) const bool NzRect<T>::Contains(T X, T Y) const
{ {
return X >= x && X < x+width && return X >= x && X <= x+width &&
Y >= y && Y < y+height; Y >= y && Y <= y+height;
} }
template<typename T> template<typename T>