Changeset 1883 for GTP/trunk/Lib/Vis/Preprocessing/src/Vector3.cpp

Timestamp:

12/12/06 17:25:53 (18 years ago)

Author:

bittner

Message:

mixture distribution initial coding

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Vector3.cpp (modified) (1 diff)

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

@@ -228 +228 @@
 }
 
-
 Vector3
 CosineRandomVector(const Vector3 &normal)
 {
-  //  float r1 = RandomValue(0.0f, 1.0f);
-  //  float r2 = RandomValue(0.0f, 1.0f);
   float r1, r2;
   
-#if USE_HALTON 
-  halton2.GetNext(r1, r2);
-#else
-   r1 = RandomValue(0.0f, 1.0f);
-   r2 = RandomValue(0.0f, 1.0f);
-#endif
-
-   float theta = 2.0f*M_PI*r2;
-   float radius = sqrt(r1);
-   float x = radius*sin(theta);
-   float z = radius*cos(theta);
-   float y = sqrt(1.0f - x*x - z*z);
-
+  r1 = RandomValue(0.0f, 1.0f);
+  r2 = RandomValue(0.0f, 1.0f);
+  
+  return CosineRandomVector(r1, r2, normal);
+}
+
+Vector3
+CosineRandomVector(const float r1,
+                                   const float r2,
+                                   const Vector3 &normal)
+{
+  float theta = 2.0f*M_PI*r2;
+  float radius = sqrt(r1);
+  float x = radius*sin(theta);
+  float z = radius*cos(theta);
+  float y = sqrt(1.0f - x*x - z*z);
+  
+  Vector3 dir(x,
+                          y,
+                          z);
+  
+  //  return Normalize(dir);
    
-   Vector3 dir(x,
-                           y,
-                           z);
-   
-   
-   //  return Normalize(dir);
-   
-   Matrix4x4 m = RotationVectorsMatrix(
-                                                                           normal,
-                                                                           Vector3(0,1,0));
-   Matrix4x4 mi = Invert(m);
-   m = m*RotationVectorsMatrix(
-                                                           Vector3(0,1,0),
-                                                           Normalize(dir))*mi;
-  
-   return TransformNormal(m, normal);
+  Matrix4x4 m = RotationVectorsMatrix(
+                                                                          normal,
+                                                                          Vector3(0,1,0)
+                                                                          );
+  Matrix4x4 mi = Invert(m);
+  m = m*RotationVectorsMatrix(
+                                                          Vector3(0,1,0),
+                                                          Normalize(dir))*mi;
+  
+  return TransformNormal(m, normal);
 }