Changeset 2667

Timestamp:

04/30/08 05:45:38 (16 years ago)

Author:

bittner

Message:

merge on nemo

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GlRenderer.cpp (modified) (1 diff)
• GvsPreprocessor.cpp (modified) (2 diffs)
• Makefile (modified) (2 diffs)
• QtInterface/QtGlRenderer.cpp (modified) (1 diff)
• default.env (modified) (1 diff)
• main.cpp (modified) (1 diff)

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

@@ -1542 +1542 @@
                 float error = GetPixelError(pvsSize);
 
+
+          //      emit UpdatePvsErrorItem(i,
+          //                                                      mPvsErrorBuffer[i]);
+          //      swapBuffers();
                 mPvsErrorBuffer[i].mError = error;
                 mPvsErrorBuffer[i].mPvsSize = pvsSize;

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

@@ -960 +960 @@
 
         ComputeViewCell(vc);
+                // $$ JB HACK compute just first viewcell
+                //              break;
         }
 }
@@ -1155 +1157 @@
         {
                 ComputeRenderError();
-                // recompute once more
+                // and second time
                 ComputeRenderError();
-
+                // and third time
+                ComputeRenderError();
         }
 

GTP/trunk/Lib/Vis/Preprocessing/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: st 23. I 19:46:53 2008
+# Generated by qmake (2.00a) (Qt 4.1.2) on: út 18. III 16:04:11 2008
 # Project:  preprocessor.pro
 # Template: app
@@ -63 +63 @@
         $(MAKE) -f $(MAKEFILE).Debug uninstall
 
-Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc.net\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \
+Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc2005\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \
                 C:\Qt\4.1.2\mkspecs\features\qt_config.prf \
                 C:\Qt\4.1.2\mkspecs\features\exclusive_builds.prf \

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

@@ -158 +158 @@
         glColorMask(GL_FALSE, GL_TRUE, GL_FALSE, GL_FALSE);
         glColor3f(0,1,0);
-
-        glDepthFunc(GL_LESS);
-        glDepthMask(GL_TRUE);
+        glDepthFunc(GL_LESS );
         glEnable(GL_DEPTH_TEST);
+
+        glDisable(GL_STENCIL_TEST);
+
+        pvsSize = pvs.GetSize();
+
+        Intersectable::NewMail();
+        
+        if (pvsSize == 0)
+                return 0.0f;
+
+        RenderPvs(pvs);
+
+        //glColorMask(GL_TRUE, GL_FALSE, GL_FALSE, GL_FALSE);
+        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
 
         glStencilFunc(GL_EQUAL, 0x0, 0x1);
         glStencilOp(GL_KEEP, GL_KEEP, GL_INCR); 
-
-        pvsSize = pvs.GetSize();
-        
-        if (pvsSize == 0)
-                return 0.0f;
-
-        RenderPvs(pvs);
-
-        //glColorMask(GL_TRUE, GL_FALSE, GL_FALSE, GL_FALSE);
-        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
         glEnable(GL_STENCIL_TEST); 
+
         glColor3f(1,0,0);
 

GTP/trunk/Lib/Vis/Preprocessing/src/default.env

@@ -7 +7 @@
 
 #filename ./data/arena-high-lods.obj
-filename ./data/vienna/vienna_cropped.obj
+#filename ./data/vienna/vienna_cropped.obj
 #filename ./data/PowerPlantM.obj
 

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

@@ -157 +157 @@
 #endif
 
-        InitTiming();
-        Debug.open("debug.log");
-
-        Environment::GetSingleton()->Parse(argc, argv, USE_EXE_PATH);
-        MeshKdTree::ParseEnvironment();
-
-        char buff[128];
-        Environment::GetSingleton()->GetStringValue("Preprocessor.type", buff);
-        string preprocessorType(buff);
-
-        if (!(preprocessor = PreprocessorFactory::CreatePreprocessor(preprocessorType)))
+  InitTiming();
+  Debug.open("debug.log");
+
+  Environment::GetSingleton()->Parse(argc, argv, USE_EXE_PATH);
+  MeshKdTree::ParseEnvironment();
+  
+  char buff[128];
+  Environment::GetSingleton()->GetStringValue("Preprocessor.type", buff);
+  string preprocessorType(buff);
+  
+  if (!(preprocessor = PreprocessorFactory::CreatePreprocessor(preprocessorType)))
         {
                 Environment::DelSingleton();