Changeset 2591 for GTP/trunk/Lib/Vis/Preprocessing

Timestamp:

01/11/08 02:35:42 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/run_demo_soda (modified) (1 diff)
• src/GlRenderer.cpp (modified) (2 diffs)
• src/GlRenderer.h (modified) (1 diff)
• src/QtInterface/QtGlRenderer.cpp (modified) (5 diffs)
• src/QtInterface/QtGlRenderer.h (modified) (3 diffs)

GTP/trunk/Lib/Vis/Preprocessing/scripts/run_demo_soda

@@ -14 +14 @@
 
 $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
--rss_distributions=mutation+object_direction+spatial \
+-rss_distributions=mutation+object_direction+direction \
 -view_cells_use_kd_pvs+ -af_use_kd_pvs+ \
 -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4a.xml \

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

@@ -205 +205 @@
 
 
-void GlRenderer::RenderRays(const VssRayContainer &rays, int colorType)
+void GlRenderer::RenderRays(const VssRayContainer &rays, int colorType, int showDistribution)
 {
         VssRayContainer::const_iterator it = rays.begin(), it_end = rays.end();
@@ -217 +217 @@
                 VssRay *ray = *it;
 
+                // only show distributions that were checked
+                if (((ray->mDistribution == SamplingStrategy::DIRECTION_BASED_DISTRIBUTION) && ((showDistribution & 1) == 0)) ||
+                        ((ray->mDistribution == SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION) && ((showDistribution & 2) == 0)) ||
+                        ((ray->mDistribution == SamplingStrategy::OBJECT_DIRECTION_BASED_DISTRIBUTION) && ((showDistribution & 4) == 0)) ||
+                        ((ray->mDistribution == SamplingStrategy::MUTATION_BASED_DISTRIBUTION) && ((showDistribution & 8) == 0)))
+                {
+                        continue;
+                }
+                
                 switch (colorType)
                 {

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

@@ -129 +129 @@
 
   void
-  RenderRays(const VssRayContainer &rays, int colorType = 0);
+  RenderRays(const VssRayContainer &rays, int colorType = 0, int showDistribution = 15);
 
   void

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

@@ -717 +717 @@
                 if (1 && mShowRays) 
                 {
-                        RenderRays(mViewCellsManager->mVizBuffer.GetRays(), mRayVisualizationMethod);
+                        RenderRays(mViewCellsManager->mVizBuffer.GetRays(), mRayVisualizationMethod, mShowDistribution);
                 }
         }
@@ -877 +877 @@
         mShowDistanceWeightedTriangles = false;
         mShowWeightedTriangles = false;
+        mShowDistribution = 15;
 
         mSpatialFilterSize = 0.01;
@@ -931 +932 @@
         connect(mControlWidget, SIGNAL(SetShowDistribution(bool)), this, SLOT(SetShowDistribution(bool)));
 
-
-        connect(mControlWidget,
-                SIGNAL(SetShowRays(bool)),
-                this,
-                SLOT(SetShowRays(bool)));
+        connect(mControlWidget, SIGNAL(SetShowDistribution1(bool)), this, SLOT(SetShowDistribution1(bool)));
+        connect(mControlWidget, SIGNAL(SetShowDistribution2(bool)), this, SLOT(SetShowDistribution2(bool)));
+        connect(mControlWidget, SIGNAL(SetShowDistribution3(bool)), this, SLOT(SetShowDistribution3(bool)));
+        connect(mControlWidget, SIGNAL(SetShowDistribution4(bool)), this, SLOT(SetShowDistribution4(bool)));
+
+
+        connect(mControlWidget, SIGNAL(SetShowRays(bool)), this, SLOT(SetShowRays(bool)));
 
         resize(1000, 500);
@@ -1648 +1651 @@
         connect(rb4, SIGNAL(toggled(bool)), SIGNAL(SetShowDistribution(bool)));
 
+
+        ///////////////////////////
+
+        
         QGroupBox *groupBox = new QGroupBox("Ray visualization options");
         QVBoxLayout *vbox2 = new QVBoxLayout;
@@ -1657 +1664 @@
         
         rb1->setChecked(true);
+
+
+        QCheckBox *cb = new QCheckBox("Distribution 1", parent);
+        vbox2->addWidget(cb);
+        cb->setChecked(true);
+        connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetShowDistribution1(bool)));
+
+        cb = new QCheckBox("Distribution 2", parent);
+        vbox2->addWidget(cb);
+        cb->setChecked(true);
+        connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetShowDistribution2(bool)));
+
+        cb = new QCheckBox("Distribution 3", parent);
+        vbox2->addWidget(cb);
+        cb->setChecked(true);
+        connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetShowDistribution3(bool)));
+        
+        cb = new QCheckBox("Distribution 4", parent);
+        vbox2->addWidget(cb);
+        cb->setChecked(true);
+        connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetShowDistribution4(bool)));
+
 
         vbox2->addStretch(1);

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

@@ -147 +147 @@
   void SetShowContribution(bool);
   void SetShowDistribution(bool);
+
+  void SetShowDistribution1(bool);
+  void SetShowDistribution2(bool);
+  void SetShowDistribution3(bool);
+  void SetShowDistribution4(bool);
 };
 
@@ -191 +196 @@
         bool mShowDistanceWeightedPvs;
         bool mShowWeightedTriangles;
+        
+        int mShowDistribution;
 
         // some statistics
@@ -459 +466 @@
                 mRayVisualizationMethod = 3;
         }
-
+        
+        void SetShowDistribution1(bool b)
+        {
+                if (b)
+                        mShowDistribution |= 1;
+                else
+                        mShowDistribution ^= 1;
+
+                std::cout << "b: " << (mShowDistribution & 1) << " " << (mShowDistribution & 2) << " " << (mShowDistribution & 4) << " " << (mShowDistribution & 8) << std::endl; 
+        }
+
+        
+        void SetShowDistribution2(bool b)
+        {
+                if (b)
+                        mShowDistribution |= 2;
+                else
+                        mShowDistribution ^= 2;
+        }
+
+        
+        void SetShowDistribution3(bool b)
+        {
+                if (b)
+                        mShowDistribution |= 4;
+                else
+                        mShowDistribution ^= 4;
+        }
+        
+        void SetShowDistribution4(bool b)
+        {
+                if (b)
+                        mShowDistribution |= 8;
+                else
+                        mShowDistribution ^= 8;
+        }
 
         void _RenderPvs();