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

Timestamp:

06/04/08 01:49:14 (16 years ago)

Author:

mattausch

Message:

added new importance sampling method for gvs

File:

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

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

@@ -70 +70 @@
 mCurrentViewCell(NULL),
 mCurrentViewPoint(Vector3(0.0f, 0.0f, 0.0f)),
-mOnlyRandomSampling(false)
-//mOnlyRandomSampling(true)
+mOnlyRandomSampling(false),
+//mOnlyRandomSampling(true),
+mUseProbablyVisibleSampling(false)
 {
         Environment::GetSingleton()->GetIntValue("GvsPreprocessor.totalSamples", mTotalSamples);
@@ -798 +799 @@
         generationTimer.Entry();
 
-        ViewCellBorderBasedDistribution vcStrat(*this, mCurrentViewCell);
-        GenerateRays(DETERMINISTIC_GVS ? numSamples : numSamples / 16, *mDistribution, simpleRays, sInvalidSamples);
+        if (mUseProbablyVisibleSampling && (RandomValue(0, 1) > 0.5))
+        {
+                ProbablyVisibleDistribution distr(*this, mCurrentViewCell, &mProbablyVisibleTriangles);
+                GenerateRays(numSamples, distr, simpleRays, sInvalidSamples);
+        }
+        else
+        {
+                GenerateRays(DETERMINISTIC_GVS ? numSamples : numSamples / 16, *mDistribution, simpleRays, sInvalidSamples);
+        }
 
         generationTimer.Exit();
@@ -814 +822 @@
                 const bool pruneInvalidRays = false;
                 //const bool pruneInvalidRays = true;
+
                 CastRays(simpleRays, vssRays, castDoubleRays, pruneInvalidRays);
         }
@@ -1432 +1441 @@
         mGvsStats.mRandomSamples = 0;
         mGvsStats.mGvsSamples = 0;
-
+        mUseProbablyVisibleSampling = false;
         //renderer->mPvsStat.currentPass = 0;
+
         mPass = 0;
 
@@ -1471 +1481 @@
                 newRandomSamples = CastInitialSamples(mInitialSamples);
                 
+                //if (!mUseProbablyVisibleSampling && !mOnlyRandomSampling)
                 if (!mOnlyRandomSampling)
                         newGvsSamples = ProcessQueue();
@@ -1500 +1511 @@
                         ++ mPass;
                         mGvsStats.mPassContribution = mGvsStats.mTotalContribution - oldContribution;
+
+                        if (mGvsStats.mPassContribution < 2000)
+                                mUseProbablyVisibleSampling = true;
+                        
+                        if (mUseProbablyVisibleSampling)
+                                PrepareProbablyVisibleSampling();
 
 
@@ -1943 +1960 @@
 
 
-}
+void GvsPreprocessor::PrepareProbablyVisibleSampling()
+{
+        
+        // warning: using mailing!
+        Intersectable::NewMail();
+
+        mProbablyVisibleTriangles.clear();
+        CollectProbablyVisibleTriangles(mProbablyVisibleTriangles);
+}
+
+
+void GvsPreprocessor::CollectProbablyVisibleTriangles(ObjectContainer &triangles)
+{
+        ObjectPvsIterator pit = mCurrentViewCell->GetPvs().GetIterator();
+
+        static ObjectContainer tmpTriangles;
+
+        while (pit.HasMoreEntries())
+        {       
+                tmpTriangles.clear();
+
+                KdIntersectable *kdObj = static_cast<KdIntersectable *>(pit.Next());
+                mKdTree->CollectObjectsWithDublicates(kdObj->GetItem(), tmpTriangles);
+
+                ObjectContainer::const_iterator oit, oit_end = tmpTriangles.end();
+
+                for (oit = tmpTriangles.begin(); oit != oit_end; ++ oit)
+                {
+                        TriangleIntersectable *triObj = static_cast<TriangleIntersectable *>(*oit);
+
+                        // find objects which are not yet accounted for yet contained in kd pvs objects
+                        if (!triObj->Mailed() && (triObj->mCounter < ACCOUNTED_OBJECT))
+                        {
+                                triObj->Mail();
+                                triangles.push_back(triObj);
+                        }
+                }
+        }
+}
+
+
+}