Changeset 1580 for GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.cpp

Timestamp:

10/06/06 21:37:00 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -67 +67 @@
                 // set flag for visualization
                 newRay->mFlags |= VssRay::ReverseSample;
-                cout << "here9444 " << (int) newRay->mFlags << " " << newRay << endl;
+                
                 // ray is not pushed into the queue => can delete ray
                 if (!HandleRay(newRay))
@@ -81 +81 @@
 bool GvsPreprocessor::HandleRay(VssRay *vssRay)
 {
-        cout << "x " << (int)vssRay->mFlags;
         const bool storeRaysForViz = true;
         mViewCellsManager->ComputeSampleContribution(*vssRay, true, storeRaysForViz);
@@ -88 +87 @@
         if (vssRay->mPvsContribution > 0)
         {
+                // add new ray to ray queue
                 mRayQueue.push(vssRay);
 
@@ -96 +96 @@
                         {
                                 VssRay *nray = new VssRay(*vssRay);
-                                nray->mFlags = vssRay->mFlags;
-                                (*vit)->mVssRays.push_back(nray);
-nray->mFlags = 10;
-                                cout << "\nhere58 " << (int)nray->mFlags << "  " << (int)vssRay->mFlags << endl;
+                                (*vit)->mVssRays.push_back(nray);                               
                         }
                 }
@@ -205 +202 @@
                 
                 if (!newRay) return 0;
-newRay->mFlags |= VssRay::BorderSample;
+
+                newRay->mFlags |= VssRay::BorderSample;
+
+                // add new ray to queue
                 const bool enqueued = HandleRay(newRay);
                 
@@ -267 +267 @@
         CastRays(simpleRays, vssRays, false, false);
 
+        // set flags
+        VssRayContainer::const_iterator rit, rit_end = vssRays.end();
+        for (rit = vssRays.begin(); rit != rit_end; ++ rit)
+        {cout << "z";
+                (*rit)->mFlags |= VssRay::BorderSample;
+                //(*rit)->mOriginObject = currentRay.mTerminationObject;
+        }
         // add to ray queue
         EnqueueRays(vssRays);
@@ -273 +280 @@
         int castRays = (int)vssRays.size();
 
-        VssRayContainer::const_iterator rit, rit_end = vssRays.end();
-        for (rit = vssRays.begin(); rit != rit_end; ++ rit)
-        {
-                (*rit)->mFlags |= VssRay::BorderSample;
-                cout << "here390 " << (int) (*rit)->mFlags << endl;
-        }
-
-#if 1
+
+#if 0
     // recursivly subdivide each edge
         for (int i = 0; i < n; ++ i)
@@ -347 +348 @@
 {       
         const long startTime = GetTime();
-
+//cout << "here8"<<endl;
         // generate simple rays
         SimpleRayContainer simpleRays;
@@ -433 +434 @@
                 /// construct the view cells from the scratch
                 ConstructViewCells();
+                // reset pvs already gathered during view cells construction
+                mViewCellsManager->ResetPvs();
                 cout << "finished view cell construction" << endl;
         }