Changeset 2120 for GTP/trunk/Lib

Timestamp:

02/15/07 15:03:28 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• ObjectPvs.h (modified) (1 diff)
• Preprocessor.vcproj (modified) (3 diffs)
• TestPreprocessor.vcproj (modified) (2 diffs)
• ViewCellsManager.cpp (modified) (1 diff)

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

@@ -23 +23 @@
                 but the individual contributions of the entries are summed up.
         */
-        float EvalPvsCost() const;
+        float EvalPvsCost() const {     
+                //temp matt 
+                return 1.0f; }
 
         friend ostream &operator<<(ostream &s, const ObjectPvs &p) 

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

@@ -72 +72 @@
                                 OptimizeForWindowsApplication="TRUE"
                                 AdditionalIncludeDirectories="..\include;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;Timer"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_BIT_PVS"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_VERBOSE_PVS"
                                 ExceptionHandling="TRUE"
                                 RuntimeLibrary="2"
@@ -383 +383 @@
                         </File>
                         <File
-                                RelativePath=".\BitVectorPvs.cpp">
-                        </File>
-                        <File
                                 RelativePath=".\BitVectorPvs.h">
                         </File>
@@ -585 +582 @@
                         <File
                                 RelativePath="..\src\MutualVisibility.h">
-                        </File>
-                        <File
-                                RelativePath=".\ObjectPvs.cpp">
                         </File>
                         <File

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

@@ -21 +21 @@
                                 Optimization="0"
                                 AdditionalIncludeDirectories="..\include;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NO_QT;USE_BIT_PVS"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NO_QT"
                                 MinimalRebuild="TRUE"
                                 BasicRuntimeChecks="3"
@@ -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_BIT_PVS"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NO_QT;USE_VERBOSE_PVS"
                                 RuntimeLibrary="2"
                                 EnableEnhancedInstructionSet="2"

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

@@ -1278 +1278 @@
 
         ViewCellContainer viewCells;
-
+#ifdef USE_BIT_PVS
         cout << "objects size: " << ObjectPvsIterator::sObjects.size() << endl;
         cout << "pvs size: " <<  ObjectPvs::sPvsSize << endl;
-
+#endif
         // $$ JB hack - the collect best viewcells does not work?
 #if 0