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

Timestamp:

10/27/06 03:05:49 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -721 +721 @@
                 tBackData.mMaxCostMisses = maxCostMisses;
                         
-                newNode->mRenderCostDecr = sc->GetRenderCostDecrease();
-                newNode->mPvsEntriesIncr = sc->GetPvsEntriesIncr();
-
+                //newNode->mRenderCostDecr = sc->GetRenderCostDecrease();
+                //newNode->mPvsEntriesIncr = sc->GetPvsEntriesIncr();
+
+                // set the time stamp so the order of traversal can be reconstructed
+                newNode->mTimeStamp = mHierarchyManager->mTimeStamp ++;
+        
                 mTotalCost -= sc->GetRenderCostDecrease();
                 mTotalPvsSize += tFrontData.mPvs + tBackData.mPvs - tData.mPvs;
@@ -978 +981 @@
 #endif
 
-        // set the time stamp so the order of traversal can be reconstructed
-        interior->mTimeStamp = mHierarchyManager->mTimeStamp ++;
-        
         return interior;
-}
-
-void VspTree::UpdateNode(const AxisAlignedPlane &splitPlane,
-                                                                 VspTraversalData &tData,
-                                                                 VspTraversalData &frontData,
-                                                                 VspTraversalData &backData)
-{
-        VspLeaf *leaf = dynamic_cast<VspLeaf *>(tData.mNode);
-/*
-        // replace a link from node's parent
-        if (parent)
-        {
-                parent->ReplaceChildLink(leaf, interior);
-                interior->SetParent(parent);
-        }
-        else // new root
-        {
-                mRoot = interior;
-        }
-
-        VspLeaf *frontLeaf = new VspLeaf(interior);
-        VspLeaf *backLeaf = new VspLeaf(interior);
-
-        // and setup child links
-        interior->SetupChildLinks(frontLeaf, backLeaf);
-        
-        // add bounding box
-        interior->SetBoundingBox(tData.mBoundingBox);
-
-        // set front and back leaf
-        frontData.mNode = frontLeaf;
-        backData.mNode = backLeaf;
-
-        // explicitely create front and back view cell
-        CreateViewCell(frontData, false);
-        CreateViewCell(backData, false);
-        */
 }
 
@@ -3321 +3284 @@
 
 
-SubdivisionCandidate *VspTree::CreateSubdivisionCandidate(VspInterior *oldNode)
-{
-        return new VspSubdivisionCandidate(oldNode->GetPlane(), VspTraversalData());
-}
-
-}
+VspNode *VspTree::SubdivideAndCopy(SplitQueue &tQueue,
+                                                                   SubdivisionCandidate *splitCandidate)
+{
+        // todo remove dynamic cast
+        VspSubdivisionCandidate *sc = dynamic_cast<VspSubdivisionCandidate *>(splitCandidate);
+
+        VspTraversalData &tData = sc->mParentData;
+        VspNode *newNode = tData.mNode;
+        VspNode *oldNode = (VspNode *)splitCandidate->mEvaluationHack;
+
+        if (!oldNode->IsLeaf())
+        {       
+                ///////////
+                //-- continue subdivision
+
+                VspTraversalData tFrontData;
+                VspTraversalData tBackData;
+                
+                VspInterior *oldInterior = dynamic_cast<VspInterior *>(oldNode);
+
+                // create new interior node and two leaf node
+                const AxisAlignedPlane splitPlane = oldInterior->GetPlane();
+                const int maxCostMisses = sc->GetMaxCostMisses();
+
+                newNode = SubdivideNode(splitPlane, tData, tFrontData, tBackData);
+        
+                // how often was max cost ratio missed in this branch?
+                tFrontData.mMaxCostMisses = maxCostMisses;
+                tBackData.mMaxCostMisses = maxCostMisses;
+                        
+                newNode->mRenderCostDecr = oldNode->mRenderCostDecr + sc->GetRenderCostDecrease();
+                newNode->mPvsEntriesIncr = oldNode->mPvsEntriesIncr + sc->GetPvsEntriesIncr();
+
+                /////////////
+                //-- evaluate new split candidates for global greedy cost heuristics
+
+                VspSubdivisionCandidate *frontCandidate = new VspSubdivisionCandidate(tFrontData);
+                VspSubdivisionCandidate *backCandidate = new VspSubdivisionCandidate(tBackData);
+
+                frontCandidate->SetPriority((float)-oldInterior->GetFront()->mTimeStamp);
+                backCandidate->SetPriority((float)-oldInterior->GetFront()->mTimeStamp);
+
+                frontCandidate->mEvaluationHack = oldInterior->GetFront();
+                backCandidate->mEvaluationHack = oldInterior->GetBack();
+
+                // cross reference
+                tFrontData.mNode->SetSubdivisionCandidate(frontCandidate); 
+                tBackData.mNode->SetSubdivisionCandidate(backCandidate);
+
+                tQueue.Push(frontCandidate);
+                tQueue.Push(backCandidate);
+
+                // note: leaf is not destroyed because it is needed to collect 
+                // dirty candidates in hierarchy manager
+        }
+
+        if (newNode->IsLeaf()) // subdivision terminated
+        {
+                // view cell is created during subdivision
+                VspLeaf *leaf = dynamic_cast<VspLeaf *>(newNode);
+                ViewCell *viewCell = leaf->GetViewCell();
+
+                int conSamp = 0;
+                float sampCon = 0.0f;
+
+#if 0
+                /////////////
+                //-- store pvs optained from rays
+
+                AddSamplesToPvs(leaf, *tData.mRays, sampCon, conSamp);
+
+                // update scalar pvs size value
+                ObjectPvs &pvs = viewCell->GetPvs();
+                mViewCellsManager->UpdateScalarPvsSize(viewCell, pvs.CountObjectsInPvs(), pvs.GetSize());
+
+                mVspStats.contributingSamples += conSamp;
+                mVspStats.sampleContributions += (int)sampCon;
+#endif
+                if (mStoreRays)
+                {
+                        //////////
+                        //-- store rays piercing this view cell
+                        RayInfoContainer::const_iterator it, it_end = tData.mRays->end();
+                        for (it = tData.mRays->begin(); it != it_end; ++ it)
+                        {
+                                (*it).mRay->Ref();                      
+                                leaf->mVssRays.push_back((*it).mRay);
+                                //leaf->mVssRays.push_back(new VssRay(*(*it).mRay));
+                        }
+                }
+
+                // finally evaluate statistics for this leaf
+                EvaluateLeafStats(tData);
+                // detach subdivision candidate: this leaf is no candidate for
+                // splitting anymore
+                tData.mNode->SetSubdivisionCandidate(NULL); 
+                // detach node so it won't get deleted
+                tData.mNode = NULL;
+        }
+
+        return newNode;
+}
+
+}