Changeset 1566 for GTP/trunk/Lib

Timestamp:

10/04/06 11:11:51 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GvsPreprocessor.cpp (modified) (6 diffs)
• ViewCellsManager.cpp (modified) (7 diffs)
• VssRay.h (modified) (1 diff)

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

@@ -85 +85 @@
                 //cout << " h " << mSampleContriPerPass << " " << mSamplesPerPass << " " << mTotalSamples << endl;
                 mRayQueue.push(vssRay);
-                //mVssRays.push_back(new VssRay(*vssRay));
+                mVssRays.push_back(new VssRay(*vssRay));
         ++ mSampleContriPerPass;
 
@@ -184 +184 @@
                 SimpleRay sray(oldRay.mOrigin, p - oldRay.mOrigin);
         
+                // cast ray into the new subdivision point
                 VssRay *newRay = mRayCaster->CastRay(sray, mViewCellsManager->GetViewSpaceBox(), false);
                 //cout << "\np1: " << p1 << "\np : " <<  p << "\np2: " << p2 << endl;
@@ -190 +191 @@
                 const bool enqueued = HandleRay(newRay);
                 
+                // subdivide further
                 const int s1 = SubdivideEdge(hitTriangle, p1, p, x, *newRay, oldRay);
                 const int s2 = SubdivideEdge(hitTriangle, p, p2, *newRay, y, oldRay);
@@ -234 +236 @@
                 simpleRays.AddRay(sr);
         }
-#if 0
-        VizStruct dummy;
-        dummy.enlargedTriangle = new Polygon3(enlargedTriangle);
-        dummy.originalTriangle = hitTriangle;
-        //dummy.ray = new VssRay(currentRay);
-        vizContainer.push_back(dummy);
-#endif
+
+        if (0)
+        {
+                VizStruct dummy;
+                dummy.enlargedTriangle = new Polygon3(enlargedTriangle);
+                dummy.originalTriangle = hitTriangle;
+                //dummy.ray = new VssRay(currentRay);
+                vizContainer.push_back(dummy);
+        }
 
         // cast rays to triangle vertices and determine visibility
@@ -363 +367 @@
 
         mTotalSampleContri += mSampleContriPerPass;
-
         return castSamples;
 }
@@ -439 +442 @@
 
                 mViewCellsManager->PrintPvsStatistics(mStats);
+
+                // visualization
+//              mViewCellsManager->Visualize(mVssRays);
+                CLEAR_CONTAINER(mVssRays);
                 // ComputeRenderError();
                 ++ mPass;

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

@@ -4227 +4227 @@
         }
 
-        int limit = min(leafOut, (int)mViewCells.size());
-
-        int raysOut = 0;
-
+        //////////
         //-- some rays for output
+
+        const int limit = min(leafOut, (int)mViewCells.size());
+        const int raysOut = min((int)rays.size(), 100);
+
         for (int i = 0; i < limit; ++ i)
         {
@@ -4246 +4247 @@
                 mViewCellsTree->GetPvs(vc, pvs);
 
-                //bspLeaves[j]->Mail();
                 char s[64]; sprintf(s, "bsp-pvs%04d.wrl", i);
                 Exporter *exporter = Exporter::GetExporter(s);
@@ -4252 +4252 @@
                 Debug << i << ": pvs size=" << (int)mViewCellsTree->GetPvsSize(vc) << endl;
 
-                //-- export the sample rays
                 if (mExportRays)
                 {
-                        // output rays stored with the view cells during subdivision
+                        ////////////
+                        //-- export rays piercing this view cell
+
+                        // take rays stored with the view cells during subdivision
                         VssRayContainer vcRays;
             VssRayContainer collectRays;
 
-                        raysOut = min((int)rays.size(), 100);
-
-                        // collect intial view cells
+                        // collect initial view cells
                         ViewCellContainer leaves;
                         mViewCellsTree->CollectLeaves(vc, leaves);
 
                         ViewCellContainer::const_iterator vit, vit_end = leaves.end();
-       
-                        for (vit = leaves.begin(); vit != vit_end; ++ vit)
+                for (vit = leaves.begin(); vit != vit_end; ++ vit)
                         {
                                 BspLeaf *vcLeaf = dynamic_cast<BspViewCell *>(*vit)->mLeaves[0];
-                                
                                 VssRayContainer::const_iterator rit, rit_end = vcLeaf->mVssRays.end();
 
@@ -4279 +4277 @@
                         }
 
+                        // prepare some rays for output
                         VssRayContainer::const_iterator rit, rit_end = collectRays.end();
-
                         for (rit = collectRays.begin(); rit != rit_end; ++ rit)
                         {
-                                float p = RandomValue(0.0f, (float)collectRays.size());
+                                const float p = RandomValue(0.0f, (float)collectRays.size());
                         
                                 if (p < raysOut)
+                                {
                                         vcRays.push_back(*rit);
+                                }
                         }
 
-                        //////////
-                        //-- export rays piercing this view cell
                         exporter->ExportRays(vcRays, RgbColor(1, 1, 1));
                 }
@@ -4310 +4308 @@
                         ////////
                         //-- export pvs
+                        Intersectable::NewMail();
                         ObjectPvsMap::const_iterator oit, oit_end = pvs.mEntries.end();
-
-                        Intersectable::NewMail();
-
+                        
                         // output PVS of view cell
                         for (oit = pvs.mEntries.begin(); oit != oit_end; ++ oit)
                         {               
                                 Intersectable *intersect = (*oit).first;
-
                                 if (!intersect->Mailed())
                                 {
@@ -5433 +5429 @@
         {
                 ViewCell *viewcell = *it;
-
+                
                 if (viewcell->GetValid())
-                {
-                        // if ray not outside of view space
+                {       // if ray not outside of view space
                         float contribution;
 
@@ -5470 +5465 @@
 
         if (!addRays)
+        {
                 return ray.mRelativePvsContribution;
+        }
 
         // sampled objects are stored in the pvs

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

@@ -20 +20 @@
  // various flags
   enum {
-    FPosDirX = 1,  // the direction of ray in X-axis is positive
-    FPosDirY = 2,  // the direction of ray in Y-axis is positive
-    FPosDirZ = 4   // the direction of ray in Z-axis is positive
+    FPosDirX = 1,    // the direction of ray in X-axis is positive
+    FPosDirY = 2,    // the direction of ray in Y-axis is positive
+    FPosDirZ = 4,    // the direction of ray in Z-axis is positive
+        BorderSample = 8,// if this ray is an adaptive border ray
+        ReverserRay = 16 // if this ray is a reverse sample
   };