Changeset 2597 for GTP/trunk/Lib/Vis

Timestamp:

01/15/08 14:54:09 (17 years ago)

Author:

mattausch

Message:

checking for null termination object (q: why does this happen?)

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.cpp (modified) (13 diffs)

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

@@ -334 +334 @@
 {
         Intersectable *tObj = currentRay.mTerminationObject;
+        // q matt: can this be possible
+        if (!tObj) return 0;
+
         Triangle3 hitTriangle;
 
         // other types not implemented yet
         if (tObj->Type() == Intersectable::TRIANGLE_INTERSECTABLE)
-        {
                 hitTriangle = static_cast<TriangleIntersectable *>(tObj)->GetItem();
-        }
         else
-        {
                 cout << "border sampling: " << tObj->Type() << " not yet implemented" << endl;
-        }
 
         VertexContainer enlargedTriangle;
@@ -407 +406 @@
 
         VssRayContainer invalidSamples;
+
 
         // handle rays
@@ -581 +581 @@
 
         //CLEAR_CONTAINER(invalidSamples);
-        //Debug << "generated " <<  numSamples << " samples in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
+        Debug << "generated " <<  numSamples << " samples in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
         return (int)simpleRays.size();
 }
@@ -609 +609 @@
         while (!mRayQueue.empty())//&& (mGvsStats.mTotalSamples + castSamples < mTotalSamples) )
         {
+                //cout << "queue size: " << mRayQueue.size() << endl;
                 // handle next ray
                 VssRay *ray = mRayQueue.top();
@@ -616 +617 @@
 
                 castSamples += newSamples;
-
                 //delete ray;
         }
 
-        // HACK
         /*if (mRayCaster->mVssRayPool.mIndex > mSamplesPerPass)
         {
@@ -692 +691 @@
         ExportVssRays(exporter, mVssRays);
 
+
         /////////////////
         //-- export view cell geometry
 
-        exporter->SetWireframe();
+        //exporter->SetWireframe();
 
         m.mDiffuseColor = RgbColor(0, 1, 0);
@@ -742 +742 @@
 void GvsPreprocessor::ProcessViewCell()
 {
-        //Intersectable::NewMail();
-
-        // compute direct intersections with view cell
+        // compute object that directly intersect view cell
         IntersectWithViewCell();
 
@@ -751 +749 @@
         int passSamples = 0;
 
+        //if (mCurrentViewCell->GetId() != 82975 )return;
+
         //while (mGvsStats.mPerViewCellSamples < mTotalSamples) 
         while (1) 
@@ -762 +762 @@
                 if (!mOnlyRandomSampling)
                         newSamples += ProcessQueue();
-
+                
                 passSamples += newSamples;
-                mGvsStats.mPerViewCellSamples += newSamples;
-                
+        mGvsStats.mPerViewCellSamples += newSamples;
+
                 if (passSamples >= mGvsSamplesPerPass)
                 {
@@ -781 +781 @@
                         // termination criterium
                         if (mGvsStats.mPassContribution < mMinContribution)
-                        {
                                 break;
-                        }
 
                         // reset
@@ -800 +798 @@
         
         int i = 0;
+
         if (!vcPoints->empty())
         {
-                cout << "loading view cell list" << endl;
+                cout << "processing view cell list" << endl;
                 
                 vector<ViewCellPoints *>::const_iterator vit, vit_end = vcPoints->end();
@@ -837 +836 @@
                                 break;
                         }
-//if (viewCell->GetId() == 36658)
-//{
+
                         mViewCells.push_back(viewCell);
-//                      return;
-//}
                 }
 
@@ -1128 +1124 @@
         if (mPerViewCell)
         {
-                // list of view cells to compute
+                // provide list of view cells to compute
                 CompileViewCellsList();
+
+                // start per view cell gvs
                 PerViewCellComputation();