Changeset 2566 for GTP/trunk/Lib/Vis

Timestamp:

12/11/07 17:00:08 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• QtInterface/QtGlRenderer.cpp (modified) (10 diffs)
• QtInterface/QtGlRenderer.h (modified) (4 diffs)
• QtInterface/QtGlViewer.cpp (modified) (3 diffs)
• QtInterface/QtGlViewer.h (modified) (3 diffs)
• SamplingStrategy.cpp (modified) (1 diff)

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

@@ -865 +865 @@
         mShowPvsSizes = false;
         mShowPiercingRays = false;
+        mShowWeightedRays = false;
+
         mSpatialFilterSize = 0.01;
         mPvsSize = 0;
@@ -902 +904 @@
         connect(mControlWidget, SIGNAL(SetRenderBoxes(bool)), this, SLOT(SetRenderBoxes(bool)));
         connect(mControlWidget, SIGNAL(SetRenderFilter(bool)), this, SLOT(SetRenderFilter(bool)));
-        connect(mControlWidget, SIGNAL(SetRenderVisibilityEstimates(bool)),
-                this, SLOT(SetRenderVisibilityEstimates(bool)));
+        connect(mControlWidget, SIGNAL(SetRenderVisibilityEstimates(bool)), this, SLOT(SetRenderVisibilityEstimates(bool)));
         connect(mControlWidget, SIGNAL(SetUseFilter(bool)), this, SLOT(SetUseFilter(bool)));
-        connect(mControlWidget, SIGNAL(SetUseSpatialFilter(bool)),
-                this, SLOT(SetUseSpatialFilter(bool)));
+        connect(mControlWidget, SIGNAL(SetUseSpatialFilter(bool)), this, SLOT(SetUseSpatialFilter(bool)));
         connect(mControlWidget, SIGNAL(SetShowPiercingRays(bool)), this, SLOT(SetShowPiercingRays(bool)));
+        connect(mControlWidget, SIGNAL(SetShowWeightedRays(bool)), this, SLOT(SetShowWeightedRays(bool)));
 
         connect(mControlWidget,
@@ -1198 +1199 @@
         ViewCellContainer &viewcells = mViewCellsManager->GetViewCells();
         int maxPvs = -1;
-        int maxPiercingRays = 1; // for savety
+        int maxPiercingRays = 1; // not zero for savety
+        float maxRelativeRays = Limits::Small; // not zero for savety
 
         for (i = 0; i < viewcells.size(); ++ i) 
@@ -1213 +1215 @@
                 if (piercingRays > maxPiercingRays)
                         maxPiercingRays = piercingRays;
-        }
-
-        if (!mShowPvsSizes && !mShowPiercingRays)
+
+                const float relativeArea = vc->GetBox().SurfaceArea() / mViewCellsManager->GetViewSpaceBox().SurfaceArea();
+
+                if ((float)piercingRays / relativeArea > maxRelativeRays)
+                        maxRelativeRays = (float)piercingRays / relativeArea;
+        }
+
+        if (!mShowPvsSizes && !mShowPiercingRays && !mShowWeightedRays)
         {
                 for (i = 0; i < viewcells.size(); ++ i) 
@@ -1260 +1267 @@
                         {
                                 ViewCell *vc = viewcells[i];
-                                const Vector3 dummyViewPoint(0.0, 0.0, 1.0);
-                                const float dist = SqrDistance(dummyViewPoint, vc->GetBox().Center());
+
+                                const float dist = SqrDistance(mDummyViewPoint, vc->GetBox().Center());
 
                                 vc->SetDistance(dist);
@@ -1269 +1276 @@
                 }
 
-                RgbColor c;
-
-        for (i = 0; i < viewcells.size(); ++ i) 
+                for (i = 0; i < viewcells.size(); ++ i) 
                 {
+                        RgbColor c;
             ViewCell *vc = viewcells[i];
                         
@@ -1283 +1289 @@
                                         ((float)vc->GetNumPiercingRays() / (float)maxPiercingRays);
                         }
-                        else
+                        else if (mShowWeightedRays) // relative number of rays
+                        {
+                                // importance = 5.0f*mTransferFunction * ((float)vc->GetPvs().CountObjectsInPvs() / (float)maxPvs);
+                                float relativeArea = vc->GetBox().SurfaceArea() / mViewCellsManager->GetViewSpaceBox().SurfaceArea();
+
+                                if (relativeArea < Limits::Small)
+                                        relativeArea = Limits::Small;
+
+                                importance = mTransferFunction * ((float)vc->GetNumPiercingRays() / relativeArea) / maxRelativeRays;
+                        }
+                        else // pvs size
                         {
                                 //importance = 5.0f*mTransferFunction * ((float)vc->GetPvs().CountObjectsInPvs() / (float)maxPvs);
                                 importance = mTransferFunction *
                                         ((float)vc->GetPvs().GetSize() / (float)maxPvs);
-                                // c = RgbColor(importance, 1.0f - importance, 0.0f);
-                                c = RainbowColorMapping(5.0f * importance);
                         }
 
@@ -1452 +1466 @@
 
 
-        QRadioButton *rb1, *rb2, *rb3;
+        QRadioButton *rb1, *rb2, *rb3, *rb4;
 
         // Create a check box to be in the group box
@@ -1468 +1482 @@
         rb3 = new QRadioButton("wireframe", hbox);
         rb3->setText("wireframe");
+        
+        rb4 = new QRadioButton("weighted rays", hbox);
+        rb4->setText("weighted rays");
+        connect(rb4, SIGNAL(toggled(bool)), SIGNAL(SetShowWeightedRays(bool)));
+
         //vl->addWidget(rb2);
         //connect(rb2, SIGNAL(toggled(bool)), SIGNAL(SetShowPvsSizes(bool)));
@@ -1478 +1497 @@
         vbox2->addWidget(rb1);
         vbox2->addWidget(rb2);
-        rb2->setChecked(true);
+        vbox2->addWidget(rb4);
+        rb3->setChecked(true);
 
         vbox2->addStretch(1);

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

@@ -115 +115 @@
   void SetShowPvsSizes(bool);
   void SetShowPiercingRays(bool);
+  void SetShowWeightedRays(bool);
   void SetTopView(bool);
   void SetCutViewCells(bool);
@@ -144 +145 @@
         bool mShowRenderCost;
         bool mShowPiercingRays;
+        bool mShowWeightedRays;
         bool mShowRays;
 
@@ -163 +165 @@
 
         unsigned int mIndexBufferSize;
+
+        Vector3 mDummyViewPoint;
 
         QtRendererControlWidget *mControlWidget;
@@ -316 +320 @@
         void SetShowPiercingRays(bool b) {
                 mShowPiercingRays = b;
+                updateGL();
+        }
+
+        void SetShowWeightedRays(bool b) {
+                mShowWeightedRays = b;
                 updateGL();
         }

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

@@ -55 +55 @@
         //glDisable(GL_DEPTH_TEST);
 
+        mRenderer->mDummyViewPoint = mDummyViewPoint;
         glColor3f(0.8f, 0.8f, 0.8f);
         mRenderer->RenderPvs();
@@ -108 +109 @@
         glLoadIdentity();
 
-        float m[4][4];
+        //float m[4][4];
+        Matrix4x4 m;
 
         glLoadIdentity();
         gluLookAt(0.0, 0.0, 1.0,  /* eye is at (0,0,30) */
-                0.0, 0.0, 0.0,      /* center is at (0,0,0) */
-                0.0, 1.0, 0.);      /* up is in positive Y direction */
-
-        build_rotmatrix(m, manipulatorLastQuat);
-        glMultMatrixf(&m[0][0]);
-
-        float s = scale*20.0f/Magnitude(mRenderer->mSceneGraph->GetBox().Diagonal());
+                      0.0, 0.0, 0.0,  /* center is at (0,0,0) */
+                      0.0, 1.0, 0.);  /* up is in positive Y direction */
+
+        build_rotmatrix(m.x, manipulatorLastQuat);
+        glMultMatrixf((float *)m.x);
+
+        float s = scale * 20.0f / Magnitude(mRenderer->mSceneGraph->GetBox().Diagonal());
         glScalef(s, s, s);
 
@@ -124 +126 @@
         glTranslatef(t.x, t.y, t.z);
 
+        mDummyViewPoint = -t;
+        mDummyViewPoint /= s;
+
+        //glGetFloatv(GL_MODELVIEW_MATRIX, m1);
+
+        m.Invert();
+
+        mDummyViewPoint = m * mDummyViewPoint;
         RenderScene();
 }

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

@@ -3 +3 @@
 
 #include <QtOpenGL>
-
+#include "Vector3.h"
 
 namespace GtpVisibilityPreprocessor 
@@ -22 +22 @@
 
         QtGlViewer(QWidget *parent,
-                QtGlRendererWidget *renderer);
+                       QtGlRendererWidget *renderer);
 
         virtual ~QtGlViewer(){};
@@ -41 +41 @@
         void mouseMoveEvent(QMouseEvent *event);
 
-        void keyPressEvent ( QKeyEvent * e );
+        void keyPressEvent(QKeyEvent * e);
 
         bool mWireframe;
 
         int timerId;
+
+        Vector3 mDummyViewPoint;
 
 private:

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

@@ -750 +750 @@
         Vector3 origin, termination, direction; 
 
-        float radius = 0.5f * 
+        const float radius = 0.5f * 
                 Magnitude(mPreprocessor.mViewCellsManager->GetViewSpaceBox().Size());