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

Timestamp:

06/04/08 11:13:41 (17 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• QtGlRenderer.cpp (modified) (5 diffs)
• QtGlRenderer.h (modified) (2 diffs)

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

@@ -377 +377 @@
                         im.save(qstr, "PNG");
 
-                        if (0)
+                        if (1)
                         {
                                 ///////////
@@ -391 +391 @@
 
                                 KdNode::NewMail2();
-                                //Intersectable::NewMail();
 
                                 ++ mCurrentFrame;
 
                                 // render pvs once
-                                RenderPvs(pvs);
+                                //RenderPvs(pvs);
+                                _RenderColoredPvs(pvs);
                                 // hack for gvs visualization
                                 //RenderTrianglePvs();
@@ -405 +405 @@
 
                                 im = toImage();
-                                sprintf_s(filename, "error-frame-%04d-%04d-%08d-pvs.png", mFrame, viewcell->GetId(), pixelCount);
+                                sprintf_s(filename, "error-frame-%05d-%05d-%08d-pvs.png", viewcell->GetId(), mFrame, pixelCount);
                                 str = mSnapPrefix + filename;
                                 qstr = str.c_str();
@@ -713 +713 @@
                                 _RenderPvs();
                         else
-                                _RenderColoredPvs();
+                                _RenderColoredPvs(mPvsCache.mPvs);
                 }
 
@@ -2634 +2634 @@
 
 
-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 *obj = it.Next(pvsData);
-
-                RgbColor color;
-
-                //cerr << "sumpdf: " << pvsData.mSumPdf << endl;
-                if (mUseRandomColorPerPvsObject)
-                {
-                        if (obj->Type() == Intersectable::KD_INTERSECTABLE)
-                        {
-                                KdIntersectable *kdint = static_cast<KdIntersectable *>(obj);
-
-                                if (kdint->mGenericIdx == -1)
-                                {
-                                        kdint->mGenericIdx = (int)mColors.size();
-                                        mColors.push_back(RandomColor(0, 1));
-                                }
-                                color = mColors[kdint->mGenericIdx];
-                        }
-                } 
-                else
-                {
-                        color = RainbowColorMapping(mTransferFunction * log10(pvsData.mSumPdf + 1));
-                }
-
-                glColor3f(color.r, color.g, color.b);
-
-                mUseForcedColors = true;
-                RenderIntersectable(obj);
-                mUseForcedColors = false;
-        }
-}
-
 
 void QtGlRendererWidget::UpdateDynamicObjects()

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

@@ -239 +239 @@
         int mCurrentPvsCost;
 
-        vector<RgbColor> mColors;
-
         bool mUseRandomColorPerPvsObject;
 
@@ -590 +588 @@
         */
         void _RenderPvs();
-        /** Render pvs using false colors.
-        */
-        void _RenderColoredPvs();
 
         float ComputeRenderCost(ViewCell *vc);