Changeset 1145 for GTP/trunk/Lib/Vis/Preprocessing/src/main.cpp

Timestamp:

07/24/06 10:12:34 (18 years ago)

Author:

mattausch

Message:

vsposp debug version

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/main.cpp (modified) (3 diffs)

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

@@ -16 +16 @@
 #include "ResourceManager.h"
 
-#include <QApplication>
-#include <QtOpenGL>
+//#include <QApplication>
+//#include <QtOpenGL>
+#include <boost/thread/thread.hpp>
+#include <boost/thread/xtime.hpp>
 #include "GlRenderer.h"
 
@@ -25 +27 @@
 
 using namespace GtpVisibilityPreprocessor;
+
+Preprocessor *preprocessor = NULL;
+
+#if QT_ENABLED
+QApplication *app = NULL;
+#endif
+
+
+void Cleanup()
+{
+#if QT_ENABLED
+        DEL_PTR(rendererWidget);
+#endif
+
+        DEL_PTR(preprocessor);
+
+        Environment::DelSingleton();
+        MeshManager::DelSingleton();
+        MaterialManager::DelSingleton();
+}
+
+
+void DisplayWidget()
+{
+#if QT_ENABLED
+        QApplication *app = NULL;
+
+        // create a qt application first (must be created before any opengl widget ...)
+        app = new QApplication(argc, argv);
+
+        if (!QGLFormat::hasOpenGL() || !QGLPixelBuffer::hasOpenGLPbuffers()) {
+                QMessageBox::information(0, "OpenGL pbuffers", 
+                        "This system does not support OpenGL/pbuffers.",
+                        QMessageBox::Ok);
+                return -1;
+        }
+        
+        // note matt: capsulate qt dependent code as good as possible
+        rendererWidget = 
+                new GlRendererWidget(p->mSceneGraph, p->mViewCellsManager, p->mKdTree);
+
+        rendererWidget->resize(640, 480);
+        rendererWidget->show();
+
+        if (0 && p->GetRenderer()) 
+        {
+                cout<<"CONNECTING"<<endl;
+                QObject::connect(p->GetRenderer(),
+                SIGNAL(UpdatePvsErrorItem(int i, GlRendererBuffer::PvsErrorEntry &)),
+                                rendererWidget->mControlWidget, 
+                                SLOT(UpdatePvsErrorItem(int i,
+                                GlRendererBuffer::PvsErrorEntry &)));
+
+                cout<<"CONNECTED"<<endl;
+        }
+#endif
+}
+
 
 int
@@ -30 +90 @@
 {
 
-  //Now just call this function at the start of your program and if you're
-  //compiling in debug mode (F5), any leaks will be displayed in the Output
-  //window when the program shuts down. If you're not in debug mode this will
-  //be ignored. Use it as you will!
-  //note: from GDNet Direct [3.8.04 - 3.14.04] void detectMemoryLeaks() {
-  _CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF|_CRTDBG_ALLOC_MEM_DF);
-  _CrtSetReportMode(_CRT_ASSERT,_CRTDBG_MODE_FILE);
-  _CrtSetReportFile(_CRT_ASSERT,_CRTDBG_FILE_STDERR); 
-
-  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);
-
-  Preprocessor *p = NULL;
-
- 
-  if (preprocessorType == "vss")
-  {
-          p = new VssPreprocessor();
-  }
-  else
-  {
-        if (preprocessorType == "rss")
-        {
-                p = new RssPreprocessor();
+        //Now just call this function at the start of your program and if you're
+        //compiling in debug mode (F5), any leaks will be displayed in the Output
+        //window when the program shuts down. If you're not in debug mode this will
+        //be ignored. Use it as you will!
+        //note: from GDNet Direct [3.8.04 - 3.14.04] void detectMemoryLeaks() {
+        _CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF|_CRTDBG_ALLOC_MEM_DF);
+        _CrtSetReportMode(_CRT_ASSERT,_CRTDBG_MODE_FILE);
+        _CrtSetReportFile(_CRT_ASSERT,_CRTDBG_FILE_STDERR); 
+
+        int returnCode = 0;
+
+        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 (preprocessorType == "vss")
+        {
+                preprocessor = new VssPreprocessor();
         }
         else
         {
-          if (preprocessorType == "exact")
-          {
-                p = new ExactPreprocessor();
-          }
-          else
-          {
-                if (preprocessorType == "sampling")
+                if (preprocessorType == "rss")
                 {
-                  p = new SamplingPreprocessor();
+                        preprocessor = new RssPreprocessor();
                 }
                 else
-                {       
-                  if (preprocessorType == "render")
-                  {
-                         p = new RenderSampler();
-                  }
-                  else {
-                          Environment::DelSingleton();
-                          cerr<<"Unknown preprocessor type"<<endl;
-                          Debug<<"Unknown preprocessor type"<<endl;
-                          exit(1);
-                  }
+                {
+                        if (preprocessorType == "exact")
+                        {
+                                preprocessor = new ExactPreprocessor();
+                        }
+                        else
+                        {
+                                if (preprocessorType == "sampling")
+                                {
+                                        preprocessor = new SamplingPreprocessor();
+                                }
+                                else
+                                {       
+                                        if (preprocessorType == "render")
+                                        {
+                                                preprocessor = new RenderSampler();
+                                        }
+                                        else {
+                                                Environment::DelSingleton();
+                                                cerr<<"Unknown preprocessor type"<<endl;
+                                                Debug<<"Unknown preprocessor type"<<endl;
+                                                exit(1);
+                                        }
+                                }
+                        }
                 }
-          }
-        }
-  }
-  
-  QApplication *app = NULL;
-
-  if (p->mUseGlRenderer || p->mUseGlDebugger) {
+        }
         
-        // create a qt application first (must be created before any opengl widget...
-        app = new QApplication(argc, argv);
-        
-        if (!QGLFormat::hasOpenGL() || !QGLPixelBuffer::hasOpenGLPbuffers()) {
-          QMessageBox::information(0, "OpenGL pbuffers", 
-                                                           "This system does not support OpenGL/pbuffers.",
-                                                           QMessageBox::Ok);
-          return -1;
-        }
-  }
-  
-  preprocessor = p;
-  
-  Environment::GetSingleton()->GetStringValue("Scene.filename", buff);
-  string filename(buff);
- 
-  p->LoadScene(filename);
-  
-  p->BuildKdTree();
-  p->KdTreeStatistics(cout);
- 
-  // parse view cells related options
-  p->PrepareViewCells();
-  
-
-  // create a preprocessor thread
-  PreprocessorThread *pt = new PreprocessorThread(p, app);
-
-  //  p->mSceneGraph->Export("soda.x3d");
-  if (0) {
-    p->Export(filename + "-out.x3d", true, false, false);
-    p->Export(filename + "-kdtree.x3d", false, true, false);    
-  }
-
-  if (p->mUseGlRenderer) {
-         
-        rendererWidget = new GlRendererWidget(p->mSceneGraph, p->mViewCellsManager, p->mKdTree);
-        //  renderer->resize(640, 480);
-         
-        rendererWidget->resize(640, 480);
-        rendererWidget->show();
-        
-        if (0 && p->GetRenderer()) {
-          
-          cout<<"CONNECTING"<<endl;
-          QObject::connect(p->GetRenderer(),
-                                           SIGNAL(UpdatePvsErrorItem(int i,
-                                                                                                 GlRendererBuffer::PvsErrorEntry &)),
-                                           
-                                           rendererWidget->mControlWidget,
-                                           SLOT(UpdatePvsErrorItem(int i,
-                                                                                           GlRendererBuffer::PvsErrorEntry &)));
-          cout<<"CONNECTED"<<endl;
-        }
-        
-        pt->start(QThread::LowPriority);
-        
-        
-  } else{
-        // just call the mail method -> will be executed in the main thread
-        pt->Main();
-  }
-  
-
-  int returnCode = 0;
-
-  if (app)
-  {
-         returnCode = app->exec();
-        DEL_PTR(app);
-        }
-
-  //-- clean up
-  DEL_PTR(p);
-  Environment::DelSingleton();
-  DEL_PTR(rendererWidget);
-
-  MeshManager::DelSingleton();
-  MaterialManager::DelSingleton();
-
-  DEL_PTR(pt);
-
-  return returnCode;
+
+        //-- load scene 
+
+        Environment::GetSingleton()->GetStringValue("Scene.filename", buff);
+        string filename(buff);
+        preprocessor->LoadScene(filename);
+
+        //-- build kd tree from scene geometry
+
+        preprocessor->BuildKdTree();
+        preprocessor->KdTreeStatistics(cout);
+
+        // parse view cells related options
+        preprocessor->PrepareViewCells();
+
+        //  p->mSceneGraph->Export("soda.x3d");
+        if (0) {
+                preprocessor->Export(filename + "-out.x3d", true, false, false);
+                preprocessor->Export(filename + "-kdtree.x3d", false, true, false);     
+        }
+
+
+        // create a preprocessor thread
+        //PreprocessorThread *pt = new PreprocessorThread(p, app);
+        PreprocessorThread pt(preprocessor);
+
+        if (preprocessor->mUseGlRenderer || preprocessor->mUseGlDebugger)
+        {
+                // display the render widget
+                DisplayWidget();
+
+                // create and run the thread
+                boost::thread thrd(pt);
+                thrd.join();
+                //pt->start(QThread::LowPriority);
+        } 
+        else
+        {
+                // just call the mail method -> will be executed in the main thread
+                pt.Main();
+        }
+
+#if QT_ENABLED
+        if (app)
+        {
+                returnCode = app->exec();
+        DEL_PTR(app);
+        }
+#endif
+
+        Cleanup();
+
+        return returnCode;
 }