Changeset 2130 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

02/20/07 13:05:26 (18 years ago)

Author:

mattausch

Message:

runs also under debug mode now

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (1 diff)
• HierarchyManager.cpp (modified) (2 diffs)
• HierarchyManager.h (modified) (2 diffs)
• ObjectsParser.cpp (modified) (2 diffs)
• Preprocessor.vcproj (modified) (2 diffs)
• RssTree.cpp (modified) (13 diffs)
• SamplingPreprocessor.cpp (modified) (1 diff)
• TestPreprocessor.vcproj (modified) (2 diffs)
• TraversalTree.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (3 diffs)

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

@@ -2785 +2785 @@
                                         "99990.0");
         
+        RegisterOption("Hierarchy.useTraversalTree",
+                                        optBool,
+                                        "hierarchy_use_traversal_tree=",
+                                        "false");
 
         ///////////////////////////////////////////////////////

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

@@ -160 +160 @@
                 "Hierarchy.Construction.minAvgRayContri", mMinAvgRayContri);
 
+        Environment::GetSingleton()->GetBoolValue(
+                "Hierarchy.useTraversalTree", mUseTraversalTree);
+
         // for comparing it with byte - value
         mTermMaxMemory *= (1024.0f * 1024.0f);
@@ -399 +402 @@
 
         // create a traversal tree which is optimized for view cell casting 
-        if (1) 
+        if (mUseTraversalTree) 
         {
                 CreateTraversalTree();

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

@@ -612 +612 @@
         BvHierarchy *mBvHierarchy;
         
+        bool mUseTraversalTree;
+
 protected:
 
@@ -682 +684 @@
 
         ViewCellContainer mOldViewCells;
-
-        //ObjectPvs mOldPvs;
 };
 

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

@@ -364 +364 @@
 
                         GzFileInputSource isource(myFilePath);
-                        Debug<<"here93" << endl;
                         parser->parse(isource);
 #else
@@ -370 +369 @@
 
 #endif
-Debug<<"here932" << endl;
+
                         const unsigned long endMillis = XMLPlatformUtils::getCurrentMillis();
                         duration = endMillis - startMillis;

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

@@ -222 +222 @@
                                 OptimizeForWindowsApplication="TRUE"
                                 AdditionalIncludeDirectories="..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\MultiLevelRayTracing;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl";"$(CG_INC_PATH)";Timer"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_INTERNAL;USE_QT"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_INTERNAL;USE_QT;USE_BIT_PVS"
                                 ExceptionHandling="TRUE"
                                 RuntimeLibrary="2"
@@ -383 +383 @@
                         </File>
                         <File
-                                RelativePath=".\BitVectorPvs.cpp">
-                        </File>
-                        <File
                                 RelativePath=".\BitVectorPvs.h">
                         </File>

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

@@ -403 +403 @@
   cout<<"Dirr Bbox = "<<dirBBox<<endl;
   
-  stat.rays = rays.size();
+  stat.rays = (int)rays.size();
   stat.initialPvsSize = 0;
   for (int i=0; i < mRoots.size(); i++) {
@@ -862 +862 @@
         info.axis = axis;
         info.costRatio = 0.5f; // not true but good for speeding up the subdivision at the top levels!
-        info.raysBack = info.raysFront = leaf->rays.size()/2;
+        info.raysBack = info.raysFront = (int)leaf->rays.size()/2;
         return;
   }
@@ -953 +953 @@
 
   currInfo.raysBack = 0;
-  currInfo.raysFront = leaf->rays.size();
+  currInfo.raysFront = (int)leaf->rays.size();
   
   currInfo.pvsBack = 0;
@@ -1135 +1135 @@
   splitCandidates->clear();
   
-  int requestedSize = 2*(node->rays.size());
+  int requestedSize = 2*((int)node->rays.size());
   // creates a sorted split candidates array
   if (splitCandidates->capacity() > 500000 &&
@@ -1195 +1195 @@
   }
 
-  if ( (int)(leaf->rays.size()) > stat.maxRayRefs)
-    stat.maxRayRefs = leaf->rays.size();
+  if ((int)leaf->rays.size() > stat.maxRayRefs)
+    stat.maxRayRefs = (int)leaf->rays.size();
 
 }
@@ -1321 +1321 @@
   // update stats
   stat.rayRefs -= (int)leaf->rays.size();
-  stat.rayRefs += back->rays.size() + front->rays.size();
+  stat.rayRefs += (int)(back->rays.size() + front->rays.size());
 
   
@@ -1461 +1461 @@
   Debug<<"done."<<endl<<flush;
 
-  stat.rayRefs += add.size() - remove.size();
+  stat.rayRefs += (int)add.size() - (int)remove.size();
 
   Debug<<"Updating statistics..."<<endl<<flush;
@@ -1817 +1817 @@
         }
   }
-  return pvs.size();
+  return (int)pvs.size();
 }
 
@@ -2021 +2021 @@
                                           )
 {
-  int nrays = leaf->rays.size();
+  int nrays = (int)leaf->rays.size();
 
   if (nrays == 2) {
@@ -2040 +2040 @@
 
   if (r1 == r2)
-        r2 = (r1+1)%leaf->rays.size();
+        r2 = (r1+1)%(int)leaf->rays.size();
 
 #else
@@ -2158 +2158 @@
   int indices[3];
 
-  int size = rays.size();
+  int size = (int)rays.size();
   // use russian roulete selection for the tripple
   // number of free positions for the bullet
@@ -2230 +2230 @@
         for (; ri != rays.end(); ++ri, ++rayIndex) {
           RssTreeNode::RayInfo *ray = *ri;
-          int tries = rays.size();
+          int tries = (int)rays.size();
           for (int i = 0; i < tries; i++) {
                 int r1, r2, r3;
@@ -2648 +2648 @@
   }
   
-  return rays.size();
+  return (int)rays.size();
   
 }

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

@@ -137 +137 @@
           
 
-          rssSamples += vssRays.size();
+          rssSamples += (int)vssRays.size();
           for (int j=0; j < vssRays.size(); j++)
                 if (vssRays[j]->mFlags & VssRay::Valid) {

GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.vcproj

@@ -81 +81 @@
                                 OptimizeForWindowsApplication="TRUE"
                                 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\MultiLevelRayTracing;Timer"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NO_QT;USE_VERBOSE_PVS"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NO_QT"
                                 RuntimeLibrary="2"
                                 EnableEnhancedInstructionSet="2"
@@ -199 +199 @@
                                 OptimizeForWindowsApplication="TRUE"
                                 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;"$(QTDIR)\include\QtOpenGl";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtCore";"$(QTDIR)\include";QtInterface"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;USE_QT;USE_CG"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;USE_QT;USE_CG;USE_BIT_PVS"
                                 ExceptionHandling="TRUE"
                                 RuntimeLibrary="2"

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

@@ -640 +640 @@
                         // hack: assume that we use vsp tree, 
                         //P so we can just test intersection with bounding boxes
-                        if (viewCell->GetBox().Intersects(lStart, lEnd));
+                        if (viewCell->GetBox().Intersects(lStart, lEnd))
                         {
                                 hitViewCells.push_back(viewCell);

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

@@ -389 +389 @@
                         if (IsValidViewSpace(viewCell) && 
                                 GenerateViewPoints(viewCell, nViewPoints, viewPoints))
-                        {cout << "here99" << endl;
+                        {
                                 Debug << "vc: " << viewCell->GetId() << endl;
 
@@ -1289 +1289 @@
         ViewCellContainer viewCells;
 #ifdef USE_BIT_PVS
-        cout << "objects size: " << ObjectPvsIterator::sObjects.size() << endl;
+        cout << "objects size: " << (int)ObjectPvsIterator::sObjects.size() << endl;
         cout << "pvs size: " <<  ObjectPvs::sPvsSize << endl;
 #endif
@@ -7022 +7022 @@
 
         if (1)
-        {       // create a traversal tree for optimal view cell casting
-                mHierarchyManager->CreateTraversalTree();
-        }
-}
-
-
-}
+        {       
+                if (mHierarchyManager->mUseTraversalTree)
+                {
+                        // create a traversal tree for optimal view cell casting
+                        mHierarchyManager->CreateTraversalTree();
+                }
+        }
+}
+
+
+}