Changeset 2690 for GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.cpp

Timestamp:

05/20/08 17:15:44 (16 years ago)

Author:

mattausch

Message:

strange errors!!

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.cpp (modified) (17 diffs)

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

@@ -152 +152 @@
 #endif
         {
-                //cout << "r";
                 // apply reverse sampling to find the gap
                 VssRay *newRay = ReverseSampling(currentRay, hitTriangle, oldRay);
@@ -160 +159 @@
 
                 // set flag for visualization
-                //newRay->mFlags |= VssRay::ReverseSample;
+                if (0) newRay->mFlags |= VssRay::ReverseSample;
                 
                 // check if ray is not further processed (ray not deleted because using ray pool)
@@ -185 +184 @@
 void GvsPreprocessor::UpdateStatsForVisualization(KdIntersectable *kdInt)
 {
-        mViewCellsManager->UpdateStatsForViewCell(mCurrentViewCell, kdInt);
+        //mViewCellsManager->UpdateStatsForViewCell(mCurrentViewCell, kdInt);
 
         // count new objects in pvs due to kd node conversion   
@@ -222 +221 @@
 
                 // counter < 2 => not accounted for yet
-                if (obj->mCounter < ACCOUNTED_OBJECT)
+                        // test of triangle was accounted for yet
+                if (result = AddTriangleObject(obj))
                 {
-                        obj->mCounter += ACCOUNTED_OBJECT;
-                        mTrianglePvs.push_back(obj);
-                
-                        mGenericStats = (int)mTrianglePvs.size();
-
                         // exchange the triangle with the node in the pvs for kd pvs
                         if (mUseKdPvs)
@@ -664 +659 @@
 
         while (!mRayQueue.empty())//&& (mGvsStats.mTotalSamples + castSamples < mTotalSamples) )
-        {//cout<<"r";
-                //cout << "queue size: " << mRayQueue.size() << endl;
+        {
                 // handle next ray
                 VssRay *ray = mRayQueue.top();
@@ -794 +788 @@
 
 
-void GvsPreprocessor::ProcessViewCell()
-{
-        // compute object that directly intersect view cell
-        IntersectWithViewCell();
-
-        mGvsStats.mPerViewCellSamples = 0;
-
-        int oldContribution = mGvsStats.mTotalContribution;
-        int passSamples = 0;
-
-        mGenericStats = 0;
-        mGenericStats2 = 0;
-
-        while (1)
-        {
-                mRayCaster->InitPass();
-
-                // Ray queue empty => 
-                // cast a number of uniform samples to fill ray queue
-                int newSamples = CastInitialSamples(mInitialSamples, mSamplingType);
-
-                if (!mOnlyRandomSampling)
-                {
-                        int samplesPerRun = ProcessQueue();
-                        newSamples += samplesPerRun;
-                        //if (samplesPerRun > 0) cout << "spr: " << samplesPerRun << " ";
-                }
-
-                passSamples += newSamples;
-        mGvsStats.mPerViewCellSamples += newSamples;
-
-                if (passSamples >= mGvsSamplesPerPass)
-                {
-                        ++ mPass;
-                        mGvsStats.mPassContribution = mGvsStats.mTotalContribution - oldContribution;
-
-                        ////////
-                        //-- stats
-
-                        mGvsStats.mPass = mPass;
-
-                        cout << "\nPass " << mPass << " #samples: " << mGvsStats.mPerViewCellSamples << endl;
-                        cout << "contribution=" << mGvsStats.mPassContribution << " (of " << mMinContribution << ")" << endl;
-
-                        //mGenericStats = mGvsStats.mPassContribution;
-
-                        // termination criterium
-                        if (mGvsStats.mPassContribution < mMinContribution)
-                                break;
-
-                        // reset
-                        oldContribution = mGvsStats.mTotalContribution;
-                        mGvsStats.mPassContribution = 0;
-                        passSamples = 0;
-                }
-        }
-}
-
-
 void GvsPreprocessor::CompileViewCellsFromPointList()
 {
@@ -945 +880 @@
 }
 
-#if 0
+#if 1
 void GvsPreprocessor::IntersectWithViewCell()
 {
@@ -1066 +1001 @@
 void GvsPreprocessor::PerViewCellComputation()
 {
-        ViewCell *vc;
-
-        while (vc = NextViewCell())
+        while (mCurrentViewCell = NextViewCell())
         {
                 // hack: reset counters
@@ -1076 +1009 @@
                         (*oit)->mCounter = NOT_ACCOUNTED_OBJECT;
 
-        ComputeViewCell(vc);
+        ComputeViewCell();
         }
 }
@@ -1088 +1021 @@
                         continue;
 
-        ViewCell *vc = mViewCellsManager->GetViewCell(mRendererWidget->GetViewPoint());
+        mCurrentViewCell = mViewCellsManager->GetViewCell(mRendererWidget->GetViewPoint());
 
                 // no valid view cell or view cell already computed
-                if (!vc || !vc->GetPvs().Empty() || !mRendererWidget->mComputeGVS)
+                if (!mCurrentViewCell || !mCurrentViewCell->GetPvs().Empty() || !mRendererWidget->mComputeGVS)
                         continue;
 
@@ -1101 +1034 @@
                         (*oit)->mCounter = NOT_ACCOUNTED_OBJECT;
 
-                ComputeViewCell(vc);
+                ComputeViewCell();
                 ++ mProcessedViewCells;
         }
@@ -1322 +1255 @@
         app << "#Id\n" << mViewCellId << endl;
         app << "#Time\n" << mTimePerViewCell << endl;;
-        app << "#TriaePvs\n" << mTrianglePvs << endl;
+        app << "#TriPvs\n" << mTrianglePvs << endl;
         app << "#ObjectPvs\n" << mPerViewCellPvs << endl;
         app << "#UpdatedPvs\n" << (int)mPvsCost << endl;
@@ -1351 +1284 @@
 
 
-void GvsPreprocessor::ComputeViewCell(ViewCell *vc)
+void GvsPreprocessor::ComputeViewCell()
 {
         KdNode::NewMail();
 
-        mCurrentViewCell = vc;
-        
         const long startTime = GetTime();
 
@@ -1364 +1295 @@
 
         // compute the pvs of the current view cell
-        ProcessViewCell();
-
-        
+        // compute object that directly intersect view cell
+        //IntersectWithViewCell();
+
+        mGvsStats.mPerViewCellSamples = 0;
+
+        int oldContribution = mGvsStats.mTotalContribution;
+        int passSamples = 0;
+
+        mGenericStats = 0;
+        mGenericStats2 = 0;
+
+        while (1)
+        {
+                int oldPvsSize = 0;//mCurrentViewCell->GetPvs().GetSize();
+
+                mRayCaster->InitPass();
+
+                // Ray queue empty => 
+                // cast a number of uniform samples to fill ray queue
+                int newSamples = CastInitialSamples(mInitialSamples, mSamplingType);
+
+                if (!mOnlyRandomSampling)
+                {
+                        int samplesPerRun = ProcessQueue();
+                        newSamples += samplesPerRun;
+                        //if (samplesPerRun > 0) cout << "spr: " << samplesPerRun << " ";
+                }
+
+                passSamples += newSamples;
+        mGvsStats.mPerViewCellSamples += newSamples;
+
+                if (passSamples >= mGvsSamplesPerPass)
+                {
+                        if (GVS_DEBUG) VisualizeViewCell(mTrianglePvs);
+
+                        const bool convertPerPass = false;
+
+                        if (convertPerPass)
+                        {       
+                                int newObjects = ConvertObjectPvs();
+
+                                cout << "added " << newObjects << " triangles to triangle pvs" << endl;
+                                mGvsStats.mTotalContribution += newObjects;
+                        }
+
+                        ++ mPass;
+                        mGvsStats.mPassContribution = mGvsStats.mTotalContribution - oldContribution;
+
+
+                        ////////
+                        //-- stats
+
+                        mGvsStats.mPass = mPass;
+
+                        cout << "\nPass " << mPass << " #samples: " << mGvsStats.mPerViewCellSamples << endl;
+                        cout << "contribution=" << mGvsStats.mPassContribution << " (of " << mMinContribution << ")" << endl;
+                        cout << "obj contri=" << mCurrentViewCell->GetPvs().GetSize() - oldPvsSize << " (of " << mMinContribution << ")" << endl;
+
+                        // termination criterium
+                        if (mGvsStats.mPassContribution < mMinContribution)
+                                break;
+
+                        // reset
+                        oldContribution = mGvsStats.mTotalContribution;
+                        mGvsStats.mPassContribution = 0;
+                        passSamples = 0;
+                }
+        }
+        
+        // finally add objects that directly intersect the view cell
+        //IntersectWithViewCell();
+
+                
         ////////
         //-- stats
 
+        // timing
+        mGvsStats.mTimePerViewCell = TimeDiff(startTime, GetTime()) * 1e-3f;
+
+        ComputeStats();
+
+        // clean up
+        mTrianglePvs.clear();
+}
+
+
+void GvsPreprocessor::ComputeStats()
+{
         // compute pvs size using larger (bvh objects)
         // note: for kd pvs we had to do this during gvs computation
@@ -1402 +1415 @@
 
         mGvsStats.mTrianglePvs = (int)mTrianglePvs.size();
-        
-        // timing
-        const long currentTime = GetTime();
-        mGvsStats.mTimePerViewCell = TimeDiff(startTime, currentTime) * 1e-3f;
 
 
@@ -1411 +1420 @@
         // global values
 
-        mGvsStats.mViewCells = mProcessedViewCells;//mPass;
+        mGvsStats.mViewCells = mProcessedViewCells;
         mGvsStats.mTotalTrianglePvs += mGvsStats.mTrianglePvs;
         mGvsStats.mTotalTime += mGvsStats.mTimePerViewCell;
@@ -1421 +1430 @@
 
         cout << "id: " << mCurrentViewCell->GetId() << " pvs cost: " 
-         << mGvsStats.mPvsCost << " pvs tri: " << mTrianglePvs.size() << endl;
-
-
-        mTrianglePvs.clear();
-}
-
-}
+             << mGvsStats.mPvsCost << " pvs tri: " << mTrianglePvs.size() << endl;
+}
+
+
+ObjectContainer triangles;
+
+int GvsPreprocessor::ConvertObjectPvs()
+{
+        int newObjects = 0;
+
+        ObjectPvsIterator pit = mCurrentViewCell->GetPvs().GetIterator();
+
+        triangles.clear();
+
+        // output PVS of view cell
+        while (pit.HasMoreEntries())
+        {               
+                KdIntersectable *kdInt = static_cast<KdIntersectable *>(pit.Next());
+
+                mKdTree->CollectObjectsWithDublicates(kdInt->GetItem(), triangles);
+
+                ObjectContainer::const_iterator oit, oit_end = triangles.end();
+
+                for (oit = triangles.begin(); oit != oit_end; ++ oit)
+                {
+                        if (AddTriangleObject(*oit))
+                                ++ newObjects;
+                }
+        }
+
+        return newObjects;
+}
+
+
+bool GvsPreprocessor::AddTriangleObject(Intersectable *triObj)
+{
+        if ((triObj->mCounter < ACCOUNTED_OBJECT))
+        {
+                triObj->mCounter += ACCOUNTED_OBJECT;
+
+                mTrianglePvs.push_back(triObj);
+                mGenericStats = (int)mTrianglePvs.size();
+                return true;
+        }
+
+        return false;
+}
+
+}