Changeset 1153

Timestamp:

07/26/06 02:12:50 (18 years ago)

Author:

mattausch

Message:

worked on qt dll / boost threads

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/OGRE/src/OgreVisibilitySceneManagerDll.cpp (modified) (1 diff)
• Preprocessing/src/BoostPreprocessorThread.cpp (modified) (2 diffs)
• Preprocessing/src/main.cpp (modified) (8 diffs)
• QtRenderer/QtRenderer.vcproj (modified) (5 diffs)
• shared/scripts/GtpVisibility.suo (modified) (previous)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreVisibilitySceneManagerDll.cpp

@@ -71 +71 @@
 {
         //delete heightmapTerrainPageSource;
-
         // BUG: crashes on delete!!!! FIX this 
 
-         //delete visibilityTerrainPlugin;
+        //delete visibilityTerrainPlugin;
         delete occlusionCullingPlugin;
 

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

@@ -25 +25 @@
         Camera camera;
 
-        if (0) 
+        cout << "here79\n"; 
+        if (0)
         {
                 // camera.LookAtBox(mPreprocessor->mKdTree->GetBox());
@@ -62 +63 @@
 BoostPreprocessorThread::~BoostPreprocessorThread()
 {
-        cerr<<"Boost Preprocessor thread destructor...\n";
+        cerr << "Boost Preprocessor thread destructor ... \n";
         DEL_PTR(mThread);
 }

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

@@ -30 +30 @@
 
 // DLL function signature
-typedef GlRendererWidget *(*importFunction)();
+typedef GlRendererWidget *(*importFunction)(Preprocessor *);
 
 int LoadMyDll()
@@ -37 +37 @@
         
     // Load DLL file
-        HINSTANCE hinstLib = LoadLibrary("QtRenderer.dll");
+        HINSTANCE hinstLib = LoadLibrary("QtGlRenderer.dll");
         
         if (hinstLib == NULL) 
@@ -46 +46 @@
 
         // Get function pointer
-    LoadRenderWidget = (importFunction)GetProcAddress(hinstLib, "LoadRenderWidget");
+        LoadRenderWidget = (importFunction)GetProcAddress(hinstLib, "LoadRenderWidget");
         
         if (LoadRenderWidget == NULL) 
@@ -55 +55 @@
 
         // load the render window
-    rendererWidget = LoadRenderWidget();
+    rendererWidget = LoadRenderWidget(preprocessor);
 
         // Unload DLL file
@@ -81 +81 @@
                 LoadMyDll();
 
-        // note matt: capsulate qt dependent code as good as possible
-        /*new GlRendererWidget(preprocessor->mSceneGraph, 
-                                                   preprocessor->mViewCellsManager, 
-                                                   preprocessor->mKdTree);
-*/
-        rendererWidget->Show();
-
-#if QT_ENABLED
-
-        // 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
+        //rendererWidget->Show();
 }
 
@@ -136 +99 @@
 
         int returnCode = 0;
-
+        
         InitTiming();
 
@@ -215 +178 @@
         if (preprocessor->mUseGlRenderer || preprocessor->mUseGlDebugger)
         {
+                cout << "here99" << endl; 
+                // create and run the preprocessor application in a parallel thread
+                pt.InitThread();        cout << "here77" << endl; 
+                //pt.RunThread();
+
+                cout << "here51" << endl; 
                 // display the render widget
                 DisplayWidget();
-
-                // create and run the preprocessor application in a parallel thread
-                pt.InitThread();
-                pt.RunThread();
         } 
         else
@@ -227 +192 @@
                 pt.Main();
         }
-
-
+        cout << "here39" << endl; 
         Cleanup();
 

GTP/trunk/Lib/Vis/QtRenderer/QtRenderer.vcproj

@@ -3 +3 @@
         ProjectType="Visual C++"
         Version="7.10"
-        Name="QtRenderer"
+        Name="QtGlRenderer"
         ProjectGUID="{B85DC7B1-58B6-4912-BD64-8B452630A368}"
         Keyword="Win32Proj">
@@ -82 +82 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="Preprocessor.lib qtmain.lib QtGui4.lib Qt3Support4.lib QAxContainer.lib QtCore4.lib QtOpenGL4.lib xerces-c_2.lib glew32.lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib"
-                                OutputFile="$(OutDir)/QtRenderer.dll"
+                                OutputFile="$(OutDir)/QtGlRenderer.dll"
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories=""$(QTDIR)\lib";..\..\..\..\..\NonGTP\Zlib\lib;"$(CG_LIB_PATH)";"..\Preprocessing\lib\$(ConfigurationName)";..\Preprocessing\src\GL;..\..\..\..\..\NonGTP\Xerces\xercesc\lib"
@@ -94 +94 @@
                                 Name="VCMIDLTool"/>
                         <Tool
-                                Name="VCPostBuildEventTool"/>
+                                Name="VCPostBuildEventTool"
+                                CommandLine="copy $(OutDir)\$(TargetFileName) $(OutDir)\..\..\Preprocessing\scripts"/>
                         <Tool
                                 Name="VCPreBuildEventTool"/>
@@ -127 +128 @@
                         </File>
                         <File
-                                RelativePath=".\QtRendererDll.cpp">
+                                RelativePath=".\QtGlRendererDll.cpp">
                         </File>
                 </Filter>
@@ -141 +142 @@
                                                 Name="VCCustomBuildTool"
                                                 Description="Performing moc on $(InputName).h"
-                                                CommandLine="%qtdir%\bin\moc.exe $(InputDir)$(InputName).h -o $(InputDir)moc_$(InputName).cpp"
+                                                CommandLine="%qtdir%\bin\moc.exe $(InputDir)$(InputName).h -o $(InputDir)moc_$(InputName).cpp
+"
                                                 Outputs="$(InputDir) moc_$(InputName).cpp"/>
                                 </FileConfiguration>