Changeset 2735

Timestamp:

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

Author:

mattausch

Message:

added new importance sampling method for gvs

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/run_gvs_vps.sh (modified) (2 diffs)
• src/GvsPreprocessor.cpp (modified) (7 diffs)
• src/GvsPreprocessor.h (modified) (2 diffs)
• src/SamplingStrategy.cpp (modified) (6 diffs)
• src/SamplingStrategy.h (modified) (5 diffs)
• src/SubdivisionPreprocessor.cpp (added)
• src/SubdivisionPreprocessor.h (added)
• src/TestPreprocessor05.vcproj (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/scripts/run_gvs_vps.sh

@@ -25 +25 @@
 
 #LOG_PREFIX=../src/SG08/rebut-arena-pixel2
-LOG_PREFIX=../src/SG08/speedtest
-LOG_PREFIX=../src/SG08/importance_5.0_10
+LOG_PREFIX=../src/SG08/probablyvis2
 
 ENVIRONMENT=gvs.env
@@ -43 +42 @@
 -gvs_samples_per_pass=1000000 \
 -gvs_initial_samples=16 \
--gvs_max_viewcells=300000
--gvs_min_contribution=10\
+-gvs_max_viewcells=3 \
+-gvs_min_contribution=100 \
 -gvs_per_viewcell=true \
 -preprocessor_detect_empty_viewspace+ \
 -preprocessor_snap_error_frames+ \
--kd_pvs_area=1e-4 \
+-kd_pvs_area=1e-5 \
 -view_cells_use_kd_pvs+ \
 -af_use_kd_pvs+ \

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);
+                        }
+                }
+        }
+}
+
+
+}

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

@@ -281 +281 @@
                                                                    SimpleRayContainer &simpleRays);
 
+        /** Collects triangles which are probably visible. Warning: returns
+                only unmailed objects.
+        */
+        void CollectProbablyVisibleTriangles(ObjectContainer &triangles);
+
+        void PrepareProbablyVisibleSampling();
+
+
         //////////////////////
 
@@ -323 +331 @@
 
         Vector3 mCurrentViewPoint;
+
+        /// container for probably visible triangles
+        ObjectContainer mProbablyVisibleTriangles;
+
+        bool mUseProbablyVisibleSampling;
 };
 

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

@@ -1 @@
-
 #include "SamplingStrategy.h"
 #include "Ray.h"
@@ -18 +17 @@
 #define USE_HALTON 1
 
+
 namespace GtpVisibilityPreprocessor {
 
@@ -27 +27 @@
 #endif
   
-//HaltonSequence SamplingStrategy::sHalton;
-
 HaltonSequence ObjectBasedDistribution::sHalton;
 HaltonSequence MixtureDistribution::sHalton;
@@ -39 +37 @@
 HaltonSequence ViewCellBasedDistribution::sHalton;
 HaltonSequence ViewCellBorderBasedDistribution::sHalton;
+HaltonSequence ProbablyVisibleDistribution::sHalton;
+
+
 
 SamplingStrategy::SamplingStrategy(Preprocessor &preprocessor): 
@@ -575 +576 @@
   {
 #ifdef USE_PERFTIMER
-        const float vcTime = viewCellCastTimer.TotalTime();
-        const float pvsTime = pvsTimer.TotalTime();
-        const float haltonTime = haltonTimer.TotalTime();
+        const double vcTime = viewCellCastTimer.TotalTime();
+        const double pvsTime = pvsTimer.TotalTime();
+        const double haltonTime = haltonTimer.TotalTime();
         
         cout << "view cell cast time: " << vcTime << " s" << endl;
@@ -881 +882 @@
 
 
-}
-
-
+bool ProbablyVisibleDistribution::GenerateSample(SimpleRay &ray)
+{       
+        static Vector3 origin;
+        static Vector3 direction; 
+        static Vector3 point;
+        static Vector3 normal;
+        
+        float r[2];
+        sHalton.GetNext(2, r);
+ 
+        r[0] *= (float)(*mObjects).size() - 1.0f;
+        const int i = (int)r[0];
+ 
+        Intersectable *obj = (*mObjects)[i];
+        
+        obj->GetRandomSurfacePoint(point, normal);
+
+        // get point on view cell surface
+        if (1)
+                origin = mViewCell->GetBox().GetRandomSurfacePoint();
+        else
+                origin = mViewCell->GetBox().GetUniformRandomSurfacePoint();
+
+        direction = point - origin;
+  
+        const float c = Magnitude(direction);
+  
+        if (c <= Limits::Small) 
+                return false;
+
+        ray = SimpleRay(origin, direction, PROBABLY_VISIBLE_DISTRIBUTION, 1.0f);
+
+        return true;
+}
+
+}
+
+

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

@@ -7 +7 @@
 #include "common.h"
 #include "Halton.h"
+#include "Containers.h"
 
 
@@ -52 +53 @@
                 FILTER_BASED_DISTRIBUTION,
                 DIFFERENCE_SAMPLING_BASED_DISTRIBUTION,
+                PROBABLY_VISIBLE_DISTRIBUTION
         };
 
@@ -246 +248 @@
 };
 
+
+class MixtureDistribution: public SamplingStrategy 
+{
+public:
+   
+  // container for the distributions
+        std::vector<SamplingStrategy *> mDistributions;
+  
+  MixtureDistribution(Preprocessor &preprocessor):
+        SamplingStrategy(preprocessor)
+  {
+  }
+
+  // has to called before first usage
+  void Init();
+
+  // equalize distribution contributions
+  void
+  Reset();
+  
+  // add contributions of the sample to the strategies
+  void ComputeContributions(VssRayContainer &vssRays);
+
+  // update distributions with new rays
+  // warning: some rays can get deleted (if maintained internally by the
+  // particular distribution)!
+  void UpdateDistributions(VssRayContainer &vssRays);
+
+  void
+  UpdateRatios();
+
+  // construct distribution mixture from a string describing the required distributions
+  bool
+  Construct(char *str);
+
+  virtual bool RequiresRays() {
+        for (int i=0; i < (int)mDistributions.size(); i++)
+          if (mDistributions[i]->RequiresRays())
+                return true;
+        return false;
+  }
+  
+  virtual int GenerateSamples(int number, SimpleRayContainer &rays, int &invalidSamples);
+  
+private:
+
+        // Generate a new sample according to a mixture distribution
+        virtual bool GenerateSample(SimpleRay &ray);
+
+        // halton sequence generator for deciding between distributions
+        static HaltonSequence sHalton;
+};
+
+
 class ViewCellBasedDistribution: public SamplingStrategy
 {
@@ -268 +324 @@
 
 
-class MixtureDistribution: public SamplingStrategy 
-{
-public:
-   
-  // container for the distributions
-        std::vector<SamplingStrategy *> mDistributions;
-  
-  MixtureDistribution(Preprocessor &preprocessor):
-        SamplingStrategy(preprocessor)
-  {
-  }
-
-  // has to called before first usage
-  void Init();
-
-  // equalize distribution contributions
-  void
-  Reset();
-  
-  // add contributions of the sample to the strategies
-  void ComputeContributions(VssRayContainer &vssRays);
-
-  // update distributions with new rays
-  // warning: some rays can get deleted (if maintained internally by the
-  // particular distribution)!
-  void UpdateDistributions(VssRayContainer &vssRays);
-
-  void
-  UpdateRatios();
-
-  // construct distribution mixture from a string describing the required distributions
-  bool
-  Construct(char *str);
-
-  virtual bool RequiresRays() {
-        for (int i=0; i < (int)mDistributions.size(); i++)
-          if (mDistributions[i]->RequiresRays())
-                return true;
-        return false;
-  }
-  
-  virtual int GenerateSamples(int number, SimpleRayContainer &rays, int &invalidSamples);
-  
-private:
-
-        // Generate a new sample according to a mixture distribution
-        virtual bool GenerateSample(SimpleRay &ray);
-
-        // halton sequence generator for deciding between distributions
-        static HaltonSequence sHalton;
-};
-
 class ViewCellBorderBasedDistribution: public SamplingStrategy
 {
@@ -343 +347 @@
 
 
+class ProbablyVisibleDistribution: public SamplingStrategy
+{
+public:
+        ProbablyVisibleDistribution(Preprocessor &preprocessor, 
+                                        ViewCell *viewCell, 
+                                                                ObjectContainer *objects)
+        : SamplingStrategy(preprocessor), mViewCell(viewCell), mObjects(objects)
+        {
+                mType = PROBABLY_VISIBLE_DISTRIBUTION;
+        }
+
+        void SetViewCell(ViewCell *vc) { mViewCell = vc; }
+
+private:
+
+        virtual bool GenerateSample(SimpleRay &ray);
+
+        ViewCell *mViewCell;
+        ObjectContainer *mObjects;
+
+        static HaltonSequence sHalton;
+};
+
+
 };
 

GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor05.vcproj

@@ -159 +159 @@
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories=""$(QTDIR)\lib";..\src\GL;"..\lib05\$(ConfigurationName)";..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;"..\MultiLevelRayTracing\RTScene\$(ConfigurationName)";"..\MultiLevelRayTracing\RTWorld\$(ConfigurationName)";"QtInterface\$(ConfigurationName)";"..\..\..\..\..\..\NonGTP\Xerces\xerces-c_2_8_0\lib";"$(CG_LIB_PATH)""
-                                GenerateDebugInformation="false"
+                                GenerateDebugInformation="true"
                                 SubSystem="1"
                                 LargeAddressAware="2"