Changeset 1976 for GTP/trunk

Timestamp:

01/14/07 23:19:32 (18 years ago)

Author:

mattausch

Message:

valid function for degenerated obj-triangles

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (1 diff)
• GvsPreprocessor.cpp (modified) (1 diff)
• GvsPreprocessor.h (modified) (1 diff)
• ObjParser.cpp (modified) (3 diffs)
• SamplingStrategy.cpp (modified) (2 diffs)

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

@@ -1311 +1311 @@
                  "1.5");
 
+        RegisterOption("GvsPreprocessor.perViewCell",
+                optBool,
+                "gvs_per_viewcell=",
+                "false");
+
         RegisterOption("GvsPreprocessor.stats",
                                         optString,

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

@@ -36 +36 @@
         Environment::GetSingleton()->GetFloatValue("GvsPreprocessor.epsilon", mEps);
         Environment::GetSingleton()->GetFloatValue("GvsPreprocessor.threshold", mThreshold);    
+        Environment::GetSingleton()->GetBoolValue("GvsPreprocessor.UsePerViewCellSampling", mPerViewCell);
 
         char gvsStatsLog[100];

GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.h

@@ -199 +199 @@
         GvsStatistics mGvsStats;
 
+        bool mPerViewCell;
         bool mOnlyRandomSampling;
 };

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

@@ -3 +3 @@
 #include <list>
 #include <map>
+#include <math.h>
+
 using namespace std;
 
@@ -22 +24 @@
 #define ROTATE_SCENE 0
 
+// hack: define this as in the intel ray tracer
+#define FLT_EPSILON 1.192092896e-07f
+
 // HACK
 static void RotateMesh(Mesh *mesh)
@@ -188 +193 @@
 bool TriangleValid(const Triangle3 &triangle)
 {
-        /*int i;
-        int good_triangles = 0;
-        int ntriangles = tri.GetSize();
-
-        for (i = 0; i < ntriangles; i++) {
-                int ti = tri[i];
-                RTVec3f v[3];
-                get_triangle(m_tree, v, tri[i]);
-                if ((v[0]-v[1]).Cross(v[0]-v[2]).LengthSquared() <= 0.000001*FLT_EPSILON*FLT_EPSILON) {
-                        // v0, v1 & v2 lays on a line (area == 0)
-                        tri[i] = -1;
-                        continue;
-                }
-                good_triangles++;
-        }*/
-
-        return false;
-}
+        const Vector3 a = triangle.mVertices[0] - triangle.mVertices[1];
+        const Vector3 b = triangle.mVertices[0] - triangle.mVertices[2];
+        const Vector3 cross_a_b = CrossProd(a, b);
+
+        if (SqrMagnitude(cross_a_b) <= 0.000001 * FLT_EPSILON * FLT_EPSILON) 
+        {
+                // v0, v1 & v2 lays on a line (area == 0)
+                return false;
+        }
+
+        return true;
+}
+
 
 bool ObjParser::ParseFile(const string filename,

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

@@ -732 +732 @@
   // set this values for last contributingRays
   int index = mBufferStart - 1;
-  int i;
-  for (i=0; i < contributingRays; i++, index--) {
+  
+  for (int i=0; i < contributingRays; i++, index--) {
         if (index < 0)
           index = mRays.size()-1;
@@ -742 +742 @@
   // compute cdf
   mRays[0].mCdf = mRays[0].mImportance/(mRays[0].mSamples+1);
-  for (i=1; i < mRays.size(); i++) 
+  for (int i=1; i < mRays.size(); i++) 
         mRays[i].mCdf = mRays[i-1].mCdf + mRays[i].mImportance/(mRays[i].mSamples+1);