Changeset 1146 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

07/24/06 17:17:18 (18 years ago)

Author:

mattausch

Message:

use qt renderer as dll
changed vsp render heuristics sweep
capsulated thread

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BoostPreprocessorThread.cpp (added)
• BoostPreprocessorThread.h (added)
• GlRenderer.cpp (modified) (1 diff)
• GlRenderer.h (modified) (5 diffs)
• PreprocessorThread.cpp (modified) (2 diffs)
• PreprocessorThread.h (modified) (2 diffs)
• RssPreprocessor.cpp (modified) (1 diff)
• SamplingStrategy.cpp (modified) (1 diff)
• VspOspTree.cpp (modified) (1 diff)
• main.cpp (modified) (6 diffs)

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

@@ -11 +11 @@
 #include "Environment.h"
 
-
-//#define GL_GLEXT_PROTOTYPES
-
-
-#include <Cg/cg.h>
-#include <Cg/cgGL.h>
-
-
-#include <QVBoxLayout>
+//#include <Cg/cg.h>
+//#include <Cg/cgGL.h>
+
 
 namespace GtpVisibilityPreprocessor {
 
-
-/*
-GLuint frontDepthMap;
-GLuint backDepthMap;
-
-const int depthMapSize = 512;
-
-//static vector<OcclusionQuery *> sQueries;
-*/
 
 static bool arbQuerySupport = false;

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

@@ -1 +1 @@
 #ifndef __GLRENDERER_H
 #define __GLRENDERER_H
-
-//#include "glInterface.h"
-
-//#include <QWaitCondition>
-//#include <QtOpenGL>
-//#include <QGLPixelBuffer>
-
-//class QWidget;
 
 #include "Vector3.h"
@@ -82 +74 @@
         derived classes
 */
-
 class GlRenderer: public Renderer
 {
@@ -151 +142 @@
 };
 
-
+/* Class implementing an OpenGl render buffer.
+*/
 class GlRendererBuffer: public GlRenderer
 {
@@ -253 +245 @@
         */
         void EvalQueryWithItemBuffer();
+
         /** Evaluates query for one direction using occlusion queries.
         */
@@ -263 +256 @@
 };
 
+
+/** Abstract class for implmenenting a gl render widget.
+*/
+class GlRenderWidget
+{
+public:
+        
+        GlRenderWidget(SceneGraph *sceneGraph, ViewCellsManager *vcm, KdTree *kdTree):
+          mSceneGraph(sceneGraph), mViewCellsManager(vcm), mKdTree(kdTree)
+        {
+        }
+
+        
+        GlRenderWidget() {}
+
+    virtual ~GlRenderWidget() {}
+
+        //virtual void Create() {}
+        virtual void Show() {}
+        
+
+protected:
+
+
+        SceneGraph *mSceneGraph;
+        ViewCellsManager *mViewCellsManager;
+        KdTree *mKdTree;
+};
+
 };
 
 #endif
-

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

@@ -1 +1 @@
 //#include <QApplication>
 #include "PreprocessorThread.h"
-#include "Camera.h"
-#include "KdTree.h"
-#include "SceneGraph.h"
-#include "Preprocessor.h"
 
 
 namespace GtpVisibilityPreprocessor {
 
-
-// matt: remove qt dependencies
-/*
-PreprocessorThread::PreprocessorThread(Preprocessor *p,
-                                                                           QObject *parent):QThread(parent)
-{
-  mPreprocessor = p;
-  
-  if (p->mQuitOnFinish)
-        connect(this, SIGNAL(finished()), qApp, SLOT(closeAllWindows(void)));
-}
-*/
 
 PreprocessorThread::PreprocessorThread(Preprocessor *p):
@@ -28 +12 @@
 
 
-void PreprocessorThread::operator()()
-{
-        Main();
-}
-
-void PreprocessorThread::Main()
-{
-        Camera camera;
-
-        if (0) 
-        {
-                // camera.LookAtBox(mPreprocessor->mKdTree->GetBox());
-                //      camera.LookInBox(mPreprocessor->mKdTree->GetBox());
-                camera.SetPosition(Vector3(3473, 6.778, -1699));
-                camera.SetDirection(Vector3(-0.2432, 0, 0.97));
-                //      camera.SetPosition(Vector3(991.7, 187.8, -271));
-                //      camera.SetDirection(Vector3(0.9, 0, -0.4));
-
-                camera.SnapImage("camera.jpg", mPreprocessor->mKdTree, mPreprocessor->mSceneGraph);
-        } 
-
-        if (0) {
-                camera.LookInBox(mPreprocessor->mKdTree->GetBox());
-                camera.SetPosition(camera.mPosition + Vector3(-250,0,-550));
-                camera.SnapImage("camera2.jpg", mPreprocessor->mKdTree, mPreprocessor->mSceneGraph);
-        }
-
-        if (0) {
-                camera.SetPosition( mPreprocessor->mKdTree->GetBox().Center() - Vector3(0,-100,0) );
-                camera.SetDirection(Vector3(1, 0, 0));
-                camera.SnapImage("camera3.jpg", mPreprocessor->mKdTree, mPreprocessor->mSceneGraph);
-        }
-
-        if (mPreprocessor->mComputeVisibility) {
-                mPreprocessor->ComputeVisibility();
-                //      mPreprocessor->ExportPreprocessedData("scene.vis");
-                mPreprocessor->PostProcessVisibility();
-        }
-
-        cerr << "Preprocessor main finished...\n";
-  
-}
-
 PreprocessorThread::~PreprocessorThread()
 {
-  cerr<<"Preprocessor thread destructor...\n";
 }
 

GTP/trunk/Lib/Vis/Preprocessing/src/PreprocessorThread.h

@@ -1 +1 @@
 #ifndef __PREPROCESSOR_THREAD_H
 #define __PREPROCESSOR_THREAD_H
-// matt: remove qt dependencies
-//#include <QThread>
 
-namespace GtpVisibilityPreprocessor {
+
+namespace GtpVisibilityPreprocessor 
+{
 
 class Preprocessor;
@@ -10 +10 @@
 /** This class represents a preprocessor thread.
 */
-class PreprocessorThread//: public QThread
+class PreprocessorThread
 {
-  //Q_OBJECT
+public:
+        PreprocessorThread(Preprocessor *p);
+        virtual ~PreprocessorThread();
 
-  Preprocessor *mPreprocessor;
-public:
-  //PreprocessorThread(Preprocessor *p, QObject *parent = 0);
-        PreprocessorThread(Preprocessor *p);
-  ~PreprocessorThread();
+        virtual void InitThread() = 0;
+        virtual void RunThread() = 0;
 
-  void operator()();
-
-  void Main();
-
-/*protected:
-  void run() {
-        Main();
-  }*/
+protected:
+        virtual void Main() = 0;
+ 
+        Preprocessor *mPreprocessor;
 };
 

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

@@ -707 +707 @@
           GenerateRays(mRssSamplesPerPass*ratios[0], RSS_BASED_DISTRIBUTION, rays);
 
-          rays.NormalizePdf(rays.size());
+          rays.NormalizePdf((int)rays.size());
           
           CastRays(rays, tmpVssRays);

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

@@ -51 +51 @@
         Vector3 origin, direction; 
 
-    const int i = RandomValue(0, (int)mPreprocessor.mObjects.size() - 1);
+    const int i = (int)RandomValue(0, (int)mPreprocessor.mObjects.size() - 1);
 
         Intersectable *object = mPreprocessor.mObjects[i];

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

@@ -1444 +1444 @@
                 if (((*ci).value >= minBand) && ((*ci).value <= maxBand))
                 {
+
+                        float currentPos;
+                        
+                        // HACK: current positition is BETWEEN visibility events
+                        if (ci != ci_end)
+                                currentPos = ((*ci).value + (*(ci + 1)).value) * 0.5f;
+                        else
+                                currentPos = (*ci).value;                       
+
                         sum = pvsl * ((*ci).value - minBox) + pvsr * (maxBox - (*ci).value);
-
-                        //Debug  << "pos=" << (*ci).value << "\t pvs=(" <<  pvsl << "," << pvsr << ")" << "\t cost= " << sum << endl;
+                        Debug  << "pos=" << (*ci).value << "\t newpos=" << currentPos << "\t pvs=(" <<  pvsl << "," << pvsr << ")" << "\t cost= " << sum << endl;
 
                         if (sum < minSum)

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

@@ -12 +12 @@
 #include "ViewCell.h"
 #include "SceneGraph.h"
-#include "PreprocessorThread.h"
+#include "BoostPreprocessorThread.h"
 #include "RenderSampler.h"
 #include "ResourceManager.h"
-
-//#include <QApplication>
-//#include <QtOpenGL>
-#include <boost/thread/thread.hpp>
-#include <boost/thread/xtime.hpp>
 #include "GlRenderer.h"
 
@@ -29 +24 @@
 
 Preprocessor *preprocessor = NULL;
-
-#if QT_ENABLED
-QApplication *app = NULL;
-#endif
+GlRenderWidget *renderWidget = NULL;
 
 
 void Cleanup()
 {
-#if QT_ENABLED
-        DEL_PTR(rendererWidget);
-#endif
-
+        DEL_PTR(renderWidget);
         DEL_PTR(preprocessor);
 
@@ -51 +40 @@
 void DisplayWidget()
 {
+        // note matt: capsulate qt dependent code as good as possible
+        renderWidget = 
+                new GlRenderWidget(preprocessor->mSceneGraph, 
+                                                   preprocessor->mViewCellsManager, 
+                                                   preprocessor->mKdTree);
+
+        renderWidget->Show();
+
 #if QT_ENABLED
-        QApplication *app = NULL;
 
         // create a qt application first (must be created before any opengl widget ...)
@@ -175 +171 @@
         // create a preprocessor thread
         //PreprocessorThread *pt = new PreprocessorThread(p, app);
-        PreprocessorThread pt(preprocessor);
+        BoostPreprocessorThread pt(preprocessor);
 
         if (preprocessor->mUseGlRenderer || preprocessor->mUseGlDebugger)
@@ -182 +178 @@
                 DisplayWidget();
 
-                // create and run the thread
-                boost::thread thrd(pt);
-                thrd.join();
-                //pt->start(QThread::LowPriority);
+                // create and run the preprocessor application in a parallel thread
+                pt.InitThread();
+                pt.RunThread();
         } 
         else
@@ -193 +188 @@
         }
 
-#if QT_ENABLED
-        if (app)
-        {
-                returnCode = app->exec();
-        DEL_PTR(app);
-        }
-#endif
 
         Cleanup();