Changeset 338 for trunk/VUT

Timestamp:

10/18/05 11:17:29 (19 years ago)

Author:

mattausch

Message:

fixed bug in balanced view cell criterium
started merge view cells functionality

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/Preprocessor.vcproj (modified) (1 diff)
• src/ViewCell.cpp (modified) (1 diff)
• src/ViewCellBsp.cpp (modified) (3 diffs)
• src/ViewCellBsp.h (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/scripts/Preprocessor.vcproj

@@ -65 +65 @@
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
                                 RuntimeLibrary="2"
+                                DisableLanguageExtensions="FALSE"
+                                ForceConformanceInForLoopScope="FALSE"
                                 RuntimeTypeInfo="TRUE"
                                 UsePrecompiledHeader="0"

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.cpp

@@ -30 +30 @@
         int limit = maxViewCells > 0 ? Min((int)objects.size(), maxViewCells) : (int)objects.size();
 
-        for (int i = 0; i < limit; ++i)
+        for (int i = 0; i < limit; ++ i)
         {
                 Intersectable *object = objects[i];

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -1099 +1099 @@
         int totalViewCells = 0;
 
+        // needed for balanced view cells criterium
         ViewCell::NewMail();
-        
+        int backId = ViewCell::mailID;
+        ViewCell::NewMail();
+        int frontId = ViewCell::mailID;
+        ViewCell::NewMail();
+        int frontAndBackId = ViewCell::mailID;
+
         PolygonContainer::const_iterator it, it_end = polys.end();
 
@@ -1135 +1141 @@
                         MeshInstance *viewCell = (*it)->mParent;
                 
-                        if (!viewCell->Mailed())
+                        // assure that we only count a view cell 
+                        // once for the front and once for the back side of the plane
+                        if (classification == Plane3::FRONT_SIDE)
                         {
-                                viewCell->Mail();
-                                sumBalancedViewCells += sBalancedTreeTable[classification];
-
-                                ++ totalViewCells;
+                                if ((viewCell->mailbox != frontId) && 
+                                        (viewCell->mailbox != frontAndBackId))
+                                {
+                                        sumBalancedViewCells += 1.0;
+
+                                        if (viewCell->mailbox != backId)
+                                                viewCell->mailbox = frontId;
+                                        else
+                                                viewCell->mailbox = frontAndBackId;
+                                        
+                                        ++ totalViewCells;
+                                }
+                        }
+                        else if (classification == Plane3::BACK_SIDE)
+                        {
+                                if ((viewCell->mailbox != backId) &&
+                                    (viewCell->mailbox != frontAndBackId))
+                                {
+                                        sumBalancedViewCells -= 1.0;
+
+                                        if (viewCell->mailbox != frontId)
+                                                viewCell->mailbox = backId;
+                                        else
+                                                viewCell->mailbox = frontAndBackId; 
+
+                                        ++ totalViewCells;
+                                }
                         }
                 }
@@ -1549 +1580 @@
 }
 
+int BspTree::MergeViewCells()
+{
+        stack<BspNode *> nodeStack;
+        nodeStack.push(mRoot);
+
+        ViewCell::NewMail();
+
+        while (!nodeStack.empty()) 
+        {
+                BspNode *node = nodeStack.top();
+                nodeStack.pop();
+
+                if (node->IsLeaf()) 
+                {
+                }
+                else 
+                {
+                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+
+                        nodeStack.push(interior->mFront);
+                        nodeStack.push(interior->mBack);
+                }
+        }
+        return 0;
+}
+
 void BspTree::SetGenerateViewCells(int generateViewCells)
 {

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -348 +348 @@
         int CastRay(Ray &ray);
 
-        /** Set true if view cells shall be generated in each leaf.
+        /** Merges view cells based on some criteria (e.g., empty view cells or
+                view cells which have a very similar PVS can be merged to one larger
+                view cell farther up in the BSP tree.
+                @returns the number of merged view cells
+        */
+        int MergeViewCells();
+
+        /** Set to true if new view cells shall be generated in each leaf.
         */
         void SetGenerateViewCells(int generateViewCells);