Changeset 573 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

Timestamp:

01/24/06 10:06:58 (18 years ago)

Author:

mattausch

Message:

implemented functtion for view cell construction

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -88 +88 @@
 
 
+int ViewCellsManager::CastPassSamples(int samplesPerPass, 
+                                                                          int sampleType, 
+                                                                          VssRayContainer *outRays) const
+{
+        VssRayContainer passSamples;
+        SimpleRayContainer simpleRays;
+
+        preprocessor->GenerateRays(samplesPerPass,
+                                                           sampleType,
+                                                           simpleRays);
+
+        // shoot simple ray and add it to importance samples
+        preprocessor->CastRays(simpleRays, passSamples);
+
+        const int numSamples = (int)passSamples.size();
+
+        if (outRays)
+        {
+                while (!passSamples.empty())
+                        outRays->push_back(passSamples.back());
+        }
+        else
+        {
+                CLEAR_CONTAINER(passSamples);
+        }
+
+        return numSamples;
+}
+
+
 int ViewCellsManager::Construct(Preprocessor *preprocessor, VssRayContainer *outRays)
 {
+        int numSamples = 0;
         SimpleRayContainer simpleRays;
-        VssRayContainer constructionRays;
-
-        preprocessor->GenerateRays(mConstructionSamples,
-                                                           Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION,
-                                                           simpleRays);
-
-        Construct(preprocessor->mObjects, constructionRays);
-
-        int numRays = (int)simpleRays.size();
-
-        static Ray traversalRay;
-
-        // shoot simple ray and add it to construction rays
-        while (!simpleRays.empty())
-        {
-                SimpleRay sray = simpleRays.back();
-
-                // TODO: shoot into kdtree
-                constructionRays.push_back(new VssRay(traversalRay));
-
-                if (outRays)
-                        outRays->push_back(constructionRays.back());
-
-                simpleRays.pop_back();
-        }
-
-        if (!outRays)
-                CLEAR_CONTAINER(constructionRays);
-
-        // guided rays
-        VssRayContainer importanceRays;
-        const int desiredImportanceRays = max(1000000, mPostProcessSamples);
-        preprocessor->GenerateRays(desiredImportanceRays,
-                                                           Preprocessor::RSS_BASED_DISTRIBUTION,
-                                                           simpleRays);
-
-        numRays += (int)simpleRays.size();
-
-        // shoot simple ray and add it to construction rays
-        while (!simpleRays.empty())
-        {
-                SimpleRay sray = simpleRays.back();
-
-                // TODO: shoot into kdtree
-                importanceRays.push_back(new VssRay(traversalRay));
-
-                if (outRays)
-                        outRays->push_back(importanceRays.back());
-
-                simpleRays.pop_back();
-        }
-
-        if (!outRays)
-                CLEAR_CONTAINER(importanceRays);
-
+        
+        VssRayContainer constructionSamples;
+
+        //-- construction rays => we use uniform samples for this
+        CastPassSamples(mConstructionSamples, 
+                                        Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION, 
+                                        &constructionSamples);
+        
+        // construct view cells
+        const int initialSamples = Construct(preprocessor->mObjects, constructionSamples);
+
+        numSamples += initialSamples;
+
+        if (outRays)
+        {
+                while (!constructionSamples.empty())
+                        outRays->push_back(constructionSamples.back());
+        }
+        else
+        {
+                CLEAR_CONTAINER(constructionSamples);
+        }
+
+
+        //-- guided rays are used for further sampling
+        const int desiredImportanceSamples = 5000000;
+        const int importanceRayPerPass = 1000000;
+
+        const int n = desiredImportanceSamples; //+initialSamples;
+
+        while (numSamples < n)
+        {
+                numSamples += CastPassSamples(importanceRayPerPass, 
+                                                                          Preprocessor::RSS_BASED_DISTRIBUTION, 
+                                                                          //Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION,
+                                                                          outRays);
+        }
+        
+
+        //-- post processing
+        VssRayContainer postProcessSamples;
+
+        //-- construction rays => we use uniform samples for this
+        CastPassSamples(max(mPostProcessSamples, mVisualizationSamples),
+                                    Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION, 
+                                        &postProcessSamples);
+        
         // merge the view cells
-        PostProcess(preprocessor->mObjects, importanceRays);
-
-        Visualize(preprocessor->mObjects, importanceRays);
-
-
-        return numRays;
+        PostProcess(preprocessor->mObjects, postProcessSamples);
+        // several visualizations
+        Visualize(preprocessor->mObjects, postProcessSamples);
+
+        if (outRays)
+        {
+                while (!postProcessSamples.empty())
+                        outRays->push_back(postProcessSamples.back());
+        }
+        else
+        {
+                CLEAR_CONTAINER(postProcessSamples);
+        }
+
+        return numSamples;
 }