From 0363a1a8fa6eef26f8cde56d9af3c0699d7d2001 Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 19 Mar 2015 12:49:08 +0100 Subject: [PATCH] (Box|Rect) Fixed Contains method excluding edge vectors Former-commit-id: f3281ad9f7af268fceccfdb9d4f67ac0ac76b445 --- include/Nazara/Math/Box.inl | 6 +++--- include/Nazara/Math/Rect.inl | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/Nazara/Math/Box.inl b/include/Nazara/Math/Box.inl index b7873d064..58904abc3 100644 --- a/include/Nazara/Math/Box.inl +++ b/include/Nazara/Math/Box.inl @@ -56,9 +56,9 @@ NzBox::NzBox(const NzBox& box) template bool NzBox::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 diff --git a/include/Nazara/Math/Rect.inl b/include/Nazara/Math/Rect.inl index 9782ac69e..9fba791c0 100644 --- a/include/Nazara/Math/Rect.inl +++ b/include/Nazara/Math/Rect.inl @@ -50,8 +50,8 @@ NzRect::NzRect(const NzRect& rect) template bool NzRect::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