Changeset 1769

Timestamp:

11/20/06 11:35:26 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Mesh.cpp (modified) (2 diffs)
• Preprocessor.cpp (modified) (1 diff)
• SamplingStrategy.cpp (modified) (5 diffs)
• SamplingStrategy.h (modified) (1 diff)
• ViewCellsManager.cpp (modified) (3 diffs)

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

@@ -802 +802 @@
 
         // get random edge of face (hack: this is not uniform in the edges!
-        const int edgeIdx = (int)RandomValue(0.0f, face->mVertexIndices.size() - 0.5f);
-
+        const int edgeIdx = (int)RandomValue(0.0f, (float)face->mVertexIndices.size() - 0.5f);
+
+        //cout << "idx = " << edgeIdx << " s: " << face->mVertexIndices.size() << endl;
         const int vertexIdxA = face->mVertexIndices[edgeIdx];
         const int vertexIdxB = face->mVertexIndices[(edgeIdx + 1) % (int)face->mVertexIndices.size()];
@@ -815 +816 @@
         point = a * w + b * (1.0f - w);
 
+        //cout << "va " << a << " vb " << b << "p " << point << endl;
         // hack: set normal of face as normal
         normal = mMesh->GetFacePlane(faceIdx).mNormal;

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

@@ -986 +986 @@
         case SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION:
                 return new ReverseObjectBasedDistribution(*this);
+        case SamplingStrategy::VIEWCELL_BORDER_BASED_DISTRIBUTION:
+                return new ViewCellBorderBasedDistribution(*this);
         //case OBJECTS_INTERIOR_DISTRIBUTION:
         //      return new ObjectsInteriorDistribution(*this);

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

@@ -199 +199 @@
         Vector3 normal, normal2;
         
-        //cout << "y";
         const int vcIdx = (int)RandomValue(0, (float)viewCells.size() - 0.5f);
         const int objIdx = (int)RandomValue(0, (float)mPreprocessor.mObjects.size() - 0.5f);
@@ -206 +205 @@
         ViewCell *viewCell = viewCells[vcIdx];
 
+        //cout << "vc: " << vcIdx << endl;
+        //cout << "obj: " << objIdx << endl;
+
         object->GetRandomSurfacePoint(point, normal);
         viewCell->GetRandomEdgePoint(origin, normal2);
@@ -214 +216 @@
         const float c = Magnitude(direction);
 
-        if ((c <= Limits::Small) || (DotProd(direction, normal) < 0))
+        if ((c <= Limits::Small) /*|| (DotProd(direction, normal) < 0)*/)
         {
                 return false;
@@ -224 +226 @@
         direction *= 1.0f / c;
         ray = SimpleRay(origin, direction, pdf);
-        
+
+        //cout << "ray: " << ray.mOrigin << " " << ray.mDirection << endl;
+
         return true;
 }
@@ -258 +262 @@
         return true;
 }
+
 #endif
 }

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

@@ -28 +28 @@
                  OBJECT_DIRECTION_BASED_DISTRIBUTION,
                  OBJECTS_INTERIOR_DISTRIBUTION,
-                 REVERSE_OBJECT_BASED_DISTRIBUTION
+                 REVERSE_OBJECT_BASED_DISTRIBUTION,
+                 VIEWCELL_BORDER_BASED_DISTRIBUTION
          };
 

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

@@ -551 +551 @@
         
         /////////////////
-        //-- Finally, we do some visualization
+        //-- Show some visualizations
 
         if (mShowVisualization)
         {
+                cout << "************************\n*********************\n";
+                if (0)
+                {
+                        strategies.clear();
+                        strategies.push_back(SamplingStrategy::VIEWCELL_BORDER_BASED_DISTRIBUTION);
+                }
+
                 ///////////////
                 //-- visualization rays, e.g., to show some samples in the scene
@@ -5501 +5508 @@
         int leafOut;
         Environment::GetSingleton()->GetIntValue("ViewCells.Visualization.maxOutput", leafOut);
+
+        const bool sortViewCells = false;
+        const bool exportPvs = true;
+        const bool exportRays = true;
         const int raysOut = 100;
 
-        ExportSingleViewCells(objects, leafOut, false, true, false, raysOut, "");
+        ExportSingleViewCells(objects, 
+                                                  leafOut, 
+                                                  sortViewCells, 
+                                                  exportPvs, 
+                                                  exportRays, 
+                                                  raysOut, 
+                                                  "");
 }
 
@@ -5943 +5960 @@
         strategies.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
         strategies.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
-
+//strategies.push_back(SamplingStrategy::VIEWCELL_BORDER_BASED_DISTRIBUTION);
         cout << "reseting pvs ... ";