Changeset 1261 for GTP/trunk/Lib

Timestamp:

08/23/06 00:33:57 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/scripts/terrainCulling.cfg (modified) (2 diffs)
• Preprocessing/src/BvHierarchy.cpp (modified) (2 diffs)
• Preprocessing/src/Preprocessor.vcproj (modified) (1 diff)
• Preprocessing/src/TestPreprocessor.vcproj (modified) (1 diff)

GTP/trunk/Lib/Vis/OnlineCullingCHC/scripts/terrainCulling.cfg

@@ -1 +1 @@
 #Scene=../../../../../resources/media/house_test1.iv
-#Scene=../../../../../resources/media/city1500_flat_1.iv;../../../../../media/roofs_1500.iv;../../../../../resources/media/CityRoads60.iv
+#Scene=../../../../../resources/media/city1500_flat_1.iv;../../../../../resources/media/roofs_1500.iv;../../../../../resources/media/CityRoads60.iv
 Scene=terrain
 
@@ -13 +13 @@
 
 #VisibilityEnvironment=D:/svn/gametools/GTP/trunk/Lib/Vis/Preprocessing/scripts/generate_viewcells.env
-VisibilityEnvironment=../../../../../../../GTP/trunk/Lib/Vis/Preprocessing/scripts/generate_viewcells.env
+#VisibilityEnvironment=../../../../../../../GTP/trunk/Lib/Vis/Preprocessing/scripts/generate_viewcells.env

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

@@ -499 +499 @@
         if ((int)(leaf->mObjects.size()) > mBvhStats.maxObjectRefs)
                 mBvhStats.maxObjectRefs = (int)leaf->mObjects.size();
-
-#ifdef _DEBUG
-        Debug << "BSP stats: "
-                  << "Depth: " << data.mDepth << " (max: " << mTermMaxDepth << "), "
-                  << "Prob: " << data.mProbability << " (min: " << mTermMinProbability << ")\n";
-#endif
 }
 
@@ -530 +524 @@
         //-- sort so we can use a sweep
         SortSubdivisionCandidates(tData, axis, minBand, maxBand);
-
-        int numViewCells;
 
         float totalVol = PrepareHeuristics(tData);

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

@@ -20 +20 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\include;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost\include"
+                                AdditionalIncludeDirectories="..\include;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost\"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
                                 MinimalRebuild="TRUE"

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

@@ -33 +33 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="xerces-c_2D.lib zdll.lib zziplibd.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib Preprocessor.lib glew32.lib"
+                                AdditionalDependencies="xerces-c_2D.lib zdll.lib zziplibd.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib Preprocessor.lib glew32.lib"
                                 OutputFile="$(OutDir)/Preprocessor.exe"
                                 LinkIncremental="2"
-                                AdditionalLibraryDirectories="..\include;..\src\GL;&quot;$(CG_LIB_PATH)&quot;;&quot;$(GTPDIR)\NonGTP\Xerces&quot;;&quot;$(GTPDIR)\NonGTP\Xerces\xercesc\lib&quot;;&quot;$(GTPDIR)\NonGTP\zlib\lib&quot;;&quot;$(GTPDIR)\NonGTP\Devil\lib&quot;;..\lib\debug;&quot;$(BOOST_LIB)&quot;"
+                                AdditionalLibraryDirectories="..\src\GL;..\lib\debug;..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib"
                                 GenerateDebugInformation="TRUE"
                                 ProgramDatabaseFile="$(OutDir)/TestPreprocessor.pdb"