Changeset 2705 for GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.cpp

Timestamp:

05/24/08 11:59:35 (16 years ago)

Author:

mattausch

Message:

enabled view cell visualization

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.cpp (modified) (7 diffs)

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

@@ -22 +22 @@
 #define NOT_ACCOUNTED_OBJECT 0
 #define ACCOUNTED_OBJECT 2
-#define SHOW_QT_VISUALIZATION 0
+
 
 static const float MIN_DIST = 0.001f;
@@ -174 +174 @@
 
 
-void GvsPreprocessor::CountObject(Intersectable *triObj)
-{
+int GvsPreprocessor::CountObject(Intersectable *triObj)
+{
+        int numObjects = 0;
+
         if ((triObj->mCounter != (NOT_ACCOUNTED_OBJECT + 1)) && 
                 (triObj->mCounter != (ACCOUNTED_OBJECT + 1)))
         {
                 ++ triObj->mCounter;
-                ++ mGenericStats[1];
-        }
+                ++ numObjects;
+        }
+
+        mGenericStats[1] += numObjects;
+
+        return numObjects;
 }
 
@@ -187 +193 @@
 void GvsPreprocessor::UpdateStatsForVisualization(KdIntersectable *kdInt)
 {
-        //mViewCellsManager->UpdateStatsForViewCell(mCurrentViewCell, kdInt);
-
         // count new objects in pvs due to kd node conversion   
         myobjects.clear();
-        mKdTree->CollectObjects(kdInt->GetItem(), myobjects);
+        // also gather duplicates to avoid mailing
+        mKdTree->CollectObjectsWithDublicates(kdInt->GetItem(), myobjects);
+
+        int numObj;
 
         ObjectContainer::const_iterator oit, oit_end = myobjects.end();
 
         for (oit = myobjects.begin(); oit != oit_end; ++ oit)
-                CountObject(*oit);
+                numObj = CountObject(*oit);
+
+        mViewCellsManager->UpdateStatsForViewCell(mCurrentViewCell, kdInt, numObj);
 }       
 
@@ -240 +249 @@
                                 mCurrentViewCell->GetPvs().AddSampleDirty(kdInt, 1.0f);
 
-                                if (SHOW_QT_VISUALIZATION) UpdateStatsForVisualization(kdInt);  
+                                if (QT_VISUALIZATION_SHOWN) UpdateStatsForVisualization(kdInt); 
                         }
                 }
@@ -871 +880 @@
 
 
-void GvsPreprocessor::IntersectWithViewCell()
+void GvsPreprocessor::ComputeViewCellGeometryIntersection()
 {
         AxisAlignedBox3 box = mCurrentViewCell->GetBox();
@@ -915 +924 @@
                         mCurrentViewCell->GetPvs().AddSampleDirty(kdInt, 1.0f);
                         //mCurrentViewCell->GetPvs().AddSampleDirtyCheck(kdInt, 1.0f);
-                        if (SHOW_QT_VISUALIZATION) UpdateStatsForVisualization(kdInt);
+                        if (QT_VISUALIZATION_SHOWN) UpdateStatsForVisualization(kdInt);
                 }
         }
@@ -1296 +1305 @@
         
         // at last compute objects that directly intersect view cell
-        IntersectWithViewCell();
+        ComputeViewCellGeometryIntersection();