![(please configure the [header_logo] section in trac.ini)](/trac/gametools/chrome/site/your_project_logo.png){kind=logo}
Changeset 1163
- Timestamp:
- 07/27/06 13:00:41 (18 years ago)
- Location:
- GTP/trunk
- Files:
-
- 17 added
- 9 edited
-
App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrain.vcproj (modified) (2 diffs)
-
App/Demos/Vis/KdTreeDemo (added)
-
App/Demos/Vis/KdTreeDemo/OGRE (added)
-
App/Demos/Vis/KdTreeDemo/OGRE/include (added)
-
App/Demos/Vis/KdTreeDemo/OGRE/include/TestKdTree.h (added)
-
App/Demos/Vis/KdTreeDemo/OGRE/include/TestKdTreeAppListener.h (added)
-
App/Demos/Vis/KdTreeDemo/OGRE/scripts (added)
-
App/Demos/Vis/KdTreeDemo/OGRE/scripts/TestKdTree.vcproj (added)
-
App/Demos/Vis/KdTreeDemo/OGRE/src (added)
-
App/Demos/Vis/KdTreeDemo/OGRE/src/TestKdTree.cpp (added)
-
Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdRenderable.h (added)
-
Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTree.h (added)
-
Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTreeSceneManager.h (added)
-
Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTreeSceneNode.h (added)
-
Lib/Vis/OnlineCullingCHC/OGRE/misc/OgreKdTreeSceneManager.def (added)
-
Lib/Vis/OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj (modified) (6 diffs)
-
Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTree.cpp (added)
-
Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp (added)
-
Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneNode.cpp (added)
-
Lib/Vis/OnlineCullingCHC/OGRE/src/OgreVisibilitySceneManagerDll.cpp (modified) (6 diffs)
-
Lib/Vis/OnlineCullingCHC/scripts/GtpVisibility.vcproj (modified) (1 diff)
-
Lib/Vis/Preprocessing/scripts/Preprocessor.vcproj (modified) (1 diff)
-
Lib/Vis/Preprocessing/scripts/TestPreprocessor.vcproj (modified) (1 diff)
-
Lib/Vis/QtRenderer/QtRenderer.vcproj (modified) (2 diffs)
-
Lib/Vis/shared/scripts/GtpVisibility.sln (modified) (2 diffs)
-
Lib/Vis/shared/scripts/GtpVisibility.suo (modified) (previous)
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrain.vcproj
r1158 r1163 30 30 WarningLevel="3" 31 31 Detect64BitPortabilityProblems="TRUE" 32 DebugInformationFormat=" 4"/>32 DebugInformationFormat="3"/> 33 33 <Tool 34 34 Name="VCCustomBuildTool"/> … … 85 85 <Tool 86 86 Name="VCLinkerTool" 87 AdditionalDependencies="OGREMain.LIB CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib Plugin_VisibilitySceneManager.lib IVReader.lib zdll.lib zziplib.lib Plugin_Collada.libxerces-c_2.lib"87 AdditionalDependencies="OGREMain.LIB CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib Plugin_VisibilitySceneManager.lib IVReader.lib zdll.lib zziplib.lib xerces-c_2.lib" 88 88 OutputFile="$(OGRE_PATH)/Samples/Common/bin/Release/TestCullingTerrain.exe" 89 89 LinkIncremental="1" 90 AdditionalLibraryDirectories=""$(OGRE_PATH)\Dependencies\Lib\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\Lib\$(ConfigurationName)";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\Ogre\lib\$(ConfigurationName)";..\..\..\..\..\Lib\Vis\OnlineCullingCHC\lib;"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)"; d:\work\Collada\bin\release;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib"90 AdditionalLibraryDirectories=""$(OGRE_PATH)\Dependencies\Lib\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\Lib\$(ConfigurationName)";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\Ogre\lib\$(ConfigurationName)";..\..\..\..\..\Lib\Vis\OnlineCullingCHC\lib;"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib" 91 91 GenerateDebugInformation="TRUE" 92 92 SubSystem="2" -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj
r1159 r1163 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_OCCLUSIONCULLINGSCENEMANAGER_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE;KDTREE_DEBUG" 24 24 MinimalRebuild="TRUE" 25 25 BasicRuntimeChecks="3" … … 30 30 WarningLevel="3" 31 31 Detect64BitPortabilityProblems="TRUE" 32 DebugInformationFormat=" 4"/>32 DebugInformationFormat="3"/> 33 33 <Tool 34 34 Name="VCCustomBuildTool"/> … … 36 36 Name="VCLinkerTool" 37 37 IgnoreImportLibrary="TRUE" 38 AdditionalDependencies="OgreMain_d.lib CEGUIBase_d.lib OgreGUIRenderer_d.lib Plugin_OctreeSceneManager.lib GtpVisibility.lib zdll.lib zziplibd.lib Preprocessor.lib devil.lib glut32.lib xerces-c_2 .lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib glew32.lib qtmain.lib QtOpenGLd4.lib QtCored4.lib QtGuid4.lib Qt3Supportd4.lib QAxContainer.lib"38 AdditionalDependencies="OgreMain_d.lib CEGUIBase_d.lib OgreGUIRenderer_d.lib Plugin_OctreeSceneManager.lib GtpVisibility.lib zdll.lib zziplibd.lib Preprocessor.lib devil.lib glut32.lib xerces-c_2D.lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib glew32.lib" 39 39 OutputFile="$(OutDir)/Plugin_VisibilitySceneManager.dll" 40 40 Version="0.99" 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;"$( QTDIR)\lib";"$(CG_LIB_PATH)""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)"" 44 44 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def" 45 45 GenerateDebugInformation="TRUE" … … 89 89 OptimizeForProcessor="2" 90 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;GTP_VISIBILITY_MODIFIED_OGRE "91 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GTP_VISIBILITY_MODIFIED_OGRE;KDTREE_DEBUG" 92 92 StringPooling="TRUE" 93 93 RuntimeLibrary="2" … … 104 104 Name="VCLinkerTool" 105 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 qtmain.lib QtOpenGL4.lib QtCore4.lib QtGui4.lib Qt3Support4.lib QAxContainer.libglut32.lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib glew32.lib glew32s.lib"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 cg.lib cgGL.lib glew32.lib glew32s.lib" 107 107 OutputFile="$(OutDir)/Plugin_VisibilitySceneManager.dll" 108 108 Version="0.99" … … 260 260 </Filter> 261 261 </Filter> 262 <Filter 263 Name="KdTreeSceneManager" 264 Filter=""> 265 <Filter 266 Name="Header Files" 267 Filter=""> 268 <File 269 RelativePath="..\include\OgreKdRenderable.h"> 270 </File> 271 <File 272 RelativePath="..\include\OgreKdTree.h"> 273 </File> 274 <File 275 RelativePath="..\include\OgreKdTreeSceneManager.h"> 276 </File> 277 <File 278 RelativePath="..\include\OgreKdTreeSceneNode.h"> 279 </File> 280 </Filter> 281 <Filter 282 Name="Source Files" 283 Filter=""> 284 <File 285 RelativePath="..\src\OgreKdTree.cpp"> 286 </File> 287 <File 288 RelativePath="..\src\OgreKdTreeSceneManager.cpp"> 289 </File> 290 <File 291 RelativePath="..\src\OgreKdTreeSceneNode.cpp"> 292 </File> 293 </Filter> 294 </Filter> 262 295 <File 263 296 RelativePath=".\VTune\Plugin_VisibilitySceneManager.vpj"> -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreVisibilitySceneManagerDll.cpp
r1153 r1163 26 26 //#include <OgreVisibilityTerrainSceneManager.h> 27 27 #include <OgreOcclusionCullingSceneManager.h> 28 #include <OgreKdTreeSceneManager.h> 28 29 29 30 //#include <OgreHeightmapTerrainPageSource.h> … … 41 42 //VisibilityTerrainSceneManagerFactory *visibilityTerrainPlugin; 42 43 OcclusionCullingSceneManagerFactory *occlusionCullingPlugin; 44 KdTreeSceneManagerFactory *kdTreeFactory; 43 45 44 46 //----------------------------------------------------------------------- … … 52 54 //visibilityTerrainPlugin = new VisibilityTerrainSceneManagerFactory(visManager); 53 55 occlusionCullingPlugin = new OcclusionCullingSceneManagerFactory(visManager); 56 kdTreeFactory = new KdTreeSceneManagerFactory(); 54 57 // Construct listener manager singleton 55 58 new TerrainPageSourceListenerManager(); … … 58 61 //Root::getSingleton().addSceneManagerFactory(visibilityTerrainPlugin); 59 62 Root::getSingleton().addSceneManagerFactory(occlusionCullingPlugin); 63 Root::getSingleton().addSceneManagerFactory(kdTreeFactory); 60 64 } 61 65 //----------------------------------------------------------------------- … … 64 68 //Root::getSingleton().removeSceneManagerFactory(visibilityTerrainPlugin); 65 69 Root::getSingleton().removeSceneManagerFactory(occlusionCullingPlugin); 70 Root::getSingleton().removeSceneManagerFactory(kdTreeFactory); 66 71 // destroy listener manager 67 72 delete TerrainPageSourceListenerManager::getSingletonPtr(); … … 75 80 //delete visibilityTerrainPlugin; 76 81 delete occlusionCullingPlugin; 82 delete kdTreeFactory; 77 83 78 84 delete visManager; -
GTP/trunk/Lib/Vis/OnlineCullingCHC/scripts/GtpVisibility.vcproj
r1002 r1163 29 29 WarningLevel="3" 30 30 Detect64BitPortabilityProblems="TRUE" 31 DebugInformationFormat=" 4"/>31 DebugInformationFormat="3"/> 32 32 <Tool 33 33 Name="VCCustomBuildTool"/> -
GTP/trunk/Lib/Vis/Preprocessing/scripts/Preprocessor.vcproj
r1150 r1163 29 29 WarningLevel="3" 30 30 Detect64BitPortabilityProblems="TRUE" 31 DebugInformationFormat=" 4"/>31 DebugInformationFormat="3"/> 32 32 <Tool 33 33 Name="VCCustomBuildTool"/> -
GTP/trunk/Lib/Vis/Preprocessing/scripts/TestPreprocessor.vcproj
r1150 r1163 36 36 OutputFile="$(OutDir)/Preprocessor.exe" 37 37 LinkIncremental="2" 38 AdditionalLibraryDirectories="..\include;..\src\GL;"$(CG_LIB_PATH)";"$(GTPDIR)\NonGTP\Xerces";"$(GTPDIR)\NonGTP\Xerces\xercesc\lib";"$(GTPDIR)\NonGTP\zlib\lib";"$(GTPDIR)\NonGTP\Devil\lib";..\lib\debug "38 AdditionalLibraryDirectories="..\include;..\src\GL;"$(CG_LIB_PATH)";"$(GTPDIR)\NonGTP\Xerces";"$(GTPDIR)\NonGTP\Xerces\xercesc\lib";"$(GTPDIR)\NonGTP\zlib\lib";"$(GTPDIR)\NonGTP\Devil\lib";..\lib\debug;"$(BOOST_LIB)"" 39 39 GenerateDebugInformation="TRUE" 40 40 ProgramDatabaseFile="$(OutDir)/TestPreprocessor.pdb" -
GTP/trunk/Lib/Vis/QtRenderer/QtRenderer.vcproj
r1153 r1163 20 20 Name="VCCLCompilerTool" 21 21 Optimization="0" 22 AdditionalIncludeDirectories=" "$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl""22 AdditionalIncludeDirectories="..\Preprocessing\src;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl";..\..\..\..\..\NonGTP\Zlib\include;"$(CG_INC_PATH)"" 23 23 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;QTRENDERER_EXPORTS" 24 24 MinimalRebuild="TRUE" … … 28 28 WarningLevel="3" 29 29 Detect64BitPortabilityProblems="TRUE" 30 DebugInformationFormat=" 4"/>30 DebugInformationFormat="3"/> 31 31 <Tool 32 32 Name="VCCustomBuildTool"/> 33 33 <Tool 34 34 Name="VCLinkerTool" 35 AdditionalDependencies="preprocessor.lib " 36 OutputFile="$(OutDir)/QtRenderer.dll" 37 LinkIncremental="2" 35 AdditionalDependencies="Preprocessor.lib qtmain.lib QtGui4.lib Qt3Support4.lib QAxContainer.lib QtCore4.lib QtOpenGL4.lib xerces-c_2.lib glew32.lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib" 36 OutputFile="$(OutDir)/QtGlRenderer.dll" 37 LinkIncremental="1" 38 AdditionalLibraryDirectories=""$(QTDIR)\lib";..\..\..\..\..\NonGTP\Zlib\lib;"$(CG_LIB_PATH)";"..\Preprocessing\lib\$(ConfigurationName)";..\Preprocessing\src\GL;..\..\..\..\..\NonGTP\Xerces\xercesc\lib" 38 39 GenerateDebugInformation="TRUE" 39 ProgramDatabaseFile="$(OutDir)/ QtRenderer.pdb"40 ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb" 40 41 SubSystem="2" 41 42 ImportLibrary="$(OutDir)/QtRenderer.lib" -
GTP/trunk/Lib/Vis/shared/scripts/GtpVisibility.sln
r1146 r1163 34 34 EndProjectSection 35 35 EndProject 36 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtRenderer", "..\..\QtRenderer\QtRenderer.vcproj", "{B85DC7B1-58B6-4912-BD64-8B452630A368}" 36 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtGlRenderer", "..\..\QtRenderer\QtRenderer.vcproj", "{B85DC7B1-58B6-4912-BD64-8B452630A368}" 37 ProjectSection(ProjectDependencies) = postProject 38 EndProjectSection 39 EndProject 40 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestKdTree", "..\..\..\..\App\Demos\Vis\KdTreeDemo\OGRE\scripts\TestKdTree.vcproj", "{17F2C6F9-6101-430E-ABF4-71383868EF24}" 37 41 ProjectSection(ProjectDependencies) = postProject 38 42 EndProjectSection … … 76 80 {B85DC7B1-58B6-4912-BD64-8B452630A368}.Release.ActiveCfg = Release|Win32 77 81 {B85DC7B1-58B6-4912-BD64-8B452630A368}.Release.Build.0 = Release|Win32 82 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Debug.ActiveCfg = Debug|Win32 83 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Debug.Build.0 = Debug|Win32 84 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Release.ActiveCfg = Release|Win32 85 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Release.Build.0 = Release|Win32 78 86 EndGlobalSection 79 87 GlobalSection(ExtensibilityGlobals) = postSolution
Note: See TracChangeset
for help on using the changeset viewer.
