Changeset 492 for trunk/VUT/GtpVisibilityPreprocessor/src/Vector3.cpp

Timestamp:

01/03/06 23:33:45 (18 years ago)

Author:

bittner

Message:

Large merge - viewcells seem not functional now

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/Vector3.cpp (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/src/Vector3.cpp

@@ -191 +191 @@
 
 Vector3
-UniformRandomVector(const Vector3 &normal)
-{
-        //  float r1 = RandomValue(0.0f, 1.0f);
-        //  float r2 = RandomValue(0.0f, 1.0f);
-        float r1, r2;
+UniformRandomVector()
+{
+  //  float r1 = RandomValue(0.0f, 1.0f);
+  //  float r2 = RandomValue(0.0f, 1.0f);
+  float r1, r2;
         
-        halton2.GetNext(r1, r2);
+  halton2.GetNext(r1, r2);
         
         
-        float cosTheta = 1.0f - r1;
+  float cosTheta = 1.0f - 2*r1;
   float sinTheta = sqrt(1 - sqr(cosTheta));
   float fi = 2.0f*M_PI*r2;
   
   Vector3 dir(sinTheta*sin(fi),
-                                                        cosTheta,
-                                                        sinTheta*cos(fi));
-        
+                          cosTheta,
+                          sinTheta*cos(fi));
+  
+  return dir;
+}
+
+Vector3
+UniformRandomVector(const Vector3 &normal)
+{
+  //  float r1 = RandomValue(0.0f, 1.0f);
+  //  float r2 = RandomValue(0.0f, 1.0f);
+  float r1, r2;
+  
+  halton2.GetNext(r1, r2);
+  
+  
+  float cosTheta = 1.0f - r1;
+  float sinTheta = sqrt(1 - sqr(cosTheta));
+  float fi = 2.0f*M_PI*r2;
+  
+  Vector3 dir(sinTheta*sin(fi),
+                          cosTheta,
+                          sinTheta*cos(fi));
+  
   
   //  return Normalize(dir);
-        
+  
   Matrix4x4 m = RotationVectorsMatrix(
-                                                                                                                                                        normal,
-                                                                                                                                                        Vector3(0,1,0));
+                                                                          normal,
+                                                                          Vector3(0,1,0));
   Matrix4x4 mi = Invert(m);
   m = m*RotationVectorsMatrix(
-                                                                                                                        Vector3(0,1,0),
-                                                                                                                        Normalize(dir))*mi;
+                                                          Vector3(0,1,0),
+                                                          Normalize(dir))*mi;
   
   return TransformNormal(m, normal);
   
-        //    return TransformNormal(
-        //                       RotationVectorsMatrix(
-        //                                             Vector3(0,1,0),
-        //                                             Normalize(dir)
-        //                                             ),
-        //                       normal
-        //                       );
-}
+  //    return TransformNormal(
+  //                     RotationVectorsMatrix(
+  //                                           Vector3(0,1,0),
+  //                                           Normalize(dir)
+  //                                           ),
+  //                     normal
+  //                     );
+}
+