Changeset 1824 for GTP/trunk/Lib/Vis/Preprocessing/src/VssRay.cpp

Timestamp:

11/28/06 19:46:36 (18 years ago)

Author:

bittner

Message:

global lines support

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VssRay.cpp (modified) (2 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/VssRay.cpp

@@ -8 +8 @@
 VssRay::mailID = 0;
 
+#define OLD_PARAM 0
 
 VssRay::VssRay(
@@ -230 +231 @@
 VssRay::GetDirParam(const int axis, const Vector3 dir)
 {
+  Vector3 d = Normalize(dir);
+#if OLD_PARAM
   return (axis == 0) ? atan2(dir.x, dir.z) : asin(dir.y);
+#else
+  //  x = cos(p0)sin(p1)
+  //  y = cos(p1)
+  //  z = sin(p0)sin(p1)
+  return (axis == 0) ? atan2(dir.z, dir.x) : acos(dir.y);
+#endif
+}
+
+Vector3 VssRay::GetInvDirParam(const float alpha, const float beta)
+{
+#if OLD_PARAM
+  return Normalize(Vector3(sin(alpha), sin(beta), cos(alpha)));
+
+#else
+  return Normalize(Vector3(cos(alpha)*sin(beta),
+                                                   cos(beta),
+                                                   sin(alpha)*sin(beta)));
+#endif
 }