Changeset 660

Timestamp:

02/21/06 17:42:39 (18 years ago)

Author:

mattausch

Message:

adding function for testing purpose

Location:

GTP/trunk/Lib/Vis

Files:

• Preprocessing/scripts/Preprocessor.vcproj (modified) (3 diffs)
• Preprocessing/scripts/default.env (modified) (4 diffs)
• Preprocessing/src/Environment.cpp (modified) (9 diffs)
• Preprocessing/src/ViewCell.cpp (modified) (13 diffs)
• Preprocessing/src/ViewCell.h (modified) (5 diffs)
• Preprocessing/src/ViewCellBsp.cpp (modified) (1 diff)
• Preprocessing/src/ViewCellsManager.cpp (modified) (49 diffs)
• Preprocessing/src/ViewCellsManager.h (modified) (8 diffs)
• Preprocessing/src/ViewCellsParser.cpp (modified) (1 diff)
• Preprocessing/src/VspBspTree.cpp (modified) (7 diffs)
• Preprocessing/src/VspBspTree.h (modified) (1 diff)
• Preprocessing/src/X3dParser.cpp (modified) (1 diff)
• shared/scripts/GtpVisibility.suo (modified) (previous)

GTP/trunk/Lib/Vis/Preprocessing/scripts/Preprocessor.vcproj

@@ -15 +15 @@
                         OutputDirectory="..\lib\$(ConfigurationName)"
                         IntermediateDirectory="..\obj\$(ConfigurationName)"
-                        ConfigurationType="4"
+                        ConfigurationType="1"
                         CharacterSet="2">
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\support;..\support\devil\include;..\support\zlib\include;..\include;&quot;$(QTDIR)&quot;\includ&quot;;&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\QtOpenGl&quot;;..\src;&quot;$(CG_INC_PATH)&quot;;&quot;$(GTPDIR)\NonGTP\Xerces&quot;;&quot;$(GTPDIR)\NonGTP\Devil&quot;;"
+                                AdditionalIncludeDirectories="..\support;..\support\devil\include;..\support\zlib\include;..\include..\support;&quot;..\include  ..\support&quot;;..\include;&quot;$(GTPDIR)\NonGTP\Devil\include&quot;;&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(GTPDIR)\NonGTP\Xerces&quot;;&quot;$(CG_INC_PATH)&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\QtOpenGl&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(GTPDIR)\NonGTP\Zlib\include&quot;"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
                                 MinimalRebuild="TRUE"
@@ -33 +33 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
-                                Name="VCLibrarianTool"
-                                OutputFile="$(OutDir)/GtpVisibility.lib"/>
+                                Name="VCLinkerTool"
+                                AdditionalDependencies="xerces-c_2D.lib zdll.lib zziplibd.lib devil.lib qtmain.lib QtOpenGLd4.lib QtCored4.lib QtGuid4.lib Qt3Supportd4.lib QAxContainer.lib glut32.lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib"
+                                AdditionalLibraryDirectories="..\support\xercesc\lib\;..\support\zlib\lib\;..\support\devil\lib;&quot;$(QTDIR)\lib&quot;;..\include;..\src\GL;&quot;$(CG_LIB_PATH)&quot;;&quot;$(GTPDIR)\NonGTP\Xerces&quot;;&quot;$(GTPDIR)\NonGTP\Xerces\xercesc\lib&quot;;&quot;$(GTPDIR)\NonGTP\zlib\lib&quot;;&quot;$(GTPDIR)\NonGTP\Devil\lib&quot;"/>
                         <Tool
                                 Name="VCMIDLTool"/>
@@ -49 +50 @@
                         <Tool
                                 Name="VCXMLDataGeneratorTool"/>
+                        <Tool
+                                Name="VCWebDeploymentTool"/>
                         <Tool
                                 Name="VCManagedWrapperGeneratorTool"/>

GTP/trunk/Lib/Vis/Preprocessing/scripts/default.env

@@ -203 +203 @@
         pruneEmptyViewCells false
         processOnlyValidViewCells false
-        
+
+        stats viewCellStats.log
+
+        samplingType directional
+
         PostProcess {
                 # how much samples are used for post processing
@@ -216 +220 @@
                 compress false
                 merge true
+                statsPrefix ../scripts/viewCells
         }
 
@@ -314 +319 @@
         maxStaticMemory 50
         
+        subdivisionStats ../subDivisionStats.log
+
         # factors for evaluating split plane costs
         Factor {
@@ -405 +412 @@
         maxTests 10000
         
+        subdivisionStats ../subDivisionStats.log
+
         # factors for evaluating split plane costs
         Factor {

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

@@ -1206 +1206 @@
                         "bspTree");
 
+        RegisterOption("ViewCells.stats",
+                                        optString,
+                                        "view_cells_stats=",
+                                        "viewCellsStats.log");
+
+        RegisterOption("ViewCells.PostProcess.statsPrefix",
+                                        optString,
+                                        "view_cells_stats_prefix=",
+                                        "viewCells");
+
+
+        RegisterOption("ViewCells.active",
+                                        optInt,
+                                        "1000");
+        
         RegisterOption("ViewCells.active",
                                         optInt,
@@ -1214 +1229 @@
                                         "view_cells_construction_samples=",
                                         "5000000");
+
+        RegisterOption("ViewCells.Evaluation.samples",
+                                        optInt,
+                                        "view_cells_evaluation_samples=",
+                                        "8000000");
+
+        RegisterOption("ViewCells.Evaluation.samplesPerPass",
+                                        optInt,
+                                        "view_cells_evaluation_samples_per_oass=",
+                                        "300000");
 
         RegisterOption("ViewCells.Construction.samplesPerPass",
@@ -1280 +1305 @@
                 "-view_cells_delayed_construction",
                 "false");
-
         
 
@@ -1297 +1321 @@
                 "-view_cells_process_only_valid_view_cells",
                 "false");
-        
+
         
         RegisterOption("ViewCells.PostProcess.maxCostRatio",
@@ -1303 +1327 @@
                         "-view_cells_post_process_max_cost_ratio=",
                         "0.9");
-
         
         RegisterOption("ViewCells.PostProcess.renderCostWeight",
@@ -1309 +1332 @@
                         "-view_cells_post_process_render_cost_weight",
                         "0.5");
-
         
         RegisterOption("ViewCells.PostProcess.avgCostMaxDeviation",
@@ -1346 +1368 @@
                 "8.0");
 
-        RegisterOption("ViewCells.Visualization.useCuttingPlane",
+        RegisterOption("ViewCells.Visualization.useClipPlane",
                 optBool, 
-                "view_cells_viz_use_cutting_plane=", 
+                "view_cells_viz_use_clip_plane=", 
                 "false");
-
         
-        RegisterOption("ViewCells.Visualization.cuttingPlaneAxis",
+        RegisterOption("ViewCells.Visualization.clipPlaneAxis",
                 optInt, 
-                "view_cells_viz_cutting_plane_axis=", 
+                "view_cells_viz_clip_plane_axis=", 
                 "0");
 
@@ -1390 +1411 @@
                 "bsp_construction_input=",
                 "fromViewCells");
+
+        RegisterOption("BspTree.subdivisionStats",
+                                        optString,
+                                        "vsp_bsp_subdivision_stats=",
+                                        "bspSubdivisionStats.log");
 
         RegisterOption("BspTree.Construction.samples",
@@ -1840 +1866 @@
                                         "vsp_bsp_term_min_pvs=",
                                         "20");
+
         RegisterOption("VspBspTree.Termination.minProbability",
                                         optFloat,
                                         "vsp_bsp_term_min_probability=",
                                         "0.001");
+
+        RegisterOption("VspBspTree.subdivisionStats",
+                                        optString,
+                                        "vsp_bsp_subdivision_stats=",
+                                        "vspBspSubdivisionStats.log");
 
         RegisterOption("VspBspTree.Termination.maxRayContribution",

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

@@ -30 +30 @@
 int ViewCell::sMailId = 21843194198;
 int ViewCell::sReservedMailboxes = 1;
+int ViewCell::sLastUpdated = 0;
 
 //int upperPvsLimit = 120;
@@ -117 +118 @@
 mParent(NULL),
 mMergeCost(0),
-mIsActive(false)
+mIsActive(false),
+mLastUpdated(sLastUpdated)
 {
 }
@@ -216 +218 @@
 }
 
+
+void ViewCell::SetActive()
+{
+        mIsActive = true;
+        mLastUpdated = sLastUpdated;
+}
+
+
+bool ViewCell::IsActive() const
+{
+        return mIsActive  && (mLastUpdated == sLastUpdated);
+}
 
 
@@ -1251 +1265 @@
 
 
-void ViewCellsTree::ExportStats()
+void ViewCellsTree::ExportStats(const string &mergeStats)
 {
         TraversalQueue tqueue;
@@ -1269 +1283 @@
 
         ofstream stats;
-        stats.open("mergeStats.log");
+        stats.open(mergeStats.c_str());
 
         stats 
@@ -1376 +1390 @@
 }
 
+
+
 void ViewCellsTree::CollectBestViewCellSet(ViewCellContainer &viewCells, 
                                                                                    const int numViewCells)
@@ -1391 +1407 @@
                 if (vc->IsLeaf() || ((viewCells.size() + tqueue.size() + 1) >= numViewCells))
                 {
-                        // todo: should be done with a function taking the active flag and some 
-                        // time stamp so I don't have to reset view cells, this also means that 
-                        // the leaf view cells can be set active fist
-                        vc->mIsActive = true; 
                         viewCells.push_back(vc);
                 }
@@ -1611 +1623 @@
 ViewCell *ViewCellsTree::GetActiveViewCell(ViewCell *vc) const
 {
-        while (vc->GetParent() && !vc->mIsActive)
+        while (vc->GetParent() && !vc->IsActive())
         {
                 vc = vc->GetParent();
@@ -1622 +1634 @@
 void ViewCellsTree::PropagatePvs(ViewCell *vc)
 {
+        // propagate pvs up
         while (vc->GetParent())
         {
@@ -1631 +1644 @@
                 return;
 
+        // propagate pvs to the leaves
         stack<ViewCell *> tstack;
-
         tstack.push(vc);
 
@@ -1791 +1804 @@
                 stream << "<Leaf ";
                 stream << "id=\"" << viewCell->GetId() << "\" ";
-                stream << "active=\"" << viewCell->mIsActive << "\" ";
+                stream << "active=\"" << viewCell->IsActive() << "\" ";
                 stream << "mergecost=\"" << viewCell->GetMergeCost() << "\" ";
                 stream << "pvs=\"";
@@ -1810 +1823 @@
                 stream << "<Interior ";
                 stream << "id=\"" << viewCell->GetId() << "\" ";
-                stream << "active=\"" << viewCell->mIsActive << "\" ";
+                stream << "active=\"" << viewCell->IsActive() << "\" ";
                 stream << "mergecost=\"" << viewCell->GetMergeCost() << "\" ";
                 stream << "pvs=\"";
@@ -1834 +1847 @@
 
 
+void ViewCellsTree::ResetPvs()
+{
+        stack<ViewCell *> tstack;
+
+        tstack.push(mRoot);
+
+        while (!tstack.empty())
+        {
+                ViewCell *vc = tstack.top();
+                tstack.pop();
+
+                vc->GetPvs().mEntries.clear();
+
+                if (!vc->IsLeaf())
+                {
+                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
+                        for (it = interior->mChildren.begin(); it != it_end; ++ it)
+                        {
+                                tstack.push(*it);
+                        }
+                }
+        }
+}
+
+
+void ViewCellsTree::SetActiveSetToLeaves()
+{
+}
 
 /**************************************************************************/

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

@@ -191 +191 @@
 
 
-                                                 
+        /** Sets this view cell to be an active view cell.
+        */
+        void SetActive();
+        /** Returns if this view cell is active.
+        */
+        bool IsActive() const;
+
         // last mail id -> warning not thread safe!
         // both mailId and mailbox should be unique for each thread!!!
         static int sMailId;
         static int sReservedMailboxes;
-        
-        bool mIsActive;
-
+
+        static int sLastUpdated;
         
 protected:
@@ -212 +217 @@
         bool mValid;
 
-  /** color used for consistent visualization */
-  RgbColor mColor;
+        int mLastUpdated;
+        bool mIsActive;
+        /** color used for consistent visualization */
+        RgbColor mColor;
 };
 
@@ -350 +357 @@
         bool IsCompressed() const;
 
+        /** Returns active view cell that is in the path of this view cell.
+        */
         ViewCell *GetActiveViewCell(ViewCell *vc) const;
 
+        /** Sets the leaves to be the currently active view cells.
+        */
+    void SetActiveSetToLeaves();
+
         /** Propagates pvs up the tree to the root and downwards the tree.
         */
@@ -360 +373 @@
         /** Export statistics of this view cell tree.
         */
-        void ExportStats();
+        void ExportStats(const string &mergeStats);
 
         /** Sets root of hierarchy.
@@ -372 +385 @@
         void CreateUniqueViewCellsIds();
 
+        /** Resets pvs of whole tree.
+        */
+        void ResetPvs();
 
 protected:

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

@@ -264 +264 @@
         environment->GetFloatValue("BspTree.Construction.epsilon", mEpsilon);
 
-        mSubdivisionStats.open("subdivisionStats.log");
+        char subdivisionStatsLog[100];
+        environment->GetStringValue("BspTree.subdivisionStats", subdivisionStatsLog);
+        mSubdivisionStats.open(subdivisionStatsLog);
 
     Debug << "BSP max depth: " << mTermMaxDepth << endl;

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

@@ -61 +61 @@
         environment->GetIntValue("ViewCells.active", mNumActiveViewCells);
         environment->GetBoolValue("ViewCells.PostProcess.compress", mCompressViewCells);
-        environment->GetBoolValue("ViewCells.Visualization.useCuttingPlane", mUseCuttingPlaneForViz);
+        environment->GetBoolValue("ViewCells.Visualization.useClipPlane", mUseClipPlaneForViz);
 
         environment->GetBoolValue("ViewCells.PostProcess.merge", mMergeViewCells);
+
+        char samplingBuf[50];
+        environment->GetStringValue("ViewCells.samplingType", samplingBuf);
+        
+        if (strcmp(samplingBuf, "box") == 0)
+                mSamplingType = Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION;
+        else if (strcmp(samplingBuf, "directional") == 0)
+                mSamplingType = Preprocessor::DIRECTION_BASED_DISTRIBUTION;
+
+#if 0
+
+                char viewCellsStatsLog[100];
+                environment->GetStringValue("ViewCells.stats", viewCellsStats);
+                mViewCellsStats.open(viewCellsStatsLog);
+#endif
 
         mMinPvsSize = emptyViewCells ? 1 : 0;
@@ -157 +172 @@
         //-- construction rays => we use uniform samples for this
         CastPassSamples(mInitialSamples, 
-                                        //Preprocessor::DIRECTION_BASED_DISTRIBUTION,
-                                        Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION, 
+                                        mSamplingType,
                                         initialSamples);
         
         cout << "finished" << endl;
 
+        
         // construct view cells
         const int numInitialSamples = 
@@ -172 +187 @@
         disposeRays(initialSamples, outRays);
         
+
+        // -- stats after contruction
+        ResetViewCells();
+        Debug << "\nView cells after initial sampling: " << mCurrentViewCellsStats << endl;
+
+        if (0) // export initial view cells
+        {
+                cout << "exporting initial view cells (=leaves) ... ";
+                Exporter *exporter = Exporter::GetExporter("view_cells.x3d");
+
+                if (exporter)
+                {
+                        if (mExportGeometry)
+                                exporter->ExportGeometry(preprocessor->mObjects);
+
+                        ExportViewCellsForViz(exporter);
+
+                        delete exporter;
+                }
+                cout << "finished" << endl;
+        }
+
 
         //-- guided rays are used for further sampling
@@ -191 +228 @@
                 dirSamples = !dirSamples; // toggle sampling method
                 numSamples += CastPassSamples(mSamplesPerPass, 
-                                                                          samplingType,
+                                                                          mSamplingType,
                                                                           constructionSamples);
 
@@ -217 +254 @@
                                     Preprocessor::DIRECTION_BASED_DISTRIBUTION, 
                                         postProcessSamples);
-        
+
+
+        // stats before post processing (i.e., merge)
+        EvaluateViewCellsStats();
+        Debug << "\noriginal view cell partition before post process:\n" << mCurrentViewCellsStats << endl;
+
+        mRenderer->RenderScene();
+        SimulationStatistics ss;
+        dynamic_cast<RenderSimulator *>(mRenderer)->GetStatistics(ss);
+
+    Debug << ss << endl;
+
+
+
         cout << "starting post processing and visualization" << endl;
+
 
         // store viewCells for postprocessing
         const bool storeViewCells = true;
+
 
         if (SAMPLE_AFTER_SUBDIVISION)
@@ -240 +292 @@
                 ComputeSampleContributions(visualizationSamples, true, storeViewCells);
 
-        //Debug << "visualizationsamples: " << mVisualizationSamples << " " << visualizationSamples.size() << endl;
         // different visualizations
         Visualize(preprocessor->mObjects, visualizationSamples);
@@ -247 +298 @@
 
         return numSamples;
+}
+
+
+void ViewCellsManager::EvalViewCellPartition()
+{
+        int samplesPerPass;
+        int numSamples;
+        int castSamples = 0;
+
+        environment->GetIntValue("ViewCells.Evaluation.samplesPerPass", samplesPerPass);
+        environment->GetIntValue("ViewCells.Evaluation.samples", numSamples);
+
+        while (castSamples < numSamples)
+        {
+        }
+        //char s[64]; sprintf(s, "bsp-pvs%04d.x3d", i);
 }
 
@@ -385 +452 @@
 void ViewCellsManager::EvaluateViewCellsStats()
 {
-        mViewCellsStats.Reset();
+        mCurrentViewCellsStats.Reset();
 
         ViewCellContainer::const_iterator it, it_end = mViewCells.end();
@@ -391 +458 @@
         for (it = mViewCells.begin(); it != it_end; ++ it)
         {
-                mViewCellsTree->UpdateViewCellsStats(*it, mViewCellsStats);
+                mViewCellsTree->UpdateViewCellsStats(*it, mCurrentViewCellsStats);
         }
 }
@@ -698 +765 @@
         mViewSpaceBox = box;
 
-        CreateCuttingPlane();
+        CreateClipPlane();
         
         mTotalAreaValid = false;
@@ -704 +771 @@
 
 
-void ViewCellsManager::CreateCuttingPlane()
+void ViewCellsManager::CreateClipPlane()
 {
         int axis = 0;
 
-        const float factor = 0.65;
+        const float factor = 0.65f;
         Vector3 point = mViewSpaceBox.Min() +  mViewSpaceBox.Size() * factor;
 
-        if (mUseCuttingPlaneForViz)
-        environment->GetIntValue("ViewCells.Visualization.cuttingPlaneAxis", axis);
+        if (mUseClipPlaneForViz)
+        environment->GetIntValue("ViewCells.Visualization.clipPlaneAxis", axis);
 
         Vector3 normal(0,0,0);
         normal[axis] = 1;
 
-        mCuttingPlane = Plane3(normal, point);
+        mClipPlane = Plane3(normal, point);
 }
 
@@ -733 +800 @@
         CollectViewCells();
         
-        mViewCellsStats.Reset();
+        mCurrentViewCellsStats.Reset();
         EvaluateViewCellsStats();
 
@@ -813 +880 @@
 
         CastLineSegment(origin, termination, viewcells);
-        //Debug << "constribution: " << (int)viewcells.size() << endl;
-
+        
         // copy viewcells memory efficiently
         //const bool storeViewcells = !addRays;
@@ -902 +968 @@
 void ViewCellsManager::PrintStatistics(ostream &s) const
 {
-        s << mViewCellsStats << endl;
+        s << mCurrentViewCellsStats << endl;
 }
 
@@ -926 +992 @@
                         ExportColor(exporter, *it);             
                         ExportViewCellGeometry(exporter, *it, 
-                                mUseCuttingPlaneForViz ? &mCuttingPlane : NULL);
+                                mUseClipPlaneForViz ? &mClipPlane : NULL);
                 }
         }
@@ -960 +1026 @@
 
 
+void ViewCellsManager::SetViewCellsActive()
+{
+        ++ ViewCell::sLastUpdated;
+        ViewCellContainer::const_iterator it, it_end = mViewCells.end();
+        for (it = mViewCells.begin(); it != it_end; ++ it)
+        {
+                (*it)->SetActive();
+        }
+}
 
 /**********************************************************************/
@@ -1032 +1107 @@
 
         //EvaluateViewCellsStats();
-        Debug << "\nView cells after construction:\n" << mViewCellsStats << endl;
+        Debug << "\nView cells after construction:\n" << mCurrentViewCellsStats << endl;
 
         // recast rest of the rays
         if (SAMPLE_AFTER_SUBDIVISION)
                 ComputeSampleContributions(savedRays, true, false);
-
-
-        ResetViewCells();
-    
-        Debug << "\nView cells after " << (int)savedRays.size() 
-                  << " samples:\n" << mViewCellsStats << endl;
-
-        if (1) // export initial view cells
-        {
-                cout << "exporting initial view cells (=leaves) ... ";
-                Exporter *exporter = Exporter::GetExporter("view_cells.x3d");
-
-                if (exporter)
-                {
-                        if (0 && mExportRays)
-                                exporter->ExportRays(rays, RgbColor(1, 1, 1));
-                        
-                        if (mExportGeometry)
-                                exporter->ExportGeometry(objects);
-
-                        //exporter->SetWireframe();
-                        exporter->SetFilled();
-                        ExportViewCellsForViz(exporter);
-
-
-                        delete exporter;
-                }
-                cout << "finished" << endl;
-        }
-
 
         return sampleContributions;
@@ -1115 +1160 @@
                 return 0;
         }
-
         
         // view cells already finished before post processing step (i.e. because they were loaded)
@@ -1130 +1174 @@
     int vcSize = 0;
         int pvsSize = 0;
-
-        EvaluateViewCellsStats();
-        Debug << "\noriginal view cell partition:\n" << mViewCellsStats << endl;
-
-        mRenderer->RenderScene();
-        SimulationStatistics ss;
-        dynamic_cast<RenderSimulator *>(mRenderer)->GetStatistics(ss);
-
-    Debug << ss << endl;
-
-        
 
         //-- merge view cells
@@ -1151 +1184 @@
         if (mMergeViewCells)
         {
-                Debug << "constructing visibility based merge tree" << endl;
+                cout << "constructing visibility based merge tree" << endl;
                 mViewCellsTree->ConstructMergeTree(rays, objects);
         }
         else
         {
-                Debug << "constructing spatial merge tree" << endl;
+                cout << "constructing spatial merge tree" << endl;
                 // create spatial merge hierarchy
                 mViewCellsTree->SetRoot(ConstructSpatialMergeTree(mBspTree->GetRoot()));
         }
 
-        mViewCellsTree->ExportStats();
+        // export statistics after merge
+        if (0)
+                mViewCellsTree->ExportStats("mergeStats.log");
 
         //-- stats and visualizations
@@ -1172 +1207 @@
         
 
+        //-- visualization and statistics
     // reset view cells and stats
         ResetViewCells();
-        Debug << "\nView cells after merge:\n" << mViewCellsStats << endl;
+        Debug << "\nView cells after merge:\n" << mCurrentViewCellsStats << endl;
+
 
         int savedColorCode  = mColorCode;
@@ -1468 +1505 @@
                 {
                         importance = (float)vc->GetPvs().GetSize() /
-                                (float)mViewCellsStats.maxPvs;
+                                (float)mCurrentViewCellsStats.maxPvs;
 
                 }
@@ -1475 +1512 @@
                 {
             int lSize = mViewCellsTree->GetSize(vc);
-                        importance = (float)lSize / (float)mViewCellsStats.maxLeaves;
+                        importance = (float)lSize / (float)mCurrentViewCellsStats.maxLeaves;
                 }
                 //break;
@@ -1502 +1539 @@
 void BspViewCellsManager::ExportViewCellGeometry(Exporter *exporter,
                                                                                                  ViewCell *vc,
-                                                                                                 const Plane3 *cuttingPlane) const
+                                                                                                 const Plane3 *clipPlane) const
 {
         if (vc->GetMesh())
@@ -1513 +1550 @@
         mBspTree->ConstructGeometry(vc, geom);
 
-
-        if (cuttingPlane)
+        if (clipPlane)
         {
                 BspNodeGeometry front;
@@ -1521 +1557 @@
                 geom.SplitGeometry(front,
                                                    back,
-                                                   *cuttingPlane,
+                                                   *clipPlane,
                                                    mViewSpaceBox, 
                                                    0.0001f);
@@ -1775 +1811 @@
 
         EvaluateViewCellsStats();
-        Debug << "\nView cells after construction:\n" << mViewCellsStats << endl;
+        Debug << "\nView cells after construction:\n" << mCurrentViewCellsStats << endl;
 
         return 0;
@@ -1978 +2014 @@
 void KdViewCellsManager::ExportViewCellGeometry(Exporter *exporter,
                                                                                                 ViewCell *vc,
-                                                                                                const Plane3 *cuttingPlane) const
+                                                                                                const Plane3 *clipPlane) const
 {
         ViewCellContainer leaves;
@@ -2098 +2134 @@
         ResetViewCells();
 
-        Debug << "\nView cells after construction:\n" << mViewCellsStats << endl;
+        Debug << "\nView cells after construction:\n" << mCurrentViewCellsStats << endl;
 
         long startTime = GetTime();
+
         // recast rest of rays
         ComputeSampleContributions(savedRays, true, false);
@@ -2328 +2365 @@
                 {
                         importance = (float)vc->GetPvs().GetSize() /
-                                (float)mViewCellsStats.maxPvs;
+                                (float)mCurrentViewCellsStats.maxPvs;
                 }
                 break;
@@ -2335 +2372 @@
                 int lSize = mViewCellsTree->GetSize(vc);
                         importance = (float)lSize /
-                                (float)mViewCellsStats.maxLeaves;
+                                (float)mCurrentViewCellsStats.maxLeaves;
                 }
                 break;
@@ -2359 +2396 @@
 void VspKdViewCellsManager::ExportViewCellGeometry(Exporter *exporter,
                                                                                                    ViewCell *vc,
-                                                                                                   const Plane3 *cuttingPlane) const
+                                                                                                   const Plane3 *clipPlane) const
 {
         VspKdViewCell *kdVc = dynamic_cast<VspKdViewCell *>(vc);
@@ -2450 +2487 @@
 
 
-/*void VspBspViewCellsManager::CollectNodes(ViewCell *vc, vector<BspNode *>nodes)
-{
-        void ViewCellsTree::CollectLeaves(ViewCell *vc, vector<BspNode *> &nodes) const
-        
-        if (vc->IsLeaf())
-        {
-                BspViewCell *bvc = dynamic_cast<BspViewCell *>(vc);
-                nodes->push_back(bvc->mLeaf);
-        }
-        else
-        {
-                ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
-
-                for (it = interior->mChildren.begin; it != it_end; ++ it)
-                {
-                        vector<BspNode *> mynodes;
-                        CollectNodes(*it, mynodes);
-
-                        if (mynodes[0]->GetParent() && (mynodes[0]->GetParent() == mynodes[1]->GetParent()))
-                        {
-                                nodes.push_back(nodes[0]->GetParent());
-                        }
-
-                }
-        }
-}*/
-
-
 int VspBspViewCellsManager::ConstructSubdivision(const ObjectContainer &objects,
                                                                                                  const VssRayContainer &rays)
@@ -2485 +2494 @@
                 return 0;
 
-        Debug << "Constructing bsp view cells" << endl;
-
         int sampleContributions = 0;
 
@@ -2496 +2503 @@
         VssRayContainer savedRays;
 
-        Debug << "samples used for subdivision: " << mInitialSamples 
+        Debug << "samples used for vsp bsp subdivision: " << mInitialSamples 
                   << " rays: " << (int)rays.size() << endl;
 
@@ -2507 +2514 @@
 
         mVspBspTree->Construct(constructionRays, &mViewSpaceBox);
-
-        Debug << mVspBspTree->GetStatistics() << endl;
 
         // collapse invalid regions
@@ -2519 +2524 @@
     cout << "finished" << endl;
 
-        cout << "reseting view cell stats ... ";
+        // -- stats
+        Debug << mVspBspTree->GetStatistics() << endl;
+
         ResetViewCells();
-        cout << "finished" << endl;
-
-        Debug << "\nView cells after construction:\n" << mViewCellsStats << endl;
-
-        if (0) // export initial view cells
-        {
-                cout << "exporting initial view cells (=leaves) ... ";
-                Exporter *exporter = Exporter::GetExporter("view_cells.x3d");
-
-                if (exporter)
-                {
-                        if (0 && mExportRays)
-                                exporter->ExportRays(rays, RgbColor(1, 1, 1));
-
-                        if (mExportGeometry)
-                                exporter->ExportGeometry(objects);
-
-                        //exporter->SetWireframe();
-                        exporter->SetFilled();
-                        ExportViewCellsForViz(exporter);
-
-                        delete exporter;
-                }
-                cout << "finished" << endl;
-        }
+        Debug << "\nView cells after construction:\n" << mCurrentViewCellsStats << endl;
+
 
         startTime = GetTime();
-
-        // reset view cells and stats
-        ResetViewCells();
 
         cout << "Computing remaining ray contributions ... ";
@@ -2575 +2556 @@
         int pvsSize = 0;
 
-        mRenderer->RenderScene();
-        SimulationStatistics ss;
-        dynamic_cast<RenderSimulator *>(mRenderer)->GetStatistics(ss);
-    Debug << ss << endl;
-
         //-- merge view cells
         
@@ -2588 +2564 @@
         if (mMergeViewCells)
         {
-                Debug << "merging view cells" << endl;
                 // TODO: should be done BEFORE the ray casting
                 mViewCellsTree->ConstructMergeTree(rays, objects);
@@ -2594 +2569 @@
         else
         {
-                Debug << "spatial merge" << endl;
                 mViewCellsTree->SetRoot(ConstructSpatialMergeTree(mVspBspTree->GetRoot()));
         }
 
-        mViewCellsTree->ExportStats();
+        if (0)
+                mViewCellsTree->ExportStats("mergeStats.log");
 
         //-- stats and visualizations
@@ -2611 +2586 @@
         int savedColorCode = mColorCode;
         
+        // get currently active view cell set
+        ResetViewCells();
+        Debug << "\nView cells after merge:\n" << mCurrentViewCellsStats << endl;
+
         //BspLeaf::NewMail();
         if (0) // export merged view cells
         {
                 mColorCode = 0;
-                cout << "reseting view cells ... ";
-                ResetViewCells();
-
-                cout << "finished" << endl;
-
                 Exporter *exporter = Exporter::GetExporter("merged_view_cells.x3d");
-                Debug << "\nView cells after merge:\n" << mViewCellsStats << endl;
-
+                
                 cout << "exporting view cells after merge ... ";
 
@@ -2775 +2748 @@
         mVspBspTree->ValidateTree();
 
-        // recompute view cell statistics
-        mViewCellsStats.Reset();
-        EvaluateViewCellsStats();
-
         // has to be recomputed
         mTotalAreaValid = false;
-
-
         VssRayContainer postProcessRays;
-
         GetRaySets(rays, mPostProcessSamples, postProcessRays);
 
         Debug << "post processing using " << (int)postProcessRays.size() << " samples" << endl;
 
-        Debug << "\nview cell partition after sampling:\n" << mViewCellsStats << endl << endl;
 
         // should maybe be done here to allow merge working with area or volume
@@ -2806 +2771 @@
                 RefineViewCells(postProcessRays, objects);
 
-        //-- render simulation after merge
+
+        //-- render simulation after merge + refine
+        
         cout << "\nevaluating bsp view cells render time before compress ... ";
         dynamic_cast<RenderSimulator *>(mRenderer)->RenderScene();
@@ -2831 +2798 @@
                 Debug << "number of entries after compress: " << pvsEntries << endl;
         }
+
 
         // collapse sibling leaves that share the same view cell
@@ -3288 +3256 @@
                 {
                         importance = (float)vc->GetPvs().GetSize() /
-                                (float)mViewCellsStats.maxPvs;
+                                (float)mCurrentViewCellsStats.maxPvs;
 
                 }
@@ -3295 +3263 @@
                 {
             int lSize = mViewCellsTree->GetSize(vc);
-                        importance = (float)lSize / (float)mViewCellsStats.maxLeaves;
+                        importance = (float)lSize / (float)mCurrentViewCellsStats.maxLeaves;
                 }
                 break;
@@ -3321 +3289 @@
 void VspBspViewCellsManager::ExportViewCellGeometry(Exporter *exporter,
                                                     ViewCell *vc,
-                                                                                                        const Plane3 *cuttingPlane) const
+                                                                                                        const Plane3 *clipPlane) const
 {
         if (vc->GetMesh())
@@ -3331 +3299 @@
 
         
-        if (cuttingPlane)
+        if (clipPlane)
         {
                 ViewCellContainer leaves;
@@ -3351 +3319 @@
                         geom.SplitGeometry(front,
                                                            back,
-                                                           *cuttingPlane,
+                                                           *clipPlane,
                                                            mViewSpaceBox, 
                                                            0.0001f);

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

@@ -320 +320 @@
         virtual void ExportViewCellGeometry(Exporter *exporter, 
                                                                                 ViewCell *vc,
-                                                                                const Plane3 *cuttingPlane = NULL) const = 0;
+                                                                                const Plane3 *clipPlane = NULL) const = 0;
 
         virtual void FinalizeViewCells(const bool createMesh);
@@ -352 +352 @@
         void CollectViewCells(const int n);
 
+        /** Returns true if this (logical) view cell is equal to a spatial node.
+        */
         virtual bool EqualToSpatialNode(ViewCell *viewCell) const { return false;}
 
+        /** Sets current view cells set to active, i.e., the sampling is done in this view cell set.
+        */
+        void SetViewCellsActive();
+
+        /** Evaluates worth of current view cell hierarchy.
+        */
+        void EvalViewCellPartition();
 
 protected:
@@ -407 +416 @@
         void CreateViewCellMeshes();
 
-
         /** Takes different measures to prepares the view cells after loading them from disc.
         */
         virtual void PrepareLoadedViewCells() {};
 
-
-        void CreateCuttingPlane();
-
-        Plane3 mCuttingPlane;
-        bool mUseCuttingPlaneForViz;
+        /** Creates clip plane for visualization.
+        */
+        void CreateClipPlane();
+
+        Plane3 mClipPlane;
+        bool mUseClipPlaneForViz;
 
 
@@ -441 +450 @@
         float mMaxPvsRatio;
 
+        int mSamplingType;
         int mNumActiveViewCells;
         bool mCompressViewCells;
 
-        ViewCellsStatistics mViewCellsStats;
+        ViewCellsStatistics mCurrentViewCellsStats;
         /// the scene bounding box
         AxisAlignedBox3 mViewSpaceBox;
@@ -517 +527 @@
         void ExportViewCellGeometry(Exporter *exporter, 
                                                                 ViewCell *vc, 
-                                                                const Plane3 *cuttingPlane = NULL) const;
+                                                                const Plane3 *clipPlane = NULL) const;
         
         void CollectMergeCandidates(const VssRayContainer &rays, 
@@ -600 +610 @@
         void ExportViewCellGeometry(Exporter *exporter, 
                                                                 ViewCell *vc,
-                                                                const Plane3 *cuttingPlane = NULL) const;
+                                                                const Plane3 *clipPlane = NULL) const;
 
         void CollectMergeCandidates(const VssRayContainer &rays, 
@@ -666 +676 @@
         void ExportViewCellGeometry(Exporter *exporter, 
                                                                 ViewCell *vc,
-                                                                const Plane3 *cuttingPlane = NULL) const;
+                                                                const Plane3 *clipPlane = NULL) const;
 
         void CollectMergeCandidates(const VssRayContainer &rays, vector<MergeCandidate> &candidates);
@@ -735 +745 @@
         void ExportViewCellGeometry(Exporter *exporter, 
                                                                 ViewCell *vc,
-                                                                const Plane3 *cuttingPlane = NULL) const;
+                                                                const Plane3 *clipPlane = NULL) const;
 
         //float GetVolume(ViewCell *viewCell) const;

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

@@ -329 +329 @@
                         const bool isActive = (bool)strtol(ptr, &endptr, 10);
 
-                        viewCell->mIsActive = isActive;
+                        if (isActive)
+                                viewCell->SetActive();
                 }
                 else if (attrName == "mergecost")

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

@@ -129 +129 @@
         environment->GetBoolValue("VspBspTree.useCostHeuristics", mUseCostHeuristics);
         environment->GetBoolValue("VspBspTree.useSplitCostQueue", mUseSplitCostQueue);
+
+        char subdivisionStatsLog[100];
+        environment->GetStringValue("BspTree.subdivisionStats", subdivisionStatsLog);
+        mSubdivisionStats.open(subdivisionStatsLog);
 
 
@@ -556 +560 @@
                                                           geom);
 
+        // compute first split candidate
         VspBspSplitCandidate splitCandidate;
-
-
         EvalSplitCandidate(tData, splitCandidate);
 
@@ -820 +823 @@
                 VspBspTraversalData tBackData;
 
-#if OCTREE_HACK
-                //Debug << "new axis:" << (tData.mAxis + 1) % 3 << endl;
-                tFrontData.mAxis = (tData.mAxis + 1) % 3;
-                tBackData.mAxis = (tData.mAxis + 1) % 3;
-#endif
                 //-- continue subdivision
                 // create new interior node and two leaf node
@@ -831 +829 @@
                 newNode = SubdivideNode(splitPlane, tData, tFrontData, tBackData, coincident);
                 
-#if 0 // TODO
+                const int splitAxis = splitCandidate.mSplitAxis;
+                const int maxCostMisses = splitCandidate.mMaxCostMisses;
+
                 if (splitAxis < 3)
                         ++ mBspStats.splits[splitAxis];
@@ -838 +838 @@
 
                 tFrontData.mIsKdNode = tBackData.mIsKdNode = (tData.mIsKdNode && splitAxis < 3);
+                
                 // how often was max cost ratio missed in this branch?
                 tFrontData.mMaxCostMisses = maxCostMisses;
                 tBackData.mMaxCostMisses = maxCostMisses;
-
-#endif
+                
+
                 if (1)
                 {
@@ -936 +937 @@
 
         // compute locally best split plane
-        SelectPlane(splitData.mSplitPlane, leaf, tData, frontData, backData, splitAxis);
+        bool success = SelectPlane(splitData.mSplitPlane, leaf, tData, frontData, backData, splitAxis);
 
         // TODO: reuse
@@ -945 +946 @@
         splitData.mRenderCost = EvalRenderCostDecrease(splitData.mSplitPlane, tData);
         splitData.mParentData = tData;
+        splitData.mMaxCostMisses = success ? tData.mMaxCostMisses : tData.mMaxCostMisses + 1;
 }
 

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

@@ -167 +167 @@
                 /// the current node
                 Plane3 mSplitPlane;
-                
+                /// split axis of this plane (0, 1, 2, or 3 if non-axis-aligned)
+                int mSplitAxis;
+                /// the number of misses of max cost ratio until this split
+                int mMaxCostMisses;
+
                 // parent data
                 VspBspTraversalData mParentData;
-
+                // cost of applying this split
                 float mRenderCost;
 

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

@@ -99 +99 @@
                         Mesh *mesh = new Mesh();
 
+                        VertexIndexContainer vc;
+
                         // add vertices
                         for (int i = 0; i < (int)(*it).size(); ++ i)
                         {
                                 mesh->mVertices.push_back(mCurrentVertices[(*it)[i]]);
-                                
+                                vc.push_back(i);
                         }
                         
-                        mesh->mFaces.push_back(new Face(0,1,2));
+                        mesh->mFaces.push_back(new Face(vc));
                         mesh->Preprocess();
                         // make an instance of this mesh