Changeset 2664 for GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp

Timestamp:

04/29/08 16:20:37 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp (modified) (9 diffs)

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

@@ -131 +131 @@
                                                       mDetectEmptyViewSpace);
 
-        mSnapErrorFrames = false;
+        //mSnapErrorFrames = false;
+        mSnapErrorFrames = true;
         mSnapPrefix = "snap/";
         mUseForcedColors = false;
@@ -706 +707 @@
                 for (q = 0; ((j + q) < (int)mObjects.size()) && (q < numQ); ++ q) 
                 {
-                        //glFinish();
                         mOcclusionQueries[q]->BeginQuery();
                         
@@ -712 +712 @@
                 
                         mOcclusionQueries[q]->EndQuery();
-                        //glFinish();
                 }
                 //cout << "q: " << q << endl;
@@ -1417 +1416 @@
 void GlRendererBuffer::InitGL()
 {
-        MakeCurrent(); 
+        //MakeCurrent(); 
         GlRenderer::InitGL();
 
+#if 0
         // initialise dual depth buffer textures
         glGenTextures(1, &frontDepthMap);
@@ -1442 +1442 @@
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
 
-#if 0
+
 #ifdef USE_CG
 
@@ -1480 +1480 @@
 #endif
 #endif
-        DoneCurrent();
+        //DoneCurrent();
 }
 
@@ -1514 +1514 @@
   SetupProjection(GetWidth(), GetHeight());
 
-  cout<<"Random Pvs STATS, mPvsStatFrames="<<mPvsStatFrames<<endl;
+  cout << "Random Pvs STATS, mPvsStatFrames=" << mPvsStatFrames << endl;
   
   for (int i=0; i < mPvsStatFrames; i++) {
@@ -1537 +1537 @@
 
 
-        if (mPvsErrorBuffer[i].mError > 0.0f) {
-          int pvsSize;
-
-          float error = GetPixelError(pvsSize);
-
-          mPvsErrorBuffer[i].mError = error;
-          mPvsErrorBuffer[i].mPvsSize = pvsSize;
-
-          //      emit UpdatePvsErrorItem(i,
-          //                                                      mPvsErrorBuffer[i]);
-          cout<<"("<<i<<" ["<<mViewPoint<<"]["<<mViewDirection<<"] "<<mPvsErrorBuffer[i].mError<<")";
-          //      swapBuffers();
-        }
-        
+        if (mPvsErrorBuffer[i].mError > 0.0f) {
+                int pvsSize;
+
+                float error = GetPixelError(pvsSize);
+
+                mPvsErrorBuffer[i].mError = error;
+                mPvsErrorBuffer[i].mPvsSize = pvsSize;
+
+                cout<<"("<<i<<" ["<<mViewPoint<<"]["<<mViewDirection<<"] "<<mPvsErrorBuffer[i].mError<<")";
+        }
+
         err = mPvsErrorBuffer[i].mError;
         
@@ -1630 +1627 @@
                 {
                         // compute the pixel error
-                        float error = GetPixelError(pvsSize);
+                        const float error = GetPixelError(pvsSize);
 
                         mPvsErrorBuffer[i].mError = error;
                         mPvsErrorBuffer[i].mPvsSize = pvsSize;
 
-                        int pixelError = (int)mPvsErrorBuffer[i].mError * GetWidth() * GetHeight();
-
+                        const int pixelError = (int)mPvsErrorBuffer[i].mError * GetWidth() * GetHeight();
                         if (0 && (pixelError > 0) && (pvsSize > 0)) 
                         {
-                                cout << "!err: " << i << "," << mViewPoint << "," << mViewDirection << " " << mPvsErrorBuffer[i].mError * GetWidth() * GetHeight() << endl;
+                                cout << "err: " << i << "," << mViewPoint << "," << mViewDirection << " " 
+                                         << mPvsErrorBuffer[i].mError * GetWidth() * GetHeight() << endl;
                         }
                 }