Changeset 2562 for GTP

Timestamp:

12/10/07 18:43:33 (17 years ago)

Author:

mattausch

Message:

worked on visualization

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp (modified) (1 diff)
• Preprocessing/src/CHCRenderer.cpp (added)
• Preprocessing/src/CHCRenderer.h (added)
• Preprocessing/src/GlRenderer.cpp (modified) (3 diffs)
• Preprocessing/src/QtInterface/QtGlRenderer.cpp (modified) (12 diffs)
• Preprocessing/src/QtInterface/QtGlRenderer.h (modified) (7 diffs)
• Preprocessing/src/QtInterface/QtGlViewer.cpp (modified) (4 diffs)
• Preprocessing/src/QtInterface/QtGlViewer.h (modified) (2 diffs)
• Preprocessing/src/ViewCell.h (modified) (2 diffs)

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

@@ -1033 +1033 @@
                                 QueuedRenderableCollection::OM_SORT_DESCENDING, true);
                 }
-
-
-        }// for each priority
+        } // for each priority
 }
 //-----------------------------------------------------------------------

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

@@ -309 +309 @@
                 SetupMaterial(mesh->mMaterial);
 
-        for (i=0; i < mesh->mFaces.size(); i++) 
+        for (i = 0; i < mesh->mFaces.size(); i++) 
         {
                 if (mWireFrame)
@@ -337 +337 @@
   glFrontFace(GL_CCW);
   glCullFace(GL_BACK);
-  glEnable(GL_CULL_FACE);
+
   glShadeModel(GL_FLAT);
-  glDepthFunc( GL_LESS );
+  glDepthFunc(GL_LESS );
   glEnable(GL_DEPTH_TEST);
   glEnable(GL_CULL_FACE);
@@ -345 +345 @@
   InitExtensions();
 
-  glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE );
-
-  glEnable( GL_NORMALIZE );
+  glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+
+  glEnable(GL_NORMALIZE);
   
   glClearColor(0.0f, 0.0f, 1.0f, 1.0f);

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

@@ -50 +50 @@
 }
 
+
+inline static bool nearerThan(ViewCell *vc1, ViewCell *vc2)
+{
+        return vc1->GetDistance() > vc2->GetDistance();
+}
+
+
 #if USE_CG
 static void handleCgError() 
@@ -322 +329 @@
                 glMatrixMode(GL_PROJECTION);
                 glLoadIdentity();
-                gluPerspective(angle, ww/(float)hh, 0.1, 2.0*Magnitude(mSceneGraph->GetBox().Diagonal()));
+                gluPerspective(angle, ww/(float)hh, 0.1, 2.0 * Magnitude(mSceneGraph->GetBox().Diagonal()));
                 glMatrixMode(GL_MODELVIEW);
         } else {
@@ -330 +337 @@
                 glMatrixMode(GL_PROJECTION);
                 glLoadIdentity();
-                gluPerspective(50.0, ww/(float)hh, 0.1, 20.0*Magnitude(mSceneGraph->GetBox().Diagonal()));
+                gluPerspective(50.0, ww / (float)hh, 0.1, 20.0 * Magnitude(mSceneGraph->GetBox().Diagonal()));
                 glMatrixMode(GL_MODELVIEW);
         }
@@ -830 +837 @@
         mRenderFilter = true;
         mRenderVisibilityEstimates = false;
+
+        mHideByCost = false;
+
         mTransferFunction = 0.2f;
         mIndexBufferSize = 0;
@@ -835 +845 @@
         //mCurrentFrame = 0;
 
-        const int delay = 500; // half a second
+        const int delay = 250; // in milliseconds
         timerId = startTimer(delay);
 
@@ -873 +883 @@
         connect(mControlWidget, SIGNAL(SetVisibilityFilterSize(int)), this, SLOT(SetVisibilityFilterSize(int)));
         connect(mControlWidget, SIGNAL(SetSpatialFilterSize(int)), this, SLOT(SetSpatialFilterSize(int)));
+        connect(mControlWidget, SIGNAL(SetHidingCost(int)), this, SLOT(SetHidingCost(int)));
 
         connect(mControlWidget, SIGNAL(SetShowViewCells(bool)), this, SLOT(SetShowViewCells(bool)));
@@ -879 +890 @@
         connect(mControlWidget, SIGNAL(SetTopView(bool)), this, SLOT(SetTopView(bool)));
         connect(mControlWidget, SIGNAL(SetCutViewCells(bool)), this, SLOT(SetCutViewCells(bool)));
+        connect(mControlWidget, SIGNAL(SetHideByCost(bool)), this, SLOT(SetHideByCost(bool)));
         connect(mControlWidget, SIGNAL(SetCutScene(bool)), this, SLOT(SetCutScene(bool)));
         connect(mControlWidget, SIGNAL(SetRenderErrors(bool)), this, SLOT(SetRenderErrors(bool)));
@@ -1119 +1131 @@
         // shift it along y according to number, which is percentage of the bounding
         // box position
-        if (mViewCellsManager) {
+        if (mViewCellsManager) 
+        {
                 AxisAlignedBox3 box = mViewCellsManager->GetViewSpaceBox();
                 Vector3 p = box.Min() + (number/1000.0f)*box.Max();
                 mSceneCutPlane.mNormal = Vector3(0,-1,0);
                 mSceneCutPlane.mD = -DotProd(mSceneCutPlane.mNormal, p);
+
                 updateGL();
         }
 }
+
+void
+QtGlRendererWidget::SetHidingCost(int number)
+{
+        mHidingCost = (float)number / 1000.0f;
+        cout << "hiding cost " << mHidingCost << endl;
+}
+
 
 void
@@ -1144 +1166 @@
         glEnable(GL_CULL_FACE);
         glCullFace(GL_FRONT);
-
-        glDisable(GL_CULL_FACE);
+        //glDisable(GL_CULL_FACE);
+
         double eq[4];
         eq[0] = mSceneCutPlane.mNormal.x;
@@ -1159 +1181 @@
 
         int i;
+
         ViewCellContainer &viewcells = mViewCellsManager->GetViewCells();
         int maxPvs = -1;
-        int maxPiercingRays = 0;
+        int maxPiercingRays = 1; // for savety
 
         for (i = 0; i < viewcells.size(); ++ i) 
@@ -1171 +1194 @@
                 if (p > maxPvs)
                         maxPvs = p;
+
                 const int piercingRays = vc->GetNumPiercingRays();
+                
                 if (piercingRays > maxPiercingRays)
                         maxPiercingRays = piercingRays;
         }
 
-
-        for (i = 0; i < viewcells.size(); ++ i) 
+        cout << "here22 " << mHideByCost << " " << mHidingCost << endl;
+
+        if (!mShowPvsSizes && !mShowPiercingRays)
         {
-                ViewCell *vc = viewcells[i];
-                //      Mesh *m = vc->GetMesh();
+                for (i = 0; i < viewcells.size(); ++ i) 
+                {
+                        ViewCell *vc = viewcells[i];
+                        RgbColor c;
+
+                        if (!mShowPvsSizes && !mShowPiercingRays)
+                        {
+                                mWireFrame = true;
+                                c = vc->GetColor();
+                        } 
+
+                        glColor3f(c.r, c.g, c.b);
+
+                        if (!mHideByCost || (mHidingCost < vc->GetNumPiercingRays() / (float)maxPiercingRays)) 
+                        {
+                RenderViewCell(vc);
+                        }
+                }
+        }
+        else
+        {
+                //glDisable(GL_CULL_FACE);
+                //glEnable(GL_CULL_FACE);
+                //glFrontFace(GL_CCW);  
+                //glCullFace(GL_BACK);
+                glEnable(GL_DEPTH_TEST);
+                glDisable(GL_BLEND);
+
+                //glDisable(GL_DEPTH_TEST);
+                //glEnable(GL_BLEND);
+        
+                //glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+                glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+
+                for (i = 0; i < viewcells.size(); ++ i) 
+                {
+                        ViewCell *vc = viewcells[i];
+                        const float dist = SqrDistance(mViewPoint, vc->GetBox().Center());
+
+                        vc->SetDistance(dist);
+                }
+
+                sort(viewcells.begin(), viewcells.end(), nearerThan);
 
                 RgbColor c;
 
-                if (!mShowPvsSizes && !mShowPiercingRays)
+        for (i = 0; i < viewcells.size(); ++ i) 
                 {
-                        mWireFrame = true;
-                        c = vc->GetColor();
-                } 
-                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);
+            ViewCell *vc = viewcells[i];
+                        
+                        //cout << "dist: " << vc->GetDistance() << " ";
+
+                        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 = RainbowColorMapping(importance);
+                        }
+                        
+                        const float alpha = 0.2f;
+                        glColor4f(c.r, c.g, c.b, alpha);
+                        
+                        if (!mHideByCost || (mHidingCost < vc->GetNumPiercingRays() / (float)maxPiercingRays)) 
+                        {
+                RenderViewCell(vc);
+                        }
                 }
-                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 = RainbowColorMapping(importance);
-                }
-
-                glColor3f(c.r, c.g, c.b);
-
-                RenderViewCell(vc);
+
+                glEnable(GL_DEPTH_TEST);        
         }
 
@@ -1474 +1549 @@
                 connect(button, SIGNAL(clicked(void)), SLOT(FocusNextPvsErrorFrame(void)));
         }
+
+        // the render cost visualization
+        slider = new QSlider(Qt::Horizontal, vbox);
+        vbox->layout()->addWidget(slider);
+        slider->show();
+        slider->setRange(0, 1000);
+        slider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+        slider->setValue(100);
+        connect(slider, SIGNAL(valueChanged(int)), SIGNAL(SetHidingCost(int)));
+        
+        cb = new QCheckBox("Hide view cells by render cost ", vbox);
+        vbox->layout()->addWidget(cb);
+        cb->setChecked(false);
+        connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetHideByCost(bool)));
 
         setWindowTitle("Preprocessor Control Widget");

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

@@ -99 +99 @@
   void SetSceneCut(int);
   void SetTopDistance(int);
+  void SetHidingCost(int);
   void SetVisibilityFilterSize(int);
   void SetSpatialFilterSize(int);
@@ -116 +117 @@
   void SetCutViewCells(bool);
   void SetCutScene(bool);
+
+  void SetHideByCost(bool);
 };
 
@@ -131 +134 @@
         bool mCutViewCells;
         bool mCutScene;
+        bool mHideByCost;
         bool mRenderErrors;
         bool mRenderFilter;
@@ -144 +148 @@
 
         Plane3 mSceneCutPlane;
+        float mHidingCost;
+
         float mTopDistance;
 
@@ -277 +283 @@
                 SetTopDistance(int dist);
 
+        void
+                SetHidingCost(int dist);
+
         void SetShowViewCells(bool b) {
                 mRenderViewCells = b;
@@ -308 +317 @@
 
         void SetCutViewCells(bool b) {
+                std::cout << "here64" << std::endl;
+
                 mCutViewCells = b;
                 updateGL();
@@ -313 +324 @@
         void SetCutScene(bool b) {
                 mCutScene = b;
+                updateGL();
+        }
+
+        void SetHideByCost(bool b) {
+                std::cout << "here45" << std::endl;
+                mHideByCost = b;
                 updateGL();
         }

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

@@ -29 +29 @@
         mWireframe = false;
         trackball(manipulatorLastQuat, 0.0f, 0.0f, 0.0f, 0.0f);
-        connect(renderer, SIGNAL(PvsUpdated()), this, SLOT(updateGL()));
+        //connect(renderer, SIGNAL(PvsUpdated()), this, SLOT(updateGL()));
+        //connect(renderer, SIGNAL(cutupdated), this, SLOT(updateGL()));
+
+        const int delay = 250; // in milliseconds
+        timerId = startTimer(delay);
 }
   
@@ -47 +51 @@
 QtGlViewer::RenderScene()
 {
-        mRenderer->mFrame++;
+        ++ mRenderer->mFrame;
         
-        // render into the right side of the window buffer
-        if (mRenderer->mRenderViewCells) 
-          mRenderer->RenderViewCells();
-        
+        glDisable(GL_DEPTH_TEST);
+
         glColor3f(0.8f, 0.8f, 0.8f);
         mRenderer->RenderPvs();
@@ -68 +70 @@
 //        }
 //      }
-        
+
         if (mRenderer->mShowRenderCost) 
           mRenderer->RenderRenderCost();
+
+        // render into the right side of the window buffer
+        if (mRenderer->mRenderViewCells)
+                mRenderer->RenderViewCells();
 
         glColor3f(1.0f, 1.0f, 1.0f);
@@ -190 +196 @@
 }
 
-}
-
+void QtGlViewer::timerEvent(QTimerEvent *event) 
+{
+        update();
+}
+
+
+}
+

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

@@ -5 +5 @@
 
 
-namespace GtpVisibilityPreprocessor {
+namespace GtpVisibilityPreprocessor 
+{
 
 class QtGlRendererWidget;
 
+
 class QtGlViewer : public QGLWidget
 {
-
-  //Q_OBJECT
+        //Q_OBJECT
 
         friend class QtGlRendererWidget;
@@ -19 +20 @@
 public:
         QtGlRendererWidget *mRenderer;
-        
+
         QtGlViewer(QWidget *parent,
-                           QtGlRendererWidget *renderer);
-        
-  virtual ~QtGlViewer(){};
-  
-  QSize minimumSizeHint() const;
-  QSize sizeHint() const;
-  
-  // This method has to be rendefined by all renderer implementations
-  virtual void RenderScene();
-  
+                QtGlRendererWidget *renderer);
+
+        virtual ~QtGlViewer(){};
+
+        QSize minimumSizeHint() const;
+        QSize sizeHint() const;
+
+        // This method has to be rendefined by all renderer implementations
+        virtual void RenderScene();
+
+        void timerEvent(QTimerEvent *event);
+
 protected:
-  void initializeGL();
-  void paintGL();
-  void resizeGL(int width, int height);
-  void mousePressEvent(QMouseEvent *event);
-  void mouseMoveEvent(QMouseEvent *event);
+        void initializeGL();
+        void paintGL();
+        void resizeGL(int width, int height);
+        void mousePressEvent(QMouseEvent *event);
+        void mouseMoveEvent(QMouseEvent *event);
 
         void keyPressEvent ( QKeyEvent * e );
-        
-  bool mWireframe;
+
+        bool mWireframe;
+
+        int timerId;
 
 private:
 
         float manipulatorLastQuat[4];
-  float scale;
-  QPoint lastPos;
+        float scale;
+        QPoint lastPos;
 
 };

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

@@ -298 +298 @@
         }
 
-        int GetNumPiercingRays()
+        int GetNumPiercingRays() const
         {
                 return mNumPiercingRays;
         }
 
+        float GetDistance() const
+        {
+                return mDistance;
+        }
+
+        void SetDistance(float dist)
+        {
+                mDistance = dist;
+        }
 
 protected:
@@ -333 +342 @@
         /// number of rays piercing this view cell
         int mNumPiercingRays;
+
+        /// distance from the current view point
+        float mDistance;
 };