*Backed out changeset 3be01fb200a5

--HG--
branch : trunk

dep/include/g3dlite/G3D/Vector4.inl

@@ -1,25 +1,34 @@
-/**
+/** 
   @file Vector4.inl
+
   @maintainer Morgan McGuire, [email protected]
+
   @created 2002-07-09
   @edited  2003-02-10
  */
+
 //----------------------------------------------------------------------------
+
 inline unsigned int hashCode(const G3D::Vector4& v) {
      return v.hashCode();
 }
+
 namespace G3D {
+
 //----------------------------------------------------------------------------
 inline Vector4::Vector4() {
     x = y = z = w = 0;
 }
+
 //----------------------------------------------------------------------------
+
 inline Vector4::Vector4 (float fX, float fY, float fZ, float fW) {
     x = fX;
     y = fY;
     z = fZ;
     w = fW;
 }
+
 //----------------------------------------------------------------------------
 inline Vector4::Vector4 (float afCoordinate[4]) {
     x = afCoordinate[0];
@@ -27,6 +36,7 @@ inline Vector4::Vector4 (float afCoordinate[4]) {
     z = afCoordinate[2];
     w = afCoordinate[3];
 }
+
 //----------------------------------------------------------------------------
 inline Vector4::Vector4(const Vector4& rkVector) {
     x = rkVector.x;
@@ -41,21 +51,26 @@ inline Vector4::Vector4(const Vector3& rkVector, float fW) {
     z = rkVector.z;
     w = fW;
 }
+
 //----------------------------------------------------------------------------
 inline float& Vector4::operator[] (int i) {
     return ((float*)this)[i];
 }
+
 //----------------------------------------------------------------------------
 inline const float& Vector4::operator[] (int i) const {
     return ((float*)this)[i];
 }
+
 //----------------------------------------------------------------------------
 inline Vector4::operator float* () {
     return (float*)this;
 }
+
 inline Vector4::operator const float* () const {
     return (float*)this;
 }
+
 //----------------------------------------------------------------------------
 inline Vector4& Vector4::operator= (const Vector4& rkVector) {
     x = rkVector.x;
@@ -64,30 +79,37 @@ inline Vector4& Vector4::operator= (const Vector4& rkVector) {
     w = rkVector.w;
     return *this;
 }
+
 //----------------------------------------------------------------------------
 inline bool Vector4::operator== (const Vector4& rkVector) const {
     return ( (x == rkVector.x) && (y == rkVector.y) && (z == rkVector.z) && (w == rkVector.w));
 }
+
 //----------------------------------------------------------------------------
 inline bool Vector4::operator!= (const Vector4& rkVector) const {
     return ( x != rkVector.x || y != rkVector.y || z != rkVector.z || w != rkVector.w);
 }
+
 //----------------------------------------------------------------------------
 inline Vector4 Vector4::operator+ (const Vector4& rkVector) const {
     return Vector4(x + rkVector.x, y + rkVector.y, z + rkVector.z, w + rkVector.w);
 }
+
 //----------------------------------------------------------------------------
 inline Vector4 Vector4::operator- (const Vector4& rkVector) const {
     return Vector4(x - rkVector.x, y - rkVector.y, z - rkVector.z, w - rkVector.w);
 }
+
 //----------------------------------------------------------------------------
 inline Vector4 Vector4::operator* (float fScalar) const {
     return Vector4(fScalar*x, fScalar*y, fScalar*z, fScalar*w);
 }
+
 //----------------------------------------------------------------------------
 inline Vector4 Vector4::operator- () const {
     return Vector4( -x, -y, -z, -w);
 }
+
 //----------------------------------------------------------------------------
 inline Vector4& Vector4::operator+= (const Vector4& rkVector) {
     x += rkVector.x;
@@ -96,6 +118,7 @@ inline Vector4& Vector4::operator+= (const Vector4& rkVector) {
     w += rkVector.w;
     return *this;
 }
+
 //----------------------------------------------------------------------------
 inline Vector4& Vector4::operator-= (const Vector4& rkVector) {
     x -= rkVector.x;
@@ -104,11 +127,14 @@ inline Vector4& Vector4::operator-= (const Vector4& rkVector) {
     w -= rkVector.w;
     return *this;
 }
+
 //----------------------------------------------------------------------------
+
 inline Vector4 Vector4::lerp(const Vector4& v, float alpha) const {
-    return (*this) + (v - *this) * alpha;
+    return (*this) + (v - *this) * alpha; 
 }
 
+
 //----------------------------------------------------------------------------
 inline Vector4& Vector4::operator*= (float fScalar) {
     x *= fScalar;
@@ -118,37 +144,50 @@ inline Vector4& Vector4::operator*= (float fScalar) {
     return *this;
 }
 
+
 //----------------------------------------------------------------------------
 inline float Vector4::dot(const Vector4& rkVector) const {
     return x*rkVector.x + y*rkVector.y + z*rkVector.z + w*rkVector.w;
 }
+
 //----------------------------------------------------------------------------
 inline Vector4 Vector4::min(const Vector4 &v) const {
     return Vector4(G3D::min(v.x, x), G3D::min(v.y, y), G3D::min(v.z, z), G3D::min(v.w, w));
 }
+
 //----------------------------------------------------------------------------
 inline Vector4 Vector4::max(const Vector4 &v) const {
     return Vector4(G3D::max(v.x, x), G3D::max(v.y, y), G3D::max(v.z, z), G3D::max(v.w, w));
 }
+
 //----------------------------------------------------------------------------
 inline bool Vector4::isZero() const {
     return (x == 0.0f) && (y == 0.0f) && (z == 0.0f) && (w == 0.0f);
 }
+
 //----------------------------------------------------------------------------
+
 inline bool Vector4::isFinite() const {
     return G3D::isFinite(x) && G3D::isFinite(y) && G3D::isFinite(z) && G3D::isFinite(w);
 }
+
 //----------------------------------------------------------------------------
+
 inline bool Vector4::isUnit() const {
     return squaredLength() == 1.0;
 }
+
 //----------------------------------------------------------------------------
+
 inline float Vector4::length() const {
     return sqrtf(squaredLength());
 }
+
 //----------------------------------------------------------------------------
+
 inline float Vector4::squaredLength() const {
     return x * x + y * y + z * z + w * w;
 }
+
 }