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

Timestamp:

01/22/08 18:59:25 (16 years ago)

Author:

mattausch

Message:

added new view cell
deleted other view cell generation stuff (please use generate_viewcells.sh script)
added visualizaton method for gvs

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GlRenderer.h (modified) (1 diff)
• GvsPreprocessor.cpp (modified) (14 diffs)
• GvsPreprocessor.h (modified) (4 diffs)
• Preprocessor.h (modified) (2 diffs)
• PvsDefinitions.h (modified) (1 diff)
• QtInterface/QtGlRenderer.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (1 diff)
• ViewCellsManager.h (modified) (2 diffs)
• VspBspTree.cpp (modified) (1 diff)
• main.cpp (modified) (2 diffs)

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

@@ -208 +208 @@
   void SetViewDirection(const Vector3 &vd) { mViewDirection = vd; }
 
+  Vector3 GetViewPoint() const { return mViewPoint; }
 public:
 

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

@@ -35 +35 @@
 mSamplingType(SamplingStrategy::VIEWCELL_BASED_DISTRIBUTION),
 mProcessedViewCells(0),
-mCurrentViewCell(NULL)
+mCurrentViewCell(NULL),
+mCurrentViewPoint(Vector3(0.0f, 0.0f, 0.0f))
 {
         Environment::GetSingleton()->GetIntValue("GvsPreprocessor.totalSamples", mTotalSamples);
@@ -96 +97 @@
 
 
-bool GvsPreprocessor::NextViewCell()
+ViewCell *GvsPreprocessor::NextViewCell()
 {
         //if (mViewCellsManager->GetNumViewCells() == mProcessedViewCells)
@@ -102 +103 @@
 
         if (mProcessedViewCells == (int)mViewCells.size())
-                return false; // no more view cells
-
-        mCurrentViewCell = mViewCells[mProcessedViewCells];
-
-   if (!mCurrentViewCell->GetMesh())
-                mViewCellsManager->CreateMesh(mCurrentViewCell);
-
-        mGvsStats.mViewCellId = mCurrentViewCell->GetId();
-
-        Debug << "vc: " << mCurrentViewCell->GetId() << endl;
+                return NULL; // no more view cells
+
+        ViewCell *vc = mViewCells[mProcessedViewCells];
+
+   if (!vc->GetMesh())
+                mViewCellsManager->CreateMesh(vc);
+
+        mGvsStats.mViewCellId = vc->GetId();
+
+        Debug << "vc: " << vc->GetId() << endl;
 
         ++ mProcessedViewCells;
     
-        return true;
+        return vc;
 }
 
@@ -178 +179 @@
                 result = ray.mPvsContribution > 0;
         }
-        else
+        else // original per view cell gvs
         {
                 Intersectable *obj = ray.mTerminationObject;
@@ -187 +188 @@
                         mTrianglePvs.push_back(obj);
                 
+                        // if using kd pvs, exchange the triangle with the node in the pvs
                         if (mUseKdPvs)
                         {
@@ -194 +196 @@
                                 {
                                         node->Mail();
-                                        mKdPvs.push_back(mKdTree->GetOrCreateKdIntersectable(node));
+                                        KdIntersectable *kdInt = mKdTree->GetOrCreateKdIntersectable(node);
+                                        mCurrentViewCell->GetPvs().AddSampleDirty(kdInt, 1.0f);
+                                        mViewCellsManager->UpdateStatsForViewCell(mCurrentViewCell, kdInt);
                                 }                       
                         }
@@ -478 +482 @@
         // the point is chosen to be on the side closer to the original ray
         if (Distance(pt1, pt3) < Distance(pt2, pt3))
-        {
                 newPoint = pt1 + eps * (pt1 - pt2);
-        }       
         else
-        {
                 newPoint = pt2 + eps * (pt2 - pt1);
-        }
 
         //cout << "passing point: " << newPoint << endl << endl;
@@ -874 +874 @@
         KdLeaf *leaf = *lit;
                 
+                // add to kdnode pvs
                 if (mUseKdPvs)
-                        mKdPvs.push_back(mKdTree->GetOrCreateKdIntersectable(leaf));
+                {
+                        leaf->Mail();
+                        KdIntersectable *kdInt = mKdTree->GetOrCreateKdIntersectable(leaf);
+                        mCurrentViewCell->GetPvs().AddSampleDirty(kdInt, 1.0f);
+        
+                        mViewCellsManager->UpdateStatsForViewCell(mCurrentViewCell, kdInt);
+                }
 
                 ObjectContainer::const_iterator oit, oit_end = leaf->mObjects.end();
@@ -898 +905 @@
 void GvsPreprocessor::PerViewCellComputation()
 {
-        // hack: reset counter
-        ObjectContainer::const_iterator oit, oit_end = mObjects.end();
-
-        for (oit = mObjects.begin(); oit != oit_end; ++ oit)
-        {
-                (*oit)->mCounter = 0;
-        }
-        
-        
-        while (NextViewCell())// && (dummy < 3))
-        {
-                //++ dummy;
-                //if (mProcessedViewCells < 53) continue;
-        
-                if (mUseKdPvs)
-                {
-                        KdNode::NewMail();
-                        mKdPvs.clear();
-                }
-
-                long startTime = GetTime();
-                cout << "\n***********************\n" 
-                         << "processing view cell " << mProcessedViewCells 
-                         << " (id: " << mCurrentViewCell->GetId() << ")" << endl;
-
-                // compute the pvs of the current view cell
-                ProcessViewCell();
-
-                //mGvsStats.mTrianglePvs = mCurrentViewCell->GetPvs().GetSize();
-                mGvsStats.mTrianglePvs = (int)mTrianglePvs.size();
-                mGvsStats.mTotalTrianglePvs += mGvsStats.mTrianglePvs;
-
-                if (!mUseKdPvs)
-                {
-                        ObjectContainer objectPvs;
-
-                        // optain object pvs
-                        GetObjectPvs(objectPvs);
-
-                        // add pvs
-                        ObjectContainer::const_iterator it, it_end = objectPvs.end();
-
-                        for (it = objectPvs.begin(); it != it_end; ++ it)
-                        {
-                                mCurrentViewCell->GetPvs().AddSampleDirty(*it, 1.0f);
-                        }
-
-                        cout << "triangle pvs of " << (int)mTrianglePvs.size() 
-                                << " was converted to object pvs of " << (int)objectPvs.size() << endl;
-
-                        mGvsStats.mPerViewCellPvs = (int)objectPvs.size();
-                }
-                else
-                {
-                        // add pvs
-                        ObjectContainer::const_iterator it, it_end = mKdPvs.end();
-
-                        for (it = mKdPvs.begin(); it != it_end; ++ it)
-                        {
-                                mCurrentViewCell->GetPvs().AddSampleDirty(*it, 1.0f);
-                        }
-
-                        mGvsStats.mPerViewCellPvs = mKdPvs.size();
-                }
-
-                ////////
-                //-- stats
-                
-                mGvsStats.mViewCells = mProcessedViewCells;//mPass;
-                
-
-                mGvsStats.mTotalPvs += mGvsStats.mPerViewCellPvs;
-                mGvsStats.mTotalSamples += mGvsStats.mPerViewCellSamples;
-
-                // timing
-                const long currentTime = GetTime();
-        
-                mGvsStats.mTimePerViewCell = TimeDiff(startTime, currentTime) * 1e-3f;
-                mGvsStats.mTotalTime += mGvsStats.mTimePerViewCell;
-
-                //lastTime = currentTime;
-
-                mGvsStats.Stop();
-                mGvsStats.Print(mGvsStatsStream);
-
-        mTrianglePvs.clear();
-#if 0
-                if (GVS_DEBUG)
-                {
-                        //VisualizeViewCell(mCurrentViewCell);
-                        VisualizeViewCell(objectPvs);
-                        CLEAR_CONTAINER(mVssRays);
-                }
-                cout << "finished" << endl;
-
-                if (mEvaluatePixelError || mExportVisibility)
-                {
-                        StorePvs(objectPvs);
-                }
-#endif
-        }
-}
+        ViewCell *vc;
+
+        while (vc = NextViewCell())
+        {
+                // hack: reset counters
+                ObjectContainer::const_iterator oit, oit_end = mObjects.end();
+
+                for (oit = mObjects.begin(); oit != oit_end; ++ oit)
+                        (*oit)->mCounter = 0;
+
+                ComputeViewCell(vc);
+        }
+}
+
+
+void GvsPreprocessor::PerViewCellComputation2()
+{
+        ViewCell *vc;
+
+        while (1)
+        {
+                if (!mRendererWidget)
+                        continue;
+
+        //ViewCell *vc = mViewCellsManager->GetViewCell(mCurrentViewPoint);
+        ViewCell *vc = mViewCellsManager->GetViewCell(mRendererWidget->GetViewPoint());
+
+                //cout << "v " << mRendererWidget->GetViewPoint() << " ";
+
+                // no valid view cell or view cell already computed
+                if (!vc || !vc->GetPvs().Empty())
+                        continue;
+
+                //cout << "computing new view cell: " << vc->GetId() << endl;
+
+                // hack: reset counters
+                ObjectContainer::const_iterator oit, oit_end = mObjects.end();
+
+                for (oit = mObjects.begin(); oit != oit_end; ++ oit)
+                        (*oit)->mCounter = 0;
+
+                ComputeViewCell(vc);
+                ++ mProcessedViewCells;
+        }
+}
+
+
 
 
@@ -1155 +1107 @@
                 cout << "finished view cell construction" << endl;
         }
-        else if (0)
+#if 0
+        else
         {       
                 //-- test successful view cells loading by exporting them again
@@ -1162 +1115 @@
                 mViewCellsManager->ExportViewCells("test.xml.gz", mViewCellsManager->GetExportPvs(), mObjects);
         }
+#endif
 
         mGvsStats.Stop();
@@ -1168 +1122 @@
         if (mPerViewCell)
         {
+#if 0
                 // provide list of view cells to compute
                 CompileViewCellsList();
@@ -1178 +1133 @@
                         ComputeRenderError();
                 }
+#else
+                PerViewCellComputation2();
+
+#endif
         }
         else
@@ -1272 +1231 @@
 
 
-}
+void GvsPreprocessor::ComputeViewCell(ViewCell *vc)
+{
+        mCurrentViewCell = vc;
+
+        if (mUseKdPvs)
+        {
+                KdNode::NewMail();
+                //mKdPvs.clear();
+        }
+
+        long startTime = GetTime();
+        cout << "\n***********************\n" 
+                << "processing view cell " << mProcessedViewCells 
+                << " (id: " << mCurrentViewCell->GetId() << ")" << endl;
+
+        // compute the pvs of the current view cell
+        ProcessViewCell();
+
+        //mGvsStats.mTrianglePvs = mCurrentViewCell->GetPvs().GetSize();
+        mGvsStats.mTrianglePvs = (int)mTrianglePvs.size();
+        mGvsStats.mTotalTrianglePvs += mGvsStats.mTrianglePvs;
+
+        if (!mUseKdPvs)
+        {
+                ObjectContainer objectPvs;
+
+                // optain object pvs
+                GetObjectPvs(objectPvs);
+
+                // add pvs
+                ObjectContainer::const_iterator it, it_end = objectPvs.end();
+
+                for (it = objectPvs.begin(); it != it_end; ++ it)
+                {
+                        mCurrentViewCell->GetPvs().AddSampleDirty(*it, 1.0f);
+                }
+
+                cout << "triangle pvs of " << (int)mTrianglePvs.size() 
+                        << " was converted to object pvs of " << (int)objectPvs.size() << endl;
+
+                mGvsStats.mPerViewCellPvs = (int)objectPvs.size();
+        }
+        else
+        {
+                /*// add pvs
+                ObjectContainer::const_iterator it, it_end = mKdPvs.end();
+
+                for (it = mKdPvs.begin(); it != it_end; ++ it)
+                        mCurrentViewCell->GetPvs().AddSampleDirty(*it, 1.0f);
+                */
+                mGvsStats.mPerViewCellPvs = mCurrentViewCell->GetPvs().GetSize();;
+        }
+
+
+        ////////
+        //-- stats
+
+        mGvsStats.mViewCells = mProcessedViewCells;//mPass;
+
+
+        mGvsStats.mTotalPvs += mGvsStats.mPerViewCellPvs;
+        mGvsStats.mTotalSamples += mGvsStats.mPerViewCellSamples;
+
+        // timing
+        const long currentTime = GetTime();
+
+        mGvsStats.mTimePerViewCell = TimeDiff(startTime, currentTime) * 1e-3f;
+        mGvsStats.mTotalTime += mGvsStats.mTimePerViewCell;
+
+        //lastTime = currentTime;
+
+        mGvsStats.Stop();
+        mGvsStats.Print(mGvsStatsStream);
+
+        mTrianglePvs.clear();
+#if 0
+        if (GVS_DEBUG)
+        {
+                //VisualizeViewCell(mCurrentViewCell);
+                VisualizeViewCell(objectPvs);
+                CLEAR_CONTAINER(mVssRays);
+        }
+        cout << "finished" << endl;
+
+        if (mEvaluatePixelError || mExportVisibility)
+        {
+                StorePvs(objectPvs);
+        }
+#endif
+}
+
+}

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

@@ -84 +84 @@
         based on heuristical sampling of view space.
 */
-class GvsPreprocessor : public Preprocessor {
+class GvsPreprocessor : public Preprocessor 
+{
 
 public:
@@ -190 +191 @@
                                                  Vector3 &newPoint) const;
 
-        bool NextViewCell();
+        ViewCell *NextViewCell();
 
         void GlobalComputation();
 
+        /** Loops over aall view cellls.
+        */
         void PerViewCellComputation();
+        void PerViewCellComputation2();
 
         void VisualizeViewCells();
@@ -205 +209 @@
         void UpdatePvs(ViewCell *currentViewCell);
 
+        void ClearRayQueue();
+
+        void CompileViewCellsList();
+
+        void GetObjectPvs(ObjectContainer &trianglePvs) const;
+
+        bool HasContribution(VssRay &ray);
+
+        void IntersectWithViewCell();
+
+        void DeterminePvsObjects(VssRayContainer &rays);
+
+        void StorePvs(const ObjectContainer &objectPvs);
+
+        void ComputeViewCell(ViewCell *vc);
+        /** Runs gvs on the current view cell.
+        */
         void ProcessViewCell();
-        void ClearRayQueue();
-
-        void CompileViewCellsList();
-
-        void GetObjectPvs(ObjectContainer &trianglePvs) const;
-
-        bool HasContribution(VssRay &ray);
-
-        void IntersectWithViewCell();
-
-        void DeterminePvsObjects(VssRayContainer &rays);
-
-        //virtual void ComputeRenderError();
-
-        void StorePvs(const ObjectContainer &objectPvs);
+
 
 
@@ -266 +273 @@
 
         bool mEvaluatePixelError;
+
+        Vector3 mCurrentViewPoint;
 };
 

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

@@ -32 +32 @@
 class GlobalLinesRenderer;
 class SceneGraphLeaf;
+class GlRendererWidget;
 
 
@@ -258 +259 @@
 
         GlRendererBuffer *renderer;
+        GlRendererWidget *mRendererWidget;
 
         int mTotalSamples;

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

@@ -8 +8 @@
 //-- typedefs
 //$$ 19.1. 2008 test for speed
-#define USE_BIT_PVS
+//#define USE_BIT_PVS
 
 

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

@@ -800 +800 @@
                 {
                         float dist = Magnitude(mSceneGraph->GetBox().Diagonal()) * mTopDistance;
-                        Vector3 pos = mViewPoint  + dist*Vector3(0,
-                                1,
-                                0);
+                        Vector3 pos = mViewPoint  + dist * Vector3(0,   1, 0);
 
                         Vector3 target = mViewPoint;

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

@@ -474 +474 @@
 inline void disposeRays(VssRayContainer &rays, VssRayContainer *outRays)
 {
+        // hack matt
+        return;
+
         cout << "disposing samples ... ";
         long startTime = GetTime();

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

@@ -584 +584 @@
 
 
+        void UpdateStatsForViewCell(ViewCell *viewCell, Intersectable *obj);
+
 
         //////////////////////////////////////////////////////////////////
@@ -689 +691 @@
         void EvaluateViewCellsStats();
         
-
-        void UpdateStatsForViewCell(ViewCell *viewCell, Intersectable *obj);
 
 

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

@@ -117 +117 @@
         Environment::GetSingleton()->GetBoolValue("VspBspTree.splitUseOnlyDrivingAxis", mOnlyDrivingAxis);
         
+        
         //////////////////////
         //-- termination criteria for axis aligned split
+
         Environment::GetSingleton()->GetFloatValue("VspBspTree.Termination.AxisAligned.maxRayContribution", 
                                                                 mTermMaxRayContriForAxisAligned);

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

@@ -305 +305 @@
 
         if (evalPixelError && (importRandomViewCells || frames))
-          {
+        {
                 QGLFormat f;
                 f.setStencil(true);
                 QGLFormat::setDefaultFormat(f);
+
                 // NOTE: render texture should be power of 2 and square
                 // renderer must be initialised
                 // $$matt
                 preprocessor->renderer = 
-                  new QtGlRendererBuffer(512, 512,
-                                                                 preprocessor->mSceneGraph,
-                                                                 preprocessor->mViewCellsManager,
-                                                                 preprocessor->mKdTree);
-                
-          }
+                        new QtGlRendererBuffer(512, 512,
+                        preprocessor->mSceneGraph,
+                        preprocessor->mViewCellsManager,
+                        preprocessor->mKdTree);
+
+        }
         
         if (preprocessor->mUseGlRenderer || preprocessor->mUseGlDebugger)
@@ -343 +344 @@
                         rendererWidget = 
                                 new QtGlRendererWidget(preprocessor->mSceneGraph,
-                                preprocessor->mViewCellsManager,
-                                preprocessor->mKdTree);
+                                                                           preprocessor->mViewCellsManager,
+                                                                           preprocessor->mKdTree);
 
                         rendererWidget->Show();
 
+                        // hack matt
+                        preprocessor->mRendererWidget = rendererWidget;
                         //rendererWidget->SetWindowTitle("Global Visualization");