Changeset 443 for trunk/VUT

Timestamp:

12/02/05 08:45:09 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT

Files:

• GtpVisibilityPreprocessor/src/ViewCellBsp.h (modified) (1 diff)
• GtpVisibilityPreprocessor/src/ViewCellsManager.cpp (modified) (8 diffs)
• GtpVisibilityPreprocessor/src/VspBspTree.cpp (modified) (1 diff)
• GtpVisibilityPreprocessor/src/VspBspTree.h (modified) (1 diff)
• scripts/GtpVisibility.suo (modified) (previous)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -495 +495 @@
         void ConstructGeometry(BspViewCell *vc, PolygonContainer &cell) const;
 
+        /** Constructs geometry of view cell returning a BSP node geometry type.
+        */
         void ConstructGeometry(BspNode *n, BspNodeGeometry &cell) const;
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -1230 +1230 @@
                                                                                 const RayContainer &rays)
 {
+        return 0;// TODO
         if (!ViewCellsConstructed())
         {
@@ -1241 +1242 @@
         int pvsSize = 0;
 
-        BspViewCellsStatistics vcStats;
-        mVspBspTree->EvaluateViewCellsStats( vcStats);
+        VspBspViewCellsStatistics vcStats;
+        mVspBspTree->EvaluateViewCellsStats(vcStats);
         Debug << "original view cell partition:\n" << vcStats << endl;
                 
@@ -1294 +1295 @@
                 iit = ray->bspIntersections.begin();
 
-                BspLeaf *previousLeaf = (*iit).mLeaf;
+                VspBspLeaf *previousLeaf = NULL;//TODO(*iit).mLeaf;
                 ++ iit;
                 
                 for (; iit != ray->bspIntersections.end(); ++ iit)
                 {
-                        BspLeaf *leaf = (*iit).mLeaf;
+                        VspBspLeaf *leaf = NULL;//TODO(*iit).mLeaf;
 
                         if (ShouldMerge(leaf, previousLeaf))
                         {                       
-                                MergeBspLeafViewCells(leaf, previousLeaf);
+                                MergeVspBspLeafViewCells(leaf, previousLeaf);
 
                                 ++ merged;
@@ -1329 +1330 @@
                                                                            const RayContainer &sampleRays)
 {
+        return; // TODO
         if (!ViewCellsConstructed())
                 return;
 
         //-- recount pvs
-        BspViewCellsStatistics vcStats;
+        VspBspViewCellsStatistics vcStats;
         mVspBspTree->EvaluateViewCellsStats(vcStats);
 
@@ -1361 +1363 @@
         }
 
-        ExportVspBspPvs(objects, sampleRays);
+//TODO  ExportVspBspPvs(objects, sampleRays);
 }
 
@@ -1474 +1476 @@
                         else
                         {
-                                PolygonContainer cell;
+                                PolygonContainer vcGeom;
+
                                 // export view cell geometry
-                                mVspBspTree->ConstructGeometry(vc, cell);
-                                exporter->ExportPolygons(cell);
-                                CLEAR_CONTAINER(cell);
+                                mVspBspTree->ConstructGeometry(vc, vcGeom);
+                                exporter->ExportPolygons(vcGeom);
+                                CLEAR_CONTAINER(vcGeom);
                         }
 
@@ -1547 +1550 @@
                                 for     (int j = 0; j < (int)ray->bspIntersections.size(); ++ j)
                                 {
-                                        VspBspLeaf *leaf; // TODO = ray->bspIntersections[j].mLeaf;
+                                        VspBspLeaf *leaf = NULL; // TODO = ray->bspIntersections[j].mLeaf;
 
                                         if (vc == leaf->GetViewCell()) 
@@ -1571 +1574 @@
                         else
                         {
-                                PolygonContainer cell;
+                                PolygonContainer vcGeom;
                                 // export view cell
-                                mVspBspTree->ConstructGeometry(vc, cell);
-                                exporter->ExportPolygons(cell);
-                                CLEAR_CONTAINER(cell);
+                                mVspBspTree->ConstructGeometry(vc, vcGeom);
+                                exporter->ExportPolygons(vcGeom);
+                                CLEAR_CONTAINER(vcGeom);
                         }
 

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -1688 +1688 @@
 }
 
+void VspBspTree::ConstructGeometry(BspViewCell *vc, PolygonContainer &cell) const
+{
+        /*
+        TODO
+        vector<VspBspLeaf *> leaves = vc->mBspLeaves;
+
+        vector<VspBspLeaf *>::const_iterator it, it_end = leaves.end();
+
+        for (it = leaves.begin(); it != it_end; ++ it)
+                ConstructGeometry(*it, vcGeom);*/
+}
 
 int VspBspTree::FindNeighbors(VspBspNode *n, vector<VspBspLeaf *> &neighbors, 

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.h

@@ -457 +457 @@
         void ConstructGeometry(VspBspNode *n, PolygonContainer &cell) const;
 
+        /** Constructs geometry associated with the half space intersections 
+                leading to this node.
+        */
+        void ConstructGeometry(BspViewCell *vc, PolygonContainer &cell) const;
+
         /** Construct geometry and stores it in a geometry node container.
         */