Changeset 2015 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp

Timestamp:

01/22/07 20:25:06 (17 years ago)

Author:

bittner

Message:

pvs efficiency tuning

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp (modified) (5 diffs)

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

@@ -268 +268 @@
 
 
-bool VspInterior::IsLeaf() const
-{ 
-        return false; 
-}
-
-
-VspNode *VspInterior::GetBack() 
-{
-        return mBack;
-}
-
-
-VspNode *VspInterior::GetFront() 
-{
-        return mFront;
-}
-
-
-AxisAlignedPlane VspInterior::GetPlane() const
-{
-        return mPlane;
-}
-
-
-float VspInterior::GetPosition() const
-{
-        return mPlane.mPosition;
-}
-
-
-int VspInterior::GetAxis() const
-{
-        return mPlane.mAxis;
-}
+
+
 
 
@@ -388 +356 @@
 
 
-ViewCellLeaf *VspLeaf::GetViewCell() const
-{
-        return mViewCell;
-}
 
 
@@ -400 +364 @@
 
 
-bool VspLeaf::IsLeaf() const 
-{ 
-        return true; 
-}
 
 
@@ -2376 +2336 @@
         int axis;
 
+        ViewCell::NewMail();
+        
         while (1)
         {
                 if (!node->IsLeaf())
                 {
-                        VspInterior *in = dynamic_cast<VspInterior *>(node);
+                        VspInterior *in = (VspInterior *)node;
                         position = in->GetPosition();
                         axis = in->GetAxis();
@@ -2425 +2387 @@
                 {
                         // compute intersection with all objects in this leaf
-                        VspLeaf *leaf = dynamic_cast<VspLeaf *>(node);
+                        VspLeaf *leaf = (VspLeaf *)node;
                         ViewCell *viewCell;
-                        if (0)
-                                viewCell = mViewCellsTree->GetActiveViewCell(leaf->GetViewCell());
-                        else
-                                viewCell = leaf->GetViewCell();
-
+                        //                      if (0)
+                        //                              viewCell = mViewCellsTree->GetActiveViewCell(leaf->GetViewCell());
+                        //                      else
+
+                        viewCell = leaf->GetViewCell();
+                        
                         // don't have to mail if each view cell belongs to exactly one leaf
-                        if (!useMailboxing || !viewCell->Mailed())
-                        {
-                                if (useMailboxing)
-                                        viewCell->Mail();
-
-                                viewcells.push_back(viewCell);
-                                ++ hits;
-                        }
-
+                        // $$ JB -> always mailbox so that we have less conditions
+                        if (!viewCell->Mailed()) {
+                          viewCell->Mail();
+                          
+                          viewcells.push_back(viewCell);
+                          ++ hits;
+                        }
+                        
                         // get the next node from the stack
                         if (tStack.empty())
-                                break;
-
+                          break;
+                        
                         entp = extp;
                         mint = maxt;