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

Merge branch 'master' into NDK

Browse Source 
Former-commit-id: 7f2646da9f2e2c29157e645afbcfcf974f0e0709
This commit is contained in:
Lynix
2015-03-19 13:13:20 +01:00
parent 4862767b69 0363a1a8fa
commit 3fd217b8a3
14 changed files with 62 additions and 69 deletions
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>
bool NzBox<T>::Contains(T X, T Y, T Z) const
{
return X >= x && X < x+width &&
Y >= y && Y < y+height &&
Z >= z && Z < z+depth;
return X >= x && X <= x+width &&
Y >= y && Y <= y+height &&
Z >= z && Z <= z+depth;
}
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>
bool NzRect<T>::Contains(T X, T Y) const
{
return X >= x && X < x+width &&
Y >= y && Y < y+height;
return X >= x && X <= x+width &&
Y >= y && Y <= y+height;
}
template<typename T>