Changeset 2671 for GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface

Timestamp:

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

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface

Files:

• QtGlRenderer.cpp (modified) (11 diffs)
• QtGlRenderer.h (modified) (1 diff)

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: