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

Timestamp:

01/17/08 21:46:32 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -369 +369 @@
         glNormalPointer(GL_FLOAT, 0, (char *)arrayPtr + offset * sizeof(Vector3));
         glDrawElements(GL_TRIANGLES, mIndexBufferSize, GL_UNSIGNED_INT, mIndices);
-}
-
-
-void QtGlRendererWidget::_UpdatePvsIndices()
+
+        // handle dynamic objects
+        DynamicObjectsContainer::const_iterator dit, dit_end = mDynamicObjects.end();
+
+        for (dit = mDynamicObjects.begin(); dit != dit_end; ++ dit)
+        {
+                RenderIntersectable(*dit);
+        }
+}
+
+
+void QtGlRendererWidget::PreparePvs()
 {
         int indexBufferSize = 0;
@@ -381 +389 @@
         mPvsSize = mPvsCache.mPvs.GetSize();
 
+        mDynamicObjects.clear();
+
         ObjectPvsIterator it = mPvsCache.mPvs.GetIterator();
 
@@ -386 +396 @@
         {
                 Intersectable *obj = it.Next();
-                KdNode *node = static_cast<KdIntersectable *>(obj)->GetItem();
-
-                _UpdatePvsIndices(node, indexBufferSize);
+                switch (obj->Type())
+                {
+                case Intersectable::KD_INTERSECTABLE:
+                        {
+                                KdNode *node = static_cast<KdIntersectable *>(obj)->GetItem();
+                                _UpdatePvsIndices(node, indexBufferSize);
+                        }
+                        break;
+                case Intersectable::TRANSFORMED_MESH_INSTANCE:
+                        mDynamicObjects.push_back(static_cast<TransformedMeshInstance *>(obj));
+                        break;
+                default:
+                        cerr << "PreparePvs: type " << Intersectable::GetTypeName(obj) << " not handled yet" << endl;
+                }
         }
 
@@ -421 +442 @@
                                 static_cast<TriangleIntersectable *>(leaf->mObjects[i]);
 
-                        // check if already rendered
-                        /*if (!obj->Mailed())
-                        {
-                                obj->Mail();
-
-                                mIndices[indexBufferSize + 0] = (obj->GetId() - 1) * 3 + 0;
-                                mIndices[indexBufferSize + 1] = (obj->GetId() - 1) * 3 + 1;
-                                mIndices[indexBufferSize + 2] = (obj->GetId() - 1) * 3 + 2;
-
-                                indexBufferSize += 3;
-                        }*/
                         if (obj->mRenderedFrame != mCurrentFrame)
                         {
@@ -481 +491 @@
                         if (mUseSpatialFilter) 
                         {
-                                //ObjectPvs pvs;
-
                                 //mMutex.lock();
                                 // mSpatialFilter size is in range 0.001 - 0.1
@@ -500 +508 @@
 
                         /// update the indices for rendering
-                        _UpdatePvsIndices();
+                        PreparePvs();
 
                         emit PvsUpdated();
                 }
 
-                //Intersectable::NewMail();
-                PvsData pvsData;
 
                 // Render PVS
@@ -519 +525 @@
                 {
                         if (!mRenderVisibilityEstimates && !mUseRandomColorPerPvsObject)
-                        {
                                 _RenderPvs();
-                        }
                         else
-                        {
-                                mPvsSize = mPvsCache.mPvs.GetSize();
-
-                                ObjectPvsIterator it = mPvsCache.mPvs.GetIterator();
-
-                                while (it.HasMoreEntries())
-                                {
-                                        Intersectable *object = it.Next(pvsData);
-
-                                        RgbColor color;
-
-                                        //float visibility = mTransferFunction*log10(entry.mData.mSumPdf + 1); // /5.0f
-                                        // glColor3f(visibility, 0.0f, 0.0f);
-                                        //cerr << "sumpdf: " << pvsData.mSumPdf << endl;
-                                        if (mUseRandomColorPerPvsObject)
-                                        {
-                                                KdIntersectable *kdint = static_cast<KdIntersectable *>(object);
-
-                                                if (kdint->mGenericIdx == -1)
-                                                {
-                                                        kdint->mGenericIdx = (int)mColors.size();
-                                                        mColors.push_back(RandomColor());
-                                                }
-                                                color = mColors[kdint->mGenericIdx];
-                                        } 
-                                        else
-                                        {
-                                                color = RainbowColorMapping(mTransferFunction * log10(pvsData.mSumPdf + 1));
-                                        }
-
-                                        glColor3f(color.r, color.g, color.b);
-
-                                        mUseForcedColors = true;
-                                        RenderIntersectable(object);
-                                        mUseForcedColors = false;
-                                }
-                        }
+                                _RenderColoredPvs();
                 }
 
@@ -587 +555 @@
                 RenderScene();
         }
-
-        //DisableDrawArrays();
-        //glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
 }
 
@@ -673 +638 @@
 {
         float MOVE_SENSITIVITY = Magnitude(mSceneGraph->GetBox().Diagonal())*1e-3;
-        float TURN_SENSITIVITY=0.1f;
-        float TILT_SENSITIVITY=32.0 ;
-        float TURN_ANGLE= M_PI/36.0 ;
+        float TURN_SENSITIVITY = 0.1f;
+        float TILT_SENSITIVITY = 32.0 ;
+        float TURN_ANGLE= M_PI  /36.0 ;
 
         int x = e->pos().x();
@@ -685 +650 @@
         if (e->modifiers() & Qt::ControlModifier) 
         {
-                mViewPoint.y += (y-mousePoint.y)*MOVE_SENSITIVITY/2.0;
-                mViewPoint.x += (x-mousePoint.x)*MOVE_SENSITIVITY/2.0;
+                mViewPoint.y += (y-mousePoint.y)*MOVE_SENSITIVITY / 2.0;
+                mViewPoint.x += (x-mousePoint.x)*MOVE_SENSITIVITY / 2.0;
         } 
         else 
@@ -930 +895 @@
         connect(mControlWidget, SIGNAL(SetRandomViewPoint()), this,     SLOT(SetRandomViewPoint()));
         connect(mControlWidget, SIGNAL(StoreStatistics(void)), this, SLOT(StoreStatistics(void)));
+        connect(mControlWidget, SIGNAL(LoadObject(void)), this, SLOT(LoadObject(void)));
 
         connect(mControlWidget, SIGNAL(SetSceneCut(int)), this, SLOT(SetSceneCut(int)));
@@ -1029 +995 @@
 }
 
+
+void QtGlRendererWidget::LoadObject()
+{
+        string filename("../data/bunny.bn");
+        
+        cout << "Loading model << " << filename << endl;
+
+        if (mViewCellsManager->GetPreprocessor()->LoadDynamicGeometry(filename))
+                cout << "Loading finished" << endl;
+        else
+                cerr << "Loading failed" << endl;
+
+    updateGL();
+}
+
 void
 QtGlRendererWidget::RenderRenderCost()
@@ -1176 +1157 @@
         
         QFont font40; font40.setPointSize(30);
-        s.sprintf("pvs:%04d", mPvsSize);
+        s.sprintf("PVS: %04d", mPvsSize);
         renderText(20, 40, s, font40);
 }
@@ -1862 +1843 @@
         QGroupBox *groupBox2 = CreateRenderCostPanel(hbox);
         vh->addWidget(groupBox2, 0, 0);
-
         
         QGroupBox *groupBox3 = CreateRayVisualizationPanel(hbox);
@@ -1877 +1857 @@
 
         vbox->resize(800,150);
-
 
         vbox = new QGroupBox("Rendering", this);
@@ -2034 +2013 @@
         connect(button, SIGNAL(clicked()), SIGNAL(StoreStatistics()));
 
+        button = new QPushButton("Load object", vbox);
+        vbox->layout()->addWidget(button);
+        connect(button, SIGNAL(clicked()), SIGNAL(LoadObject()));
+
         /*cb = new QCheckBox("Stats", vbox);
         vbox->layout()->addWidget(cb);
         cb->setChecked(false);
-        connect(cb, SIGNAL(toggled(bool)), SIGNAL(StoreStatistics()));
-*/
+        connect(cb, SIGNAL(toggled(bool)), SIGNAL(StoreStatistics()));*/
         if (0) 
         {
@@ -2207 +2189 @@
 
 
-}
+void QtGlRendererWidget::_RenderColoredPvs()
+{
+        // note: could be done more efficiently using color buffers
+        mPvsSize = mPvsCache.mPvs.GetSize();
+
+        ObjectPvsIterator it = mPvsCache.mPvs.GetIterator();
+
+        PvsData pvsData;
+
+        while (it.HasMoreEntries())
+        {
+                Intersectable *object = it.Next(pvsData);
+
+                RgbColor color;
+
+                //float visibility = mTransferFunction*log10(entry.mData.mSumPdf + 1); // /5.0f
+                // glColor3f(visibility, 0.0f, 0.0f);
+                //cerr << "sumpdf: " << pvsData.mSumPdf << endl;
+                if (mUseRandomColorPerPvsObject)
+                {
+                        KdIntersectable *kdint = static_cast<KdIntersectable *>(object);
+
+                        if (kdint->mGenericIdx == -1)
+                        {
+                                kdint->mGenericIdx = (int)mColors.size();
+                                mColors.push_back(RandomColor());
+                        }
+                        color = mColors[kdint->mGenericIdx];
+                } 
+                else
+                {
+                        color = RainbowColorMapping(mTransferFunction * log10(pvsData.mSumPdf + 1));
+                }
+
+                glColor3f(color.r, color.g, color.b);
+
+                mUseForcedColors = true;
+                RenderIntersectable(object);
+                mUseForcedColors = false;
+        }
+}
+
+}