Changeset 1159 for GTP/trunk

Timestamp:

07/26/06 16:02:21 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj (modified) (1 diff)
• Preprocessing/src/Environment.cpp (modified) (1 diff)
• Preprocessing/src/PreprocessorThread.cpp (modified) (1 diff)
• Preprocessing/src/SamplingPreprocessor.cpp (modified) (1 diff)
• Preprocessing/src/ViewCellsManager.cpp (modified) (8 diffs)
• Preprocessing/src/ViewCellsManager.h (modified) (2 diffs)
• Preprocessing/src/VspOspTree.h (modified) (1 diff)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj

@@ -109 +109 @@
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-                                AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\GtpVisibility\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Zlib\lib;"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;"$(QTDIR)\lib";..\..\..\Preprocessing\src\GL;"$(CG_LIB_PATH)""
+                                AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\GtpVisibility\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;"$(QTDIR)\lib";..\..\..\Preprocessing\src\GL;"$(CG_LIB_PATH)";..\..\..\..\..\..\..\NonGTP\Zlib\lib"
                                 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def"
                                 GenerateDebugInformation="TRUE"

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

@@ -1494 +1494 @@
                 "0");
 
+        RegisterOption("ViewCells.storeKdPvs",
+                optBool, 
+                "view_cells_store_kd_pvs=", 
+                "false");
+        
 
         /************************************************************************************/

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

@@ -1 @@
-//#include <QApplication>
 #include "PreprocessorThread.h"
 

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

@@ -82 +82 @@
         VssRay vssRay(ray);
 
-        mViewCellsManager->ComputeSampleContributions(vssRay, true, false);
+        mViewCellsManager->ComputeSampleContribution(vssRay, true, false);
         
         return vssRay.mPvsContribution;

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

@@ -20 +20 @@
 #include "KdIntersectable.h"
 
+// should not count origin object for sampling because it disturbs heuristics
+#define COUNT_ORIGIN_OBJECTS 0
 
 namespace GtpVisibilityPreprocessor {
@@ -103 +105 @@
         Environment::GetSingleton()->GetBoolValue("ViewCells.exportPvs", mExportPvs);
         
+        Environment::GetSingleton()->GetBoolValue("ViewCells.storeKdPvs", mStoreKdPvs);
+
 
         char buf[100];
@@ -217 +221 @@
         Debug << "export pvs for view cells: " << mExportPvs << endl;
         
-        
+        Debug << "store kd pvs: " << mStoreKdPvs << endl;
+
         Debug << endl;
 }
@@ -1376 +1381 @@
   for (it = rays.begin(); it != it_end; ++ it) 
   {
-          sum += ComputeSampleContributions(*(*it), addRays, storeViewCells);
+          sum += ComputeSampleContribution(*(*it), addRays, storeViewCells);
   }
 
@@ -1842 +1847 @@
 
 
-float ViewCellsManager::ComputeSampleContributions(VssRay &ray,
-                                                                                                   const bool addRays,
-                                                                                                   const bool storeViewCells)
+float ViewCellsManager::ComputeSampleContribution(VssRay &ray,
+                                                                                                  const bool addRays,
+                                                                                                  const bool storeViewCells)
 {
         ViewCellContainer viewcells;
@@ -1893 +1898 @@
                         // made in one direction!!!
                         // the other contributions of this sample will be counted for the oposite ray!
-#if 0
+#if COUNT_ORIGIN_OBJECTS
                         if (ray.mOriginObject && 
                                 viewcell->GetPvs().GetSampleContribution(ray.mOriginObject,
@@ -1917 +1922 @@
                                 // if ray not outside of view space
 
-                                // add kd cell
+                                // add new object to the pvs
                                 if (ray.mTerminationObject)
                                 {
-                                        if (!mStoreKdPvs)
-                                        {
-                                                viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
-                                        }
-                                        else
-                                        {
-                                                // todo
-                                                //viewcell->GetPvs().AddSample(ray.mTerminationNode, ray.mPdf);
-                                        }
-                                }
-                                
-#if 0
+                                        viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
+                                }                               
+#if COUNT_ORIGIN_OBJECTS
                                  if (ray.mOriginObject)
+                                 {
                                          viewcell->GetPvs().AddSample(ray.mOriginObject, ray.mPdf);
+                                 }
 #endif
                         }
@@ -5714 +5712 @@
         
 
+float VspOspViewCellsManager::ComputeSampleContribution(VssRay &ray,
+                                                                                                                const bool addRays,
+                                                                                                                const bool storeViewCells)
+{
+        ViewCellContainer viewcells;
+
+        ray.mPvsContribution = 0;
+        ray.mRelativePvsContribution = 0.0f;
+
+        static Ray hray;
+        hray.Init(ray);
+        //hray.mFlags |= Ray::CULL_BACKFACES;
+        //Ray hray(ray);
+
+        float tmin = 0, tmax = 1.0;
+
+        if (!GetViewSpaceBox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax))
+                return 0;
+
+        Vector3 origin = hray.Extrap(tmin);
+        Vector3 termination = hray.Extrap(tmax);
+
+        // traverse the view space subdivision
+        CastLineSegment(origin, termination, viewcells);
+
+        if (storeViewCells)
+        {       // copy viewcells memory efficiently
+                ray.mViewCells.reserve(viewcells.size());
+                ray.mViewCells = viewcells;
+        }
+
+        ViewCellContainer::const_iterator it = viewcells.begin();
+
+        for (; it != viewcells.end(); ++ it) 
+        {
+                ViewCell *viewcell = *it;
+
+                if (viewcell->GetValid())
+                {
+                        // if ray not outside of view space
+                        float contribution;
+
+                        if (ray.mTerminationObject) 
+                        {
+                                if (viewcell->GetPvs().GetSampleContribution(ray.mTerminationObject,
+                                        ray.mPdf, contribution))
+                                {
+                                        ++ ray.mPvsContribution;
+                                }
+
+                                ray.mRelativePvsContribution += contribution;
+                        }
+
+                        // for directional sampling it is important to count only contributions
+                        // made in one direction!!!
+                        // the other contributions of this sample will be counted for the oposite ray!
+#if COUNT_ORIGIN_OBJECTS
+                        if (ray.mOriginObject && 
+                                viewcell->GetPvs().GetSampleContribution(ray.mOriginObject,
+                                                                                                                 ray.mPdf,
+                                                                                                                 contribution))
+                        {
+                                ++ ray.mPvsContribution;
+                                ray.mRelativePvsContribution += contribution;
+                        }
+#endif
+                }
+        }
+
+        // if addrays is true, sampled entities are stored in the pvs
+        if (addRays)
+        {
+                for (it = viewcells.begin(); it != viewcells.end(); ++ it) 
+                {
+                        ViewCell *viewcell = *it;
+            
+                        if (viewcell->GetValid())
+                        {
+                                // if ray not outside of view space
+
+                                // add kd cell
+                                if (ray.mTerminationObject)
+                                {
+                                        if (!mStoreKdPvs)
+                                        {
+                                                viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
+                                        }
+                                        else
+                                        {
+                                                /// get current leaf the point
+                                                KdLeaf *leaf = mOspTree->GetLeaf(ray.mTermination);
+
+                                                KdIntersectable *entry = mOspTree->GetOrCreateKdIntersectable(leaf);
+
+                                                viewcell->GetPvs().AddSample(entry, ray.mPdf);
+                                        }
+                                }
+                                
+#if COUNT_ORIGIN_OBJECTS
+                                 if (ray.mOriginObject)
+                                         viewcell->GetPvs().AddSample(ray.mOriginObject, ray.mPdf);
+#endif
+                        }
+                }
+        }
+
+        return ray.mRelativePvsContribution;
+}
+
+
 void VspOspViewCellsManager::PrepareLoadedViewCells()
 {

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

@@ -116 +116 @@
                 @returns number of sample contributions
         */
-        virtual float ComputeSampleContributions(VssRay &ray, 
-                                                                                         const bool addRays,
-                                                                                         const bool storeViewCells);
+        virtual float ComputeSampleContribution(VssRay &ray, 
+                                                                                        const bool addRays,
+                                                                                        const bool storeViewCells);
 
         virtual void AddSampleContributions(VssRay &ray);
@@ -1012 +1012 @@
         void Finalize(ViewCell *viewCell, const bool createMesh);
 
+        /** Stores sample contribution for kd cells or objects.
+        */
+        virtual float ComputeSampleContribution(VssRay &ray, 
+                                                                                        const bool addRays,
+                                                                                        const bool storeViewCells);
 
 protected:
-
         
         /** Exports view cell geometry.

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

@@ -1390 +1390 @@
         int ComputePvsSize(const ObjectContainer &objects) const;
 
-        KdLeaf *GetLeaf(const Vector3 &pt, KdNode *node) const;
+        /** Returns kd leaf the point pt lies in, starting from root.
+        */
+        KdLeaf *GetLeaf(const Vector3 &pt, KdNode *root = NULL) const;