Changeset 2560 for GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface

Timestamp:

12/10/07 09:12:27 (17 years ago)

Author:

mattausch

Message:

added functionality for visualization

Location:

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface

Files:

• QtGlRenderer.cpp (modified) (9 diffs)
• QtGlRenderer.h (modified) (3 diffs)
• QtGlViewer.cpp (modified) (1 diff)
• QtInterface.vcproj (modified) (1 diff)

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

@@ -690 +690 @@
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-        if (1) {
+        if (1) 
+        {
                 SetupCameraProjection(width(), height());
                 SetupCamera();
 
-                if (mRenderErrors) {
+                if (mRenderErrors) 
+                {
                         RenderErrors();
-                } else {
+                } 
+                else 
+                {
                         glColor3f(0.6f, 0.6f, 0.6f);
                         RenderPvs();
@@ -845 +849 @@
         mShowRenderCost = false;
         mShowPvsSizes = false;
+        mShowPiercingRays = false;
         mSpatialFilterSize = 0.01;
         mPvsSize = 0;
@@ -883 +888 @@
         connect(mControlWidget, SIGNAL(SetUseSpatialFilter(bool)),
                 this, SLOT(SetUseSpatialFilter(bool)));
+        connect(mControlWidget, SIGNAL(SetShowPiercingRays(bool)), this, SLOT(SetShowPiercingRays(bool)));
 
         connect(mControlWidget,
@@ -1146 +1152 @@
         eq[3] = mSceneCutPlane.mD;
 
-        if (mCutViewCells) {
+        if (mCutViewCells) 
+        {
                 glClipPlane(GL_CLIP_PLANE0, eq);
                 glEnable(GL_CLIP_PLANE0);
@@ -1154 +1161 @@
         ViewCellContainer &viewcells = mViewCellsManager->GetViewCells();
         int maxPvs = -1;
-        for (i=0; i < viewcells.size(); i++) 
+        int maxPiercingRays = 0;
+
+        for (i = 0; i < viewcells.size(); ++ i) 
         {
                 ViewCell *vc = viewcells[i];
@@ -1162 +1171 @@
                 if (p > maxPvs)
                         maxPvs = p;
-        }
-
-
-        for (i=0; i < viewcells.size(); i++) {
+                const int piercingRays = vc->GetNumPiercingRays();
+                if (piercingRays > maxPiercingRays)
+                        maxPiercingRays = piercingRays;
+        }
+
+
+        for (i = 0; i < viewcells.size(); ++ i) 
+        {
                 ViewCell *vc = viewcells[i];
                 //      Mesh *m = vc->GetMesh();
@@ -1171 +1184 @@
                 RgbColor c;
 
-                if (!mShowPvsSizes) {
+                if (!mShowPvsSizes && !mShowPiercingRays)
+                {
                         mWireFrame = true;
                         c = vc->GetColor();
-                } else {
-                        //        const float importance = 5.0f*mTransferFunction * ((float)vc->GetPvs().CountObjectsInPvs() / (float)maxPvs);
-                        const float importance = 5.0f*mTransferFunction *
+                } 
+                else if (mShowPiercingRays)
+                {
+                        // const float importance = 5.0f*mTransferFunction * ((float)vc->GetPvs().CountObjectsInPvs() / (float)maxPvs);
+                        const float importance = 5.0f * mTransferFunction *
+                                ((float)vc->GetNumPiercingRays() / (float)maxPiercingRays);
+                        // c = RgbColor(importance, 1.0f - importance, 0.0f);
+                        c = RainbowColorMapping(importance);
+                }
+                else
+                {
+                        // const float importance = 5.0f*mTransferFunction * ((float)vc->GetPvs().CountObjectsInPvs() / (float)maxPvs);
+                        const float importance = 5.0f * mTransferFunction *
                                 ((float)vc->GetPvs().GetSize() / (float)maxPvs);
-                        //        c = RgbColor(importance, 1.0f - importance, 0.0f);
+                        // c = RgbColor(importance, 1.0f - importance, 0.0f);
                         c = RainbowColorMapping(importance);
-
                 }
+
                 glColor3f(c.r, c.g, c.b);
 
@@ -1191 +1215 @@
 
         glPopAttrib();
-
 }
 
@@ -1318 +1341 @@
         connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetShowRays(bool)));
 
-        vbox->resize(800,100);
+        
+        cb = new QCheckBox("Show piercing rays", hbox);
+        hlayout->addWidget(cb);
+        cb->setChecked(false);
+        connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetShowPiercingRays(bool)));
+
+        vbox->resize(800,150);
 
 

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

@@ -112 +112 @@
   void SetShowRenderCost(bool);
   void SetShowPvsSizes(bool);
+  void SetShowPiercingRays(bool);
   void SetTopView(bool);
   void SetCutViewCells(bool);
   void SetCutScene(bool);
-
 };
 
@@ -137 +137 @@
         bool mUseSpatialFilter;
         bool mShowRenderCost;
+        bool mShowPiercingRays;
         bool mShowRays;
 
@@ -293 +294 @@
         void SetShowPvsSizes(bool b) {
                 mShowPvsSizes = b;
+                updateGL();
+        }
+
+        void SetShowPiercingRays(bool b) {
+                mShowPiercingRays = b;
                 updateGL();
         }

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

@@ -52 +52 @@
         if (mRenderer->mRenderViewCells) 
           mRenderer->RenderViewCells();
-
+        
         glColor3f(0.8f, 0.8f, 0.8f);
         mRenderer->RenderPvs();

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtInterface.vcproj

@@ -166 +166 @@
                                 Name="VCCLCompilerTool"
                                 AdditionalIncludeDirectories="..\..\src;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl";..\..\..\..\..\..\..\NonGTP\Zlib\include;"$(CG_INC_PATH)""
-                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;QTGLRENDERER_EXPORTS;USE_VERBOSE_PVS"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;QTGLRENDERER_EXPORTS;USE_VERBOSE_PVS;USE_QT;USE_CG;GTP_INTERNAL"
                                 RuntimeLibrary="2"
                                 UsePrecompiledHeader="0"