Changeset 609 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

Timestamp:

02/09/06 01:18:31 (18 years ago)

Author:

mattausch

Message:

 

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp (modified) (6 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -699 +699 @@
         int axis = 0;
 
-        const float factor = 0.35;
+        const float factor = 0.65;
         Vector3 point = mViewSpaceBox.Min() +  mViewSpaceBox.Size() * factor;
 
@@ -2613 +2613 @@
 
 
-bool VspBspViewCellsManager::EqualToSpatialNode(ViewCell *viewCell)
-{
-        BspNode *node;
-        return EqualToSpatialNode(viewCell, &node);
-}
-
-
-bool VspBspViewCellsManager::EqualToSpatialNode(ViewCell *viewCell, BspNode **node)
+bool VspBspViewCellsManager::EqualToSpatialNode(ViewCell *viewCell) const
+{
+        return GetSpatialNode(viewCell) != NULL;
+}
+
+
+BspNode *VspBspViewCellsManager::GetSpatialNode(ViewCell *viewCell) const
 {
         if (!viewCell->IsLeaf())
@@ -2626 +2625 @@
                 BspViewCell *bspVc = dynamic_cast<BspViewCell *>(viewCell);
 
-                *node = bspVc->mLeaf;
-        return true;
-        }
+                return bspVc->mLeaf;
+        }
         else
         {
@@ -2635 +2633 @@
                 // cannot be node of binary tree
                 if (interior->mChildren.size() != 2)
-                        return false;
+                        return NULL;
 
                 ViewCell *left = interior->mChildren[0];
                 ViewCell *right = interior->mChildren[1];
 
-                BspNode *leftNode;
-                BspNode *rightNode;
-
-                if (EqualToSpatialNode(left, &leftNode) && EqualToSpatialNode(right, &rightNode))
-                {
-                        *node = leftNode->GetParent();
-                        return leftNode->IsSibling(rightNode);  
-                }
-
-                *node = NULL;
-
-                return false;
-        }
+                BspNode *leftNode = GetSpatialNode(left);
+                BspNode *rightNode = GetSpatialNode(right);
+
+                if (leftNode && rightNode && leftNode->IsSibling(rightNode))
+                {
+                        return leftNode->GetParent(); 
+                }
+        }
+
+        return NULL;
 }
 
@@ -2691 +2686 @@
 
 
-        // view cells already finished before post processing step (i.e. because they were loaded)
+        // view cells already finished before post processing step 
+        // (i.e. because they were loaded)
         if (mViewCellsFinished)
         {
@@ -2790 +2786 @@
 {
         return VSP_BSP;
+}
+
+
+void VspBspViewCellsManager::CreateMergeHierarchy()
+{
+        
 }