Changeset 1941 for GTP

Timestamp:

01/05/07 16:06:23 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (5 diffs)
• BvHierarchy.h (modified) (3 diffs)
• GlRenderer.cpp (modified) (1 diff)
• GlobalLinesRenderer.h (added)

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

@@ -1553 +1553 @@
         }
 
-        // only use a subset of the rays for visibility based heuristics
-        if (mUseCostHeuristics && useVisibilityBasedHeuristics)
+        // if #rays high consider only use a subset of the rays for 
+        // visibility based heuristics
+        VssRay::NewMail();
+
+        if ((mMaxTests < tData.mNumRays) &&      mUseCostHeuristics && useVisibilityBasedHeuristics)
         {
                 VssRayContainer rays;
+
                 // maximal 2 objects share the same ray
                 rays.reserve(tData.mNumRays * 2);
                 CollectRays(tData.mNode->mObjects, rays);
 
-                const float prop = (float)mMaxTests / (float)tData.mNumRays;
-
-                VssRay::NewMail();
+                const float prop = (float)mMaxTests / (float)rays.size();
 
                 VssRayContainer::const_iterator rit, rit_end = rays.end();
 
-                int nRays = 0;
-
+                // mail rays which will not be considered
                 for (rit = rays.begin(); rit != rit_end; ++ rit)
                 {
-                        if ((mMaxTests >= (int)rays.size()) || (Random(1.0f) < prop))
+                        if (Random(1.0f) > prop)
                         {
                                 (*rit)->Mail();
-                                ++ nRays;
                         }
-                }
+                }               
         }
 
@@ -1839 +1839 @@
                                                                   ViewCellContainer &viewCells,
                                                                   const bool setCounter,
-                                                                  const bool onlyMailedRays) const
+                                                                  const bool onlyUnmailedRays) const
 {
         ViewCell::NewMail();
@@ -1849 +1849 @@
         {
                 // always use only mailed objects
-                numRays += CollectViewCells(*oit, viewCells, true, setCounter, onlyMailedRays);
+                numRays += CollectViewCells(*oit, viewCells, true, setCounter, onlyUnmailedRays);
         }
 
@@ -1860 +1860 @@
                                                                   const bool useMailBoxing,
                                                                   const bool setCounter,
-                                                                  const bool onlyMailedRays) const
+                                                                  const bool onlyUnmailedRays) const
 {
         VssRayContainer::const_iterator rit, rit_end = obj->GetOrCreateRays()->end();
@@ -1870 +1870 @@
                 VssRay *ray = (*rit);
 
-                if (onlyMailedRays && !ray->Mailed())
+                if (onlyUnmailedRays && ray->Mailed())
                 {
                         continue;

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

@@ -822 +822 @@
                                                  ViewCellContainer &viewCells,
                                                  const bool setCounter,
-                                                 const bool onlyMailedRays) const;
+                                                 const bool onlyUnmailedRays) const;
 
         /** Collects view cells which see an object.
@@ -828 +828 @@
                 only unmailed object should pass
                 @param setCounter counter for the sweep algorithm
-                @param onlyMailedRays if only mailed rays should be considered
+                @param onlyUnmailedRays if only unmailed rays should be considered
         */
         int CollectViewCells(Intersectable *object, 
@@ -834 +834 @@
                                                  const bool useMailBoxing,
                                                  const bool setCounter,
-                                                 const bool onlyMailedRays) const;
+                                                 const bool onlyUnmailedRays) const;
 
         /** Counts the view cells of this object. note: only

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

@@ -125 +125 @@
   if (mUseFalseColors)
         SetupFalseColor(object->mId);
-  
+  glColor3f(1, 1,1);
 
   switch (object->Type()) {