Changeset 2593 for GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp

Timestamp:

01/14/08 18:25:44 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp (modified) (4 diffs)

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

@@ -14 +14 @@
 #include "KdTree.h"
 #include "SamplingStrategy.h"
+#include "Preprocessor.h"
 
 
@@ -145 +146 @@
 void GlRenderer::RenderIntersectable(Intersectable *object)
 {
-        if (!object)
+        if (!object || (object->mRenderedFrame == mCurrentFrame))
                 return;
 
-        if (object->mRenderedFrame == mCurrentFrame)
-                return;
-
         object->mRenderedFrame = mCurrentFrame;
-
-        //if (object->Mailed()) return;
-        //object->Mail();
 
         glPushAttrib(GL_CURRENT_BIT);
@@ -205 +200 @@
 
 
-void GlRenderer::RenderRays(const VssRayContainer &rays, int colorType, int showDistribution)
-{
+void GlRenderer::RenderRays(const VssRayContainer &rays, int colorType, int showDistribution, int maxAge)
+{
+        float importance;
+
+        glBegin(GL_LINES);
+
         VssRayContainer::const_iterator it = rays.begin(), it_end = rays.end();
-
-        glBegin(GL_LINES);
-        
-        float importance;
 
         for (; it != it_end; ++it) 
@@ -221 +216 @@
                         ((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)))
+                        ((ray->mDistribution == SamplingStrategy::MUTATION_BASED_DISTRIBUTION) && ((showDistribution & 8) == 0)) ||
+                        ((mViewCellsManager->GetPreprocessor()->mPass - ray->mPass) >= maxAge))
                 {
                         continue;