Changeset 373 for trunk/VUT

Timestamp:

11/03/05 16:14:24 (19 years ago)

Author:

mattausch

Message:

added visualization of view cells versus leaves

Location:

trunk/VUT

Files:

• GtpVisibility/include/BatchedQueriesCullingManager.h (added)
• GtpVisibility/scripts/GtpVisibility.vcproj (modified) (3 diffs)
• GtpVisibility/src/BatchedQueriesCullingManager.cpp (added)
• GtpVisibilityPreprocessor/scripts/Preprocessor.vcproj (modified) (1 diff)
• GtpVisibilityPreprocessor/src/Exporter.h (modified) (1 diff)
• GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp (modified) (4 diffs)
• GtpVisibilityPreprocessor/src/SamplingPreprocessor.h (modified) (4 diffs)
• GtpVisibilityPreprocessor/src/ViewCellBsp.cpp (modified) (2 diffs)
• GtpVisibilityPreprocessor/src/ViewCellBsp.h (modified) (1 diff)
• GtpVisibilityPreprocessor/src/X3dExporter.cpp (modified) (3 diffs)
• GtpVisibilityPreprocessor/src/X3dExporter.h (modified) (1 diff)

trunk/VUT/GtpVisibility/scripts/GtpVisibility.vcproj

@@ -103 +103 @@
                         UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
                         <File
+                                RelativePath="..\src\BatchedQueriesCullingManager.cpp">
+                        </File>
+                        <File
                                 RelativePath="..\src\CoherentHierarchicalCullingManager.cpp">
                         </File>
@@ -137 +140 @@
                         Filter="h;hpp;hxx;hm;inl;inc;xsd"
                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+                        <File
+                                RelativePath="..\include\BatchedQueriesCullingManager.h">
+                        </File>
                         <File
                                 RelativePath="..\include\CoherentHierarchicalCullingManager.h">
@@ -183 +189 @@
                         </File>
                 </Filter>
+                <File
+                        RelativePath=".\VTune\GtpVisibility.vpj">
+                </File>
         </Files>
         <Globals>

trunk/VUT/GtpVisibilityPreprocessor/scripts/Preprocessor.vcproj

@@ -20 +20 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\include"
+                                AdditionalIncludeDirectories="..\support;..\support\devil\include;..\support\zlib\include;"$(QTDIR)\include";"$(QTDIR)\include\Qt";..\include"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
                                 MinimalRebuild="TRUE"

trunk/VUT/GtpVisibilityPreprocessor/src/Exporter.h

@@ -78 +78 @@
   ExportPolygons(const PolygonContainer &polys) = 0;
 
+  virtual void
+  ExportBspViewCellPartition(const BspTree &tree) = 0;
+
+  virtual void 
+  ExportBspLeaves(const BspTree &tree) = 0;
+
   void SetExportRayDensity(const bool d) { mExportRayDensity = d; }
   

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -550 +550 @@
 
                 cout << "evaluating render time heuristics ... ";
-                Real rt = EvaluateRenderHeuristics();
+                Real rt = SimulateRendering();
                 cout << "finished" << endl;
 
@@ -877 +877 @@
                                 if (!objects[j]->Mailed())
                                 {
-                                        //if (j == 2198)m.mDiffuseColor = RgbColor(1, 0, 1);
-                                        //else m.mDiffuseColor = RgbColor(1, 1, 0);
                                         exporter->SetForcedMaterial(m);
                                         exporter->ExportIntersectable(objects[j]);
@@ -886 +884 @@
                 DEL_PTR(exporter);
         }
-}
-
-Real SamplingPreprocessor::EvaluateRenderHeuristics()
+
+        if (1) // export view cells and leaves
+        {
+                Exporter *exporter = Exporter::GetExporter("viewCells.x3d");
+                if (exporter)
+                {
+                        exporter->ExportBspViewCellPartition(*mBspTree);
+                        delete exporter;
+                }
+
+                exporter = Exporter::GetExporter("bspLeaves.x3d");
+
+                if (exporter)
+                {
+                        exporter->ExportBspLeaves(*mBspTree);
+                        delete exporter;
+                }
+        }
+
+}
+
+
+
+Real SamplingPreprocessor::RenderPvs(ViewCell &viewCell, 
+                                                                         const float objRenderTime) const
+{
+        return viewCell.GetPvs().GetSize() * objRenderTime;
+}
+
+Real SamplingPreprocessor::SimulateRendering()
 {
         Real renderTime = 0;
 
-        const float objRt = 1.0f; // render time for 1 object of PVS
-        const float vcOverhead = 1.0f; // const overhead for crossing a view cell border
+        // render time for 1 object of PVS
+        const float objRt = 1.0f; 
+         // const overhead for crossing a view cell border
+        const float vcOverhead = 0.01f;
         
         float totalArea = 0;
@@ -915 +942 @@
                         area += (*pit)->GetArea();
                 
-                renderTime += area * (*it)->GetPvs().GetSize() * objRt;
+                renderTime += area * RenderPvs(*(*it), objRt);
                 totalArea += area;
         }

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.h

@@ -12 +12 @@
 class SamplingPreprocessor : public Preprocessor {
 public:
+                
+  SamplingPreprocessor();
+
+  ~SamplingPreprocessor();
+
+  virtual bool ComputeVisibility();
+
+protected:
         int mPass;
 
@@ -22 +30 @@
   int mBspConstructionSamples;
   int mPostProcessSamples;
-        
-  SamplingPreprocessor();
 
-  ~SamplingPreprocessor();
-
-  virtual bool ComputeVisibility();
 
   void
@@ -93 +96 @@
         /** Post processes view cells (i.e., merges or subdivides view cells based
                 on the PVS and the ray sets.
+                @param rays a set of rays which carries the visibility information 
+                the merging / subdivision is based on.
                 @returns number of merged view cells.
         */
@@ -100 +105 @@
                 quality of the view cell partition.
         */
-        Real EvaluateRenderHeuristics();
+        Real SimulateRendering();
+        /** Simulates rendering of the pvs of one view cell, with given rendering time for an object.
+                @param viewCell the view cell holding the Pvs
+                @param objRenderTime estimated render time for one object of the Pvs
+        */
+        Real RenderPvs(ViewCell &viewCell, const float objRenderTime) const;
+
 };
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -1486 +1486 @@
 }
 
-void BspTree::CollectLeaves(vector<BspLeaf *> &leaves)
+void BspTree::CollectLeaves(vector<BspLeaf *> &leaves) const
 {
         stack<BspNode *> nodeStack;
@@ -1499 +1499 @@
                 if (node->IsLeaf()) 
                 {
-                        BspLeaf *leaf = (BspLeaf *)node;
-                        
+                        BspLeaf *leaf = (BspLeaf *)node;                
                         leaves.push_back(leaf);
-                } else 
+                } 
+                else 
                 {
                         BspInterior *interior = dynamic_cast<BspInterior *>(node);

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -341 +341 @@
         /** Returns list of BSP leaves.
         */
-        void CollectLeaves(vector<BspLeaf *> &leaves);
+        void CollectLeaves(vector<BspLeaf *> &leaves) const;
 
         /** Returns box which bounds the whole tree.

trunk/VUT/GtpVisibilityPreprocessor/src/X3dExporter.cpp

@@ -8 +8 @@
 #include "ViewCell.h"
 #include "Polygon3.h"
-ViewCellContainer X3dExporter::foundViewCells; // TODO: delete later
 
 X3dExporter::X3dExporter(const string filename):Exporter(filename)
@@ -177 +176 @@
         for (it = viewCells.begin(); it != it_end; ++ it)
                 ExportViewCell(*it);
+}
+
+void 
+X3dExporter::ExportBspViewCellPartition(const BspTree &tree)
+{
+        ViewCellContainer viewCells;
+        tree.CollectViewCells(viewCells);
+
+        ViewCellContainer::const_iterator it, it_end = viewCells.end();
+
+        for (it = viewCells.begin(); it != it_end; ++ it)
+        {
+                if ((*it)->GetMesh())
+                        ExportViewCell(*it);
+                else
+                {
+                        PolygonContainer cell;
+                        tree.ConstructGeometry(dynamic_cast<BspViewCell *>(*it), cell);
+                        ExportPolygons(cell);
+                }
+        }
+}
+
+void 
+X3dExporter::ExportBspLeaves(const BspTree &tree)
+{
+        vector<BspLeaf *> leaves;
+        tree.CollectLeaves(leaves);
+
+        vector<BspLeaf *>::const_iterator it, it_end = leaves.end();
+
+        for (it = leaves.begin(); it != it_end; ++ it)
+        {
+                PolygonContainer cell;
+                tree.ConstructGeometry(*it, cell);
+                ExportPolygons(cell);
+        }
 }
 
@@ -477 +513 @@
                 }
         }
-        else // export view cells
-        {
-                while (!tStack.empty()) 
-                {
-            BspNode *node = tStack.top();
-    
-                        tStack.pop();
-        
-                        if (node->IsLeaf()) 
-                        {
-                                ViewCell *viewCell = dynamic_cast<BspLeaf *>(node)->GetViewCell();
-                                if (viewCell)
-                                        foundViewCells.push_back(viewCell);
-                        }
-                        else
-                        {
-                                BspInterior *interior = dynamic_cast<BspInterior *>(node);
-      
-                                tStack.push(interior->GetFront());
-                                tStack.push(interior->GetBack());
-                        }
-                }
-
-                Debug << "Number of view cells with dublicates: " << (int)foundViewCells.size() << endl;
-
-        //-- erase dublicates
-                sort(foundViewCells.begin(), foundViewCells.end());
-                ViewCellContainer::iterator new_end = unique(foundViewCells.begin(), foundViewCells.end());
-                foundViewCells.erase(new_end, foundViewCells.end());
-                ExportViewCells(foundViewCells);
-
-                Debug << "Number of view cells after erasing dublicates: " << (int)foundViewCells.size() << endl;
-        }
+        // export view cells
+        ExportBspViewCellPartition(tree);       
 
         return true;

trunk/VUT/GtpVisibilityPreprocessor/src/X3dExporter.h

@@ -85 +85 @@
                          const RgbColor &color = RgbColor(1,1,1));
 
-  static ViewCellContainer foundViewCells; // todo: remove this
+  virtual void
+  ExportBspViewCellPartition(const BspTree &tree);
+
+  virtual void 
+  ExportBspLeaves(const BspTree &tree);
+
 protected: