Changeset 1692

Timestamp:

10/27/06 21:31:39 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/vsposp_typical.env (modified) (2 diffs)
• src/BvHierarchy.cpp (modified) (6 diffs)
• src/HierarchyManager.cpp (modified) (3 diffs)
• src/IntersectableWrapper.cpp (modified) (2 diffs)
• src/RayInfo.h (modified) (1 diff)
• src/SamplingStrategy.cpp (modified) (3 diffs)
• src/ViewCellsManager.cpp (modified) (5 diffs)
• src/ViewCellsManager.h (modified) (1 diff)
• src/VspTree.cpp (modified) (6 diffs)

GTP/trunk/Lib/Vis/Preprocessing/scripts/vsposp_typical.env

@@ -173 +173 @@
         
         Evaluation {
-                samplesPerPass 100000
-                samples 100000
+                samplesPerPass 10000
+                samples 50000
                 statsPrefix ../scripts/viewCells
         }
@@ -233 +233 @@
         Construction {
 
-                samples 200000
+                samples 20000
 
                 # type 0 = sequential computation, 1 = interleaved, 2 = gradient

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

@@ -59 +59 @@
 mMailbox(0),
 mMemoryIncr(0),
+mRenderCostDecr(0), 
 mPvsEntriesIncr(0),
 mTimeStamp(0)
@@ -70 +71 @@
 mMailbox(0),
 mMemoryIncr(0),
+mRenderCostDecr(0), 
 mPvsEntriesIncr(0),
 mTimeStamp(0)
@@ -1104 +1106 @@
 {
         //-- insert object queries
-        ObjectContainer *objects = 
-                mUseGlobalSorting ? tData.mSortedObjects[axis] : &tData.mNode->mObjects;
+        ObjectContainer *objects = mUseGlobalSorting ? 
+                tData.mSortedObjects[axis] : &tData.mNode->mObjects;
 
         CreateLocalSubdivisionCandidates(*objects, &mSubdivisionCandidates, !mUseGlobalSorting, axis);
@@ -1284 +1286 @@
                                 }
                                 else
-                                {       cout << "e rays: " << tData.mNumRays << " ";
+                                {       //cout << "e rays: " << tData.mNumRays << " ";
                                         //////////////////
                                         //-- view cells not constructed yet     => use surface area heuristic                   
@@ -2127 +2129 @@
                 BvhInterior *oldInterior = dynamic_cast<BvhInterior *>(oldNode);
                 
+                sc->mFrontObjects.clear();
+                sc->mBackObjects.clear();
+
                 oldInterior->GetFront()->CollectObjects(sc->mFrontObjects);
                 oldInterior->GetBack()->CollectObjects(sc->mBackObjects);
@@ -2136 +2141 @@
                 currentNode = SubdivideNode(*sc, tFrontData, tBackData);
         
-                oldNode->mRenderCostDecr += sc->GetRenderCostDecrease();
-                oldNode->mPvsEntriesIncr += sc->GetPvsEntriesIncr();
-cout << "here5" << endl;
+                //oldNode->mRenderCostDecr += sc->GetRenderCostDecrease();
+                //oldNode->mPvsEntriesIncr += sc->GetPvsEntriesIncr();
+                
+                oldNode->mRenderCostDecr = sc->GetRenderCostDecrease();
+                oldNode->mPvsEntriesIncr = sc->GetPvsEntriesIncr();
+                
                 ///////////////////////////
                 //-- push the new split candidates on the queue

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

@@ -1630 +1630 @@
 
 
-void HierarchyManager::EvaluateSubdivision(const VssRayContainer &sampleRays,                                                                                                                                              const ObjectContainer &objects,
+void HierarchyManager::EvaluateSubdivision(const VssRayContainer &sampleRays,                                                                                                                                              
+                                                                                   const ObjectContainer &objects,
                                                                                    const string &filename)
 {
@@ -1681 +1682 @@
         ViewCellContainer viewCells;
         mVspTree->CollectViewCells(viewCells, false);
-        CLEAR_CONTAINER(viewCells);
-
+        
         // helper trees can be destroyed
         DEL_PTR(mVspTree);
         DEL_PTR(mBvHierarchy);
+
+        CLEAR_CONTAINER(viewCells);
 
         // reset hierarchies
@@ -1726 +1728 @@
         {
                 SubdivisionCandidate *nextCandidate = NextSubdivisionCandidate(tQueue);
-                
-                cout << "next candidate: " << nextCandidate->GetPriority() << endl;
+                bool isLeaf;
+                int timeStamp;
+                float rcDecr; 
+                int entriesIncr; 
 
         if (nextCandidate->Type() == SubdivisionCandidate::VIEW_SPACE)
                 {
-                        cout << "here8" << endl;
-                        mVspTree->SubdivideAndCopy(tQueue, nextCandidate);
-
+                        timeStamp = (int)-nextCandidate->GetPriority();
+
+                        VspNode *newNode = mVspTree->SubdivideAndCopy(tQueue, nextCandidate);
                         VspNode *oldNode = (VspNode *)nextCandidate->mEvaluationHack;
                         
-                        totalRenderCost -= oldNode->mRenderCostDecr;
-                        entriesInPvs += oldNode->mPvsEntriesIncr;
+                        isLeaf = newNode->IsLeaf();
+                        rcDecr = oldNode->mRenderCostDecr;
+                        entriesIncr = oldNode->mPvsEntriesIncr;
                 }
                 else
-                {cout << "here9" << endl;
-                        mBvHierarchy->SubdivideAndCopy(tQueue, nextCandidate);
+                {
+                        timeStamp = (int)-nextCandidate->GetPriority();
                         
+                        BvhNode *newNode = mBvHierarchy->SubdivideAndCopy(tQueue, nextCandidate);
                         BvhNode *oldNode = (BvhNode *)nextCandidate->mEvaluationHack;
                         
-                        totalRenderCost -= oldNode->mRenderCostDecr;
-                        entriesInPvs += oldNode->mPvsEntriesIncr;
+                        isLeaf = newNode->IsLeaf();
+                        rcDecr = oldNode->mRenderCostDecr;
+                        entriesIncr = oldNode->mPvsEntriesIncr;
                 }               
-
-                ++ steps;
-                cout << "rc: " << nextCandidate->GetRenderCostDecrease() << endl;
-                cout << "pvs: " << nextCandidate->GetPvsEntriesIncr() << endl;
-
-                const float memoryCost = (float)entriesInPvs * (float)ObjectPvs::GetEntrySize();
-                UpdateStats(stats, steps, totalRenderCost, entriesInPvs, memoryCost, false);
+                                
+                if (!isLeaf)
+                {
+                        totalRenderCost -= rcDecr;
+                        entriesInPvs += entriesIncr;
+                        // if (rcDecr <= 0)
+                        if (nextCandidate->Type() == SubdivisionCandidate::VIEW_SPACE) 
+                                cout << "v";//cout << "vsp t: " << timeStamp << " rc: " << rcDecr << " pvs: " << entriesIncr << endl;
+                        else
+                                cout << "o";//"osp t: " << timeStamp << " rc: " << rcDecr << " pvs: " << entriesIncr << endl;
+
+                        ++ steps;
+
+                        if ((steps % 500) == 499)
+                                cout << steps << " steps taken" << endl;
+                        const float memoryCost = (float)entriesInPvs * (float)ObjectPvs::GetEntrySize();
+                        UpdateStats(stats, steps, totalRenderCost, entriesInPvs, memoryCost, false);
+                }
+
+                DEL_PTR(nextCandidate);
         }
 

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

@@ -65 +65 @@
         const float sum = a + b + c;
 
-        // scale so we get value between zero and one
+        // scale so we get vaccumated value of 1
         if (sum)
         {
@@ -73 +73 @@
         }
 
-        //cout << "a " << a << "b: " << b << "c: " << c << endl;
+        //cout << "a: " << a << " b: " << b << " c: " << c << " sum: " << sum << endl;
         point = mItem.mVertices[0] * a + mItem.mVertices[1] * b + mItem.mVertices[2] * c;
         normal = mItem.GetNormal();

GTP/trunk/Lib/Vis/Preprocessing/src/RayInfo.h

@@ -94 +94 @@
 
         friend void GetRayInfoSets(const RayInfoContainer &sourceRays,
-                const int maxSize,
-                RayInfoContainer &usedRays,
-                RayInfoContainer *savedRays = NULL);
+                                                           const int maxSize,
+                                                           RayInfoContainer &usedRays,
+                                                           RayInfoContainer *savedRays = NULL);
 };
 

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

@@ -35 +35 @@
         Vector3 point;
         Vector3 normal;
-          
+        //cout << "y";
         const int i = (int)RandomValue(0, (float)mPreprocessor.mObjects.size() - 0.5f);
 
@@ -66 +66 @@
         
         Vector3 normal;
-        
+        //cout << "x";
         object->GetRandomSurfacePoint(origin, normal);
         direction = UniformRandomVector(normal);
@@ -137 +137 @@
         mPreprocessor.mViewCellsManager->GetViewPoint(origin);
         direction = mPreprocessor.mKdTree->GetBox().GetRandomPoint() - origin;
-        
+        //cout << "z";
         const float c = Magnitude(direction);
 

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

@@ -38 +38 @@
 // HACK
 const static bool SAMPLE_AFTER_SUBDIVISION = true;
-const static bool CLAMP_TO_BOX = true;
+const static bool CLAMP_TO_BOX = false;
 
 template <typename T> class myless
@@ -5617 +5617 @@
 }
 
-#if 1
+
+#if 0
 #if TEST_EVALUATION
 void VspOspViewCellsManager::EvalViewCellPartition()
@@ -5744 +5745 @@
     cout << "Evaluating view cell partition ... " << endl;
 
+        VssRayContainer evaluationSamples;
+
         while (castSamples < numSamples)
         {               
@@ -5749 +5752 @@
                 //-- we have to use uniform sampling strategy for construction rays
 
-                VssRayContainer evaluationSamples;
+                //VssRayContainer evaluationSamples;
                 const int samplingType = mEvaluationSamplingType;
 
@@ -5791 +5794 @@
                 Debug << "statistis compted in " << timeDiff * 1e-3 << " secs" << endl;
         
-                disposeRays(evaluationSamples, NULL);
-        }
+                //disposeRays(evaluationSamples, NULL);
+        }
+        
+        disposeRays(evaluationSamples, NULL);
+
 }
 #endif

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.h

@@ -1102 +1102 @@
 
 //#if TEST_EVALUATION
-        virtual void EvalViewCellPartition();
+        //virtual void EvalViewCellPartition();
 //#endif
 

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

@@ -192 +192 @@
 mTreeValid(true), 
 mMemoryIncr(0),
+mRenderCostDecr(0),
 mPvsEntriesIncr(0),
 mTimeStamp(0)
@@ -750 +751 @@
         if (newNode->IsLeaf()) // subdivision terminated
         {
+                VspLeaf *leaf = dynamic_cast<VspLeaf *>(newNode);
+                
+#if 0
+        /////////////
+                //-- store pvs optained from rays
+
                 // 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);
@@ -1517 +1519 @@
 
                 float t;
+                
+                // classify ray
+                const int cf = rayInf.ComputeRayIntersection(candidatePlane.mAxis, 
+                                                                                                         candidatePlane.mPosition, 
+                                                                                                         t);
+
                 VssRay *ray = rayInf.mRay;
-
-                // classify ray
-                const int cf = 
-                        rayInf.ComputeRayIntersection(candidatePlane.mAxis, 
-                                                                                  candidatePlane.mPosition, t);
 
                 // evaluate contribution of ray endpoint to front 
                 // and back pvs with respect to the classification
-                UpdateContributionsToPvs(*ray, true, cf, pvsFront, pvsBack, totalPvs);  
+                UpdateContributionsToPvs(*ray, true, cf, pvsFront, pvsBack, totalPvs);
 #if COUNT_ORIGIN_OBJECTS
                 UpdateContributionsToPvs(*ray, false, cf, pvsFront, pvsBack, totalPvs);
 #endif
         }
-
+    
         AxisAlignedBox3 frontBox;
         AxisAlignedBox3 backBox;
@@ -3303 +3306 @@
                 // create new interior node and two leaf node
                 const AxisAlignedPlane splitPlane = oldInterior->GetPlane();
-                
+        
+                sc->mSplitPlane = splitPlane;
+        
                 // evaluate the changes in render cost and pvs entries
                 EvalSubdivisionCandidate(*sc, false);
@@ -3309 +3314 @@
                 newNode = SubdivideNode(splitPlane, tData, tFrontData, tBackData);
         
-                oldNode->mRenderCostDecr += sc->GetRenderCostDecrease();
-                oldNode->mPvsEntriesIncr += sc->GetPvsEntriesIncr();
-cout << "here4" << endl;
-                
+                //oldNode->mRenderCostDecr += sc->GetRenderCostDecrease();
+                //oldNode->mPvsEntriesIncr += sc->GetPvsEntriesIncr();
+
+                oldNode->mRenderCostDecr = sc->GetRenderCostDecrease();
+                oldNode->mPvsEntriesIncr = sc->GetPvsEntriesIncr();
+
                 /////////////
                 //-- evaluate new split candidates for global greedy cost heuristics
@@ -3338 +3345 @@
         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
+                // detach subdivision candidate: this leaf is no candidate for splitting anymore
                 tData.mNode->SetSubdivisionCandidate(NULL); 
                 // detach node so it won't get deleted