Changeset 1155 for GTP/trunk/Lib/Vis

Timestamp:

07/26/06 09:22:09 (18 years ago)

Author:

mattausch

Message:

added support for kd pvs sampling

Location:

GTP/trunk/Lib/Vis

Files:

• Preprocessing/src/ViewCellsManager.cpp (modified) (7 diffs)
• Preprocessing/src/ViewCellsManager.h (modified) (5 diffs)
• Preprocessing/src/VspOspTree.cpp (modified) (1 diff)
• QtRenderer/QtRendererDll.cpp (deleted)
• shared/scripts/GtpVisibility.suo (modified) (previous)

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

@@ -54 +54 @@
 mMaxPvsRatio(1.0),
 mViewCellPvsIsUpdated(false),
-mPreprocessor(NULL)
+mPreprocessor(NULL),
+mStoreKdPvs(false)
 {
         mViewSpaceBox.Initialize();
@@ -1361 +1362 @@
 float
 ViewCellsManager::ComputeSampleContributions(const VssRayContainer &rays,
-                                                                                         const bool addRays,
+                                                                                         const bool addRays,                                                                    
                                                                                          const bool storeViewCells
                                                                                          )
@@ -1372 +1373 @@
 
   float sum = 0.0f;
+
   for (it = rays.begin(); it != it_end; ++ it) 
   {
           sum += ComputeSampleContributions(*(*it), addRays, storeViewCells);
-          //ComputeSampleContributions(*(*it), addRays);
-          //    sum += (*it)->mPvsContribution;
   }
 
@@ -1867 +1867 @@
         CastLineSegment(origin, termination, viewcells);
 
-        //const bool storeViewcells = !addRays;
-//return 0;
         if (storeViewCells)
-        {
-                // copy viewcells memory efficiently
+        {       // copy viewcells memory efficiently
                 ray.mViewCells.reserve(viewcells.size());
                 ray.mViewCells = viewcells;
@@ -1909 +1906 @@
         }
 
-        
+        // if addrays is true, sampled entities are stored in the pvs
         if (addRays)
         {
@@ -1919 +1916 @@
                         {
                                 // if ray not outside of view space
-                                 if (ray.mTerminationObject)
-                                         viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
-
+
+                                // add kd cell
+                                if (ray.mTerminationObject)
+                                {
+                                        if (!mStoreKdPvs)
+                                        {
+                                                viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
+                                        }
+                                        else
+                                        {
+                                                // todo
+                                                //viewcell->GetPvs().AddSample(ray.mTerminationNode, ray.mPdf);
+                                        }
+                                }
+                                
 #if 0
                                  if (ray.mOriginObject)
@@ -2446 +2455 @@
 
 
+void ViewCellsManager::SetStoreKdPvs(const bool storeKdPvs)
+{
+        mStoreKdPvs = storeKdPvs;
+}
+
+
+bool ViewCellsManager::GetStoreKdPVs() const
+{
+        return mStoreKdPvs;
+}
+
 
 /*******************************************************************/

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

@@ -101 +101 @@
         */
         float ComputeSampleContributions(const VssRayContainer &rays,
-                                                                   const bool addContributions,
-                                                                   const bool storeViewCells);
-
-        /** Add sample contributions to the viewcells they intersect */
+                                                                         const bool addContributions,
+                                                                         const bool storeViewCells);
+
+        /** Add sample contributions to the viewcells they intersect 
+        */
         void AddSampleContributions(const VssRayContainer &rays);
   
@@ -116 +117 @@
         */
         virtual float ComputeSampleContributions(VssRay &ray, 
-                                                                                         const bool addRays, 
+                                                                                         const bool addRays,
                                                                                          const bool storeViewCells);
 
@@ -475 +476 @@
 
 
-        /** Returns true if this view cell is equivalent to a node of the spatial hierarchy.
+        /** Returns true if the view cell is equivalent to a 
+                node of the spatial hierarchy. This function can be used for merged
+                view cell.
+                e.g. to see if the spatial tree can be reduced on this location
         */
         virtual bool EqualToSpatialNode(ViewCell *viewCell) const;
+
+        /** If true, the kd nodes are stored instead of the object pvs.
+        */
+        void SetStoreKdPvs(const bool storeKdPvs);
+
+        /** Returns true if the kd nodes are stored instead of the object pvs.
+        **/
+        bool GetStoreKdPVs() const;
 
 protected:
@@ -592 +604 @@
         bool mPruneEmptyViewCells;
 
-        /// if the pvss in the view cell leaves and the interiors are up to date
+        /// if the values in the view cell leaves and the interiors are up to date
+        /// this is meant for lazy storing of the pvs, where only a scalar indicating
+        /// pvs size is stored in interiors and not the pvs itself.
         bool mViewCellPvsIsUpdated;
 
@@ -658 +672 @@
         /// if pvs should be exported with view cells
         bool mExportPvs;
+
+        bool mStoreKdPvs;
 };
 

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

@@ -508 +508 @@
         {
                 mBoundingBox.Initialize();
-
                 VssRayContainer::const_iterator rit, rit_end = rays.end();