Changeset 1679 for GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp

Timestamp:

10/25/06 20:29:41 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp (modified) (6 diffs)

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

@@ -44 +44 @@
 /***************************************************************/
 
-BvhNode::BvhNode(): mParent(NULL), mMailbox(0)
+BvhNode::BvhNode(): 
+mParent(NULL), 
+mMailbox(0),
+mRenderCostDecr(0), 
+mMemoryIncr(0),
+mPvsEntriesIncr(0),
+mTimeStamp(0)
 {
 }
 
 BvhNode::BvhNode(const AxisAlignedBox3 &bbox):
-mParent(NULL), mBoundingBox(bbox), mMailbox(0)
+mParent(NULL), 
+mBoundingBox(bbox), 
+mMailbox(0),
+mMemoryIncr(0),
+mPvsEntriesIncr(0),
+mTimeStamp(0)
 {
 }
@@ -55 +66 @@
 
 BvhNode::BvhNode(const AxisAlignedBox3 &bbox, BvhInterior *parent):
-mBoundingBox(bbox), mParent(parent), mMailbox(0)
+mBoundingBox(bbox), 
+mParent(parent), 
+mMailbox(0),
+mMemoryIncr(0),
+mPvsEntriesIncr(0),
+mTimeStamp(0)
 {
 }
@@ -400 +416 @@
         backData.mMaxCostMisses = sc.GetMaxCostMisses();
         
+        // set the time stamp so the order of traversal can be reconstructed
+        node->mTimeStamp = mHierarchyManager->mTimeStamp ++;
+        cout << "here4 " << node->mTimeStamp << endl;
+        node->mRenderCostDecr = sc.GetRenderCostDecrease();
+        node->mPvsEntriesIncr = sc.GetPvsEntriesIncr();
+
         // assign the objects in sorted order
         if (mUseGlobalSorting)
@@ -491 +513 @@
         if (computeSplitPlane)
         {
-                const bool sufficientSamples = splitCandidate.mParentData.mNumRays < mMinRaysForVisibility;
+                const bool sufficientSamples = splitCandidate.mParentData.mNumRays > mMinRaysForVisibility;
 
                 const bool useVisibiliyBasedHeuristics = 
                         !mUseSah &&
-                        !(mHierarchyManager->GetViewSpaceSubdivisionType() == HierarchyManager::KD_BASED_VIEWSPACE_SUBDIV) &&
+                        (mHierarchyManager->GetViewSpaceSubdivisionType() == HierarchyManager::KD_BASED_VIEWSPACE_SUBDIV) &&
                         sufficientSamples;
 
@@ -1259 +1281 @@
                                 if (useVisibilityBasedHeuristics)
                                 {
+                                        //cout << "v";
                                         ///////////
                                         //-- heuristics using objects weighted by view cells volume
                                         nCostRatio[axis] =
-                                                EvalLocalCostHeuristics(
-                                                                                                tData,
-                                                                                                axis,
-                                                                                                nFrontObjects[axis],
-                                                                                                nBackObjects[axis]);
+                                                EvalLocalCostHeuristics(tData, axis, nFrontObjects[axis], nBackObjects[axis]);
                                 }
                                 else
-                                {
+                                {//cout << "e";
                                         //////////////////
                                         //-- view cells not constructed yet     => use surface area heuristic                   
                                         nCostRatio[axis] =
-                                                EvalSah(
-                                                                tData,
-                                                                axis,
-                                                                nFrontObjects[axis],
-                                                                nBackObjects[axis]);
+                                                EvalSah(tData, axis, nFrontObjects[axis], nBackObjects[axis]);
                                 }
                         }
@@ -1284 +1299 @@
                                 //-- split objects using some simple criteria
                                 nCostRatio[axis] =
-                                        EvalLocalObjectPartition(
-                                                                                         tData,
-                                                                                         axis,
-                                                                                         nFrontObjects[axis],
-                                                                                         nBackObjects[axis]);
+                                        EvalLocalObjectPartition(tData, axis, nFrontObjects[axis], nBackObjects[axis]);
                         }