Changeset 2844 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Vector3.h

Timestamp:

07/17/08 17:21:39 (16 years ago)

Author:

mattausch

Message:

lod starting to work

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Vector3.h (modified) (5 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Vector3.h

@@ -314 +314 @@
 inline float SqrMagnitude(const Vector3 &v) 
 {
-  return v.x * v.x + v.y * v.y + v.z * v.z;
+        return v.x * v.x + v.y * v.y + v.z * v.z;
 }
 
@@ -320 +320 @@
 inline float Distance(const Vector3 &v1, const Vector3 &v2)
 {
-  return sqrtf(sqrt(v1.x - v2.x) + sqrt(v1.y - v2.y) + sqrt(v1.z - v2.z));
+        //return sqrtf(sqrt(v1.x - v2.x) + sqrt(v1.y - v2.y) + sqrt(v1.z - v2.z));
+        return Magnitude(v1 - v2);
 }
 
@@ -326 +327 @@
 inline float SqrDistance(const Vector3 &v1, const Vector3 &v2)
 {
-  return sqrt(v1.x - v2.x) + sqrt(v1.y - v2.y) + sqrt(v1.z - v2.z);
+        //return sqrt(v1.x - v2.x) + sqrt(v1.y - v2.y) + sqrt(v1.z - v2.z);
+        return SqrMagnitude(v1 - v2);
 }
 
@@ -332 +334 @@
 inline Vector3 Normalize(const Vector3 &A)
 {
-  return A * (1.0f / Magnitude(A));
+        return A * (1.0f / Magnitude(A));
 }
 
@@ -338 +340 @@
 inline float DotProd(const Vector3 &A, const Vector3 &B)
 {
-  return A.x * B.x + A.y * B.y + A.z * B.z;
+        return A.x * B.x + A.y * B.y + A.z * B.z;
 }