Renamed Vector3 class to KRVector3

KRObjPacker project updated to use KREngine_osx framework rather than having a copy of the files

--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4015
This commit is contained in:
kearwood
2012-03-15 22:57:20 +00:00
parent a9786b80e6
commit bb38ede18e
28 changed files with 136 additions and 130 deletions

View File

@@ -32,27 +32,27 @@
#include "KRVector3.h"
//default constructor
Vector3::Vector3()
KRVector3::KRVector3()
{
x = 0.0f;
y = 0.0f;
z = 0.0f;
}
Vector3::Vector3(float X = 0, float Y = 0, float Z = 0)
KRVector3::KRVector3(float X, float Y, float Z)
{
x = X;
y = Y;
z = Z;
}
Vector3::Vector3(const Vector3& p) {
KRVector3::KRVector3(const KRVector3& p) {
x = p.x;
y = p.y;
z = p.z;
}
Vector3& Vector3::operator = ( const Vector3& p ) {
KRVector3& KRVector3::operator = ( const KRVector3& p ) {
x = p.x;
y = p.y;
z = p.z;
@@ -60,44 +60,44 @@ Vector3& Vector3::operator = ( const Vector3& p ) {
return *this;
}
Vector3::~Vector3()
KRVector3::~KRVector3()
{
}
//calculate and return the magnitude of this vector
float Vector3::GetMagnitude()
float KRVector3::GetMagnitude()
{
return sqrtf(x * x + y * y + z * z);
}
//multiply this vector by a scalar
Vector3 Vector3::operator*(float num) const
KRVector3 KRVector3::operator*(float num) const
{
return Vector3(x * num, y * num, z * num);
return KRVector3(x * num, y * num, z * num);
}
//pass in a vector, pass in a scalar, return the product
/*
Vector3 Vector3::operator*(float num, Vector3 const &vec)
KRVector3 KRVector3::operator*(float num, KRVector3 const &vec)
{
return Vector3(vec.x * num, vec.y * num, vec.z * num);
return KRVector3(vec.x * num, vec.y * num, vec.z * num);
}
*/
//add two vectors
Vector3 Vector3::operator+(const Vector3 &vec) const
KRVector3 KRVector3::operator+(const KRVector3 &vec) const
{
return Vector3(x + vec.x, y + vec.y, z + vec.z);
return KRVector3(x + vec.x, y + vec.y, z + vec.z);
}
//subtract two vectors
Vector3 Vector3::operator-(const Vector3 &vec) const
KRVector3 KRVector3::operator-(const KRVector3 &vec) const
{
return Vector3(x - vec.x, y - vec.y, z - vec.z);
return KRVector3(x - vec.x, y - vec.y, z - vec.z);
}
//normalize this vector
void Vector3::normalize()
void KRVector3::normalize()
{
float magnitude = sqrtf(x * x + y * y + z * z);
x /= magnitude;
@@ -106,15 +106,15 @@ void Vector3::normalize()
}
//calculate and return dot product
float Vector3::dot(const Vector3 &vec) const
float KRVector3::dot(const KRVector3 &vec) const
{
return x * vec.x + y * vec.y + z * vec.z;
}
//calculate and return cross product
Vector3 Vector3::cross(const Vector3 &vec) const
KRVector3 KRVector3::cross(const KRVector3 &vec) const
{
return Vector3(y * vec.z - z * vec.y,
return KRVector3(y * vec.z - z * vec.y,
z * vec.x - x * vec.z,
x * vec.y - y * vec.x);
}