Changeset 2671 for GTP/trunk/Lib/Vis

Timestamp:

04/30/08 18:53:06 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/run_gvs_vps.sh (modified) (1 diff)
• src/GlRenderer.cpp (modified) (9 diffs)
• src/GlRenderer.h (modified) (2 diffs)
• src/GvsPreprocessor.cpp (modified) (1 diff)
• src/QtInterface/QtGlRenderer.cpp (modified) (11 diffs)
• src/QtInterface/QtGlRenderer.h (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/scripts/run_gvs_vps.sh

@@ -27 +27 @@
 -preprocessor=gvs \
 -gvs_epsilon=0.0001 \
--gvs_total_samples=500000 \
--gvs_samples_per_pass=50000 \
+-gvs_total_samples=1000000 \
+-gvs_samples_per_pass=1000000 \
 -gvs_initial_samples=16 \
--gvs_max_viewcells=2  \
+-gvs_max_viewcells=200  \
 -gvs_min_contribution=50 \
 -gvs_per_viewcell=true \

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

@@ -466 +466 @@
 
 
-
-void
-GlRenderer::_RenderScene()
-{
-  
-  ObjectContainer::const_iterator oi = mObjects.begin();
-  for (; oi != mObjects.end(); oi++)
-        RenderIntersectable(*oi);
-}
+void GlRenderer::_RenderScene()
+{
+        ObjectContainer::const_iterator oi = mObjects.begin();
+
+        for (; oi != mObjects.end(); oi++)
+                RenderIntersectable(*oi);
+}
+
 
 void GlRenderer::_RenderSceneTrianglesWithDrawArrays()
@@ -483 +482 @@
                 glBindBufferARB(GL_ARRAY_BUFFER_ARB, mVboId);
 
-        int offset = (int)mObjects.size() * 3;
+        const int offset = (int)mObjects.size() * 3;
         char *arrayPtr = mUseVbos ? NULL : (char *)mData;
         
@@ -489 +488 @@
         glNormalPointer(GL_FLOAT, 0, (char *)arrayPtr + offset * sizeof(Vector3));
         
-        glDrawArrays(GL_TRIANGLES, 0, (int)mObjects.size() * 3);
-        //DisableDrawArrays();
+        glDrawArrays(GL_TRIANGLES, 0, offset);
 }
 
@@ -556 +554 @@
 
 
-bool
-GlRenderer::RenderScene()
-{
-  mCurrentFrame++;
-  
-  Intersectable::NewMail();
+bool GlRenderer::RenderScene()
+{
+        ++ mCurrentFrame;
+
+        Intersectable::NewMail();
+
 #if DYNAMIC_OBJECTS_HACK
         Preprocessor *p = mViewCellsManager->GetPreprocessor();
@@ -570 +568 @@
         {
 #if USE_TRANSFORMED_MESH_INSTANCE_HACK
-        RenderIntersectable(*dit);
+                RenderIntersectable(*dit);
 #else
                 _RenderDynamicObject(*dit);
@@ -576 +574 @@
         }
 #endif
+
 #if 1
         _RenderSceneTrianglesWithDrawArrays();
@@ -603 +602 @@
         // read back the texture
         glReadPixels(0, 0,
-                                GetWidth(), GetHeight(),
-                                GL_RGBA,
-                                GL_UNSIGNED_BYTE,
-                                mPixelBuffer);
-                
-                        
+                GetWidth(), GetHeight(),
+                GL_RGBA,
+                GL_UNSIGNED_BYTE,
+                mPixelBuffer);
+
+
         unsigned int *p = mPixelBuffer;
-                        
+
         for (int y = 0; y < GetHeight(); y++)
         {
@@ -1837 +1836 @@
 {
         int indexBufferSize = 0;
-        
+        mRenderedNodes = 0;
+
         KdNode::NewMail2();
                 
@@ -1898 +1898 @@
                 }
 
+                ++ mRenderedNodes;
+
                 leaf->mIndexBufferSize = indexBufferSize - leaf->mIndexBufferStart;
         }
 }
+
 
 void GlRenderer::CreateVertexArrays(SceneGraphLeaf *leaf)

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

@@ -233 +233 @@
 
         vector<PvsErrorEntry> mPvsErrorBuffer;
+
         bool mComputeGVS;
 
@@ -281 +282 @@
 
         bool mUseVbos;
+
+        int mRenderedNodes;
 };
 

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

@@ -1168 +1168 @@
         {
                 ComputeRenderError();
-                // and second time
-                ComputeRenderError();
-                // and third time
-                ComputeRenderError();
         }
 

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

@@ -113 +113 @@
 void QtGlRendererBuffer::RenderPvs(const ObjectPvs &pvs)
 {
+        EnableDrawArrays();
         PreparePvs(pvs);
+
+        if (mUseVbos)
+                glBindBufferARB(GL_ARRAY_BUFFER_ARB, mVboId);
 
         int offset = (int)mObjects.size() * 3;
@@ -128 +132 @@
 {
         MakeCurrent();
-        
+
         if (0)
         {
@@ -213 +217 @@
         Intersectable::NewMail();
 
-KdNode::NewMail2();
-        Intersectable::NewMail();
-        KdNode::NewMail2();
-        Intersectable::NewMail();
-
         // render pvs once
         RenderPvs(pvs);
+
+        //cout << "rendered nodes: " << mRenderedNodes << endl;
 
         //glColorMask(GL_TRUE, GL_FALSE, GL_FALSE, GL_FALSE);
@@ -226 +227 @@
 
         glEnable(GL_STENCIL_TEST); 
-        glColor3f(1,0,0);
+        glColor3f(1, 0, 0);
 
 
@@ -250 +251 @@
         if (pixelCount > 0) 
         {
-                cout << "vc id: " << viewcell->GetId() << " pvs: " << pvsSize << " pc: " << pixelCount << endl;
+                cout << "frame " << mFrame << " vc id: " << viewcell->GetId() << " pvs: " << pvsSize << " pc: " << pixelCount << endl;
         
                 if (mSnapErrorFrames) 
@@ -256 +257 @@
                         glReadBuffer(GL_BACK);
                         //glReadBuffer(GL_FRONT);
+
 
                         //////////////
@@ -284 +286 @@
 
                         ++ mCurrentFrame;
+
                         // render pvs once
                         RenderPvs(pvs);
@@ -290 +293 @@
 
                         im = toImage();
-                        sprintf(filename, "error-frame-%04d-%0.5f-pvs.png", mFrame, pErrorPixels);
+                        sprintf(filename, "error-frame-%04d-%04d-%0.5f-pvs.png", mFrame, viewcell->GetId(), pErrorPixels);
                         str = mSnapPrefix + filename;
                         qstr = str.c_str();
@@ -331 +334 @@
                         ObjectContainer::iterator oit =
                                 lower_bound(objects.begin(), objects.end(), &dummy, ilt);
-
 
                         if (//(oit != oit.end()) && 
@@ -464 +466 @@
 void QtGlRendererWidget::_RenderPvs()
 {
+        EnableDrawArrays();
+        if (mUseVbos)
+                glBindBufferARB(GL_ARRAY_BUFFER_ARB, mVboId);
+
         mUseFalseColors = false;
 
@@ -583 +589 @@
                         
                         // update the indices for rendering
-                        PreparePvs2(mPvsCache.mPvs);
+                        PreparePvs(mPvsCache.mPvs);
                         emit PvsUpdated();
                         mCurrentPvsCost = mPvsCache.mPvs.EvalPvsCost();

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

@@ -74 +74 @@
 
         int ComputePvs(ObjectContainer &objects, ObjectContainer &pvs) const;
+
 
 public: