![(please configure the [header_logo] section in trac.ini)](/trac/gametools/chrome/site/your_project_logo.png){kind=logo}
Changeset 1273 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src
- Timestamp:
- 08/24/06 14:17:44 (18 years ago)
- Location:
- GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src
- Files:
-
- 6 added
- 3 edited
-
OgreKdHeightmapTerrainPageSource.cpp (added)
-
OgreKdTerrainPage.cpp (added)
-
OgreKdTerrainPageSource.cpp (added)
-
OgreKdTerrainRenderable.cpp (added)
-
OgreKdTerrainSceneManager.cpp (added)
-
OgreKdTerrainVertexProgram.cpp (added)
-
OgreKdTreeSceneManager.cpp (modified) (3 diffs)
-
OgreVisibilitySceneManagerDll.cpp (modified) (5 diffs)
-
Plugin_VisibilitySceneManager.vcproj (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp
r1264 r1273 13 13 #include <OgreLogManager.h> 14 14 #include <OgreStringConverter.h> 15 16 #include <OgreTerrainPage.h>17 #include <OgreTerrainVertexProgram.h>18 #include <OgreHeightmapTerrainPageSource.h>19 15 20 16 #include "OgreKdTreeSceneManager.h" … … 293 289 } 294 290 // options for CHC 295 if (strKey == "UseDepthPass")291 else if (strKey == "UseDepthPass") 296 292 { 297 293 mUseDepthPass = (*static_cast<const bool *>(pValue)); 298 294 return true; 299 295 } 300 if (strKey == "PrepareVisualization")296 else if (strKey == "PrepareVisualization") 301 297 { 302 298 mShowVisualization = (*static_cast<const bool *>(pValue)); 303 299 return true; 304 300 } 305 if (strKey == "RenderNodesForViz")301 else if (strKey == "RenderNodesForViz") 306 302 { 307 303 mRenderNodesForViz = (*static_cast<const bool *>(pValue)); 308 304 return true; 309 305 } 310 if (strKey == "RenderNodesContentForViz")306 else if (strKey == "RenderNodesContentForViz") 311 307 { 312 308 mRenderNodesContentForViz = (*static_cast<const bool *>(pValue)); 313 309 return true; 314 310 } 315 if (strKey == "SkyBoxEnabled")311 else if (strKey == "SkyBoxEnabled") 316 312 { 317 313 mSkyBoxEnabled = (*static_cast<const bool *>(pValue)); 318 314 return true; 319 315 } 320 if (strKey == "SkyPlaneEnabled")316 else if (strKey == "SkyPlaneEnabled") 321 317 { 322 318 mSkyPlaneEnabled = (*static_cast<const bool *>(pValue)); 323 319 return true; 324 320 } 325 if (strKey == "SkyDomeEnabled")321 else if (strKey == "SkyDomeEnabled") 326 322 { 327 323 mSkyDomeEnabled = (*static_cast<const bool *>(pValue)); 328 324 return true; 329 325 } 330 if (strKey == "VisualizeCulledNodes")326 else if (strKey == "VisualizeCulledNodes") 331 327 { 332 328 mVisualizeCulledNodes = (*static_cast<const bool *>(pValue)); 333 329 return true; 334 330 } 335 if (strKey == "DelayRenderTransparents")331 else if (strKey == "DelayRenderTransparents") 336 332 { 337 333 mDelayRenderTransparents = (*static_cast<const bool *>(pValue)); … … 339 335 } 340 336 341 if (strKey == "DepthWrite")337 else if (strKey == "DepthWrite") 342 338 { 343 339 mEnableDepthWrite = (*static_cast<const bool *>(pValue)); 344 340 return true; 345 341 } 346 if (strKey == "UseItemBuffer")342 else if (strKey == "UseItemBuffer") 347 343 { 348 344 mUseItemBuffer = (*static_cast<const bool *>(pValue)); 349 345 return true; 350 346 } 351 if (strKey == "ExecuteVertexProgramForAllPasses")347 else if (strKey == "ExecuteVertexProgramForAllPasses") 352 348 { 353 349 mExecuteVertexProgramForAllPasses = (*static_cast<const bool *>(pValue)); 354 350 return true; 355 351 } 356 if (strKey == "RenderTransparentsForItemBuffer")352 else if (strKey == "RenderTransparentsForItemBuffer") 357 353 { 358 354 mRenderTransparentsForItemBuffer = (*static_cast<const bool *>(pValue)); -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreVisibilitySceneManagerDll.cpp
r1264 r1273 24 24 */ 25 25 26 #include <OgreOcclusionCullingSceneManager.h> 27 #include <OgreKdTreeSceneManager.h> 26 #include "OgreOcclusionCullingSceneManager.h" 27 #include "OgreKdTreeSceneManager.h" 28 #include "OgreKdTerrainSceneManager.h" 28 29 #include <OgreRoot.h> 29 30 #include <OgreLogManager.h> … … 40 41 OcclusionCullingSceneManagerFactory *occlusionCullingPlugin; 41 42 KdTreeSceneManagerFactory *kdTreeFactory; 43 KdTerrainSceneManagerFactory *kdTerrainFactory; 42 44 43 45 //----------------------------------------------------------------------- … … 51 53 occlusionCullingPlugin = new OcclusionCullingSceneManagerFactory(visManager); 52 54 kdTreeFactory = new KdTreeSceneManagerFactory(visManager); 53 55 kdTerrainFactory = new KdTerrainSceneManagerFactory(visManager); 54 56 // Construct listener manager singleton 55 57 new TerrainPageSourceListenerManager(); 58 new KdTerrainPageSourceListenerManager(); 56 59 57 60 // Register 58 61 Root::getSingleton().addSceneManagerFactory(occlusionCullingPlugin); 59 62 Root::getSingleton().addSceneManagerFactory(kdTreeFactory); 63 Root::getSingleton().addSceneManagerFactory(kdTerrainFactory); 60 64 } 61 65 //----------------------------------------------------------------------- … … 64 68 Root::getSingleton().removeSceneManagerFactory(occlusionCullingPlugin); 65 69 Root::getSingleton().removeSceneManagerFactory(kdTreeFactory); 66 70 Root::getSingleton().removeSceneManagerFactory(kdTerrainFactory); 67 71 // destroy listener manager 68 72 delete TerrainPageSourceListenerManager::getSingletonPtr(); 73 delete KdTerrainPageSourceListenerManager::getSingletonPtr(); 69 74 } 70 75 //----------------------------------------------------------------------- … … 75 80 delete occlusionCullingPlugin; 76 81 delete kdTreeFactory; 82 delete kdTerrainFactory; 77 83 78 84 delete visManager; -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/Plugin_VisibilitySceneManager.vcproj
r1239 r1273 21 21 Optimization="0" 22 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" 23 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLUGIN_ OCCLUSIONCULLINGSCENEMANAGER_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE"23 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLUGIN_KD_TERRAIN_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE" 24 24 MinimalRebuild="TRUE" 25 25 BasicRuntimeChecks="3" … … 74 74 OutputDirectory="..\lib\$(ConfigurationName)" 75 75 IntermediateDirectory="..\obj\$(ConfigurationName)" 76 ConfigurationType="2" 77 CharacterSet="2" 78 WholeProgramOptimization="TRUE"> 79 <Tool 80 Name="VCCLCompilerTool" 81 Optimization="3" 82 GlobalOptimizations="TRUE" 83 InlineFunctionExpansion="2" 84 EnableIntrinsicFunctions="TRUE" 85 ImproveFloatingPointConsistency="TRUE" 86 FavorSizeOrSpeed="1" 87 OmitFramePointers="TRUE" 88 EnableFiberSafeOptimizations="TRUE" 89 OptimizeForProcessor="2" 90 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" 91 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_KD_TERRAIN_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE" 92 StringPooling="TRUE" 93 RuntimeLibrary="2" 94 BufferSecurityCheck="FALSE" 95 EnableFunctionLevelLinking="TRUE" 96 RuntimeTypeInfo="TRUE" 97 UsePrecompiledHeader="0" 98 WarningLevel="3" 99 Detect64BitPortabilityProblems="TRUE" 100 DebugInformationFormat="3"/> 101 <Tool 102 Name="VCCustomBuildTool"/> 103 <Tool 104 Name="VCLinkerTool" 105 IgnoreImportLibrary="TRUE" 106 AdditionalDependencies="OgreMain.lib CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib GtpVisibility.lib zdll.lib zziplib.lib Preprocessor.lib xerces-c_2.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib glew32.lib glew32s.lib" 107 OutputFile="$(OutDir)/Plugin_VisibilitySceneManager.dll" 108 Version="0.99" 109 LinkIncremental="1" 110 SuppressStartupBanner="TRUE" 111 AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\Preprocessing\src\GL;..\..\..\..\..\..\..\NonGTP\Zlib\lib;"..\..\lib\$(ConfigurationName)"" 112 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def" 113 GenerateDebugInformation="TRUE" 114 SubSystem="2" 115 OptimizeReferences="2" 116 EnableCOMDATFolding="2" 117 ImportLibrary="$(OutDir)/Plugin_VisibilitySceneManager.lib" 118 TargetMachine="1"/> 119 <Tool 120 Name="VCMIDLTool"/> 121 <Tool 122 Name="VCPostBuildEventTool" 123 CommandLine="copy $(OutDir)\$(TargetFileName) $(OGRE_PATH)\Samples\Common\bin\$(ConfigurationName)"/> 124 <Tool 125 Name="VCPreBuildEventTool"/> 126 <Tool 127 Name="VCPreLinkEventTool"/> 128 <Tool 129 Name="VCResourceCompilerTool"/> 130 <Tool 131 Name="VCWebServiceProxyGeneratorTool"/> 132 <Tool 133 Name="VCXMLDataGeneratorTool"/> 134 <Tool 135 Name="VCWebDeploymentTool"/> 136 <Tool 137 Name="VCManagedWrapperGeneratorTool"/> 138 <Tool 139 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 140 </Configuration> 141 <Configuration 142 Name="mlrt|Win32" 143 OutputDirectory="$(ConfigurationName)" 144 IntermediateDirectory="$(ConfigurationName)" 76 145 ConfigurationType="2" 77 146 CharacterSet="2" … … 104 173 Name="VCLinkerTool" 105 174 IgnoreImportLibrary="TRUE" 106 AdditionalDependencies="OgreMain.lib CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib GtpVisibility.lib zdll.lib zziplib.lib Preprocessor.lib xerces-c_2.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib glew32.lib glew32s.lib"175 AdditionalDependencies="OgreMain.lib CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib GtpVisibility.lib zdll.lib zziplib.lib Preprocessor.lib xerces-c_2.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib glew32.lib glew32s.lib" 107 176 OutputFile="$(OutDir)/Plugin_VisibilitySceneManager.dll" 108 177 Version="0.99" 109 178 LinkIncremental="1" 110 179 SuppressStartupBanner="TRUE" 111 AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";" $(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\Preprocessing\src\GL;..\..\..\..\..\..\..\NonGTP\Zlib\lib;"..\..\lib\$(ConfigurationName)""180 AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(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;..\..\..\Preprocessing\src\GL;"$(CG_LIB_PATH)";..\..\..\..\..\..\..\NonGTP\Zlib\lib" 112 181 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def" 113 182 GenerateDebugInformation="TRUE" … … 140 209 </Configuration> 141 210 <Configuration 142 Name=" mlrt|Win32"211 Name="Release_Internal|Win32" 143 212 OutputDirectory="$(ConfigurationName)" 144 213 IntermediateDirectory="$(ConfigurationName)" … … 209 278 </Configuration> 210 279 <Configuration 211 Name="Release _Internal|Win32"280 Name="Release Internal|Win32" 212 281 OutputDirectory="$(ConfigurationName)" 213 282 IntermediateDirectory="$(ConfigurationName)" … … 277 346 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 278 347 </Configuration> 279 <Configuration280 Name="Release Internal|Win32"281 OutputDirectory="$(ConfigurationName)"282 IntermediateDirectory="$(ConfigurationName)"283 ConfigurationType="2"284 CharacterSet="2"285 WholeProgramOptimization="TRUE">286 <Tool287 Name="VCCLCompilerTool"288 Optimization="3"289 GlobalOptimizations="TRUE"290 InlineFunctionExpansion="2"291 EnableIntrinsicFunctions="TRUE"292 ImproveFloatingPointConsistency="TRUE"293 FavorSizeOrSpeed="1"294 OmitFramePointers="TRUE"295 EnableFiberSafeOptimizations="TRUE"296 OptimizeForProcessor="2"297 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"298 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GTP_VISIBILITY_MODIFIED_OGRE"299 StringPooling="TRUE"300 RuntimeLibrary="2"301 BufferSecurityCheck="FALSE"302 EnableFunctionLevelLinking="TRUE"303 RuntimeTypeInfo="TRUE"304 UsePrecompiledHeader="0"305 WarningLevel="3"306 Detect64BitPortabilityProblems="TRUE"307 DebugInformationFormat="3"/>308 <Tool309 Name="VCCustomBuildTool"/>310 <Tool311 Name="VCLinkerTool"312 IgnoreImportLibrary="TRUE"313 AdditionalDependencies="OgreMain.lib CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib GtpVisibility.lib zdll.lib zziplib.lib Preprocessor.lib xerces-c_2.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib glew32.lib glew32s.lib"314 OutputFile="$(OutDir)/Plugin_VisibilitySceneManager.dll"315 Version="0.99"316 LinkIncremental="1"317 SuppressStartupBanner="TRUE"318 AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(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;..\..\..\Preprocessing\src\GL;"$(CG_LIB_PATH)";..\..\..\..\..\..\..\NonGTP\Zlib\lib"319 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def"320 GenerateDebugInformation="TRUE"321 SubSystem="2"322 OptimizeReferences="2"323 EnableCOMDATFolding="2"324 ImportLibrary="$(OutDir)/Plugin_VisibilitySceneManager.lib"325 TargetMachine="1"/>326 <Tool327 Name="VCMIDLTool"/>328 <Tool329 Name="VCPostBuildEventTool"330 CommandLine="copy $(OutDir)\$(TargetFileName) $(OGRE_PATH)\Samples\Common\bin\$(ConfigurationName)"/>331 <Tool332 Name="VCPreBuildEventTool"/>333 <Tool334 Name="VCPreLinkEventTool"/>335 <Tool336 Name="VCResourceCompilerTool"/>337 <Tool338 Name="VCWebServiceProxyGeneratorTool"/>339 <Tool340 Name="VCXMLDataGeneratorTool"/>341 <Tool342 Name="VCWebDeploymentTool"/>343 <Tool344 Name="VCManagedWrapperGeneratorTool"/>345 <Tool346 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>347 </Configuration>348 348 </Configurations> 349 349 <References> … … 355 355 <Filter 356 356 Name="Header Files" 357 Filter=" ">357 Filter="h;hpp;hxx;hm;inl;inc"> 358 358 <File 359 359 RelativePath="..\include\OgreOcclusionCullingSceneManager.h"> … … 368 368 <Filter 369 369 Name="Source Files" 370 Filter=" ">370 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> 371 371 <File 372 372 RelativePath="..\src\OgreOcclusionCullingSceneManager.cpp"> … … 472 472 <Filter 473 473 Name="Header Files" 474 Filter=" ">474 Filter="h;hpp;hxx;hm;inl;inc"> 475 475 <File 476 476 RelativePath="..\include\OgreKdRenderable.h"> … … 494 494 <Filter 495 495 Name="Source Files" 496 Filter=" ">496 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> 497 497 <File 498 498 RelativePath="..\src\OgreKdTree.cpp"> … … 509 509 <File 510 510 RelativePath="..\src\OgreKdTreeSceneNode.cpp"> 511 </File> 512 </Filter> 513 </Filter> 514 <Filter 515 Name="KdTreeTerrainSceneManager" 516 Filter=""> 517 <Filter 518 Name="Header Files" 519 Filter="h;hpp;hxx;hm;inl;inc"> 520 <File 521 RelativePath="..\include\OgreKdHeightmapTerrainPageSource.h"> 522 </File> 523 <File 524 RelativePath="..\include\OgreKdTerrainPage.h"> 525 </File> 526 <File 527 RelativePath="..\include\OgreKdTerrainPageSource.h"> 528 </File> 529 <File 530 RelativePath="..\include\OgreKdTerrainPrerequisites.h"> 531 </File> 532 <File 533 RelativePath="..\include\OgreKdTerrainRenderable.h"> 534 </File> 535 <File 536 RelativePath="..\include\OgreKdTerrainSceneManager.h"> 537 </File> 538 <File 539 RelativePath="..\include\OgreKdTerrainVertexProgram.h"> 540 </File> 541 </Filter> 542 <Filter 543 Name="Source Files" 544 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> 545 <File 546 RelativePath=".\OgreKdHeightmapTerrainPageSource.cpp"> 547 </File> 548 <File 549 RelativePath=".\OgreKdTerrainPage.cpp"> 550 </File> 551 <File 552 RelativePath=".\OgreKdTerrainPageSource.cpp"> 553 </File> 554 <File 555 RelativePath=".\OgreKdTerrainRenderable.cpp"> 556 </File> 557 <File 558 RelativePath=".\OgreKdTerrainSceneManager.cpp"> 559 </File> 560 <File 561 RelativePath=".\OgreKdTerrainVertexProgram.cpp"> 511 562 </File> 512 563 </Filter>
Note: See TracChangeset
for help on using the changeset viewer.
