Changeset 2643 for GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

Timestamp:

02/21/08 18:10:24 (16 years ago)

Author:

mattausch

Message:

compiling under release internal

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp (modified) (19 diffs)

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

@@ -307 +307 @@
         GlRenderer::InitGL();
 
+        //glEnable(GL_FOG);
+        //glFogi(GL_FOG_MODE, GL_EXP);
+        glFogi(GL_FOG_MODE, GL_LINEAR);
+
+//      glFogf(GL_FOG_DENSITY, .2f);
+        glFogf(GL_FOG_START, 50.f);
+        glFogf(GL_FOG_END, 500.f);
+
         GLfloat light_ambient[] = {0.3, 0.3, 0.3, 1.0};
     GLfloat light_diffuse[] = {0.6, 0.6, 0.6, 1.0};
@@ -440 +448 @@
         int indexBufferSize = 0;
         
-        KdNode::NewMail();
+        KdNode::NewMail2();
         //Intersectable::NewMail();
 
@@ -506 +514 @@
         if (viewcell) 
         {
-#if 1
+#if 0
                 // copy the pvs so that it can be filtered ...
                 if (PvsChanged(viewcell)) 
@@ -518 +526 @@
                                 //mMutex.lock();
                                 // mSpatialFilter size is in range 0.001 - 0.1
-                          mViewCellsManager->ApplyFilter2(viewcell,
-                                                                    mUseFilter,
-                                                                    100.0f * mSpatialFilterSize,
-                                                                    //pvs,
-                                                                                                mPvsCache.mPvs,         
-                                                                    &mPvsCache.filteredBoxes);
+                                mViewCellsManager->ApplyFilter2(viewcell,
+                                        mUseFilter,
+                                        100.0f * mSpatialFilterSize,
+                                        mPvsCache.mPvs,         
+                                        &mPvsCache.filteredBoxes);
                                 //mPvsCache.mPvs = pvs;
                                 //mMutex.unlock();
@@ -535 +542 @@
                         // update the indices for rendering
                         PreparePvs2(mPvsCache.mPvs);
-                        
                         emit PvsUpdated();
+                        mCurrentPvsCost = mPvsCache.mPvs.EvalPvsCost();
                 }
 #else
+        
                 PreparePvs2(viewcell->GetPvs());
                 emit PvsUpdated();
+
 #endif
 
@@ -577 +586 @@
                         mWireFrame = false;
                 }
+                mCurrentPvsCost = viewcell->GetPvs().EvalPvsCost();
         } 
         else 
@@ -585 +595 @@
                 RenderScene();
         }
+
+        //cout << "vp: " << mViewPoint << " vd: " << mViewDirection << endl;
 }
 
@@ -794 +806 @@
                 }
 
-                if (1 && mShowRays) 
+                if (mShowRays) 
                 {
                         RenderRays(mViewCellsManager->mVizBuffer.GetRays(), mRayVisualizationMethod, mShowDistribution, 1);
@@ -937 +949 @@
         //mRenderVisibilityEstimates = true;
 
+        mComputeGVS = false;
         mUseRandomColorPerPvsObject = false;
 
@@ -980 +993 @@
         mShowRays = false;
 
-        SetSceneCut(0);
+        SetSceneCut(1000);
         mControlWidget = new QtRendererControlWidget(NULL);
 
@@ -991 +1004 @@
         connect(mControlWidget, SIGNAL(SetRandomViewPoint()), this,     SLOT(SetRandomViewPoint()));
         connect(mControlWidget, SIGNAL(StoreStatistics(void)), this, SLOT(StoreStatistics(void)));
+        connect(mControlWidget, SIGNAL(ComputeGVS(void)), this, SLOT(ComputeGVS(void)));
         connect(mControlWidget, SIGNAL(LoadObject(void)), this, SLOT(LoadObject(void)));
 
@@ -1270 +1284 @@
 #if 0
         QFont font40; font40.setPointSize(30);
-        s.sprintf("PVS: %04d", mPvsSize);
-        renderText(20, 40, s, font40);
+        //s.sprintf("PVS: %04d", mPvsSize);
+        //renderText(20, 40, s, font40);
 #endif
         
-/*      QFont font40; font40.setPointSize(30);
-        s.sprintf("New triangles: %04d", 100);
-        renderText(200, 40, s, font40);*/
+        //s.sprintf("RAW TRI: %07d", mViewCellsManager->GetPreprocessor()->mGenericStats);
+        //renderText(290, 40, s, font40);
+        //s.sprintf("PVS TRI: %07d", mViewCellsManager->GetPreprocessor()->mGenericStats2);
+        //renderText(290, 70, s, font40);
+
+        s.sprintf("PVS TRI: %07d", (int)mCurrentPvsCost);
+        renderText(290, 70, s, font40);
+        //renderText(290, 70, s, font40);
+
 }
 
@@ -1283 +1303 @@
 QtGlRendererWidget::SetViewCellGranularity(int number)
 {
-        if (mViewCellsManager) {
-                //      mViewCellsManager->SetMaxFilterSize(number);
+        if (mViewCellsManager)
+        {
+                //      mViewCellsManager->SetMaxFilterSize(number);
 
                 // $$ tmp off
@@ -1301 +1322 @@
         if (mViewCellsManager) 
                 mViewCellsManager->SetMaxFilterSize(number);
+
         mPvsCache.Reset();
         updateGL();
@@ -1324 +1346 @@
                 AxisAlignedBox3 box = mViewCellsManager->GetViewSpaceBox();
                 Vector3 p = (1.0f - f) * box.Min() + f * box.Max();
-                mSceneCutPlane.mNormal = Vector3(0,-1,0);
+                mSceneCutPlane.mNormal = Vector3(0, -1, 0);
                 mSceneCutPlane.mD = -DotProd(mSceneCutPlane.mNormal, p);
 
@@ -1996 +2018 @@
         QGroupBox *groupBox = CreateVisualizationPanel(hbox);
         vh->addWidget(groupBox, 0, 0);
+
 #if REMOVE_TEMPORARY
         QGroupBox *groupBox2 = CreateRenderCostPanel(hbox);
         vh->addWidget(groupBox2, 0, 0);
-#endif
+        
         QGroupBox *groupBox3 = CreateRayVisualizationPanel(hbox);
         vh->addWidget(groupBox3, 0, 0);
@@ -2005 +2028 @@
         QGroupBox *groupBox4 = CreateTrafoPanel(hbox);
         vh->addWidget(groupBox4, 0, 0);
+#endif
 
         //////////////////////////////////
 
-
-        /*cb = new QRadiobox("Top View", vbox);
-        vl->addWidget(cb);
-        cb->setChecked(false);
-        connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetTopView(bool)));
-*/
 
         //vbox->resize(800,150);
@@ -2168 +2186 @@
 #endif
 
+        button = new QPushButton("Compute GVS", vbox);
+        vbox->layout()->addWidget(button);
+        connect(button, SIGNAL(clicked()), SIGNAL(ComputeGVS()));
+
 #if DYNAMIC_OBJECTS_HACK
 
@@ -2202 +2224 @@
         
         //connect(button, SIGNAL(clicked(void)), SLOT(StoreStatistics(void)));
-        //mHidingCost = 0.1f;
-//////////////////////////////////////////
+        
+        //////////////////////////////////////////
 
         label = new QLabel("Spatial Filter size");