From 60d045e139d673754c99db7ee374bcecfd7b573c Mon Sep 17 00:00:00 2001 From: Gawaboumga Date: Fri, 4 Jul 2014 11:31:51 +0200 Subject: [PATCH] Suppressions of getters Former-commit-id: db5ae144a8eb8794e7df9981805d2250bbd8b4ee --- include/Nazara/Math/Plane.hpp | 3 --- include/Nazara/Math/Plane.inl | 12 ------------ include/Nazara/Math/Ray.hpp | 2 -- include/Nazara/Math/Ray.inl | 14 +------------- include/Nazara/Math/Sphere.hpp | 1 - include/Nazara/Math/Sphere.inl | 6 ------ 6 files changed, 1 insertion(+), 37 deletions(-) diff --git a/include/Nazara/Math/Plane.hpp b/include/Nazara/Math/Plane.hpp index e2bbcaa52..b816ae195 100644 --- a/include/Nazara/Math/Plane.hpp +++ b/include/Nazara/Math/Plane.hpp @@ -27,9 +27,6 @@ class NzPlane T Distance(const NzVector3& point) const; T Distance(T x, T y, T z) const; - NzVector3 GetNormal() const; - T GetDistance() const; - NzPlane& Set(T normalX, T normalY, T normalZ, T Distance); NzPlane& Set(const T plane[4]); NzPlane& Set(const NzPlane& plane); diff --git a/include/Nazara/Math/Plane.inl b/include/Nazara/Math/Plane.inl index 1101a7b81..4e7c81029 100644 --- a/include/Nazara/Math/Plane.inl +++ b/include/Nazara/Math/Plane.inl @@ -58,18 +58,6 @@ T NzPlane::Distance(T x, T y, T z) const return Distance(NzVector3(x, y, z)); } -template -NzVector3 NzPlane::GetNormal() const -{ - return normal; -} - -template -T NzPlane::GetDistance() const -{ - return distance; -} - template NzPlane& NzPlane::Set(T normalX, T normalY, T normalZ, T D) { diff --git a/include/Nazara/Math/Ray.hpp b/include/Nazara/Math/Ray.hpp index 4704cf866..d342dcc26 100644 --- a/include/Nazara/Math/Ray.hpp +++ b/include/Nazara/Math/Ray.hpp @@ -29,8 +29,6 @@ template class NzRay ~NzRay() = default; NzVector3 GetClosestPoint(const NzVector3& point) const; - NzVector3 GetDirection() const; - NzVector3 GetOrigin() const; NzVector3 GetPoint(T lambda) const; bool Intersect(const NzBox& box, NzVector3 * hitPoint = nullptr, NzVector3 * hitSecondPoint = nullptr) const; diff --git a/include/Nazara/Math/Ray.inl b/include/Nazara/Math/Ray.inl index 4cb075ecd..1b423f900 100644 --- a/include/Nazara/Math/Ray.inl +++ b/include/Nazara/Math/Ray.inl @@ -55,18 +55,6 @@ NzVector3 NzRay::GetClosestPoint(const NzVector3& point) const return GetPoint(proj/vsq); } -template -NzVector3 NzRay::GetDirection() const -{ - return direction; -} - -template -NzVector3 NzRay::GetOrigin() const -{ - return origin; -} - template NzVector3 NzRay::GetPoint(T lambda) const { @@ -302,7 +290,7 @@ NzString NzRay::ToString() const { NzStringStream ss; - return ss << "Ray(" << origin.x << ", " << origin.y << ", " << origin.z << " | direction: " << direction.x << ", " << direction.y << ", " << direction.z << ')'; + return ss << "Ray(origin: " << origin.ToString() << ", direction: " << direction.ToString() << ")"; } template diff --git a/include/Nazara/Math/Sphere.hpp b/include/Nazara/Math/Sphere.hpp index 989bb6962..64378a949 100644 --- a/include/Nazara/Math/Sphere.hpp +++ b/include/Nazara/Math/Sphere.hpp @@ -39,7 +39,6 @@ class NzSphere NzVector3 GetNegativeVertex(const NzVector3& normal) const; NzVector3 GetPosition() const; NzVector3 GetPositiveVertex(const NzVector3& normal) const; - T GetRadius() const; bool Intersect(const NzBox& box) const; bool Intersect(const NzSphere& sphere) const; diff --git a/include/Nazara/Math/Sphere.inl b/include/Nazara/Math/Sphere.inl index 1f469f6d7..b9a97eb43 100644 --- a/include/Nazara/Math/Sphere.inl +++ b/include/Nazara/Math/Sphere.inl @@ -118,12 +118,6 @@ NzVector3 NzSphere::GetPositiveVertex(const NzVector3& normal) const return pos; } -template -T NzSphere::GetRadius() const -{ - return radius; -} - template bool NzSphere::Intersect(const NzBox& box) const {