projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactored Vector2
[physics.git]
/
src
/
Vector2.cpp
diff --git
a/src/Vector2.cpp
b/src/Vector2.cpp
index
d13ea95
..
2a8c8af
100644
(file)
--- a/
src/Vector2.cpp
+++ b/
src/Vector2.cpp
@@
-16,26
+16,19
@@
*/
#include "Vector2.h"
*/
#include "Vector2.h"
+#include "debug.h"
+
#include "mathw.h"
/// ***** Constructors/Destructors *****
Vector2::Vector2()
#include "mathw.h"
/// ***** Constructors/Destructors *****
Vector2::Vector2()
- :
x(0), y
(0)
+ :
m_fX(0), m_fY
(0)
{
}
{
}
-Vector2::Vector2(float x, float y)
- : x(x), y(y)
-{
-
-}
-Vector2::Vector2(const Vector2& vec)
- : x(vec.x), y(vec.y)
-{
-
-}
-Vector2::~Vector2()
+Vector2::Vector2(float fX, float fY)
+ : m_fX(fX), m_fY(fY)
{
}
{
}
@@
-44,21
+37,22
@@
Vector2::~Vector2()
void Vector2::zero()
{
void Vector2::zero()
{
-
x
= 0;
-
y
= 0;
+
m_fX
= 0;
+
m_fY
= 0;
}
void Vector2::unit()
{
}
void Vector2::unit()
{
- float
l
en = length();
+ float
fL
en = length();
-
x /= l
en;
-
y /= l
en;
+
m_fX /= fL
en;
+
m_fY /= fL
en;
}
float Vector2::angle() const
{
//TODO
}
float Vector2::angle() const
{
//TODO
- //return atan2A(y,x);
+ DASSERT(false);
+ //return atan2A(m_fY,m_fX);
return 0;
}
float Vector2::length() const
return 0;
}
float Vector2::length() const
@@
-67,53
+61,45
@@
float Vector2::length() const
}
float Vector2::sqrLength() const
{
}
float Vector2::sqrLength() const
{
- return
x*x + y*y
;
+ return
this->dot(*this)
;
}
}
-float Vector2::dot(const Vector2& v) const
+float Vector2::dot(const Vector2& v
ec
) const
{
{
- return
x*v.x + y*v.y
;
+ return
m_fX * vec.m_fX + m_fY * vec.m_fY
;
}
string Vector2::toString() const
{
// long just to be safe
}
string Vector2::toString() const
{
// long just to be safe
- char* strX = new char[50];
- char* strY = new char[50];
-
- sprintf(strX, "%f", x);
- sprintf(strY, "%f", y);
-
- string val = (string)"Vector2 x: " + strX + ", y: " + strY;
+ char rgchars[100];
- // deletes the allocated memory, not just what is used by sprintf
- delete []strX;
- delete []strY;
+ sprintf(rgchars, "Vector2 X: %f, Y: %f", m_fX, m_fY);
- return
val
;
+ return
rgchars
;
}
void Vector2::print() const
{
}
void Vector2::print() const
{
- printf("%s\n",toString().c_str());
+ printf("%s\n",
toString().c_str());
}
Vector2 Vector2::add(const Vector2& vec) const
{
}
Vector2 Vector2::add(const Vector2& vec) const
{
- return Vector2(
x+vec.x, y+vec.y
);
+ return Vector2(
m_fX + vec.m_fX, m_fY + vec.m_fY
);
}
Vector2 Vector2::subtract(const Vector2& vec) const
{
}
Vector2 Vector2::subtract(const Vector2& vec) const
{
- return Vector2(
x-vec.x, y-vec.y
);
+ return Vector2(
m_fX - vec.m_fX, m_fY - vec.m_fY
);
}
}
-Vector2 Vector2::multiply(float
c
) const
+Vector2 Vector2::multiply(float
f
) const
{
{
- return Vector2(
x*c, y*c
);
+ return Vector2(
m_fX * f, m_fY * f
);
}
}
-Vector2 Vector2::divide(float
c
) const
+Vector2 Vector2::divide(float
f
) const
{
{
- return Vector2(
x/c, y/c
);
+ return Vector2(
m_fX / f, m_fY / f
);
}
/// ***** Public Methods *****
}
/// ***** Public Methods *****
@@
-126,37
+112,37
@@
Vector2 operator-(const Vector2& vec1, const Vector2& vec2)
{
return vec1.subtract(vec2);
}
{
return vec1.subtract(vec2);
}
-Vector2 operator*(float
c
, const Vector2& vec)
+Vector2 operator*(float
f
, const Vector2& vec)
{
{
- return vec.multiply(
c
);
+ return vec.multiply(
f
);
}
}
-Vector2 operator*(const Vector2& vec, float
c
)
+Vector2 operator*(const Vector2& vec, float
f
)
{
{
- return vec.multiply(
c
);
+ return vec.multiply(
f
);
}
}
-Vector2 operator/(const Vector2& vec, float
c
)
+Vector2 operator/(const Vector2& vec, float
f
)
{
{
- return vec.divide(
c
);
+ return vec.divide(
f
);
}
void operator+=(Vector2& vec1, const Vector2& vec2)
{
}
void operator+=(Vector2& vec1, const Vector2& vec2)
{
- vec1.
x += vec2.x
;
- vec1.
y += vec2.y
;
+ vec1.
m_fX += vec2.m_fX
;
+ vec1.
m_fY += vec2.m_fY
;
}
void operator-=(Vector2& vec1, const Vector2& vec2)
{
}
void operator-=(Vector2& vec1, const Vector2& vec2)
{
- vec1.
x -= vec2.x
;
- vec1.
y -= vec2.y
;
+ vec1.
m_fX -= vec2.m_fX
;
+ vec1.
m_fY -= vec2.m_fY
;
}
}
-void operator*=(Vector2& vec, float
c
)
+void operator*=(Vector2& vec, float
f
)
{
{
- vec.
x *= c
;
- vec.
y *= c
;
+ vec.
m_fX *= f
;
+ vec.
m_fY *= f
;
}
}
-void operator/=(Vector2& vec, float
c
)
+void operator/=(Vector2& vec, float
f
)
{
{
- vec.
x /= c
;
- vec.
y /= c
;
+ vec.
m_fX /= f
;
+ vec.
m_fY /= f
;
}
}