Changeset 221 for trunk/VUT/GtpVisibilityPreprocessor/src

Timestamp:

08/08/05 14:39:15 (19 years ago)

Author:

mattausch

Message:

changed notation for bsp trees

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• Preprocessor.h (modified) (1 diff)
• Rectangle3.h (modified) (1 diff)
• ViewCell.h (modified) (1 diff)
• ViewCellBsp.cpp (modified) (10 diffs)
• ViewCellBsp.h (added)

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.h

@@ -79 +79 @@
   SceneGraph *mSceneGraph;
   /// BSP tree representing the viewcells
-  BSPTree *mViewCellBSPTree;
+  BspTree *mViewCellBspTree;
   /// kD-tree organizing the scene graph (occluders + occludees) + viewcells
   KdTree *mKdTree;

trunk/VUT/GtpVisibilityPreprocessor/src/Rectangle3.h

@@ -38 +38 @@
         Rectangle3 &r1,
         Rectangle3 &r2
-        ) const;
+        ) const
 
-        
+  {//TODO
+  }
   
 };

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.h

@@ -6 +6 @@
 //namespace GtpVisibilityPreprocessor {
   
-class BSPInterior;
+class BspInterior;
 class BspPvs;
 /**

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -8 +8 @@
 //namespace GtpVisibilityPreprocessor {
 /****************************************************************/
-/*                  class BSPNode implementation                */
+/*                  class BspNode implementation                */
 /****************************************************************/
-bool BSPNode::IsRoot() const 
+bool BspNode::IsRoot() const 
 {
         return mParent == NULL;
@@ -16 +16 @@
 
 /****************************************************************/
-/*              class BSPInterior implementation                */
+/*              class BspInterior implementation                */
 /****************************************************************/
 
-bool BSPInterior::IsLeaf() const
+bool BspInterior::IsLeaf() const
 { 
         return false; 
 }
 
-void BSPInterior::ReplaceChildLink(BSPNode *oldChild, BSPNode *newChild) 
+void BspInterior::ReplaceChildLink(BspNode *oldChild, BspNode *newChild) 
 {
         if (mBack == oldChild)
@@ -36 +36 @@
 }
 
-void BSPInterior::SetupChildLinks(BSPNode *b, BSPNode *f) 
+void BspInterior::SetupChildLinks(BspNode *b, BspNode *f) 
 {
     mBack = b;
@@ -43 +43 @@
 
 /****************************************************************/
-/*                  class BSPLeaf implementation                */
+/*                  class BspLeaf implementation                */
 /****************************************************************/
 
-BSPLeaf::BSPLeaf(ViewCell *viewCell): mViewCell(viewCell) 
+BspLeaf::BspLeaf(ViewCell *viewCell): mViewCell(viewCell) 
 {
 }
 
-bool BSPLeaf::IsLeaf() const 
+bool BspLeaf::IsLeaf() const 
 { 
         return true; 
@@ -56 +56 @@
 
 /****************************************************************/
-/*                  class BSPTree implementation                */
+/*                  class BspTree implementation                */
 /****************************************************************/
 
-BSPTree::BSPTree(ViewCell *cell) 
+BspTree::BspTree(ViewCell *cell) 
 {
         mRootCell = cell;
-        mRoot = new BSPLeaf(mRootCell);
+        mRoot = new BspLeaf(mRootCell);
 }
 
   
-void BSPTree::Subdivide()
+void BspTree::Subdivide()
 {
-        BSPNode *currentNode = mRoot;
+        BspNode *currentNode = mRoot;
   
-        std::stack<BSPTraversalData> tStack;
+        std::stack<BspTraversalData> tStack;
         //  stack<STraversalData> tStack;
 
@@ -77 +77 @@
         while (!tStack.empty()) 
         {
-            BSPTraversalData data = tStack.top();
+            BspTraversalData data = tStack.top();
             tStack.pop();
     
@@ -83 +83 @@
                 Mesh frontPolys;
 
-                BSPNode *node = SubdivideNode(dynamic_cast<BSPLeaf *>(data.mNode),
+                BspNode *node = SubdivideNode(dynamic_cast<BspLeaf *>(data.mNode),
                                                                           data.mParent,
                                                                           &data.mViewCell,
@@ -92 +92 @@
                 if (!node->IsLeaf())
                 {
-                        BSPInterior *interior = dynamic_cast<BSPInterior *>(node);
+                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
 
                         // push the children on the stack
                         if (interior->GetBack())
-                                tStack.push(BSPTraversalData(interior->GetBack(), interior, backPolys, data.mDepth+1));
+                                tStack.push(BspTraversalData(interior->GetBack(), interior, backPolys, data.mDepth+1));
                         if (interior->GetFront())
-                                tStack.push(BSPTraversalData(interior->GetFront(), interior, frontPolys, data.mDepth+1));
+                                tStack.push(BspTraversalData(interior->GetFront(), interior, frontPolys, data.mDepth+1));
                 }
         }
 }
 
-Plane3 *BSPTree::SelectPlane(Mesh *viewcell)
+Plane3 *BspTree::SelectPlane(Mesh *viewcell)
 {
         return &viewcell->GetFacePlane(0);
 }
 
-BSPNode *BSPTree::SubdivideNode(BSPLeaf *leaf, BSPInterior *parent, 
+BspNode *BspTree::SubdivideNode(BspLeaf *leaf, BspInterior *parent, 
                                                                 Mesh *viewCell, const int depth, 
                                                                 Mesh &frontPolys, Mesh &backPolys)
@@ -119 +119 @@
         // add the new nodes to the tree + select subdivision plane
         Plane3 *plane = SelectPlane(viewCell);
-        BSPInterior *node = new BSPInterior(*plane); // ERROR!!
+        BspInterior *node = new BspInterior(*plane); // ERROR!!
   
 
@@ -128 +128 @@
         }
   
-        BSPLeaf *back = new BSPLeaf(mRootCell);
-        BSPLeaf *front = new BSPLeaf(mRootCell);
+        BspLeaf *back = new BspLeaf(mRootCell);
+        BspLeaf *front = new BspLeaf(mRootCell);
 
         // replace a link from node's parent