Changeset 2687 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

05/19/08 02:43:25 (17 years ago)

Author:

mattausch

Message:

gvs testing

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (1 diff)
• GlRenderer.cpp (modified) (6 diffs)
• GvsPreprocessor.cpp (modified) (10 diffs)
• GvsPreprocessor.h (modified) (2 diffs)
• Preprocessor.cpp (modified) (2 diffs)
• QtInterface/QtGlRenderer.cpp (modified) (9 diffs)

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

@@ -1923 +1923 @@
                                    "false");
         
+        RegisterOption("Preprocessor.useVbos",
+                                   optBool,
+                                   "preprocessor_use_vbos",
+                                   "true");
+
         RegisterOption("Preprocessor.quitOnFinish",
                                    optBool,

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

@@ -83 +83 @@
 mData(NULL),
 mIndices(NULL),
-//mUseVbos(true),
-mUseVbos(false),
 mComputeGVS(false),
 mCurrentFrame(100)
@@ -121 +119 @@
                 mViewPoint = Vector3(1038.7f, 192.4f, -471.0f);
                 mViewDirection = Vector3(-0.8f, 0.0f, -0.6f);
+
+                mViewPoint = Vector3(440.295, 196.959, -781.302);
+                mViewDirection = Vector3(-0.0566328, 0, -0.998395);
         }
 
@@ -136 +137 @@
         //mUseGlLists = true;
         mUseGlLists = false;
+
+        bool mUseVbos;
+        Environment::GetSingleton()->GetBoolValue("Preprocessor.useVbos", mUseVbos);
 
         if (mViewCellsManager->GetViewCellPointsList()->size())
@@ -1590 +1594 @@
         for (sit = viewPoints.begin(); sit != sit_end; ++ sit, ++ i) 
         {
-                if ((i % 100) == 99)
-                        cout << "processed " << i << " view points " << endl;
-
-                //cout << "\n\nvp: " << (*sit) << endl;
                 SimpleRay sray = *sit;
+                
                 int pvsSize = -1;
 
@@ -1623 +1624 @@
                 // drop the first frame (for some reason, the first frame yields wrong pixel error)
                 
-                if (//(mFrame > 0) && 
-                        (err >=  -1e-6f) && (err < (1.0f - 1e-6f)) && (pvsSize != 0)) 
-                {
-                        if (err > mPvsStat.maxError)
+                if (pvsSize != 0)
+                {
+                        // hack: test if error is suspiciously large
+                        if ((err >=  -1e-6f) && (err < (1.0f - 1e-6f)))
                         {
-                                mPvsStat.maxError = err;
-                                cout << "new max error: " << mPvsStat.maxError * GetWidth() * GetHeight()  << endl;
+                                if (err > mPvsStat.maxError)
+                                {
+                                        mPvsStat.maxError = err;
+                                        cout << "new max error: " << mPvsStat.maxError * GetWidth() * GetHeight()  << endl;
+                                }
+
+                                mPvsStat.sumError += err;
+                                mPvsStat.sumPvsSize += mPvsErrorBuffer[i].mPvsSize;
+
+                                if (err == 0.0f)
+                                        ++ mPvsStat.errorFreeFrames;
+
+                                // $$ JB
+                                // moved it back here not to count frames with negative err (backfacing triangle)
+                                ++ mPvsStat.frames;
+
+                                if ((mPvsStat.frames % 100) == 0)
+                                        cout << "processed " << mPvsStat.frames << " valid view points " << endl;
                         }
-
-                        mPvsStat.sumError += err;
-                        mPvsStat.sumPvsSize += mPvsErrorBuffer[i].mPvsSize;
-
-                        if (err == 0.0f)
-                                ++ mPvsStat.errorFreeFrames;
-
-                        // $$ JB
-                        // moved it back here not to count frames with negative err (backfacing triangle)
-                        ++ mPvsStat.frames;
-                }
-                else
-                {
-                        cerr << "warning: negative error " << err << " at pvs size " << pvsSize << endl;
-                }
-
+                        else
+                        {
+                                cerr << "warning: strange error (" << err << "), pvs size " << pvsSize << endl;
+                        }
+                }
         }
 
@@ -1703 +1709 @@
 
 
+        // backfacing polygon found -> not a valid viewspace sample
         if (pixelCount > 0)
-        {
-                return false; // backfacing polygon found -> not a valid viewspace sample
-        }
+                return false; 
+        
         return true;
 }

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

@@ -174 +174 @@
 void GvsPreprocessor::CountObject(Intersectable *triObj)
 {
-        if ((triObj->mCounter != (NOT_ACCOUNTED_OBJECT + 1)) && (triObj->mCounter != (ACCOUNTED_OBJECT + 1)))
+        if ((triObj->mCounter != (NOT_ACCOUNTED_OBJECT + 1)) && 
+                (triObj->mCounter != (ACCOUNTED_OBJECT + 1)))
         {
                 ++ triObj->mCounter;
@@ -486 +487 @@
         //CLEAR_CONTAINER(invalidSamples);
         
-        //cout << "cast rays: " << castRays << endl;
+        //cout << "here3 cast rays: " << castRays << endl;
         return castRays;
 }
@@ -658 +659 @@
 int GvsPreprocessor::ProcessQueue()
 {
+        ++ mGvsStats.mGvsPass;
+
         int castSamples = 0;
-        ++ mGvsStats.mGvsPass;
 
         while (!mRayQueue.empty())//&& (mGvsStats.mTotalSamples + castSamples < mTotalSamples) )
-        {
+        {//cout<<"r";
                 //cout << "queue size: " << mRayQueue.size() << endl;
                 // handle next ray
@@ -671 +673 @@
 
                 castSamples += newSamples;
-                //delete ray;
+                // note: don't have to delete because handled by ray pool
         }
 
@@ -814 +816 @@
 
                 if (!mOnlyRandomSampling)
-                        newSamples += ProcessQueue();
-                
+                {
+                        int samplesPerRun = ProcessQueue();
+                        newSamples += samplesPerRun;
+                        //if (samplesPerRun > 0) cout << "spr: " << samplesPerRun << " ";
+                }
+
                 passSamples += newSamples;
         mGvsStats.mPerViewCellSamples += newSamples;
@@ -847 +853 @@
 
 
-void GvsPreprocessor::CompileViewCellsList()
-{
+void GvsPreprocessor::CompileViewCellsFromPointList()
+{
+        ViewCell::NewMail();
+
         // Receive list of view cells from view cells manager
         ViewCellPointsList *vcPoints = mViewCellsManager->GetViewCellPointsList();
-        
-        if (!vcPoints->empty())
-        {
-                cout << "processing view cell list" << endl;
-                
-                vector<ViewCellPoints *>::const_iterator vit, vit_end = vcPoints->end();
-
-                for (vit = vcPoints->begin(); vit != vit_end; ++ vit)
+
+        vector<ViewCellPoints *>::const_iterator vit, vit_end = vcPoints->end();
+
+        for (vit = vcPoints->begin(); vit != vit_end; ++ vit)
+        {
+                ViewCellPoints *vp = *vit;
+
+                if (vp->first) // view cell  specified
                 {
-                        mViewCells.push_back((*vit)->first);
-
-                        if (mViewCells.size() >= mMaxViewCells)
-                                break;
+                        ViewCell *viewCell = vp->first;
+
+                        if (!viewCell->Mailed())
+                        {
+                                viewCell->Mail();
+                                mViewCells.push_back(viewCell);
+
+                                if (mViewCells.size() >= mMaxViewCells)
+                                        break;
+                        }
                 }
+                else // no view cell specified => compute view cells using view point
+                {
+                        SimpleRayContainer::const_iterator rit, rit_end = vp->second.end();
+
+                        for (rit = vp->second.begin(); rit != rit_end; ++ rit)
+                        {
+                                SimpleRay ray = *rit;
+
+                                ViewCell *viewCell = mViewCellsManager->GetViewCell(ray.mOrigin);
+
+                                if (viewCell && !viewCell->Mailed())
+                                {
+                                        viewCell->Mail();
+                                        mViewCells.push_back(viewCell);
+
+                                        if (mViewCells.size() >= mMaxViewCells)
+                                                break;
+                                }
+                        }
+                }
+        }
+}
+
+
+void GvsPreprocessor::CompileViewCellsList()
+{
+        if (!mViewCellsManager->GetViewCellPointsList()->empty())
+        {
+                cout << "processing view point list" << endl;
+                CompileViewCellsFromPointList();
         }
         else
         {
+                ViewCell::NewMail();
+
                 while ((int)mViewCells.size() < mMaxViewCells)
                 {
-                        if (0)
-                        {
-                                mViewCells.push_back(mViewCellsManager->GetViewCell((int)mViewCells.size()));
-                                continue;
-                        }
-
-                        // HACK
                         const int tries = 10000;
                         int i = 0;
@@ -906 +945 @@
 }
 
-
+#if 0
 void GvsPreprocessor::IntersectWithViewCell()
 {
@@ -955 +994 @@
                 }
         }
-}
-
+        cout << "added " << mTrianglePvs.size() << " triangles (" << mCurrentViewCell->GetPvs().GetSize() << " objects) by intersection" << endl;
+
+}
+
+#else
+
+void GvsPreprocessor::IntersectWithViewCell()
+{
+        //Intersectable::NewMail();
+        mCurrentViewCell->GetMesh()->ComputeBoundingBox();
+        AxisAlignedBox3 box = mCurrentViewCell->GetMesh()->mBox;
+
+        // compute pvs kd nodes that intersect view cell
+        ObjectContainer kdobjects;
+        mKdTree->CollectKdObjects(box, kdobjects);
+
+        ObjectContainer pvsKdObjects;
+
+        ObjectContainer::const_iterator oit, oit_end = kdobjects.end();
+
+        for (oit = kdobjects.begin(); oit != oit_end; ++ oit)
+        {
+        KdIntersectable *kdInt = static_cast<KdIntersectable *>(*oit);
+        
+                myobjects.clear();
+                mKdTree->CollectObjects(kdInt->GetItem(), myobjects);
+
+                // account for kd object pvs
+                bool addkdobj = false;
+
+                ObjectContainer::const_iterator oit, oit_end = myobjects.end();
+
+                for (oit = myobjects.begin(); oit != oit_end; ++ oit)
+                {
+                        TriangleIntersectable *triObj = static_cast<TriangleIntersectable *>(*oit);
+             
+                        // the triangle itself intersects => add object
+                        if (box.Intersects(triObj->GetItem()))
+                        {
+                                if ((triObj->mCounter < ACCOUNTED_OBJECT))
+                                {
+                                        triObj->mCounter += ACCOUNTED_OBJECT;
+
+                                        mTrianglePvs.push_back(triObj);
+                                        mGenericStats = (int)mTrianglePvs.size();
+
+                                        addkdobj = true;
+                                }
+                        }
+                }
+                
+                // add node to object pvs
+                if (addkdobj)
+                        pvsKdObjects.push_back(kdInt);
+        }
+
+        // new mail because objects were mailed for kd tree search
+        KdNode::NewMail();
+
+        // now actually ADD new objects to object pvs
+        oit_end = pvsKdObjects.end();
+
+        for (oit = pvsKdObjects.begin(); oit != oit_end; ++ oit)
+        {
+        KdIntersectable *kdInt = static_cast<KdIntersectable *>(*oit);
+        
+                kdInt->Mail();
+
+                mCurrentViewCell->GetPvs().AddSampleDirty(kdInt, 1.0f);
+                if (SHOW_QT_VISUALIZATION) UpdateStatsForVisualization(kdInt);  
+        }
+
+        cout << "added " << mTrianglePvs.size() << " triangles (" << (int)pvsKdObjects.size() << " objects) by intersection" << endl;
+}
+#endif
 
 void GvsPreprocessor::PerViewCellComputation()
@@ -1147 +1259 @@
         }
 
-        cout << "cast " << 2 * mGvsStats.mTotalSamples / (1e3f * TimeDiff(startTime, GetTime())) << "M rays/s" << endl;
+        cout << "cast " << mGvsStats.mTotalSamples / (1e3f * TimeDiff(startTime, GetTime())) << "M single rays/s" << endl;
 
         if (GVS_DEBUG)
@@ -1216 +1328 @@
         app << "#Id\n" << mViewCellId << endl;
         app << "#Time\n" << mTimePerViewCell << endl;;
-        app << "#TrianglePvs\n" << mTrianglePvs << endl;
+        app << "#TriaePvs\n" << mTrianglePvs << endl;
         app << "#ObjectPvs\n" << mPerViewCellPvs << endl;
-        app << "#PvsCost\n" << (int)mPvsCost << endl;
+        app << "#UpdatedPvs\n" << (int)mPvsCost << endl;
 
         app << "#PerViewCellSamples\n" << mPerViewCellSamples << endl;

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

@@ -13 +13 @@
 class TriangleIntersectable;
 class KdIntersectable;
+
 
 /** View space partition statistics.
@@ -243 +244 @@
         void CountObject(Intersectable *triObj);
 
+        void CompileViewCellsFromPointList();
+
 
         //////////////////////

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

@@ -1192 +1192 @@
         else
         {
-                cout << "setting ray pool size to samples per pass" << endl;       
-                reserveRays = mSamplesPerPass * 2;
+                const int n = 4;
+                cout << "hack: setting ray pool size to multiple " << n << " of samples per pass" << endl;       
+                reserveRays = mSamplesPerPass * n;
         }
 
@@ -1256 +1257 @@
 #if SHOW_RAYCAST_TIMING
                 if (castDoubleRays)
-                        cout << 2 * rays.size() / (1e3f * TimeDiff(t1, t2)) << "M rays/s" << endl;
+                        cout << 2 * rays.size() / (1e3f * TimeDiff(t1, t2)) << "M double rays/s" << endl;
                 else
-                        cout << rays.size() / (1e3f * TimeDiff(t1, t2)) << "M rays/s" << endl;
+                        cout << rays.size() / (1e3f * TimeDiff(t1, t2)) << "M single rays/s" << endl;
 #endif
 
         }
-        //cout << "numDummy: " << numTransformed << endl;       
-        //cerr<<"Determining PVS objects"<<endl;
+
         DeterminePvsObjects(vssRays);
-        //      cerr<<"done."<<endl;
-        
 }
 

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

@@ -104 +104 @@
 GlRendererBuffer(sceneGraph, viewcells, tree)
 {
-        mUseVbos = true;
-        //mUseVbos = false;
-        
         //makeCurrent();
         MakeLive();
@@ -267 +264 @@
         pErrorPixels = (float)pixelCount / (GetWidth() * GetHeight());
 
-        const int pixelThres = 100000;
+        const int pixelThres = 0;
 
         // some error happened
@@ -285 +282 @@
                         char filename[256];
                         //sprintf(filename, "error-frame-%04d-%0.5f.png", mFrame, pErrorPixels);
-                        sprintf(filename, "error-frame-%04d-%08d.png", mFrame, pixelCount);
+                        sprintf(filename, "error-frame-%04d-%04d-%08d.png", mFrame, viewcell->GetId(), pixelCount);
                         QImage im = toImage();
                         string str = mSnapPrefix + filename;
@@ -292 +289 @@
                         im.save(qstr, "PNG");
 
-
+#if 0
                         ///////////
                         //-- output computed pvs
 
-                        mUseFalseColors = false;
-
+                        //mUseFalseColors = true;
                         glPushAttrib(GL_CURRENT_BIT);
                         glColor3f(0, 1, 0);
@@ -312 +308 @@
                         RenderPvs(pvs);
 
-                        mUseForcedColors = false;
-
+                        //mUseForcedColors = false;
                         im = toImage();
                         sprintf(filename, "error-frame-%04d-%04d-%08d-pvs.png", mFrame, viewcell->GetId(), pixelCount);
@@ -321 +316 @@
 
                         glPopAttrib();
+#endif
                 }
         }
@@ -575 +571 @@
         if (viewcell) 
         {
-#if 1
                 // copy the pvs so that it can be filtered ...
                 if (PvsChanged(viewcell)) 
@@ -607 +602 @@
                         mCurrentPvsCost = mPvsCache.mPvs.EvalPvsCost();
                 }
-#else
-        
-                // update the indices for rendering
-                PreparePvs(viewcell->GetPvs());
-                emit PvsUpdated();
-
-#endif
 
                 // Render PVS
@@ -643 +631 @@
         else 
         {
-                //OcclusionQuery *query = mOcclusionQueries[0];
-                //query->BeginQuery();
-                
                 RenderScene();
-
-                //query->EndQuery();
-                //int pixels = query->GetQueryResult();
-                //cout << " pixels: " << pixels;
         }