From 5921db5dbb54a8c715985c4d83665fc234a74fc9 Mon Sep 17 00:00:00 2001 From: Patrik Gornicz Date: Sat, 2 May 2009 14:21:32 -0400 Subject: [PATCH] fixed method namespaceing bug --- src/Vector2.cpp | 18 +++++++++--------- src/debug.cpp | 8 ++++---- src/mathw.cpp | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Vector2.cpp b/src/Vector2.cpp index a0bc445..5f2fcd8 100644 --- a/src/Vector2.cpp +++ b/src/Vector2.cpp @@ -107,44 +107,44 @@ Vector2 Vector2::divide(float f) const /// ***** Public Methods ***** -Vector2 operator+(const Vector2& vec1, const Vector2& vec2) +Vector2 pg::operator+(const Vector2& vec1, const Vector2& vec2) { return vec1.add(vec2); } -Vector2 operator-(const Vector2& vec1, const Vector2& vec2) +Vector2 pg::operator-(const Vector2& vec1, const Vector2& vec2) { return vec1.subtract(vec2); } -Vector2 operator*(float f, const Vector2& vec) +Vector2 pg::operator*(float f, const Vector2& vec) { return vec.multiply(f); } -Vector2 operator*(const Vector2& vec, float f) +Vector2 pg::operator*(const Vector2& vec, float f) { return vec.multiply(f); } -Vector2 operator/(const Vector2& vec, float f) +Vector2 pg::operator/(const Vector2& vec, float f) { return vec.divide(f); } -void operator+=(Vector2& vec1, const Vector2& vec2) +void pg::operator+=(Vector2& vec1, const Vector2& vec2) { vec1.m_fX += vec2.m_fX; vec1.m_fY += vec2.m_fY; } -void operator-=(Vector2& vec1, const Vector2& vec2) +void pg::operator-=(Vector2& vec1, const Vector2& vec2) { vec1.m_fX -= vec2.m_fX; vec1.m_fY -= vec2.m_fY; } -void operator*=(Vector2& vec, float f) +void pg::operator*=(Vector2& vec, float f) { vec.m_fX *= f; vec.m_fY *= f; } -void operator/=(Vector2& vec, float f) +void pg::operator/=(Vector2& vec, float f) { vec.m_fX /= f; vec.m_fY /= f; diff --git a/src/debug.cpp b/src/debug.cpp index 69dd332..603bbe2 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -33,24 +33,24 @@ using namespace pg; Mutex muDPF; -void DPF(int level, const char* pstr) +void pg::DPF(int level, const char* pstr) { Autolock lock(muDPF); cout << pstr << endl; } -void debug::init() +void pg::debug::init() { muDPF.init(); } -void debug::clean() +void pg::debug::clean() { muDPF.clean(); } -void DASSERT(bool fBreak) +void pg::DASSERT(bool fBreak) { assert(fBreak); } diff --git a/src/mathw.cpp b/src/mathw.cpp index 7264fd2..e83af5a 100644 --- a/src/mathw.cpp +++ b/src/mathw.cpp @@ -22,14 +22,14 @@ using namespace pg; /// ***** Public Methods ***** -int mod(int x, int y) +int pg::mod(int x, int y) { return x % y + (x < 0 ? y : 0); } // Vector2 Math -Vector2 vectorToLine +Vector2 pg::vectorToLine ( const Vector2& vec, float x1, @@ -58,12 +58,12 @@ Vector2 vectorToLine } } -Vector2 perp(const Vector2& vec) +Vector2 pg::perp(const Vector2& vec) { return Vector2(-vec.m_fY, vec.m_fX); } -float dot(const Vector2& vec1, const Vector2& vec2) +float pg::dot(const Vector2& vec1, const Vector2& vec2) { return vec1.m_fX * vec2.m_fX + vec1.m_fY * vec2.m_fY; } -- 2.10.2