![(please configure the [header_logo] section in trac.ini)](/trac/gametools/chrome/site/your_project_logo.png){kind=logo}
Changeset 2130 for GTP/trunk/Lib/Vis
- Timestamp:
- 02/20/07 13:05:26 (18 years ago)
- Location:
- GTP/trunk/Lib/Vis
- Files:
-
- 19 edited
-
GtpVisibility.sln (modified) (1 diff)
-
OnlineCullingCHC/IVReader/src/IVReader.vcproj (modified) (2 diffs)
-
OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp (modified) (1 diff)
-
OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (2 diffs)
-
OnlineCullingCHC/OGRE/src/Plugin_VisibilitySceneManager.vcproj (modified) (5 diffs)
-
OnlineCullingCHC/ObjReader/src/ObjReader.vcproj (modified) (6 diffs)
-
OnlineCullingCHC/scripts/terrainCulling.cfg (modified) (5 diffs)
-
Preprocessing/scripts/preprocess_visibility.sh (modified) (1 diff)
-
Preprocessing/scripts/preprocess_visibility_internal.sh (modified) (1 diff)
-
Preprocessing/src/Environment.cpp (modified) (1 diff)
-
Preprocessing/src/HierarchyManager.cpp (modified) (2 diffs)
-
Preprocessing/src/HierarchyManager.h (modified) (2 diffs)
-
Preprocessing/src/ObjectsParser.cpp (modified) (2 diffs)
-
Preprocessing/src/Preprocessor.vcproj (modified) (2 diffs)
-
Preprocessing/src/RssTree.cpp (modified) (13 diffs)
-
Preprocessing/src/SamplingPreprocessor.cpp (modified) (1 diff)
-
Preprocessing/src/TestPreprocessor.vcproj (modified) (2 diffs)
-
Preprocessing/src/TraversalTree.cpp (modified) (1 diff)
-
Preprocessing/src/ViewCellsManager.cpp (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/Lib/Vis/GtpVisibility.sln
r2123 r2130 16 16 {101A7691-74F3-48B4-96A3-CF35578F5900} = {101A7691-74F3-48B4-96A3-CF35578F5900} 17 17 {EABCE292-D598-4600-A1C9-2591E7D62FDA} = {EABCE292-D598-4600-A1C9-2591E7D62FDA} 18 {7319E499-473D-4CE5-9983-725D6E68A55D} = {7319E499-473D-4CE5-9983-725D6E68A55D} 18 19 {7319E499-473D-4CE5-9983-725D6E68A55D} = {7319E499-473D-4CE5-9983-725D6E68A55D} 19 20 {7319E499-473D-4CE5-9983-725D6E68A55D} = {7319E499-473D-4CE5-9983-725D6E68A55D} -
GTP/trunk/Lib/Vis/OnlineCullingCHC/IVReader/src/IVReader.vcproj
r2123 r2130 73 73 Name="VCCLCompilerTool" 74 74 AdditionalIncludeDirectories=""$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";"$(OGRE_PATH)\Samples\Common\include";..\include" 75 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IVREADER_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE "75 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IVREADER_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE1;USE_VERBOSE_PVS" 76 76 RuntimeLibrary="2" 77 77 UsePrecompiledHeader="0" … … 219 219 <Configuration 220 220 Name="Release Internal|Win32" 221 OutputDirectory=" $(ConfigurationName)"222 IntermediateDirectory=" $(ConfigurationName)"221 OutputDirectory="Release" 222 IntermediateDirectory="Release" 223 223 ConfigurationType="2" 224 224 CharacterSet="2"> -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp
r2123 r2130 364 364 else if (strKey == "UseViewCells") 365 365 { 366 Ogre::LogManager::getSingleton().logMessage("here44");367 366 if (mViewCellsLoaded) 368 367 { 369 Ogre::LogManager::getSingleton().logMessage("here99");370 368 mUseViewCells = *static_cast<const bool *>(pValue); 371 369 -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp
r2123 r2130 176 176 float maxAxis = std::max(max_x, max_y); 177 177 maxAxis = std::max(maxAxis, max_z); 178 //resize(AxisAlignedBox( 0, 0, 0, maxAxis, maxAxis, maxAxis));179 resize(AxisAlignedBox( 0, 0, 0, max_x, max_y, max_z ));178 resize(AxisAlignedBox( 0, 0, 0, maxAxis, maxAxis, maxAxis)); 179 //resize(AxisAlignedBox( 0, 0, 0, max_x, max_y, max_z )); 180 180 181 181 setupTerrainMaterial(); … … 1844 1844 mTerrainPageSources.push_back(ps); 1845 1845 tsm->registerPageSource("Heightmap", ps); 1846 1846 LogManager::getSingleton().logMessage("here4"); 1847 1847 return tsm; 1848 1848 } -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/Plugin_VisibilitySceneManager.vcproj
r2123 r2130 20 20 Name="VCCLCompilerTool" 21 21 Optimization="0" 22 AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";..\include;..\..\..\OnlineCullingCHC\include;..\..\..\Preprocessing\src;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ IVReader\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ObjReader\include"22 AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";..\include;..\..\..\OnlineCullingCHC\include;..\..\..\Preprocessing\src;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ObjReader\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;..\..\..\Preprocessing\src\Timer" 23 23 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLUGIN_KD_TERRAIN_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE" 24 24 MinimalRebuild="TRUE" … … 41 41 LinkIncremental="1" 42 42 SuppressStartupBanner="TRUE" 43 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\Preprocessing\src\GL;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;"$(CG_LIB_PATH)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ ObjReader\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)""43 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\Preprocessing\src\GL;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;"$(CG_LIB_PATH)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ObjReader\lib\$(ConfigurationName)"" 44 44 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def" 45 45 GenerateDebugInformation="TRUE" … … 87 87 OmitFramePointers="TRUE" 88 88 EnableFiberSafeOptimizations="TRUE" 89 OptimizeForProcessor=" 0"89 OptimizeForProcessor="3" 90 90 OptimizeForWindowsApplication="TRUE" 91 AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";..\include;..\..\..\OnlineCullingCHC\include;..\..\..\Preprocessing\src;..\..\..\ Preprocessing\src\Timer;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ObjReader\include"92 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_KD_TERRAIN_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE "91 AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";..\include;..\..\..\OnlineCullingCHC\include;..\..\..\Preprocessing\src;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;..\..\..\Preprocessing\src\Timer;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ObjReader\include" 92 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_KD_TERRAIN_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE1" 93 93 StringPooling="TRUE" 94 94 RuntimeLibrary="2" … … 297 297 OptimizeForProcessor="3" 298 298 OptimizeForWindowsApplication="TRUE" 299 AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";..\include;..\..\..\OnlineCullingCHC\include;..\..\..\Preprocessing\src;..\ IVReader\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include"299 AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";..\include;..\..\..\OnlineCullingCHC\include;..\..\..\Preprocessing\src;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ObjReader\include" 300 300 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GTP_VISIBILITY_MODIFIED_OGRE;PLUGIN_KD_TERRAIN_EXPORTS" 301 301 StringPooling="TRUE" … … 318 318 LinkIncremental="1" 319 319 SuppressStartupBanner="TRUE" 320 AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\Release";"$(OGRE_PATH)\OgreMain\lib\Release";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";..\..\GtpVisibility\lib\Release;..\..\lib\Release;..\lib\Release;"$(OGRE_PATH)\Dependencies\lib\Release";..\..\..\Preprocessing\lib\Release;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\Preprocessing\src\GL;"$(CG_LIB_PATH)";..\..\..\..\..\..\..\NonGTP\Zlib\lib "320 AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\Release";"$(OGRE_PATH)\OgreMain\lib\Release";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";..\..\GtpVisibility\lib\Release;..\..\lib\Release;..\lib\Release;"$(OGRE_PATH)\Dependencies\lib\Release";..\..\..\Preprocessing\lib\Release;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\Preprocessing\src\GL;"$(CG_LIB_PATH)";..\..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\Lib\Vis\Preprocessing\MultiLevelRayTracing\RTWorld\Release;..\..\..\..\..\Lib\Vis\Preprocessing\MultiLevelRayTracing\RTScene\Release;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\Release;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ObjReader\lib\Release" 321 321 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def" 322 322 GenerateDebugInformation="FALSE" -
GTP/trunk/Lib/Vis/OnlineCullingCHC/ObjReader/src/ObjReader.vcproj
r2123 r2130 33 33 <Tool 34 34 Name="VCLinkerTool" 35 AdditionalDependencies="OgreMain_d.lib CEGUIBase_d.lib OgreGUIRenderer_d.lib Preprocessor.lib xerces-c_2.lib zdll.lib zziplibd.lib"36 OutputFile="$(OutDir)/ObjReader.dll" 37 LinkIncremental="1" 38 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";" $(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\GtpVisibility\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib"35 AdditionalDependencies="OgreMain_d.lib Preprocessor.lib xerces-c_2D.lib zdll.lib zziplibd.lib" 36 OutputFile="$(OutDir)/ObjReader.dll" 37 LinkIncremental="1" 38 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"..\..\GtpVisibility\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\Preprocessing\src\GL" 39 39 GenerateDebugInformation="TRUE" 40 40 ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb" … … 73 73 Name="VCCLCompilerTool" 74 74 AdditionalIncludeDirectories=""$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";"$(OGRE_PATH)\Samples\Common\include";..\include;..\..\..\Preprocessing\src" 75 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OBJREADER_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE "75 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OBJREADER_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE1" 76 76 RuntimeLibrary="2" 77 77 UsePrecompiledHeader="0" … … 86 86 OutputFile="$(OutDir)/ObjReader.dll" 87 87 LinkIncremental="1" 88 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib "88 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\Preprocessing\src\GL" 89 89 GenerateDebugInformation="FALSE" 90 90 SubSystem="2" … … 219 219 <Configuration 220 220 Name="Release Internal|Win32" 221 OutputDirectory=" $(ConfigurationName)"222 IntermediateDirectory=" $(ConfigurationName)"221 OutputDirectory="Release" 222 IntermediateDirectory="Release" 223 223 ConfigurationType="2" 224 224 CharacterSet="2"> … … 232 232 OmitFramePointers="TRUE" 233 233 EnableFiberSafeOptimizations="TRUE" 234 OptimizeForProcessor=" 3"234 OptimizeForProcessor="0" 235 235 OptimizeForWindowsApplication="TRUE" 236 AdditionalIncludeDirectories=""$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";"$(OGRE_PATH)\Samples\Common\include";..\include "236 AdditionalIncludeDirectories=""$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";"$(OGRE_PATH)\Samples\Common\include";..\include;..\..\..\Preprocessing\src" 237 237 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OBJREADER_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE" 238 238 StringPooling="TRUE" … … 246 246 <Tool 247 247 Name="VCLinkerTool" 248 AdditionalDependencies="OgreMain.lib CEGUIBase.lib OgreGUIRenderer.lib"249 OutputFile="$(OutDir)/ObjReader.dll" 250 LinkIncremental="1" 251 AdditionalLibraryDirectories=""$(OGRE_PATH)\ OgreMain\lib\Release";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";..\..\GtpVisibility\lib\Release;..\..\lib\Release;..\lib\Release;"$(OGRE_PATH)\Dependencies\lib\Release""252 GenerateDebugInformation=" TRUE"248 AdditionalDependencies="OgreMain.lib zdll.lib zziplib.lib Preprocessor.lib xerces-c_2.lib RTScene.lib RTWorld.lib" 249 OutputFile="$(OutDir)/ObjReader.dll" 250 LinkIncremental="1" 251 AdditionalLibraryDirectories=""$(OGRE_PATH)\Dependencies\lib\Release";"$(OGRE_PATH)\OgreMain\lib\Release";..\..\GtpVisibility\lib\Release;..\..\lib\Release;..\lib\Release;..\..\..\Preprocessing\lib\Release;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\Preprocessing\src\GL;..\..\..\..\..\Lib\Vis\Preprocessing\MultiLevelRayTracing\RTWorld\Release;..\..\..\..\..\Lib\Vis\Preprocessing\MultiLevelRayTracing\RTScene\Release" 252 GenerateDebugInformation="FALSE" 253 253 SubSystem="2" 254 254 OptimizeReferences="2" -
GTP/trunk/Lib/Vis/OnlineCullingCHC/scripts/terrainCulling.cfg
r2107 r2130 26 26 27 27 #Scene=../../../../../resources/media/house_test1.iv 28 Scene=../../../../../resources/media/city1500_flat_1.iv;../../../../../resources/media/roofs_1500.iv;../../../../../resources/media/CityRoads60.iv;../../../../../resources/media/CityPlane60.iv28 #Scene=../../../../../resources/media/city1500_flat_1.iv;../../../../../resources/media/roofs_1500.iv;../../../../../resources/media/CityRoads60.iv;../../../../../resources/media/CityPlane60.iv 29 29 #Scene=../../../../../resources/media/city1.iv;../../../../../resources/media/roofs_1500.iv;../../../../../resources/media/CityRoads60.iv 30 30 … … 33 33 # 34 34 35 ViewCells=../../../../../../../GTP/trunk/Lib/Vis/Preprocessing/scripts/vienna-visibility.xml.gz35 #ViewCells=../../../../../../../GTP/trunk/Lib/Vis/Preprocessing/scripts/vienna-visibility.xml.gz 36 36 37 37 … … 40 40 # 41 41 42 FlushQueue=1 42 #FlushQueue=true 43 43 44 44 … … 50 50 # 51 51 52 #Scene=terrain52 Scene=terrain 53 53 54 54 # … … 56 56 # 57 57 58 #FlushQueue=false58 FlushQueue=false 59 59 60 60 #UseDepthPass=false -
GTP/trunk/Lib/Vis/Preprocessing/scripts/preprocess_visibility.sh
r2124 r2130 1 1 #!/bin/sh 2 2 3 #PREPROCESSOR=../bin/release/preprocessor.exe4 PREPROCESSOR=../bin/debug/preprocessor.exe3 PREPROCESSOR=../bin/release/preprocessor.exe 4 #PREPROCESSOR=../bin/debug/preprocessor.exe 5 5 6 6 if [ $# -ne 3 ] -
GTP/trunk/Lib/Vis/Preprocessing/scripts/preprocess_visibility_internal.sh
r2099 r2130 13 13 export PATH=$PATH:../bin 14 14 15 NUM_SAMPLE_RAYS=1000000000 15 #NUM_SAMPLE_RAYS=1000000000 16 NUM_SAMPLE_RAYS=10000000 16 17 17 18 $PREPROCESSOR -total_samples=$NUM_SAMPLE_RAYS \ -
GTP/trunk/Lib/Vis/Preprocessing/src/Environment.cpp
r2124 r2130 2785 2785 "99990.0"); 2786 2786 2787 RegisterOption("Hierarchy.useTraversalTree", 2788 optBool, 2789 "hierarchy_use_traversal_tree=", 2790 "false"); 2787 2791 2788 2792 /////////////////////////////////////////////////////// -
GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp
r2124 r2130 160 160 "Hierarchy.Construction.minAvgRayContri", mMinAvgRayContri); 161 161 162 Environment::GetSingleton()->GetBoolValue( 163 "Hierarchy.useTraversalTree", mUseTraversalTree); 164 162 165 // for comparing it with byte - value 163 166 mTermMaxMemory *= (1024.0f * 1024.0f); … … 399 402 400 403 // create a traversal tree which is optimized for view cell casting 401 if ( 1)404 if (mUseTraversalTree) 402 405 { 403 406 CreateTraversalTree(); -
GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.h
r2124 r2130 612 612 BvHierarchy *mBvHierarchy; 613 613 614 bool mUseTraversalTree; 615 614 616 protected: 615 617 … … 682 684 683 685 ViewCellContainer mOldViewCells; 684 685 //ObjectPvs mOldPvs;686 686 }; 687 687 -
GTP/trunk/Lib/Vis/Preprocessing/src/ObjectsParser.cpp
r2123 r2130 364 364 365 365 GzFileInputSource isource(myFilePath); 366 Debug<<"here93" << endl;367 366 parser->parse(isource); 368 367 #else … … 370 369 371 370 #endif 372 Debug<<"here932" << endl; 371 373 372 const unsigned long endMillis = XMLPlatformUtils::getCurrentMillis(); 374 373 duration = endMillis - startMillis; -
GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.vcproj
r2123 r2130 222 222 OptimizeForWindowsApplication="TRUE" 223 223 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" 224 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_INTERNAL;USE_QT "224 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_INTERNAL;USE_QT;USE_BIT_PVS" 225 225 ExceptionHandling="TRUE" 226 226 RuntimeLibrary="2" … … 383 383 </File> 384 384 <File 385 RelativePath=".\BitVectorPvs.cpp">386 </File>387 <File388 385 RelativePath=".\BitVectorPvs.h"> 389 386 </File> -
GTP/trunk/Lib/Vis/Preprocessing/src/RssTree.cpp
r2119 r2130 403 403 cout<<"Dirr Bbox = "<<dirBBox<<endl; 404 404 405 stat.rays = rays.size();405 stat.rays = (int)rays.size(); 406 406 stat.initialPvsSize = 0; 407 407 for (int i=0; i < mRoots.size(); i++) { … … 862 862 info.axis = axis; 863 863 info.costRatio = 0.5f; // not true but good for speeding up the subdivision at the top levels! 864 info.raysBack = info.raysFront = leaf->rays.size()/2;864 info.raysBack = info.raysFront = (int)leaf->rays.size()/2; 865 865 return; 866 866 } … … 953 953 954 954 currInfo.raysBack = 0; 955 currInfo.raysFront = leaf->rays.size();955 currInfo.raysFront = (int)leaf->rays.size(); 956 956 957 957 currInfo.pvsBack = 0; … … 1135 1135 splitCandidates->clear(); 1136 1136 1137 int requestedSize = 2*( node->rays.size());1137 int requestedSize = 2*((int)node->rays.size()); 1138 1138 // creates a sorted split candidates array 1139 1139 if (splitCandidates->capacity() > 500000 && … … 1195 1195 } 1196 1196 1197 if ( (int)(leaf->rays.size()) > stat.maxRayRefs)1198 stat.maxRayRefs = leaf->rays.size();1197 if ((int)leaf->rays.size() > stat.maxRayRefs) 1198 stat.maxRayRefs = (int)leaf->rays.size(); 1199 1199 1200 1200 } … … 1321 1321 // update stats 1322 1322 stat.rayRefs -= (int)leaf->rays.size(); 1323 stat.rayRefs += back->rays.size() + front->rays.size();1323 stat.rayRefs += (int)(back->rays.size() + front->rays.size()); 1324 1324 1325 1325 … … 1461 1461 Debug<<"done."<<endl<<flush; 1462 1462 1463 stat.rayRefs += add.size() -remove.size();1463 stat.rayRefs += (int)add.size() - (int)remove.size(); 1464 1464 1465 1465 Debug<<"Updating statistics..."<<endl<<flush; … … 1817 1817 } 1818 1818 } 1819 return pvs.size();1819 return (int)pvs.size(); 1820 1820 } 1821 1821 … … 2021 2021 ) 2022 2022 { 2023 int nrays = leaf->rays.size();2023 int nrays = (int)leaf->rays.size(); 2024 2024 2025 2025 if (nrays == 2) { … … 2040 2040 2041 2041 if (r1 == r2) 2042 r2 = (r1+1)% leaf->rays.size();2042 r2 = (r1+1)%(int)leaf->rays.size(); 2043 2043 2044 2044 #else … … 2158 2158 int indices[3]; 2159 2159 2160 int size = rays.size();2160 int size = (int)rays.size(); 2161 2161 // use russian roulete selection for the tripple 2162 2162 // number of free positions for the bullet … … 2230 2230 for (; ri != rays.end(); ++ri, ++rayIndex) { 2231 2231 RssTreeNode::RayInfo *ray = *ri; 2232 int tries = rays.size();2232 int tries = (int)rays.size(); 2233 2233 for (int i = 0; i < tries; i++) { 2234 2234 int r1, r2, r3; … … 2648 2648 } 2649 2649 2650 return rays.size();2650 return (int)rays.size(); 2651 2651 2652 2652 } -
GTP/trunk/Lib/Vis/Preprocessing/src/SamplingPreprocessor.cpp
r2066 r2130 137 137 138 138 139 rssSamples += vssRays.size();139 rssSamples += (int)vssRays.size(); 140 140 for (int j=0; j < vssRays.size(); j++) 141 141 if (vssRays[j]->mFlags & VssRay::Valid) { -
GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.vcproj
r2120 r2130 81 81 OptimizeForWindowsApplication="TRUE" 82 82 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\MultiLevelRayTracing;Timer" 83 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NO_QT ;USE_VERBOSE_PVS"83 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NO_QT" 84 84 RuntimeLibrary="2" 85 85 EnableEnhancedInstructionSet="2" … … 199 199 OptimizeForWindowsApplication="TRUE" 200 200 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" 201 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;USE_QT;USE_CG "201 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;USE_QT;USE_CG;USE_BIT_PVS" 202 202 ExceptionHandling="TRUE" 203 203 RuntimeLibrary="2" -
GTP/trunk/Lib/Vis/Preprocessing/src/TraversalTree.cpp
r2124 r2130 640 640 // hack: assume that we use vsp tree, 641 641 //P so we can just test intersection with bounding boxes 642 if (viewCell->GetBox().Intersects(lStart, lEnd)) ;642 if (viewCell->GetBox().Intersects(lStart, lEnd)) 643 643 { 644 644 hitViewCells.push_back(viewCell); -
GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp
r2124 r2130 389 389 if (IsValidViewSpace(viewCell) && 390 390 GenerateViewPoints(viewCell, nViewPoints, viewPoints)) 391 { cout << "here99" << endl;391 { 392 392 Debug << "vc: " << viewCell->GetId() << endl; 393 393 … … 1289 1289 ViewCellContainer viewCells; 1290 1290 #ifdef USE_BIT_PVS 1291 cout << "objects size: " << ObjectPvsIterator::sObjects.size() << endl;1291 cout << "objects size: " << (int)ObjectPvsIterator::sObjects.size() << endl; 1292 1292 cout << "pvs size: " << ObjectPvs::sPvsSize << endl; 1293 1293 #endif … … 7022 7022 7023 7023 if (1) 7024 { // create a traversal tree for optimal view cell casting 7025 mHierarchyManager->CreateTraversalTree(); 7026 } 7027 } 7028 7029 7030 } 7024 { 7025 if (mHierarchyManager->mUseTraversalTree) 7026 { 7027 // create a traversal tree for optimal view cell casting 7028 mHierarchyManager->CreateTraversalTree(); 7029 } 7030 } 7031 } 7032 7033 7034 }
Note: See TracChangeset
for help on using the changeset viewer.
