Changeset 1587 for GTP/trunk/Lib

Timestamp:

10/09/06 16:40:52 (18 years ago)

Author:

mattausch

Message:

fixed bug in TriangleIntersectable::GetRandomSurfacePoint?

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• IntersectableWrapper.cpp (modified) (2 diffs)
• IntersectableWrapper.h (modified) (1 diff)
• Mesh.cpp (modified) (1 diff)
• SamplingStrategy.cpp (modified) (1 diff)

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

@@ -59 +59 @@
 {
         // random barycentric coordinates
-        const float a = RandomValue(0, 1);
-        const float b = RandomValue(0, 1);
-        const float c = 1.0 - a - b;
+        float a = RandomValue(0,1);
+        float b = RandomValue(0,1);
+        float c = RandomValue(0,1);
         
-        point = mItem.mVertices[0] + a * (mItem.mVertices[1] - mItem.mVertices[0]) +
-                        mItem.mVertices[0] + b * (mItem.mVertices[2] - mItem.mVertices[0]) +
-                        mItem.mVertices[1] + c * (mItem.mVertices[2] - mItem.mVertices[1]);
-        
+        const float sum = a + b + c;
+
+        // scale so we get value between zero and one
+        if (sum)
+        {
+                a /= sum;
+                b /= sum;
+                c /= sum;
+        }
+
+        //cout << "a " << a << "b: " << b << "c: " << c << endl;
+        point = mItem.mVertices[0] * a + mItem.mVertices[1] * b + mItem.mVertices[2] * c;
         normal = mItem.GetNormal();
 
@@ -72 +80 @@
 }
 
+
+int TriangleIntersectable::GetRandomVisibleSurfacePoint(Vector3 &point,
+                                                                                                                Vector3 &normal,
+                                                                                                                const Vector3 &viewpoint,
+                                                                                                                const int maxTries)
+{
+        return GetRandomSurfacePoint(point, normal);
+}
  
 }

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

@@ -187 +187 @@
 
         int GetRandomSurfacePoint(Vector3 &point, Vector3 &normal);
+
+        int GetRandomVisibleSurfacePoint(
+                Vector3 &point,
+                Vector3 &normal,
+                const Vector3 &viewpoint,
+                const int maxTries);
 };
 

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

@@ -810 +810 @@
 int TransformedMeshInstance::GetRandomSurfacePoint(Vector3 &point, Vector3 &normal)
 {
-  int index = mMesh->GetRandomSurfacePoint(point, normal);
-  point = mWorldTransform*point;
+  const int index = mMesh->GetRandomSurfacePoint(point, normal);
+  point = mWorldTransform * point;
   normal = TransformNormal(mWorldTransform, normal);
   return index;

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

@@ -62 +62 @@
 {       
         Vector3 origin, direction; 
-    const int i = (int)RandomValue(0, (Real)((int)mPreprocessor.mObjects.size() - 1));
+    const int i = (int)RandomValue(0, (Real)mPreprocessor.mObjects.size() - 0.5f);
         Intersectable *object = mPreprocessor.mObjects[i];