Changeset 2736 for GTP/trunk

Timestamp:

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

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/run_gvs_vps.sh (modified) (1 diff)
• src/GlRenderer.cpp (modified) (2 diffs)
• src/GlRenderer.h (modified) (3 diffs)
• src/GvsPreprocessor.cpp (modified) (8 diffs)
• src/GvsPreprocessor.h (modified) (2 diffs)
• src/Preprocessor.cpp (modified) (1 diff)
• src/Preprocessor.h (modified) (1 diff)
• src/QtInterface/QtGlRenderer.cpp (modified) (5 diffs)
• src/QtInterface/QtGlRenderer.h (modified) (2 diffs)

GTP/trunk/Lib/Vis/Preprocessing/scripts/run_gvs_vps.sh

@@ -43 +43 @@
 -gvs_initial_samples=16 \
 -gvs_max_viewcells=3 \
--gvs_min_contribution=100 \
+-gvs_min_contribution=200 \
 -gvs_per_viewcell=true \
 -preprocessor_detect_empty_viewspace+ \

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

@@ -840 +840 @@
 GlRenderer::RenderKdNode(KdNode *node)
 {
-  if (node->IsLeaf()) 
-        {
-#if !EVAL_ERROR
+        if (node->IsLeaf()) 
+        {
                 RenderKdLeaf(static_cast<KdLeaf *>(node));
-#else
-                KdLeaf *leaf = static_cast<KdLeaf *>(node);
-                for (int i=0; i < leaf->mObjects.size(); i++) 
-                  {
-                        RenderIntersectable(leaf->mObjects[i]);
-                        
-                  }
-#endif
+
         } 
         else 
@@ -1946 +1938 @@
 
 
-
-}
+void GlRenderer::_RenderColoredPvs(const ObjectPvs &pvs)
+{
+        // note: could be done more efficiently using color buffers
+        ObjectPvsIterator it = pvs.GetIterator();
+
+        PvsData pvsData;
+
+        while (it.HasMoreEntries())
+        {
+                Intersectable *obj = it.Next(pvsData);
+
+                RgbColor color;
+
+                //cerr << "sumpdf: " << pvsData.mSumPdf << endl;
+                if (1)//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(log10(pvsData.mSumPdf + 1));
+                }
+
+                glColor3f(color.r, color.g, color.b);
+
+                mUseForcedColors = true;
+                RenderIntersectable(obj);
+                mUseForcedColors = false;
+        }
+}
+
+
+
+}

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

@@ -8 +8 @@
 #include "Renderer.h"
 #include "Beam.h"
+#include <vector>
+#include "Material.h"
 
 
@@ -221 +223 @@
   bool GetUseVbos() const { return mUseVbos; }
 
+  /** Render pvs using false colors.
+  */
+  void _RenderColoredPvs(const ObjectPvs &pvs);
 
 public:
@@ -296 +301 @@
 
         int mRenderedNodes;
+
+        std::vector<RgbColor> mColors;
 };
 

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

@@ -192 +192 @@
         else
         {
+                float scale = 0.01f;
+
                 if (0)
                         CastRayBundle4(simpleRay, reverseRays, mViewCellsManager->GetViewSpaceBox());
                 else
-                        CastRayBundle16(simpleRay, reverseRays);
+                        CastRayBundle16(simpleRay, reverseRays, scale);
         }
 
@@ -502 +504 @@
                                                                                   1.0f);
                         
-                        GenerateJitteredRays(simpleRays, mainRay, numRandomRays, 0);
+                        GenerateJitteredRays(simpleRays, mainRay, numRandomRays, 0, 0.01f);
                 }
                 else
@@ -625 +627 @@
                                                                   SamplingStrategy::GVS, 1.0f);
 
-        GenerateJitteredRays(simpleRays, mainRay, numRandomRays, 0);
+        GenerateJitteredRays(simpleRays, mainRay, numRandomRays, 0, 0.01f);
         //GenerateRays(numRandomRays, *mDistribution, simpleRays, sInvalidSamples);
 
@@ -799 +801 @@
         generationTimer.Entry();
 
-        if (mUseProbablyVisibleSampling && (RandomValue(0, 1) > 0.5))
+        if (mUseProbablyVisibleSampling)// && (RandomValue(0, 1) > 0.5))
         {
                 ProbablyVisibleDistribution distr(*this, mCurrentViewCell, &mProbablyVisibleTriangles);
@@ -827 +829 @@
         else
         {
+                float scale = 0.1f;
                 if (0)
                         // casting bundles of 4 rays generated from the simple rays
                         CastRayBundles4(simpleRays, vssRays);
                 else
-                        CastRayBundles16(simpleRays, vssRays);
+                        CastRayBundles16(simpleRays, vssRays, scale);
         }
 
@@ -1820 +1823 @@
 
 
-void GvsPreprocessor::CastRayBundle16(const SimpleRay &ray, VssRayContainer &vssRays)
+void GvsPreprocessor::CastRayBundle16(const SimpleRay &ray, VssRayContainer &vssRays, float scale)
 {
         static SimpleRayContainer simpleRays;
@@ -1826 +1829 @@
 
         simpleRays.push_back(ray);
-        GenerateJitteredRays(simpleRays, ray, 15, 0);
+        GenerateJitteredRays(simpleRays, ray, 15, 0, scale);
 
         CastRays(simpleRays, vssRays, false, false);
@@ -1832 +1835 @@
 
 
-void GvsPreprocessor::CastRayBundles16(const SimpleRayContainer &rays, VssRayContainer &vssRays)
+void GvsPreprocessor::CastRayBundles16(const SimpleRayContainer &rays, VssRayContainer &vssRays, float scale)
 {
         SimpleRayContainer::const_iterator it, it_end = rays.end();
 
         for (it = rays.begin(); it != it_end; ++ it)
-                CastRayBundle16(*it, vssRays);
+                CastRayBundle16(*it, vssRays, scale);
 }
 

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

@@ -258 +258 @@
         void CastRayBundles4(const SimpleRayContainer &rays, VssRayContainer &vssRays);
         
-        void CastRayBundles16(const SimpleRayContainer &rays, VssRayContainer &vssRays);
+        void CastRayBundles16(const SimpleRayContainer &rays, VssRayContainer &vssRays, float scale);
 
         /** Generates a ray bundle of 4 jittered rays and casts them using optimized 4 eye ray casting.
@@ -270 +270 @@
         void Cast4Rays(float *dist, Vector3 *dirs, Vector3 *origs, VssRayContainer &vssRays, const AxisAlignedBox3 &box);
 
-        void CastRayBundle16(const SimpleRay &ray, VssRayContainer &vssRays);
+        void CastRayBundle16(const SimpleRay &ray, VssRayContainer &vssRays, float scale);
 
         virtual void ComputeRenderError();

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

@@ -1328 +1328 @@
                                                                                 const SimpleRay &mainRay,
                                                                                 int number,
-                                                                                int pertubType) const
-{
-        //rayBundle.push_back(mainRay);
-        //const float pertubOrigin = 0.0f;
-        const float pertubDir = 0.01f;
+                                                                                int pertubType,
+                                                                                float scale) const
+{
         Vector3 pertub;
 
         for (int i = 0; i < number; ++ i)
         {
-                pertub.x = RandomValue(-pertubDir, pertubDir);
-                pertub.y = RandomValue(-pertubDir, pertubDir);
-                pertub.z = RandomValue(-pertubDir, pertubDir);
+                pertub.x = RandomValue(-scale, scale);
+                pertub.y = RandomValue(-scale, scale);
+                pertub.z = RandomValue(-scale, scale);
 
                 Vector3 newDir = mainRay.mDirection + pertub;

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

@@ -144 +144 @@
                                                          const SimpleRay &mainRay,
                                                          int number,
-                                                         int shuffleType) const;
+                                                         int shuffleType,
+                                                         float scale) const;
 
         virtual void CastRays(SimpleRayContainer &rays,

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);