![(please configure the [header_logo] section in trac.ini)](/trac/gametools/chrome/site/your_project_logo.png){kind=logo}
Changeset 2353
- Timestamp:
- 05/08/07 13:04:43 (17 years ago)
- Location:
- GTP/trunk
- Files:
-
- 5 deleted
- 26 edited
-
App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrain.vcproj (modified) (5 diffs)
-
App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.cpp (modified) (2 diffs)
-
App/Demos/Vis/KdTreeDemo/OGRE/scripts/TestKdTree.vcproj (modified) (4 diffs)
-
Lib/Vis/GtpVisibility.sln (modified) (10 diffs)
-
Lib/Vis/OnlineCullingCHC/IVReader/src/IVReader.vcproj (modified) (2 diffs)
-
Lib/Vis/OnlineCullingCHC/OGRE/include/OgreBoundingBoxConverter.h (modified) (2 diffs)
-
Lib/Vis/OnlineCullingCHC/OGRE/src/OgreBvHierarchy.cpp (deleted)
-
Lib/Vis/OnlineCullingCHC/OGRE/src/OgreBvHierarchyCamera.cpp (deleted)
-
Lib/Vis/OnlineCullingCHC/OGRE/src/OgreBvHierarchyInterface.cpp (deleted)
-
Lib/Vis/OnlineCullingCHC/OGRE/src/OgreBvHierarchySceneManager.cpp (deleted)
-
Lib/Vis/OnlineCullingCHC/OGRE/src/OgreBvHierarchySceneNode.cpp (deleted)
-
Lib/Vis/OnlineCullingCHC/OGRE/src/OgreVisibilitySceneManagerDll.cpp (modified) (5 diffs)
-
Lib/Vis/OnlineCullingCHC/OGRE/src/Plugin_VisibilitySceneManager.vcproj (modified) (5 diffs)
-
Lib/Vis/OnlineCullingCHC/ObjReader/src/ObjReader.vcproj (modified) (3 diffs)
-
Lib/Vis/OnlineCullingCHC/include/DummyPreprocessingManager.h (modified) (1 diff)
-
Lib/Vis/OnlineCullingCHC/include/PreprocessingManager.h (modified) (3 diffs)
-
Lib/Vis/OnlineCullingCHC/src/DummyPreprocessingManager.cpp (modified) (1 diff)
-
Lib/Vis/OnlineCullingCHC/src/GtpVisibility.vcproj (modified) (2 diffs)
-
Lib/Vis/Preprocessing/EvalStats/EvalStats.vcproj (modified) (6 diffs)
-
Lib/Vis/Preprocessing/src/HierarchyManager.cpp (modified) (3 diffs)
-
Lib/Vis/Preprocessing/src/HierarchyManager.h (modified) (1 diff)
-
Lib/Vis/Preprocessing/src/Mutation.cpp (modified) (1 diff)
-
Lib/Vis/Preprocessing/src/Preprocessor.vcproj (modified) (6 diffs)
-
Lib/Vis/Preprocessing/src/SamplingStrategy.cpp (modified) (1 diff)
-
Lib/Vis/Preprocessing/src/TestPreprocessor.vcproj (modified) (3 diffs)
-
Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (6 diffs)
-
Lib/Vis/Preprocessing/src/ViewCellsManager.h (modified) (4 diffs)
-
Lib/Vis/Preprocessing/src/VspTree.cpp (modified) (13 diffs)
-
Lib/Vis/Preprocessing/src/VspTree.h (modified) (1 diff)
-
Lib/Vis/Preprocessing/src/VssRay.h (modified) (2 diffs)
-
Lib/Vis/Preprocessing/src/main.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrain.vcproj
r2290 r2353 98 98 LinkIncremental="1" 99 99 AdditionalLibraryDirectories=""$(OGRE_PATH)\Dependencies\Lib\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\Lib\$(ConfigurationName)";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;"..\..\..\..\..\Lib\Vis\Preprocessing\lib\$(ConfigurationName)"" 100 GenerateDebugInformation="TRUE"101 SubSystem="2"102 OptimizeReferences="2"103 EnableCOMDATFolding="2"104 TargetMachine="1"/>105 <Tool106 Name="VCMIDLTool"/>107 <Tool108 Name="VCPostBuildEventTool"/>109 <Tool110 Name="VCPreBuildEventTool"/>111 <Tool112 Name="VCPreLinkEventTool"/>113 <Tool114 Name="VCResourceCompilerTool"/>115 <Tool116 Name="VCWebServiceProxyGeneratorTool"/>117 <Tool118 Name="VCXMLDataGeneratorTool"/>119 <Tool120 Name="VCWebDeploymentTool"/>121 <Tool122 Name="VCManagedWrapperGeneratorTool"/>123 <Tool124 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>125 </Configuration>126 <Configuration127 Name="mlrt|Win32"128 OutputDirectory="$(ConfigurationName)"129 IntermediateDirectory="$(ConfigurationName)"130 ConfigurationType="1"131 CharacterSet="2">132 <Tool133 Name="VCCLCompilerTool"134 AdditionalIncludeDirectories=""$(OGRE_PATH)\Dependencies\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";..\..\Ogre\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\include;..\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;"$(LIBXML_HOME)\include";d:\work\Collada\include"135 PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_RELEASE;WIN32;_STLP_RELEASE;GTP_VISIBILITY_MODIFIED_OGRE"136 RuntimeLibrary="2"137 RuntimeTypeInfo="TRUE"138 UsePrecompiledHeader="0"139 WarningLevel="3"140 Detect64BitPortabilityProblems="TRUE"141 DebugInformationFormat="3"/>142 <Tool143 Name="VCCustomBuildTool"/>144 <Tool145 Name="VCLinkerTool"146 AdditionalDependencies="OGREMain.LIB CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib Plugin_VisibilitySceneManager.lib IVReader.lib zdll.lib zziplib.lib xerces-c_2.lib"147 OutputFile="$(OGRE_PATH)/Samples/Common/bin/Release/TestCullingTerrain.exe"148 LinkIncremental="1"149 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"150 GenerateDebugInformation="TRUE"151 SubSystem="2"152 OptimizeReferences="2"153 EnableCOMDATFolding="2"154 TargetMachine="1"/>155 <Tool156 Name="VCMIDLTool"/>157 <Tool158 Name="VCPostBuildEventTool"/>159 <Tool160 Name="VCPreBuildEventTool"/>161 <Tool162 Name="VCPreLinkEventTool"/>163 <Tool164 Name="VCResourceCompilerTool"/>165 <Tool166 Name="VCWebServiceProxyGeneratorTool"/>167 <Tool168 Name="VCXMLDataGeneratorTool"/>169 <Tool170 Name="VCWebDeploymentTool"/>171 <Tool172 Name="VCManagedWrapperGeneratorTool"/>173 <Tool174 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>175 </Configuration>176 <Configuration177 Name="Release_Internal|Win32"178 OutputDirectory="$(ConfigurationName)"179 IntermediateDirectory="$(ConfigurationName)"180 ConfigurationType="1"181 CharacterSet="2">182 <Tool183 Name="VCCLCompilerTool"184 AdditionalIncludeDirectories=""$(OGRE_PATH)\Dependencies\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";..\..\Ogre\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\include;..\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;"$(LIBXML_HOME)\include";d:\work\Collada\include"185 PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_RELEASE;WIN32;_STLP_RELEASE;GTP_VISIBILITY_MODIFIED_OGRE"186 RuntimeLibrary="2"187 RuntimeTypeInfo="TRUE"188 UsePrecompiledHeader="0"189 WarningLevel="3"190 Detect64BitPortabilityProblems="TRUE"191 DebugInformationFormat="3"/>192 <Tool193 Name="VCCustomBuildTool"/>194 <Tool195 Name="VCLinkerTool"196 AdditionalDependencies="OGREMain.LIB CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib Plugin_VisibilitySceneManager.lib IVReader.lib zdll.lib zziplib.lib xerces-c_2.lib"197 OutputFile="$(OGRE_PATH)/Samples/Common/bin/Release/TestCullingTerrain.exe"198 LinkIncremental="1"199 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"200 100 GenerateDebugInformation="TRUE" 201 101 SubSystem="2" … … 259 159 LinkIncremental="1" 260 160 AdditionalLibraryDirectories=""$(OGRE_PATH)\Dependencies\Lib\Release";"$(OGRE_PATH)\OgreMain\Lib\Release";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\Release";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";..\..\Ogre\lib\Release;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\lib;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\lib\Release;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\Release;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\lib\Release;..\..\..\..\..\Lib\Vis\Preprocessing\lib\Release" 261 GenerateDebugInformation=" TRUE"161 GenerateDebugInformation="FALSE" 262 162 SubSystem="2" 263 163 OptimizeReferences="2" … … 288 188 <Configuration 289 189 Name="Release_qt|Win32" 290 OutputDirectory=" $(ConfigurationName)"291 IntermediateDirectory=" $(ConfigurationName)"190 OutputDirectory="Release" 191 IntermediateDirectory="Release" 292 192 ConfigurationType="1" 293 193 CharacterSet="2"> … … 299 199 EnableIntrinsicFunctions="TRUE" 300 200 FavorSizeOrSpeed="1" 201 OmitFramePointers="TRUE" 301 202 EnableFiberSafeOptimizations="TRUE" 302 203 OptimizeForProcessor="0" 303 204 OptimizeForWindowsApplication="TRUE" 304 AdditionalIncludeDirectories=""$(OGRE_PATH)\Dependencies\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";..\..\ Ogre\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\include;..\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include"205 AdditionalIncludeDirectories=""$(OGRE_PATH)\Dependencies\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";..\..\..\..\..\Lib\Vis\OnlineCullingCHC\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include" 305 206 PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_RELEASE;WIN32;_STLP_RELEASE;GTP_VISIBILITY_MODIFIED_OGRE" 306 207 RuntimeLibrary="2" … … 317 218 OutputFile="$(OGRE_PATH)/Samples/Common/bin/Release/TestCullingTerrain.exe" 318 219 LinkIncremental="1" 319 AdditionalLibraryDirectories=""$(OGRE_PATH)\Dependencies\Lib\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\Lib\$(ConfigurationName)";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;"..\..\..\..\..\Lib\Vis\Preprocessing\lib\$(ConfigurationName)"" 220 AdditionalLibraryDirectories=""$(OGRE_PATH)\Dependencies\Lib\Release";"$(OGRE_PATH)\OgreMain\Lib\Release";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\Release";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";..\..\..\..\..\Lib\Vis\OnlineCullingCHC\lib\Release;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\lib\Release;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\Release;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\Lib\Vis\Preprocessing\lib\Release" 221 GenerateDebugInformation="FALSE" 222 SubSystem="2" 223 OptimizeReferences="2" 224 EnableCOMDATFolding="2" 225 TargetMachine="1"/> 226 <Tool 227 Name="VCMIDLTool"/> 228 <Tool 229 Name="VCPostBuildEventTool" 230 CommandLine="copy $(OutDir)\$(TargetFileName) $(OGRE_PATH)\Samples\Common\bin\Release"/> 231 <Tool 232 Name="VCPreBuildEventTool"/> 233 <Tool 234 Name="VCPreLinkEventTool"/> 235 <Tool 236 Name="VCResourceCompilerTool"/> 237 <Tool 238 Name="VCWebServiceProxyGeneratorTool"/> 239 <Tool 240 Name="VCXMLDataGeneratorTool"/> 241 <Tool 242 Name="VCWebDeploymentTool"/> 243 <Tool 244 Name="VCManagedWrapperGeneratorTool"/> 245 <Tool 246 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 247 </Configuration> 248 <Configuration 249 Name="Release_noqt|Win32" 250 OutputDirectory="Release" 251 IntermediateDirectory="Release" 252 ConfigurationType="1" 253 CharacterSet="2"> 254 <Tool 255 Name="VCCLCompilerTool" 256 Optimization="3" 257 GlobalOptimizations="TRUE" 258 InlineFunctionExpansion="2" 259 EnableIntrinsicFunctions="TRUE" 260 FavorSizeOrSpeed="1" 261 OmitFramePointers="TRUE" 262 EnableFiberSafeOptimizations="TRUE" 263 OptimizeForProcessor="0" 264 OptimizeForWindowsApplication="TRUE" 265 AdditionalIncludeDirectories=""$(OGRE_PATH)\Dependencies\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";..\..\..\..\..\Lib\Vis\OnlineCullingCHC\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include" 266 PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_RELEASE;WIN32;_STLP_RELEASE;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE" 267 RuntimeLibrary="2" 268 RuntimeTypeInfo="TRUE" 269 UsePrecompiledHeader="0" 270 WarningLevel="3" 271 Detect64BitPortabilityProblems="TRUE" 272 DebugInformationFormat="3"/> 273 <Tool 274 Name="VCCustomBuildTool"/> 275 <Tool 276 Name="VCLinkerTool" 277 AdditionalDependencies="OGREMain.LIB CEGUIBase.lib OgreGUIRenderer.lib IVReader.lib zdll.lib zziplib.lib xerces-c_2.lib Plugin_OctreeSceneManager.lib Plugin_VisibilitySceneManager.lib GtpVisibility.lib Preprocessor.lib" 278 OutputFile="$(OGRE_PATH)/Samples/Common/bin/Release/TestCullingTerrain.exe" 279 LinkIncremental="1" 280 AdditionalLibraryDirectories=""$(OGRE_PATH)\Dependencies\Lib\Release";"$(OGRE_PATH)\OgreMain\Lib\Release";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\Release";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";..\..\..\..\..\Lib\Vis\OnlineCullingCHC\lib\Release;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\lib\Release;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\Release;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\Lib\Vis\Preprocessing\lib\Release" 320 281 GenerateDebugInformation="FALSE" 321 282 SubSystem="2" -
GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.cpp
r2352 r2353 573 573 this); 574 574 575 //mTerrainFrameListener->setPriority(10);576 //mTerrainFrameListener->setPriority(10);575 mTerrainFrameListener->setPriority(10); 576 577 577 mRoot->addFrameListener(mTerrainFrameListener); 578 578 } … … 593 593 594 594 //mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager"); 595 596 //mSceneMgr = mRoot->createSceneManager("TerrainSceneManager"); 597 //mSceneMgr = mRoot->createSceneManager("OctreeSceneManager"); 598 //mSceneMgr = mRoot->createSceneManager("BiHierarchySceneManager"); 599 600 mSceneMgr = mRoot->createSceneManager("BiTreeTerrainSceneManager"); 595 mSceneMgr = mRoot->createSceneManager("BiHierarchySceneManager"); 596 //mSceneMgr = mRoot->createSceneManager("BiTreeTerrainSceneManager"); 601 597 602 598 #endif -
GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/scripts/TestKdTree.vcproj
r2290 r2353 133 133 </Configuration> 134 134 <Configuration 135 Name="mlrt|Win32"136 OutputDirectory="$(ConfigurationName)"137 IntermediateDirectory="$(ConfigurationName)"138 ConfigurationType="1"139 CharacterSet="2"140 WholeProgramOptimization="TRUE">141 <Tool142 Name="VCCLCompilerTool"143 Optimization="2"144 GlobalOptimizations="TRUE"145 InlineFunctionExpansion="1"146 EnableIntrinsicFunctions="TRUE"147 ImproveFloatingPointConsistency="TRUE"148 FavorSizeOrSpeed="1"149 OmitFramePointers="TRUE"150 OptimizeForProcessor="2"151 OptimizeForWindowsApplication="TRUE"152 AdditionalIncludeDirectories="..\include;"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\OgreMain\include";..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\include;..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\include"153 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;GTP_VISIBILITY_MODIFIED_OGRE"154 StringPooling="TRUE"155 MinimalRebuild="TRUE"156 RuntimeLibrary="2"157 BufferSecurityCheck="FALSE"158 EnableFunctionLevelLinking="TRUE"159 UsePrecompiledHeader="0"160 WarningLevel="3"161 Detect64BitPortabilityProblems="TRUE"162 DebugInformationFormat="3"/>163 <Tool164 Name="VCCustomBuildTool"/>165 <Tool166 Name="VCLinkerTool"167 AdditionalDependencies="OgreMain.lib IVReader.lib"168 OutputFile="$(OutDir)/$(ProjectName).exe"169 LinkIncremental="1"170 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)""171 GenerateDebugInformation="TRUE"172 SubSystem="2"173 OptimizeReferences="2"174 EnableCOMDATFolding="2"175 OptimizeForWindows98="1"176 TargetMachine="1"/>177 <Tool178 Name="VCMIDLTool"/>179 <Tool180 Name="VCPostBuildEventTool"181 CommandLine="copy $(OutDir)\$(TargetFileName) "$(OGRE_PATH)\Samples\Common\bin\$(ConfigurationName)""/>182 <Tool183 Name="VCPreBuildEventTool"/>184 <Tool185 Name="VCPreLinkEventTool"/>186 <Tool187 Name="VCResourceCompilerTool"/>188 <Tool189 Name="VCWebServiceProxyGeneratorTool"/>190 <Tool191 Name="VCXMLDataGeneratorTool"/>192 <Tool193 Name="VCWebDeploymentTool"/>194 <Tool195 Name="VCManagedWrapperGeneratorTool"/>196 <Tool197 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>198 </Configuration>199 <Configuration200 Name="Release_Internal|Win32"201 OutputDirectory="$(ConfigurationName)"202 IntermediateDirectory="$(ConfigurationName)"203 ConfigurationType="1"204 CharacterSet="2"205 WholeProgramOptimization="TRUE">206 <Tool207 Name="VCCLCompilerTool"208 Optimization="2"209 GlobalOptimizations="TRUE"210 InlineFunctionExpansion="1"211 EnableIntrinsicFunctions="TRUE"212 ImproveFloatingPointConsistency="TRUE"213 FavorSizeOrSpeed="1"214 OmitFramePointers="TRUE"215 OptimizeForProcessor="2"216 OptimizeForWindowsApplication="TRUE"217 AdditionalIncludeDirectories="..\include;"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\OgreMain\include";..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\include;..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\include"218 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;GTP_VISIBILITY_MODIFIED_OGRE"219 StringPooling="TRUE"220 MinimalRebuild="TRUE"221 RuntimeLibrary="2"222 BufferSecurityCheck="FALSE"223 EnableFunctionLevelLinking="TRUE"224 UsePrecompiledHeader="0"225 WarningLevel="3"226 Detect64BitPortabilityProblems="TRUE"227 DebugInformationFormat="3"/>228 <Tool229 Name="VCCustomBuildTool"/>230 <Tool231 Name="VCLinkerTool"232 AdditionalDependencies="OgreMain.lib IVReader.lib"233 OutputFile="$(OutDir)/$(ProjectName).exe"234 LinkIncremental="1"235 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)""236 GenerateDebugInformation="TRUE"237 SubSystem="2"238 OptimizeReferences="2"239 EnableCOMDATFolding="2"240 OptimizeForWindows98="1"241 TargetMachine="1"/>242 <Tool243 Name="VCMIDLTool"/>244 <Tool245 Name="VCPostBuildEventTool"246 CommandLine="copy $(OutDir)\$(TargetFileName) "$(OGRE_PATH)\Samples\Common\bin\$(ConfigurationName)""/>247 <Tool248 Name="VCPreBuildEventTool"/>249 <Tool250 Name="VCPreLinkEventTool"/>251 <Tool252 Name="VCResourceCompilerTool"/>253 <Tool254 Name="VCWebServiceProxyGeneratorTool"/>255 <Tool256 Name="VCXMLDataGeneratorTool"/>257 <Tool258 Name="VCWebDeploymentTool"/>259 <Tool260 Name="VCManagedWrapperGeneratorTool"/>261 <Tool262 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>263 </Configuration>264 <Configuration265 135 Name="Release Internal|Win32" 266 136 OutputDirectory="..\bin\Release" … … 329 199 <Configuration 330 200 Name="Release_qt|Win32" 331 OutputDirectory=" $(ConfigurationName)"332 IntermediateDirectory=" $(ConfigurationName)"201 OutputDirectory="Release" 202 IntermediateDirectory="Release" 333 203 ConfigurationType="1" 334 204 CharacterSet="2" … … 343 213 FavorSizeOrSpeed="1" 344 214 OmitFramePointers="TRUE" 215 EnableFiberSafeOptimizations="TRUE" 345 216 OptimizeForProcessor="2" 346 217 OptimizeForWindowsApplication="TRUE" 347 AdditionalIncludeDirectories=" ..\include;"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\OgreMain\include";..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\include;..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\include"218 AdditionalIncludeDirectories=""$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\OgreMain\include";..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\include;..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\include;..\include" 348 219 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;GTP_VISIBILITY_MODIFIED_OGRE" 349 220 StringPooling="TRUE" … … 363 234 OutputFile="$(OutDir)/$(ProjectName).exe" 364 235 LinkIncremental="1" 365 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)"" 236 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\Release";..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\Release" 237 GenerateDebugInformation="TRUE" 238 SubSystem="2" 239 OptimizeReferences="2" 240 EnableCOMDATFolding="2" 241 OptimizeForWindows98="1" 242 TargetMachine="1"/> 243 <Tool 244 Name="VCMIDLTool"/> 245 <Tool 246 Name="VCPostBuildEventTool" 247 CommandLine="copy $(OutDir)\$(TargetFileName) "$(OGRE_PATH)\Samples\Common\bin\$(ConfigurationName)""/> 248 <Tool 249 Name="VCPreBuildEventTool"/> 250 <Tool 251 Name="VCPreLinkEventTool"/> 252 <Tool 253 Name="VCResourceCompilerTool"/> 254 <Tool 255 Name="VCWebServiceProxyGeneratorTool"/> 256 <Tool 257 Name="VCXMLDataGeneratorTool"/> 258 <Tool 259 Name="VCWebDeploymentTool"/> 260 <Tool 261 Name="VCManagedWrapperGeneratorTool"/> 262 <Tool 263 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 264 </Configuration> 265 <Configuration 266 Name="Release_noqt|Win32" 267 OutputDirectory="Release" 268 IntermediateDirectory="Release" 269 ConfigurationType="1" 270 CharacterSet="2" 271 WholeProgramOptimization="TRUE"> 272 <Tool 273 Name="VCCLCompilerTool" 274 Optimization="2" 275 GlobalOptimizations="TRUE" 276 InlineFunctionExpansion="1" 277 EnableIntrinsicFunctions="TRUE" 278 ImproveFloatingPointConsistency="TRUE" 279 FavorSizeOrSpeed="1" 280 OmitFramePointers="TRUE" 281 EnableFiberSafeOptimizations="TRUE" 282 OptimizeForProcessor="2" 283 OptimizeForWindowsApplication="TRUE" 284 AdditionalIncludeDirectories=""$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\OgreMain\include";..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\include;..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\include;..\include" 285 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;GTP_VISIBILITY_MODIFIED_OGRE" 286 StringPooling="TRUE" 287 MinimalRebuild="TRUE" 288 RuntimeLibrary="2" 289 BufferSecurityCheck="FALSE" 290 EnableFunctionLevelLinking="TRUE" 291 UsePrecompiledHeader="0" 292 WarningLevel="3" 293 Detect64BitPortabilityProblems="TRUE" 294 DebugInformationFormat="3"/> 295 <Tool 296 Name="VCCustomBuildTool"/> 297 <Tool 298 Name="VCLinkerTool" 299 AdditionalDependencies="OgreMain.lib IVReader.lib" 300 OutputFile="$(OutDir)/$(ProjectName).exe" 301 LinkIncremental="1" 302 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\Release";..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\Release" 366 303 GenerateDebugInformation="TRUE" 367 304 SubSystem="2" -
GTP/trunk/Lib/Vis/GtpVisibility.sln
r2332 r2353 61 61 Release = Release 62 62 Release Internal = Release Internal 63 release_noqt = release_noqt63 Release_noqt = Release_noqt 64 64 Release_qt = Release_qt 65 65 EndGlobalSection … … 71 71 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Release Internal.ActiveCfg = Release Internal|Win32 72 72 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Release Internal.Build.0 = Release Internal|Win32 73 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}. release_noqt.ActiveCfg = Release_qt|Win3274 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}. release_noqt.Build.0 = Release_qt|Win3273 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Release_noqt.ActiveCfg = Release_noqt|Win32 74 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Release_noqt.Build.0 = Release_noqt|Win32 75 75 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Release_qt.ActiveCfg = Release_qt|Win32 76 76 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Release_qt.Build.0 = Release_qt|Win32 … … 81 81 {101A7691-74F3-48B4-96A3-CF35578F5900}.Release Internal.ActiveCfg = Release Internal|Win32 82 82 {101A7691-74F3-48B4-96A3-CF35578F5900}.Release Internal.Build.0 = Release Internal|Win32 83 {101A7691-74F3-48B4-96A3-CF35578F5900}. release_noqt.ActiveCfg = Release_qt|Win3284 {101A7691-74F3-48B4-96A3-CF35578F5900}. release_noqt.Build.0 = Release_qt|Win3283 {101A7691-74F3-48B4-96A3-CF35578F5900}.Release_noqt.ActiveCfg = Release_noqt|Win32 84 {101A7691-74F3-48B4-96A3-CF35578F5900}.Release_noqt.Build.0 = Release_noqt|Win32 85 85 {101A7691-74F3-48B4-96A3-CF35578F5900}.Release_qt.ActiveCfg = Release_qt|Win32 86 86 {101A7691-74F3-48B4-96A3-CF35578F5900}.Release_qt.Build.0 = Release_qt|Win32 … … 91 91 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release Internal.ActiveCfg = Release Internal|Win32 92 92 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release Internal.Build.0 = Release Internal|Win32 93 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}. release_noqt.ActiveCfg = Release_qt|Win3294 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}. release_noqt.Build.0 = Release_qt|Win3293 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release_noqt.ActiveCfg = Release_noqt|Win32 94 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release_noqt.Build.0 = Release_noqt|Win32 95 95 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release_qt.ActiveCfg = Release_qt|Win32 96 96 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release_qt.Build.0 = Release_qt|Win32 … … 101 101 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release Internal.ActiveCfg = Release Internal|Win32 102 102 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release Internal.Build.0 = Release Internal|Win32 103 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release_noqt.ActiveCfg = Release_noqt|Win32 104 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release_noqt.Build.0 = Release_noqt|Win32 103 105 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release_qt.ActiveCfg = Release_qt|Win32 104 106 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release_qt.Build.0 = Release_qt|Win32 … … 109 111 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Release Internal.ActiveCfg = Release Internal|Win32 110 112 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Release Internal.Build.0 = Release Internal|Win32 111 {EABCE292-D598-4600-A1C9-2591E7D62FDA}. release_noqt.ActiveCfg = release_noqt|Win32112 {EABCE292-D598-4600-A1C9-2591E7D62FDA}. release_noqt.Build.0 = release_noqt|Win32113 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Release_noqt.ActiveCfg = Release_noqt|Win32 114 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Release_noqt.Build.0 = Release_noqt|Win32 113 115 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Release_qt.ActiveCfg = Release_Qt|Win32 114 116 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Release_qt.Build.0 = Release_Qt|Win32 … … 119 121 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release Internal.ActiveCfg = Release Internal|Win32 120 122 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release Internal.Build.0 = Release Internal|Win32 121 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}. release_noqt.ActiveCfg = release_noqt|Win32122 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}. release_noqt.Build.0 = release_noqt|Win32123 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release_noqt.ActiveCfg = Release_noqt|Win32 124 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release_noqt.Build.0 = Release_noqt|Win32 123 125 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release_qt.ActiveCfg = Release_Qt|Win32 124 126 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release_qt.Build.0 = Release_Qt|Win32 … … 129 131 {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Release Internal.ActiveCfg = Release Internal|Win32 130 132 {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Release Internal.Build.0 = Release Internal|Win32 131 {248F19A6-2FE0-4F5D-8928-E0EA10609887}. release_noqt.ActiveCfg = Release_qt|Win32132 {248F19A6-2FE0-4F5D-8928-E0EA10609887}. release_noqt.Build.0 = Release_qt|Win32133 {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Release_noqt.ActiveCfg = Release_noqt|Win32 134 {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Release_noqt.Build.0 = Release_noqt|Win32 133 135 {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Release_qt.ActiveCfg = Release_qt|Win32 134 136 {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Release_qt.Build.0 = Release_qt|Win32 … … 139 141 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Release Internal.ActiveCfg = Release Internal|Win32 140 142 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Release Internal.Build.0 = Release Internal|Win32 141 {17F2C6F9-6101-430E-ABF4-71383868EF24}. release_noqt.ActiveCfg = Release_qt|Win32142 {17F2C6F9-6101-430E-ABF4-71383868EF24}. release_noqt.Build.0 = Release_qt|Win32143 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Release_noqt.ActiveCfg = Release_noqt|Win32 144 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Release_noqt.Build.0 = Release_noqt|Win32 143 145 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Release_qt.ActiveCfg = Release_qt|Win32 144 146 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Release_qt.Build.0 = Release_qt|Win32 … … 149 151 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release Internal.ActiveCfg = Release Internal|Win32 150 152 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release Internal.Build.0 = Release Internal|Win32 151 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}. release_noqt.ActiveCfg = Release_qt|Win32152 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}. release_noqt.Build.0 = Release_qt|Win32153 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release_noqt.ActiveCfg = Release_noqt|Win32 154 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release_noqt.Build.0 = Release_noqt|Win32 153 155 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release_qt.ActiveCfg = Release_qt|Win32 154 156 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release_qt.Build.0 = Release_qt|Win32 -
GTP/trunk/Lib/Vis/OnlineCullingCHC/IVReader/src/IVReader.vcproj
r2318 r2353 125 125 </Configuration> 126 126 <Configuration 127 Name="mlrt|Win32"128 OutputDirectory="$(ConfigurationName)"129 IntermediateDirectory="$(ConfigurationName)"130 ConfigurationType="2"131 CharacterSet="2">132 <Tool133 Name="VCCLCompilerTool"134 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"135 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IVREADER_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE"136 RuntimeLibrary="2"137 UsePrecompiledHeader="0"138 WarningLevel="3"139 Detect64BitPortabilityProblems="TRUE"140 DebugInformationFormat="3"/>141 <Tool142 Name="VCCustomBuildTool"/>143 <Tool144 Name="VCLinkerTool"145 AdditionalDependencies="OgreMain.lib CEGUIBase.lib OgreGUIRenderer.lib"146 OutputFile="$(OutDir)/IVReader.dll"147 LinkIncremental="1"148 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\GtpVisibility\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)""149 GenerateDebugInformation="TRUE"150 SubSystem="2"151 OptimizeReferences="2"152 EnableCOMDATFolding="2"153 ImportLibrary="$(OutDir)/IVReader.lib"154 TargetMachine="1"/>155 <Tool156 Name="VCMIDLTool"/>157 <Tool158 Name="VCPostBuildEventTool"159 CommandLine="copy $(OutDir)\$(TargetFileName) "$(OGRE_PATH)\Samples\Common\bin\$(ConfigurationName)""/>160 <Tool161 Name="VCPreBuildEventTool"/>162 <Tool163 Name="VCPreLinkEventTool"/>164 <Tool165 Name="VCResourceCompilerTool"/>166 <Tool167 Name="VCWebServiceProxyGeneratorTool"/>168 <Tool169 Name="VCXMLDataGeneratorTool"/>170 <Tool171 Name="VCWebDeploymentTool"/>172 <Tool173 Name="VCManagedWrapperGeneratorTool"/>174 <Tool175 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>176 </Configuration>177 <Configuration178 Name="Release_Internal|Win32"179 OutputDirectory="$(ConfigurationName)"180 IntermediateDirectory="$(ConfigurationName)"181 ConfigurationType="2"182 CharacterSet="2">183 <Tool184 Name="VCCLCompilerTool"185 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"186 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IVREADER_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE"187 RuntimeLibrary="2"188 UsePrecompiledHeader="0"189 WarningLevel="3"190 Detect64BitPortabilityProblems="TRUE"191 DebugInformationFormat="3"/>192 <Tool193 Name="VCCustomBuildTool"/>194 <Tool195 Name="VCLinkerTool"196 AdditionalDependencies="OgreMain.lib CEGUIBase.lib OgreGUIRenderer.lib"197 OutputFile="$(OutDir)/IVReader.dll"198 LinkIncremental="1"199 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\GtpVisibility\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)""200 GenerateDebugInformation="TRUE"201 SubSystem="2"202 OptimizeReferences="2"203 EnableCOMDATFolding="2"204 ImportLibrary="$(OutDir)/IVReader.lib"205 TargetMachine="1"/>206 <Tool207 Name="VCMIDLTool"/>208 <Tool209 Name="VCPostBuildEventTool"210 CommandLine="copy $(OutDir)\$(TargetFileName) "$(OGRE_PATH)\Samples\Common\bin\$(ConfigurationName)""/>211 <Tool212 Name="VCPreBuildEventTool"/>213 <Tool214 Name="VCPreLinkEventTool"/>215 <Tool216 Name="VCResourceCompilerTool"/>217 <Tool218 Name="VCWebServiceProxyGeneratorTool"/>219 <Tool220 Name="VCXMLDataGeneratorTool"/>221 <Tool222 Name="VCWebDeploymentTool"/>223 <Tool224 Name="VCManagedWrapperGeneratorTool"/>225 <Tool226 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>227 </Configuration>228 <Configuration229 127 Name="Release Internal|Win32" 230 128 OutputDirectory="..\lib\Release" … … 290 188 <Configuration 291 189 Name="Release_qt|Win32" 292 OutputDirectory="Release" 293 IntermediateDirectory="Release" 190 OutputDirectory="..\lib\Release" 191 IntermediateDirectory="..\obj\Release" 192 ConfigurationType="2" 193 CharacterSet="2"> 194 <Tool 195 Name="VCCLCompilerTool" 196 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" 197 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IVREADER_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE" 198 RuntimeLibrary="2" 199 UsePrecompiledHeader="0" 200 WarningLevel="3" 201 Detect64BitPortabilityProblems="TRUE" 202 DebugInformationFormat="3"/> 203 <Tool 204 Name="VCCustomBuildTool"/> 205 <Tool 206 Name="VCLinkerTool" 207 AdditionalDependencies="OgreMain.lib CEGUIBase.lib OgreGUIRenderer.lib" 208 OutputFile="$(OutDir)/IVReader.dll" 209 LinkIncremental="1" 210 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\Release";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"$(OGRE_PATH)\Dependencies\lib\Release";..\..\GtpVisibility\lib\Release;..\..\lib\Release" 211 GenerateDebugInformation="FALSE" 212 SubSystem="2" 213 OptimizeReferences="2" 214 EnableCOMDATFolding="2" 215 ImportLibrary="$(OutDir)/IVReader.lib" 216 TargetMachine="1"/> 217 <Tool 218 Name="VCMIDLTool"/> 219 <Tool 220 Name="VCPostBuildEventTool" 221 CommandLine="copy $(OutDir)\$(TargetFileName) "$(OGRE_PATH)\Samples\Common\bin\Release""/> 222 <Tool 223 Name="VCPreBuildEventTool"/> 224 <Tool 225 Name="VCPreLinkEventTool"/> 226 <Tool 227 Name="VCResourceCompilerTool"/> 228 <Tool 229 Name="VCWebServiceProxyGeneratorTool"/> 230 <Tool 231 Name="VCXMLDataGeneratorTool"/> 232 <Tool 233 Name="VCWebDeploymentTool"/> 234 <Tool 235 Name="VCManagedWrapperGeneratorTool"/> 236 <Tool 237 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 238 </Configuration> 239 <Configuration 240 Name="Release_noqt|Win32" 241 OutputDirectory="..\lib\Release" 242 IntermediateDirectory="..\obj\Release" 294 243 ConfigurationType="2" 295 244 CharacterSet="2"> -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreBoundingBoxConverter.h
r2349 r2353 17 17 class OctreeSceneManager; 18 18 class KdTreeSceneManager; 19 class BvHierarchySceneManager;20 19 class BiHierarchySceneManager; 21 20 … … 328 327 329 328 typedef PlatFormBoundingBoxConverter<OctreeSceneManager> OctreeBoundingBoxConverter; 330 typedef PlatFormBoundingBoxConverter<BvHierarchySceneManager> BvhBoundingBoxConverter;331 329 typedef PlatFormBoundingBoxConverter<BiHierarchySceneManager> BihBoundingBoxConverter; 332 330 typedef PlatFormBoundingBoxConverter<KdTreeSceneManager> KdTreeBoundingBoxConverter; -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreVisibilitySceneManagerDll.cpp
r2348 r2353 49 49 KdTerrainSceneManagerFactory *kdTerrainFactory; 50 50 BiTerrainSceneManagerFactory *biTerrainFactory; 51 BvHierarchySceneManagerFactory *bvHierarchyFactory;52 51 BiHierarchySceneManagerFactory *biHierarchyFactory; 53 52 … … 64 63 kdTerrainFactory = new KdTerrainSceneManagerFactory(visManager); 65 64 biTerrainFactory = new BiTerrainSceneManagerFactory(visManager); 66 bvHierarchyFactory = new BvHierarchySceneManagerFactory(visManager);67 65 biHierarchyFactory = new BiHierarchySceneManagerFactory(visManager); 68 66 … … 78 76 Root::getSingleton().addSceneManagerFactory(kdTerrainFactory); 79 77 Root::getSingleton().addSceneManagerFactory(biTerrainFactory); 80 Root::getSingleton().addSceneManagerFactory(bvHierarchyFactory);81 78 Root::getSingleton().addSceneManagerFactory(biHierarchyFactory); 82 79 } … … 88 85 Root::getSingleton().removeSceneManagerFactory(kdTerrainFactory); 89 86 Root::getSingleton().removeSceneManagerFactory(biTerrainFactory); 90 Root::getSingleton().removeSceneManagerFactory(bvHierarchyFactory);91 87 Root::getSingleton().removeSceneManagerFactory(biHierarchyFactory); 92 88 … … 105 101 delete kdTerrainFactory; 106 102 delete biTerrainFactory; 107 delete bvHierarchyFactory;108 103 delete biHierarchyFactory; 109 104 -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/Plugin_VisibilitySceneManager.vcproj
r2348 r2353 145 145 </Configuration> 146 146 <Configuration 147 Name="mlrt|Win32"148 OutputDirectory="$(ConfigurationName)"149 IntermediateDirectory="$(ConfigurationName)"150 ConfigurationType="2"151 CharacterSet="2"152 WholeProgramOptimization="TRUE">153 <Tool154 Name="VCCLCompilerTool"155 Optimization="3"156 GlobalOptimizations="TRUE"157 InlineFunctionExpansion="2"158 EnableIntrinsicFunctions="TRUE"159 ImproveFloatingPointConsistency="TRUE"160 FavorSizeOrSpeed="1"161 OmitFramePointers="TRUE"162 EnableFiberSafeOptimizations="TRUE"163 OptimizeForProcessor="2"164 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"165 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GTP_VISIBILITY_MODIFIED_OGRE"166 StringPooling="TRUE"167 RuntimeLibrary="2"168 BufferSecurityCheck="FALSE"169 EnableFunctionLevelLinking="TRUE"170 RuntimeTypeInfo="TRUE"171 UsePrecompiledHeader="0"172 WarningLevel="3"173 Detect64BitPortabilityProblems="TRUE"174 DebugInformationFormat="3"/>175 <Tool176 Name="VCCustomBuildTool"/>177 <Tool178 Name="VCLinkerTool"179 IgnoreImportLibrary="TRUE"180 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"181 OutputFile="$(OutDir)/Plugin_VisibilitySceneManager.dll"182 Version="0.99"183 LinkIncremental="1"184 SuppressStartupBanner="TRUE"185 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"186 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def"187 GenerateDebugInformation="TRUE"188 SubSystem="2"189 OptimizeReferences="2"190 EnableCOMDATFolding="2"191 ImportLibrary="$(OutDir)/Plugin_VisibilitySceneManager.lib"192 TargetMachine="1"/>193 <Tool194 Name="VCMIDLTool"/>195 <Tool196 Name="VCPostBuildEventTool"197 CommandLine="copy $(OutDir)\$(TargetFileName) $(OGRE_PATH)\Samples\Common\bin\$(ConfigurationName)"/>198 <Tool199 Name="VCPreBuildEventTool"/>200 <Tool201 Name="VCPreLinkEventTool"/>202 <Tool203 Name="VCResourceCompilerTool"/>204 <Tool205 Name="VCWebServiceProxyGeneratorTool"/>206 <Tool207 Name="VCXMLDataGeneratorTool"/>208 <Tool209 Name="VCWebDeploymentTool"/>210 <Tool211 Name="VCManagedWrapperGeneratorTool"/>212 <Tool213 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>214 </Configuration>215 <Configuration216 Name="Release_Internal|Win32"217 OutputDirectory="Release"218 IntermediateDirectory="Release"219 ConfigurationType="2"220 CharacterSet="2"221 WholeProgramOptimization="TRUE">222 <Tool223 Name="VCCLCompilerTool"224 Optimization="3"225 GlobalOptimizations="TRUE"226 InlineFunctionExpansion="2"227 EnableIntrinsicFunctions="TRUE"228 ImproveFloatingPointConsistency="TRUE"229 FavorSizeOrSpeed="1"230 OmitFramePointers="TRUE"231 EnableFiberSafeOptimizations="TRUE"232 OptimizeForProcessor="2"233 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"234 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GTP_VISIBILITY_MODIFIED_OGRE"235 StringPooling="TRUE"236 RuntimeLibrary="2"237 BufferSecurityCheck="FALSE"238 EnableFunctionLevelLinking="TRUE"239 RuntimeTypeInfo="FALSE"240 UsePrecompiledHeader="0"241 WarningLevel="3"242 Detect64BitPortabilityProblems="TRUE"243 DebugInformationFormat="3"/>244 <Tool245 Name="VCCustomBuildTool"/>246 <Tool247 Name="VCLinkerTool"248 IgnoreImportLibrary="TRUE"249 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"250 OutputFile="$(OutDir)/Plugin_VisibilitySceneManager.dll"251 Version="0.99"252 LinkIncremental="1"253 SuppressStartupBanner="TRUE"254 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"255 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def"256 GenerateDebugInformation="TRUE"257 SubSystem="2"258 OptimizeReferences="2"259 EnableCOMDATFolding="2"260 ImportLibrary="$(OutDir)/Plugin_VisibilitySceneManager.lib"261 TargetMachine="1"/>262 <Tool263 Name="VCMIDLTool"/>264 <Tool265 Name="VCPostBuildEventTool"266 CommandLine="copy $(OutDir)\$(TargetFileName) $(OGRE_PATH)\Samples\Common\bin\Release"/>267 <Tool268 Name="VCPreBuildEventTool"/>269 <Tool270 Name="VCPreLinkEventTool"/>271 <Tool272 Name="VCResourceCompilerTool"/>273 <Tool274 Name="VCWebServiceProxyGeneratorTool"/>275 <Tool276 Name="VCXMLDataGeneratorTool"/>277 <Tool278 Name="VCWebDeploymentTool"/>279 <Tool280 Name="VCManagedWrapperGeneratorTool"/>281 <Tool282 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>283 </Configuration>284 <Configuration285 147 Name="Release Internal|Win32" 286 148 OutputDirectory="..\lib\Release" … … 322 184 LinkIncremental="1" 323 185 SuppressStartupBanner="TRUE" 324 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"186 AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\Release";"$(OGRE_PATH)\OgreMain\lib\Release";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"$(OGRE_PATH)\Dependencies\lib\Release";..\..\..\Preprocessing\lib\Release;..\..\..\Preprocessing\src\GL;..\..\GtpVisibility\lib\Release;..\..\lib\Release;..\lib\Release;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\..\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;"$(CG_LIB_PATH)"" 325 187 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def" 326 188 GenerateDebugInformation="TRUE" … … 355 217 <Configuration 356 218 Name="Release_qt|Win32" 357 OutputDirectory=" $(ConfigurationName)"358 IntermediateDirectory=" $(ConfigurationName)"219 OutputDirectory="..\lib\Release" 220 IntermediateDirectory="..\obj\Release" 359 221 ConfigurationType="2" 360 222 CharacterSet="2" … … 423 285 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 424 286 </Configuration> 287 <Configuration 288 Name="Release_noqt|Win32" 289 OutputDirectory="..\lib\Release" 290 IntermediateDirectory="..\obj\Release" 291 ConfigurationType="2" 292 CharacterSet="2" 293 WholeProgramOptimization="TRUE"> 294 <Tool 295 Name="VCCLCompilerTool" 296 Optimization="3" 297 GlobalOptimizations="TRUE" 298 InlineFunctionExpansion="2" 299 EnableIntrinsicFunctions="TRUE" 300 ImproveFloatingPointConsistency="TRUE" 301 FavorSizeOrSpeed="1" 302 OmitFramePointers="TRUE" 303 EnableFiberSafeOptimizations="TRUE" 304 OptimizeForProcessor="0" 305 OptimizeForWindowsApplication="TRUE" 306 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" 307 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_KD_TERRAIN_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE" 308 StringPooling="TRUE" 309 RuntimeLibrary="2" 310 BufferSecurityCheck="FALSE" 311 EnableFunctionLevelLinking="TRUE" 312 RuntimeTypeInfo="TRUE" 313 UsePrecompiledHeader="0" 314 WarningLevel="3" 315 Detect64BitPortabilityProblems="TRUE" 316 DebugInformationFormat="3"/> 317 <Tool 318 Name="VCCustomBuildTool"/> 319 <Tool 320 Name="VCLinkerTool" 321 IgnoreImportLibrary="TRUE" 322 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 RTScene.lib RTWorld.lib IVReader.lib" 323 OutputFile="$(OutDir)/Plugin_VisibilitySceneManager.dll" 324 Version="0.99" 325 LinkIncremental="1" 326 SuppressStartupBanner="TRUE" 327 AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\Release";"$(OGRE_PATH)\OgreMain\lib\Release";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"$(OGRE_PATH)\Dependencies\lib\Release";..\..\GtpVisibility\lib\Release;..\..\lib\Release;..\lib\Release;..\..\..\Preprocessing\lib\Release;..\..\..\Preprocessing\src\GL;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\..\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;"$(CG_LIB_PATH)"" 328 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def" 329 GenerateDebugInformation="FALSE" 330 SubSystem="2" 331 OptimizeReferences="2" 332 EnableCOMDATFolding="2" 333 ImportLibrary="$(OutDir)/Plugin_VisibilitySceneManager.lib" 334 TargetMachine="1"/> 335 <Tool 336 Name="VCMIDLTool"/> 337 <Tool 338 Name="VCPostBuildEventTool" 339 CommandLine="copy $(OutDir)\$(TargetFileName) $(OGRE_PATH)\Samples\Common\bin\$(ConfigurationName)"/> 340 <Tool 341 Name="VCPreBuildEventTool"/> 342 <Tool 343 Name="VCPreLinkEventTool"/> 344 <Tool 345 Name="VCResourceCompilerTool"/> 346 <Tool 347 Name="VCWebServiceProxyGeneratorTool"/> 348 <Tool 349 Name="VCXMLDataGeneratorTool"/> 350 <Tool 351 Name="VCWebDeploymentTool"/> 352 <Tool 353 Name="VCManagedWrapperGeneratorTool"/> 354 <Tool 355 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 356 </Configuration> 425 357 </Configurations> 426 358 <References> … … 454 386 <File 455 387 RelativePath="..\src\OgreTerrainContentGenerator.cpp"> 456 </File>457 </Filter>458 </Filter>459 <Filter460 Name="BvHierarchySceneManager"461 Filter="">462 <Filter463 Name="src"464 Filter="">465 <File466 RelativePath=".\OgreBvHierarchy.cpp">467 </File>468 <File469 RelativePath=".\OgreBvHierarchyCamera.cpp">470 </File>471 <File472 RelativePath=".\OgreBvHierarchyInterface.cpp">473 </File>474 <File475 RelativePath=".\OgreBvHierarchySceneManager.cpp">476 </File>477 <File478 RelativePath=".\OgreBvHierarchySceneNode.cpp">479 </File>480 </Filter>481 <Filter482 Name="include"483 Filter="">484 <File485 RelativePath="..\include\OgreBvHierarchy.h">486 </File>487 <File488 RelativePath="..\include\OgreBvHierarchyCamera.h">489 </File>490 <File491 RelativePath="..\include\OgreBvHierarchyInterface.h">492 </File>493 <File494 RelativePath="..\include\OgreBvHierarchySceneManager.h">495 </File>496 <File497 RelativePath="..\include\OgreBvHierarchySceneNode.h">498 </File>499 <File500 RelativePath="..\include\OgreBvhRenderable.h">501 388 </File> 502 389 </Filter> -
GTP/trunk/Lib/Vis/OnlineCullingCHC/ObjReader/src/ObjReader.vcproj
r2332 r2353 96 96 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" 97 97 GenerateDebugInformation="FALSE" 98 SubSystem="2"99 OptimizeReferences="2"100 EnableCOMDATFolding="2"101 ImportLibrary="$(OutDir)/ObjReader.lib"102 TargetMachine="1"/>103 <Tool104 Name="VCMIDLTool"/>105 <Tool106 Name="VCPostBuildEventTool"107 CommandLine="copy $(OutDir)\$(TargetFileName) "$(OGRE_PATH)\Samples\Common\bin\$(ConfigurationName)""/>108 <Tool109 Name="VCPreBuildEventTool"/>110 <Tool111 Name="VCPreLinkEventTool"/>112 <Tool113 Name="VCResourceCompilerTool"/>114 <Tool115 Name="VCWebServiceProxyGeneratorTool"/>116 <Tool117 Name="VCXMLDataGeneratorTool"/>118 <Tool119 Name="VCWebDeploymentTool"/>120 <Tool121 Name="VCManagedWrapperGeneratorTool"/>122 <Tool123 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>124 </Configuration>125 <Configuration126 Name="mlrt|Win32"127 OutputDirectory="$(ConfigurationName)"128 IntermediateDirectory="$(ConfigurationName)"129 ConfigurationType="2"130 CharacterSet="2">131 <Tool132 Name="VCCLCompilerTool"133 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"134 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OBJREADER_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE"135 RuntimeLibrary="2"136 UsePrecompiledHeader="0"137 WarningLevel="3"138 Detect64BitPortabilityProblems="TRUE"139 DebugInformationFormat="3"/>140 <Tool141 Name="VCCustomBuildTool"/>142 <Tool143 Name="VCLinkerTool"144 AdditionalDependencies="OgreMain.lib CEGUIBase.lib OgreGUIRenderer.lib"145 OutputFile="$(OutDir)/ObjReader.dll"146 LinkIncremental="1"147 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\GtpVisibility\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)""148 GenerateDebugInformation="TRUE"149 SubSystem="2"150 OptimizeReferences="2"151 EnableCOMDATFolding="2"152 ImportLibrary="$(OutDir)/ObjReader.lib"153 TargetMachine="1"/>154 <Tool155 Name="VCMIDLTool"/>156 <Tool157 Name="VCPostBuildEventTool"158 CommandLine="copy $(OutDir)\$(TargetFileName) "$(OGRE_PATH)\Samples\Common\bin\$(ConfigurationName)""/>159 <Tool160 Name="VCPreBuildEventTool"/>161 <Tool162 Name="VCPreLinkEventTool"/>163 <Tool164 Name="VCResourceCompilerTool"/>165 <Tool166 Name="VCWebServiceProxyGeneratorTool"/>167 <Tool168 Name="VCXMLDataGeneratorTool"/>169 <Tool170 Name="VCWebDeploymentTool"/>171 <Tool172 Name="VCManagedWrapperGeneratorTool"/>173 <Tool174 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>175 </Configuration>176 <Configuration177 Name="Release_Internal|Win32"178 OutputDirectory="$(ConfigurationName)"179 IntermediateDirectory="$(ConfigurationName)"180 ConfigurationType="2"181 CharacterSet="2">182 <Tool183 Name="VCCLCompilerTool"184 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"185 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OBJREADER_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE"186 RuntimeLibrary="2"187 UsePrecompiledHeader="0"188 WarningLevel="3"189 Detect64BitPortabilityProblems="TRUE"190 DebugInformationFormat="3"/>191 <Tool192 Name="VCCustomBuildTool"/>193 <Tool194 Name="VCLinkerTool"195 AdditionalDependencies="OgreMain.lib CEGUIBase.lib OgreGUIRenderer.lib"196 OutputFile="$(OutDir)/ObjReader.dll"197 LinkIncremental="1"198 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\GtpVisibility\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)""199 GenerateDebugInformation="TRUE"200 98 SubSystem="2" 201 99 OptimizeReferences="2" … … 289 187 <Configuration 290 188 Name="Release_qt|Win32" 291 OutputDirectory=" Release"292 IntermediateDirectory=" Release"189 OutputDirectory="..\lib\Release" 190 IntermediateDirectory="..\obj\Release" 293 191 ConfigurationType="2" 294 192 CharacterSet="2"> … … 310 208 LinkIncremental="1" 311 209 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\Release";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";..\..\GtpVisibility\lib\Release;..\..\lib\Release" 210 GenerateDebugInformation="FALSE" 211 SubSystem="2" 212 OptimizeReferences="2" 213 EnableCOMDATFolding="2" 214 ImportLibrary="$(OutDir)/ObjReader.lib" 215 TargetMachine="1"/> 216 <Tool 217 Name="VCMIDLTool"/> 218 <Tool 219 Name="VCPostBuildEventTool" 220 CommandLine="copy $(OutDir)\$(TargetFileName) "$(OGRE_PATH)\Samples\Common\bin\Release""/> 221 <Tool 222 Name="VCPreBuildEventTool"/> 223 <Tool 224 Name="VCPreLinkEventTool"/> 225 <Tool 226 Name="VCResourceCompilerTool"/> 227 <Tool 228 Name="VCWebServiceProxyGeneratorTool"/> 229 <Tool 230 Name="VCXMLDataGeneratorTool"/> 231 <Tool 232 Name="VCWebDeploymentTool"/> 233 <Tool 234 Name="VCManagedWrapperGeneratorTool"/> 235 <Tool 236 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 237 </Configuration> 238 <Configuration 239 Name="Release_noqt|Win32" 240 OutputDirectory="..\lib\Release" 241 IntermediateDirectory="..\obj\Release" 242 ConfigurationType="2" 243 CharacterSet="2"> 244 <Tool 245 Name="VCCLCompilerTool" 246 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" 247 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OBJREADER_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE" 248 RuntimeLibrary="2" 249 UsePrecompiledHeader="0" 250 WarningLevel="3" 251 Detect64BitPortabilityProblems="TRUE" 252 DebugInformationFormat="3"/> 253 <Tool 254 Name="VCCustomBuildTool"/> 255 <Tool 256 Name="VCLinkerTool" 257 AdditionalDependencies="OgreMain.lib zdll.lib zziplib.lib Preprocessor.lib xerces-c_2.lib RTScene.lib RTWorld.lib" 258 OutputFile="$(OutDir)/ObjReader.dll" 259 LinkIncremental="1" 260 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" 312 261 GenerateDebugInformation="FALSE" 313 262 SubSystem="2" -
GTP/trunk/Lib/Vis/OnlineCullingCHC/include/DummyPreprocessingManager.h
r2280 r2353 7 7 8 8 namespace GtpVisibility { 9 10 11 12 9 10 /** 11 Implements a dummy interface to the external visibility preprocessing. 12 */ 13 13 class DummyPreprocessingManager : public PreprocessingManager 14 14 { 15 15 public: 16 16 17 /** Constructor taking a scene traverser for a specific type of 18 hierarchyInterface as argument. 19 */ 20 DummyPreprocessingManager(HierarchyInterface *hierarchyInterface); 17 21 18 /** Constructor taking a scene traverser for a specific type of 19 hierarchyInterface as argument. 20 */ 21 DummyPreprocessingManager(HierarchyInterface *hierarchyInterface); 22 23 24 /** 25 Export the scene for visibility preprocessing. Exports the hierarchyInterface including 26 its bounding boxes + mesh data for occluders. The viewcell data will either be 27 supplied directly to the visibility preprocessing standalone module 28 */ 29 virtual bool ExportScene(const string filename); 30 31 32 /** 33 Load preprocessed visibility information 34 */ 35 virtual bool LoadPreprocessedData(const string filename); 36 37 22 /** 23 Export the scene for visibility preprocessing. Exports the hierarchyInterface including 24 its bounding boxes + mesh data for occluders. The viewcell data will either be 25 supplied directly to the visibility preprocessing standalone module 26 */ 27 virtual bool ExportScene(const std::string &filename); 28 29 /** 30 Load preprocessed visibility information 31 */ 32 virtual bool LoadPreprocessedData(const std::string &filename); 33 34 38 35 protected: 39 36 40 41 42 43 44 45 46 47 48 */37 /** 38 Find viewcells intersecting a spherical neighborhood of a point. 39 Returns false if no viewcell was found. 40 */ 41 /*virtual bool LocateViewCellIds(const Vector3 ¢er, 42 const float radius, 43 vector<int> *viewCellIds 44 ); 45 */ 49 46 50 51 52 53 54 55 // NodeInfoContainer *visibleNodes,56 // MeshInfoContainer *visibleMeshes);47 /** 48 Add a PVS of the given viewcell to the already evaluated PVS by computing 49 a union with visibleNodes and visibleMeshes. Returns the number of added entries. 50 */ 51 //virtual int AddViewCellPVS(const int cellID, 52 // NodeInfoContainer *visibleNodes, 53 // MeshInfoContainer *visibleMeshes); 57 54 58 55 }; -
GTP/trunk/Lib/Vis/OnlineCullingCHC/include/PreprocessingManager.h
r2280 r2353 3 3 4 4 #include <string> 5 using namespace std;6 5 7 6 #include "HierarchyInterface.h" 8 7 #include "VisibilityInfo.h" 9 //#include "VisibilityVector3.h" 8 10 9 11 10 namespace GtpVisibility { … … 48 47 @return true if the export was succesful. 49 48 */ 50 virtual bool ExportScene(const stringfilename) = 0;49 virtual bool ExportScene(const std::string &filename) = 0; 51 50 52 51 /** Load preprocessed visibility information. The loaded data is matched with the current … … 60 59 @return true if the loading was succesful. 61 60 */ 62 virtual bool LoadPreprocessedData(const stringfilename) = 0;61 virtual bool LoadPreprocessedData(const std::string &filename) = 0; 63 62 64 63 /** -
GTP/trunk/Lib/Vis/OnlineCullingCHC/src/DummyPreprocessingManager.cpp
r2280 r2353 1 1 #include "DummyPreprocessingManager.h" 2 2 3 #include <iostream> 3 4 #include <fstream> 5 6 using namespace std; 7 4 8 5 9 namespace GtpVisibility { 6 10 7 11 DummyPreprocessingManager::DummyPreprocessingManager(HierarchyInterface *hierarchyInterface) 8 12 :PreprocessingManager(hierarchyInterface) 9 13 { 10 14 } 11 12 15 13 bool DummyPreprocessingManager::ExportScene(const string filename) 16 17 bool DummyPreprocessingManager::ExportScene(const string &filename) 14 18 { 15 ofstream s(filename.c_str()); 16 s<<"#VRML 2.0 utf8"<<endl; 17 s<<"#Dummy module output"<<endl; 18 return true; 19 } 20 21 22 bool DummyPreprocessingManager::LoadPreprocessedData(const string filename) 23 { 24 // do nothing 25 return false; 19 ofstream s(filename.c_str()); 20 s<<"#VRML 2.0 utf8"<<endl; 21 s<<"#Dummy module output"<<endl; 22 return true; 26 23 } 27 24 28 29 30 /*bool DummyPreprocessingManager::LocateViewCellIds(const Vector3 ¢er, 31 const float radius, 32 vector<int> *viewCellIds) 25 26 bool DummyPreprocessingManager::LoadPreprocessedData(const string &filename) 33 27 { 34 return false; 35 }*/ 36 37 /*int DummyPreprocessingManager::AddViewCellPVS(const int cellID, 38 NodeInfoContainer *visibleNodes, 39 MeshInfoContainer *visibleMeshes ) 40 { 41 // return the root of the hierarchyInterface regardless of the cellId 42 // visibleNodes->push_back(traverser->GetRoot()); 43 return false; 28 // do nothing 29 return false; 44 30 } 45 */ 31 32 46 33 } -
GTP/trunk/Lib/Vis/OnlineCullingCHC/src/GtpVisibility.vcproj
r2280 r2353 106 106 </Configuration> 107 107 <Configuration 108 Name="mlrt|Win32"109 OutputDirectory="$(ConfigurationName)"110 IntermediateDirectory="$(ConfigurationName)"111 ConfigurationType="4"112 CharacterSet="2">113 <Tool114 Name="VCCLCompilerTool"115 OptimizeForWindowsApplication="TRUE"116 AdditionalIncludeDirectories="..\include;"$(OGRE_PATH)\OgreMain\include";..\..\Preprocessing\src"117 PreprocessorDefinitions="WIN32;NDEBUG;_LIB"118 RuntimeLibrary="2"119 RuntimeTypeInfo="TRUE"120 UsePrecompiledHeader="0"121 WarningLevel="3"122 Detect64BitPortabilityProblems="TRUE"123 DebugInformationFormat="3"/>124 <Tool125 Name="VCCustomBuildTool"/>126 <Tool127 Name="VCLibrarianTool"128 OutputFile="$(OutDir)/GtpVisibility.lib"/>129 <Tool130 Name="VCMIDLTool"/>131 <Tool132 Name="VCPostBuildEventTool"/>133 <Tool134 Name="VCPreBuildEventTool"/>135 <Tool136 Name="VCPreLinkEventTool"/>137 <Tool138 Name="VCResourceCompilerTool"/>139 <Tool140 Name="VCWebServiceProxyGeneratorTool"/>141 <Tool142 Name="VCXMLDataGeneratorTool"/>143 <Tool144 Name="VCManagedWrapperGeneratorTool"/>145 <Tool146 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>147 </Configuration>148 <Configuration149 Name="Release_Internal|Win32"150 OutputDirectory="$(ConfigurationName)"151 IntermediateDirectory="$(ConfigurationName)"152 ConfigurationType="4"153 CharacterSet="2">154 <Tool155 Name="VCCLCompilerTool"156 OptimizeForWindowsApplication="TRUE"157 AdditionalIncludeDirectories="..\include;"$(OGRE_PATH)\OgreMain\include";..\..\Preprocessing\src"158 PreprocessorDefinitions="WIN32;NDEBUG;_LIB"159 RuntimeLibrary="2"160 RuntimeTypeInfo="TRUE"161 UsePrecompiledHeader="0"162 WarningLevel="3"163 Detect64BitPortabilityProblems="TRUE"164 DebugInformationFormat="3"/>165 <Tool166 Name="VCCustomBuildTool"/>167 <Tool168 Name="VCLibrarianTool"169 OutputFile="$(OutDir)/GtpVisibility.lib"/>170 <Tool171 Name="VCMIDLTool"/>172 <Tool173 Name="VCPostBuildEventTool"/>174 <Tool175 Name="VCPreBuildEventTool"/>176 <Tool177 Name="VCPreLinkEventTool"/>178 <Tool179 Name="VCResourceCompilerTool"/>180 <Tool181 Name="VCWebServiceProxyGeneratorTool"/>182 <Tool183 Name="VCXMLDataGeneratorTool"/>184 <Tool185 Name="VCManagedWrapperGeneratorTool"/>186 <Tool187 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>188 </Configuration>189 <Configuration190 108 Name="Release Internal|Win32" 191 109 OutputDirectory="..\lib\Release" … … 282 200 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 283 201 </Configuration> 202 <Configuration 203 Name="Release_noqt|Win32" 204 OutputDirectory="..\lib\Release" 205 IntermediateDirectory="..\obj\Release" 206 ConfigurationType="4" 207 CharacterSet="2"> 208 <Tool 209 Name="VCCLCompilerTool" 210 GlobalOptimizations="TRUE" 211 FavorSizeOrSpeed="1" 212 OmitFramePointers="TRUE" 213 OptimizeForWindowsApplication="TRUE" 214 AdditionalIncludeDirectories="..\include;"$(OGRE_PATH)\OgreMain\include";..\..\Preprocessing\src" 215 PreprocessorDefinitions="WIN32;NDEBUG;_LIB" 216 RuntimeLibrary="2" 217 RuntimeTypeInfo="TRUE" 218 UsePrecompiledHeader="0" 219 WarningLevel="3" 220 Detect64BitPortabilityProblems="TRUE" 221 DebugInformationFormat="3"/> 222 <Tool 223 Name="VCCustomBuildTool"/> 224 <Tool 225 Name="VCLibrarianTool" 226 OutputFile="$(OutDir)/GtpVisibility.lib"/> 227 <Tool 228 Name="VCMIDLTool"/> 229 <Tool 230 Name="VCPostBuildEventTool"/> 231 <Tool 232 Name="VCPreBuildEventTool"/> 233 <Tool 234 Name="VCPreLinkEventTool"/> 235 <Tool 236 Name="VCResourceCompilerTool"/> 237 <Tool 238 Name="VCWebServiceProxyGeneratorTool"/> 239 <Tool 240 Name="VCXMLDataGeneratorTool"/> 241 <Tool 242 Name="VCManagedWrapperGeneratorTool"/> 243 <Tool 244 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 245 </Configuration> 284 246 </Configurations> 285 247 <References> -
GTP/trunk/Lib/Vis/Preprocessing/EvalStats/EvalStats.vcproj
r2280 r2353 106 106 </Configuration> 107 107 <Configuration 108 Name="mlrt|Win32"109 OutputDirectory="$(ConfigurationName)"110 IntermediateDirectory="$(ConfigurationName)"111 ConfigurationType="1"112 CharacterSet="2">113 <Tool114 Name="VCCLCompilerTool"115 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"116 RuntimeLibrary="0"117 UsePrecompiledHeader="3"118 WarningLevel="3"119 Detect64BitPortabilityProblems="TRUE"120 DebugInformationFormat="3"/>121 <Tool122 Name="VCCustomBuildTool"/>123 <Tool124 Name="VCLinkerTool"125 OutputFile="$(OutDir)/EvalStats.exe"126 LinkIncremental="1"127 GenerateDebugInformation="TRUE"128 SubSystem="1"129 OptimizeReferences="2"130 EnableCOMDATFolding="2"131 TargetMachine="1"/>132 <Tool133 Name="VCMIDLTool"/>134 <Tool135 Name="VCPostBuildEventTool"/>136 <Tool137 Name="VCPreBuildEventTool"/>138 <Tool139 Name="VCPreLinkEventTool"/>140 <Tool141 Name="VCResourceCompilerTool"/>142 <Tool143 Name="VCWebServiceProxyGeneratorTool"/>144 <Tool145 Name="VCXMLDataGeneratorTool"/>146 <Tool147 Name="VCWebDeploymentTool"/>148 <Tool149 Name="VCManagedWrapperGeneratorTool"/>150 <Tool151 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>152 </Configuration>153 <Configuration154 Name="Release_Internal|Win32"155 OutputDirectory="$(ConfigurationName)"156 IntermediateDirectory="$(ConfigurationName)"157 ConfigurationType="1"158 CharacterSet="2">159 <Tool160 Name="VCCLCompilerTool"161 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"162 RuntimeLibrary="0"163 UsePrecompiledHeader="3"164 WarningLevel="3"165 Detect64BitPortabilityProblems="TRUE"166 DebugInformationFormat="3"/>167 <Tool168 Name="VCCustomBuildTool"/>169 <Tool170 Name="VCLinkerTool"171 OutputFile="$(OutDir)/EvalStats.exe"172 LinkIncremental="1"173 GenerateDebugInformation="TRUE"174 SubSystem="1"175 OptimizeReferences="2"176 EnableCOMDATFolding="2"177 TargetMachine="1"/>178 <Tool179 Name="VCMIDLTool"/>180 <Tool181 Name="VCPostBuildEventTool"/>182 <Tool183 Name="VCPreBuildEventTool"/>184 <Tool185 Name="VCPreLinkEventTool"/>186 <Tool187 Name="VCResourceCompilerTool"/>188 <Tool189 Name="VCWebServiceProxyGeneratorTool"/>190 <Tool191 Name="VCXMLDataGeneratorTool"/>192 <Tool193 Name="VCWebDeploymentTool"/>194 <Tool195 Name="VCManagedWrapperGeneratorTool"/>196 <Tool197 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>198 </Configuration>199 <Configuration200 108 Name="Release Internal|Win32" 201 OutputDirectory=" ..\bin\Release"202 IntermediateDirectory=" ..\obj\Release"109 OutputDirectory="Release" 110 IntermediateDirectory="Release" 203 111 ConfigurationType="1" 204 112 CharacterSet="2"> … … 226 134 OutputFile="$(OutDir)/EvalStats.exe" 227 135 LinkIncremental="1" 228 GenerateDebugInformation=" TRUE"136 GenerateDebugInformation="FALSE" 229 137 SubSystem="1" 230 138 OptimizeReferences="2" … … 255 163 <Configuration 256 164 Name="Release_qt|Win32" 257 OutputDirectory=" $(ConfigurationName)"258 IntermediateDirectory=" $(ConfigurationName)"165 OutputDirectory="Release" 166 IntermediateDirectory="Release" 259 167 ConfigurationType="1" 260 168 CharacterSet="2"> … … 274 182 LinkIncremental="1" 275 183 GenerateDebugInformation="TRUE" 184 SubSystem="1" 185 OptimizeReferences="2" 186 EnableCOMDATFolding="2" 187 TargetMachine="1"/> 188 <Tool 189 Name="VCMIDLTool"/> 190 <Tool 191 Name="VCPostBuildEventTool"/> 192 <Tool 193 Name="VCPreBuildEventTool"/> 194 <Tool 195 Name="VCPreLinkEventTool"/> 196 <Tool 197 Name="VCResourceCompilerTool"/> 198 <Tool 199 Name="VCWebServiceProxyGeneratorTool"/> 200 <Tool 201 Name="VCXMLDataGeneratorTool"/> 202 <Tool 203 Name="VCWebDeploymentTool"/> 204 <Tool 205 Name="VCManagedWrapperGeneratorTool"/> 206 <Tool 207 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 208 </Configuration> 209 <Configuration 210 Name="Release_noqt|Win32" 211 OutputDirectory="Release" 212 IntermediateDirectory="Release" 213 ConfigurationType="1" 214 CharacterSet="2"> 215 <Tool 216 Name="VCCLCompilerTool" 217 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" 218 RuntimeLibrary="0" 219 UsePrecompiledHeader="3" 220 WarningLevel="3" 221 Detect64BitPortabilityProblems="TRUE" 222 DebugInformationFormat="3"/> 223 <Tool 224 Name="VCCustomBuildTool"/> 225 <Tool 226 Name="VCLinkerTool" 227 OutputFile="Release/EvalStats.exe" 228 LinkIncremental="1" 229 GenerateDebugInformation="FALSE" 276 230 SubSystem="1" 277 231 OptimizeReferences="2" … … 325 279 </FileConfiguration> 326 280 <FileConfiguration 327 Name="mlrt|Win32">328 <Tool329 Name="VCCLCompilerTool"330 UsePrecompiledHeader="1"/>331 </FileConfiguration>332 <FileConfiguration333 Name="Release_Internal|Win32">334 <Tool335 Name="VCCLCompilerTool"336 UsePrecompiledHeader="1"/>337 </FileConfiguration>338 <FileConfiguration339 281 Name="Release Internal|Win32"> 340 282 <Tool … … 344 286 <FileConfiguration 345 287 Name="Release_qt|Win32"> 288 <Tool 289 Name="VCCLCompilerTool" 290 UsePrecompiledHeader="1"/> 291 </FileConfiguration> 292 <FileConfiguration 293 Name="Release_noqt|Win32"> 346 294 <Tool 347 295 Name="VCCLCompilerTool" -
GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp
r2342 r2353 285 285 286 286 // split was not reevaluated before => do it now 287 if (splitCandidate->IsDirty()) 287 // matt: for new evaluation method, we cannot be sure if the candidate is dirty, 288 // so ALWAYS reevaluate 289 if (1 || splitCandidate->IsDirty()) 288 290 { 289 291 splitCandidate->EvalCandidate(); … … 2509 2511 } 2510 2512 2511 #ifdef USE_SSE 2513 2512 2514 int HierarchyManager::CastLineSegment(RayPacket &packet) 2513 2515 { … … 2515 2517 } 2516 2518 2517 #endif 2518 2519 } 2519 2520 } -
GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.h
r2347 r2353 318 318 const bool useMailboxing = true); 319 319 320 #ifdef USE_SSE321 320 int CastLineSegment(RayPacket &packet); 322 #endif323 321 324 322 -
GTP/trunk/Lib/Vis/Preprocessing/src/Mutation.cpp
r2210 r2353 49 49 // cout<<mRays[i].mMutations<<" "; 50 50 // cout<<endl; 51 cerr<<"Mu attion update..."<<endl;51 cerr<<"Mutation update..."<<endl; 52 52 cerr<<"rays = "<<mRays.size()<<endl; 53 53 if ((int)mRays.size()) { -
GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.vcproj
r2342 r2353 80 80 UsePrecompiledHeader="0" 81 81 BrowseInformation="1" 82 WarningLevel="2"83 Detect64BitPortabilityProblems="TRUE"84 DebugInformationFormat="3"/>85 <Tool86 Name="VCCustomBuildTool"/>87 <Tool88 Name="VCLibrarianTool"/>89 <Tool90 Name="VCMIDLTool"/>91 <Tool92 Name="VCPostBuildEventTool"/>93 <Tool94 Name="VCPreBuildEventTool"/>95 <Tool96 Name="VCPreLinkEventTool"/>97 <Tool98 Name="VCResourceCompilerTool"/>99 <Tool100 Name="VCWebServiceProxyGeneratorTool"/>101 <Tool102 Name="VCXMLDataGeneratorTool"/>103 <Tool104 Name="VCManagedWrapperGeneratorTool"/>105 <Tool106 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>107 </Configuration>108 <Configuration109 Name="Release_Internal|Win32"110 OutputDirectory="$(ConfigurationName)"111 IntermediateDirectory="$(ConfigurationName)"112 ConfigurationType="4"113 CharacterSet="2">114 <Tool115 Name="VCCLCompilerTool"116 Optimization="0"117 InlineFunctionExpansion="0"118 FavorSizeOrSpeed="0"119 OptimizeForWindowsApplication="TRUE"120 AdditionalIncludeDirectories="..\include;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl";..\src;"$(CG_INC_PATH)";..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;"$(BOOST_INCLUDE)";..\..\Preprocessing\MultiLevelRayTracing"121 PreprocessorDefinitions="WIN32;NDEBUG;_LIB"122 ExceptionHandling="TRUE"123 RuntimeLibrary="2"124 DisableLanguageExtensions="FALSE"125 ForceConformanceInForLoopScope="FALSE"126 RuntimeTypeInfo="TRUE"127 UsePrecompiledHeader="0"128 82 WarningLevel="2" 129 83 Detect64BitPortabilityProblems="TRUE" … … 270 224 </Configuration> 271 225 <Configuration 272 Name="Release_ Qt|Win32"226 Name="Release_qt|Win32" 273 227 OutputDirectory="..\lib\Release" 274 228 IntermediateDirectory="..\obj\Release" … … 627 581 <FileConfiguration 628 582 Name="Release|Win32"> 629 <Tool630 Name="VCCustomBuildTool"631 Description=""632 CommandLine=""633 Outputs=""/>634 </FileConfiguration>635 <FileConfiguration636 Name="Release_Internal|Win32">637 583 <Tool 638 584 Name="VCCustomBuildTool" … … 658 604 </FileConfiguration> 659 605 <FileConfiguration 660 Name="Release_ Qt|Win32">606 Name="Release_qt|Win32"> 661 607 <Tool 662 608 Name="VCCustomBuildTool" … … 679 625 <FileConfiguration 680 626 Name="Release|Win32"> 681 <Tool682 Name="VCCustomBuildTool"683 Description=""684 CommandLine=""685 Outputs=""/>686 </FileConfiguration>687 <FileConfiguration688 Name="Release_Internal|Win32">689 627 <Tool 690 628 Name="VCCustomBuildTool" … … 710 648 </FileConfiguration> 711 649 <FileConfiguration 712 Name="Release_ Qt|Win32">650 Name="Release_qt|Win32"> 713 651 <Tool 714 652 Name="VCCustomBuildTool" -
GTP/trunk/Lib/Vis/Preprocessing/src/SamplingStrategy.cpp
r2227 r2353 496 496 } 497 497 498 // add contributions of the sample to the strategies 498 499 #if TEST_PACKETS 500 501 // add contributions of the sample to the strategies 502 void MixtureDistribution::ComputeContributions(VssRayContainer &vssRays) 503 { 504 int i; 505 506 mPreprocessor.mViewCellsManager->ComputeSampleContributions(vssRays, true, false); 507 508 VssRayContainer::iterator it = vssRays.begin(); 509 510 for (i=0; i < mDistributions.size(); i++) { 511 mDistributions[i]->mContribution = 0; 512 mDistributions[i]->mRays = 0; 513 } 514 515 for(; it != vssRays.end(); ++ it) 516 { 517 VssRay *ray = *it; 518 519 for (i = 0; i < mDistributions.size() - 1; ++ i) 520 { 521 if (mDistributions[i]->mType == ray->mDistribution) 522 break; 523 } 524 525 float contribution = 526 mPreprocessor.mViewCellsManager->ComputeSampleContribution(*ray, true, false); 527 528 mDistributions[i]->mContribution += contribution; 529 mDistributions[i]->mRays ++; 530 531 mDistributions[i]->mTotalContribution += contribution; 532 mDistributions[i]->mTotalRays ++; 533 } 534 535 UpdateRatios(); 536 537 538 const float vcTime = viewCellCastTimer.TotalTime(); 539 const float pvsTime = pvsTimer.TotalTime(); 540 const float haltonTime = haltonTimer.TotalTime(); 541 542 cout << "view cell cast time: " << vcTime << " s" << endl; 543 cout << "pvs time: " << pvsTime << " s" << endl; 544 cout << "halton time: "<< haltonTime << " s" << endl; 545 546 Debug << "view cell cast time: " << vcTime << " s" << endl; 547 Debug << "pvs time: " << pvsTime << " s" << endl; 548 Debug << "halton time: "<< haltonTime << " s" << endl; 549 } 550 551 552 #else 553 554 // add contributions of the sample to the strategies 499 555 void 500 556 MixtureDistribution::ComputeContributions(VssRayContainer &vssRays) 501 557 { 502 int i; 503 504 VssRayContainer::iterator it = vssRays.begin(); 505 506 for (i=0; i < mDistributions.size(); i++) { 507 mDistributions[i]->mContribution = 0; 508 mDistributions[i]->mRays = 0; 509 } 510 511 for(; it != vssRays.end(); ++it) { 512 VssRay *ray = *it; 513 for (i=0; i < mDistributions.size()-1; i++) { 514 if (mDistributions[i]->mType == ray->mDistribution) 515 break; 516 } 517 518 float contribution = 519 mPreprocessor.mViewCellsManager->ComputeSampleContribution(*ray, 520 true, 521 false); 522 523 mDistributions[i]->mContribution += contribution; 524 mDistributions[i]->mRays ++; 525 526 mDistributions[i]->mTotalContribution += contribution; 527 mDistributions[i]->mTotalRays ++; 528 } 529 530 #if 0 531 pvsTimer.Entry(); 532 // resort pvss 533 mPreprocessor.mViewCellsManager->SortViewCellPvs(); 534 pvsTimer.Exit(); 558 int i; 559 560 VssRayContainer::iterator it = vssRays.begin(); 561 562 for (i=0; i < mDistributions.size(); i++) { 563 mDistributions[i]->mContribution = 0; 564 mDistributions[i]->mRays = 0; 565 } 566 567 for(; it != vssRays.end(); ++it) { 568 VssRay *ray = *it; 569 for (i=0; i < mDistributions.size()-1; i++) { 570 if (mDistributions[i]->mType == ray->mDistribution) 571 break; 572 } 573 574 float contribution = 575 mPreprocessor.mViewCellsManager->ComputeSampleContribution(*ray, 576 true, 577 false); 578 579 mDistributions[i]->mContribution += contribution; 580 mDistributions[i]->mRays ++; 581 582 mDistributions[i]->mTotalContribution += contribution; 583 mDistributions[i]->mTotalRays ++; 584 } 585 586 UpdateRatios(); 587 588 589 if (1) 590 { 591 const float vcTime = viewCellCastTimer.TotalTime(); 592 const float pvsTime = pvsTimer.TotalTime(); 593 const float haltonTime = haltonTimer.TotalTime(); 594 595 cout << "view cell cast time: " << vcTime << " s" << endl; 596 cout << "pvs time: " << pvsTime << " s" << endl; 597 cout << "halton time: "<< haltonTime << " s" << endl; 598 599 Debug << "view cell cast time: " << vcTime << " s" << endl; 600 Debug << "pvs time: " << pvsTime << " s" << endl; 601 Debug << "halton time: "<< haltonTime << " s" << endl; 602 } 603 } 604 535 605 #endif 536 606 537 538 UpdateRatios();539 540 #if 1541 const float vcTime = viewCellCastTimer.TotalTime();542 const float pvsTime = pvsTimer.TotalTime();543 const float haltonTime = haltonTimer.TotalTime();544 545 cout << "view cell cast time: " << vcTime << " s" << endl;546 cout << "pvs time: " << pvsTime << " s" << endl;547 cout << "halton time: "<< haltonTime << " s" << endl;548 // cout<<"obj time:"<<objTimer.TotalTime()<<" s"<<endl;549 550 Debug << "view cell cast time: " << vcTime << " s" << endl;551 Debug << "pvs time: " << pvsTime << " s" << endl;552 Debug << "halton time: "<< haltonTime << " s" << endl;553 #endif554 }555 607 556 608 void -
GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.vcproj
r2347 r2353 212 212 OptimizeForProcessor="1" 213 213 OptimizeForWindowsApplication="TRUE" 214 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces ;"$(QTDIR)\include\QtOpenGl";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtCore";"$(QTDIR)\include""214 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces" 215 215 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;NO_QT;USE_SSE" 216 216 RuntimeLibrary="2" … … 226 226 Name="VCLinkerTool" 227 227 AdditionalDependencies="xerces-c_2.lib glew32.lib zdll.lib zziplib.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib Preprocessor.lib RTScene.lib RTWorld.lib" 228 OutputFile="../bin/release/Preprocessor 2.exe"228 OutputFile="../bin/release/Preprocessor.exe" 229 229 LinkIncremental="1" 230 230 AdditionalLibraryDirectories="..\src\GL;..\lib\release;..\..\Preprocessing\lib\release;..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;..\MultiLevelRayTracing\RTScene\Release;..\MultiLevelRayTracing\RTWorld\Release" … … 258 258 </Configuration> 259 259 <Configuration 260 Name="Release_ Qt|Win32"260 Name="Release_qt|Win32" 261 261 OutputDirectory="..\bin\Release" 262 262 IntermediateDirectory="..\obj\Release" -
GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp
r2351 r2353 6652 6652 stream << "</ViewCells>" << endl; 6653 6653 6654 6654 6655 ////////////////////// 6655 6656 //-- export the view space hierarchy … … 6808 6809 } 6809 6810 6810 6811 #if 16812 6811 6813 6812 void VspOspViewCellsManager::EvalViewCellPartition() … … 6898 6897 Debug << "statistics computed in " << timeDiff * 1e-3 << " secs" << endl; 6899 6898 6900 #if 06901 //////////////6902 // filtered stats6903 6904 sprintf(suffix, "-%09d-eval-filter.log", castSamples);6905 const string filename2 = string(statsPrefix) + string(suffix);6906 6907 startTime = GetTime();6908 6909 cout << "compute new statistics for filtered pvs ... " << endl;6910 6911 ofstream ofstr2(filename2.c_str());6912 mHierarchyManager->EvaluateSubdivision2(ofstr2, splitsStepSize, true);6913 6914 timeDiff = TimeDiff(startTime, GetTime());6915 cout << "finished in " << timeDiff * 1e-3 << " secs" << endl;6916 cout << "*************************************" << endl;6917 Debug << "filtered statistics computed in " << timeDiff * 1e-3 << " secs" << endl;6918 #endif6919 6920 // only for debugging purpose6921 if (0)6922 {6923 ViewCellContainer viewCells;6924 mViewCellsTree->CollectLeaves(mViewCellsTree->GetRoot(), viewCells);6925 6926 ViewCellContainer::const_iterator vit, vit_end = viewCells.end();6927 int pvsSize = 0;6928 6929 for (vit = viewCells.begin(); vit != vit_end; ++ vit)6930 {6931 pvsSize += (*vit)->GetPvs().GetSize();6932 }6933 6934 cout << "debug entries: " << pvsSize << ", memcost: "6935 << (float)pvsSize * ObjectPvs::GetEntrySize() << endl;6936 }6937 6899 ++ pass; 6938 6900 } … … 6959 6921 6960 6922 //for (int pass = histoStepSize; pass <= numLeaves; pass += histoStepSize) 6961 if (1) 6962 { 6963 string filename; 6964 6965 cout << "computing histogram for " << pass << " view cells" << endl; 6966 6967 ////////////////////////////////////////// 6968 //-- evaluate histogram for pvs size 6969 6970 cout << "computing pvs histogram for " << pass << " view cells" << endl; 6971 6972 sprintf(str, "-%09d-histo-pvs2.log", pass); 6973 filename = string(statsPrefix) + string(str); 6974 6975 EvalViewCellHistogramForPvsSize(filename, pass); 6976 } 6977 } 6978 } 6979 6980 #endif 6923 6924 string filename; 6925 6926 cout << "computing histogram for " << pass << " view cells" << endl; 6927 6928 ///////////////////////////// 6929 //-- evaluate histogram for pvs size 6930 6931 cout << "computing pvs histogram for " << pass << " view cells" << endl; 6932 6933 sprintf(str, "-%09d-histo-pvs2.log", pass); 6934 filename = string(statsPrefix) + string(str); 6935 6936 EvalViewCellHistogramForPvsSize(filename, pass); 6937 } 6938 } 6939 6981 6940 6982 6941 void VspOspViewCellsManager::FinalizeViewCells(const bool createMesh) … … 6993 6952 6994 6953 #if TEST_PACKETS 6995 #ifdef USE_SSE 6996 6997 float ViewCellsManager::ComputeSampleContributions(const VssRayContainer &rays, 6998 const bool addContributions, 6999 const bool storeViewCells, 7000 const bool useHitObjects) 7001 { 6954 6955 float VspOspViewCellsManager::ComputeSampleContributions(const VssRayContainer &rays, 6956 const bool addContributions, 6957 const bool storeViewCells, 6958 const bool useHitObjects) 6959 { 6960 if (!ViewCellsConstructed()) 6961 return 0; 6962 7002 6963 float sum = 0.0f; 7003 7004 6964 VssRayContainer::const_iterator it, it_end = rays.end(); 7005 6965 7006 6966 VssRayContainer tmpRays; 7007 RayPacket packet;7008 6967 7009 6968 for (it = rays.begin(); it != it_end; ++ it) 7010 6969 { 7011 if (!ViewCellsConstructed()) 7012 { 7013 // view cells not yet constructed 7014 // just take the lenghts of the rays as contributions 7015 if ((*it)->mTerminationObject) 6970 sum += ComputeSampleContribution(*(*it), addContributions, storeViewCells, useHitObjects); 6971 6972 tmpRays.push_back(new VssRay(*(*it))); 6973 6974 if (tmpRays.size() == 4) 6975 { 6976 // cast packets of 4 rays 6977 RayPacket packet(tmpRays); 6978 mHierarchyManager->CastLineSegment(packet); 6979 6980 for (int i = 0; i < 4; ++ i) 7016 6981 { 7017 sum += (*it)->Length(); 6982 ComputeSampleContribution(*tmpRays[i], addContributions, true, useHitObjects); 6983 6984 ////////// 6985 // compare results 6986 6987 cout << "ray " << i << ": " << (int)tmpRays[i]->mViewCells.size() << " " << (int)packet.mViewCells[i].size() << endl; 7018 6988 } 7019 } 7020 else 7021 { 7022 sum += ComputeSampleContribution(*(*it), addContributions, storeViewCells, useHitObjects); 7023 7024 tmpRays.push_back(new VssRay(*it)); 6989 7025 6990 7026 if (tmpRays.size() == 4) 7027 { 7028 // cast packets of 4 rays 7029 RayPacket packet(tmpRays); 7030 mHierarchyManager->CastLineSegment(packet); 7031 7032 for (int i = 0; i < 4; ++ i) 7033 { 7034 ComputeSampleContribution(tmpRays[i], addContributions, true, useHitObjects); 7035 } 7036 7037 // compare results 7038 ////////// 7039 7040 CLEAR_CONTAINER(tmpRays); 7041 } 7042 } 7043 } 6991 6992 CLEAR_CONTAINER(tmpRays); 6993 } 6994 } 6995 cout << "=================\nhere6"<<endl; 6996 CLEAR_CONTAINER(tmpRays); 7044 6997 7045 6998 cout << "view cell cast time: " << viewCellCastTimer.TotalTime() << " s" << endl; … … 7053 7006 7054 7007 #endif 7055 #endif 7056 7057 } 7008 7009 7010 } -
GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.h
r2332 r2353 1225 1225 }; 1226 1226 1227 #define TEST_EVALUATION 0 1228 1229 /** 1230 Manages different higher order operations on the view cells. 1227 1228 1229 /** Manages different higher order operations on the view cells. 1231 1230 */ 1232 1231 class VspOspViewCellsManager: public ViewCellsManager … … 1301 1300 1302 1301 #if TEST_PACKETS 1303 #ifdef USE_SSE 1304 1305 float ViewCellsManager::ComputeSampleContributions(const VssRayContainer &rays, 1306 const bool addContributions, 1307 const bool storeViewCells, 1308 const bool useHitObjects); 1309 1302 1303 float ComputeSampleContributions(const VssRayContainer &rays, 1304 const bool addContributions, 1305 const bool storeViewCells, 1306 const bool useHitObjects = false); 1310 1307 #endif 1311 #endif1312 1308 1313 1309 protected: … … 1315 1311 VspOspViewCellsManager(ViewCellsTree *vcTree, HierarchyManager *hm); 1316 1312 1317 #if 1//TEST_EVALUATION1318 1313 virtual void EvalViewCellPartition(); 1319 #endif1320 1314 1321 1315 /** Exports view cell geometry. … … 1349 1343 static HierarchyManager *CreateHierarchyManager(const string &name); 1350 1344 1351 //void ExportStats(const string &mergeStats);1352 1353 1345 /** collect objects intersecting a given spatial box 1354 1346 */ -
GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp
r2351 r2353 1623 1623 1624 1624 const float oldRenderCost = penaltyOld * pOverall; 1625 const float newRenderCost = sc.mCorrectedFrontRenderCost * pFront + 1626 sc.mCorrectedBackRenderCost * pBack; 1625 const float newRenderCost = sc.mCorrectedFrontRenderCost * pFront + sc.mCorrectedBackRenderCost * pBack; 1627 1626 1628 1627 … … 1634 1633 1635 1634 #if GTP_DEBUG 1636 Debug << "old: " << normalizedOldRenderCost << " new: " << newRenderCost / viewSpaceVol << " corr: " << tData.mCorrectedRenderCost << " ratio: " << oldRenderCostRatio << endl; 1635 Debug << "old: " << normalizedOldRenderCost << " new: " << newRenderCost / viewSpaceVol 1636 << " corr: " << tData.mCorrectedRenderCost << " ratio: " << oldRenderCostRatio << endl; 1637 1637 #endif 1638 1638 … … 2425 2425 tStack.push(LineTraversalData(farChild, extp, maxt)); //TODO 2426 2426 2427 // new exit point for near child 2427 2428 extp = origin + dir * tdist; 2428 2429 maxt = tdist; … … 2453 2454 break; 2454 2455 2456 // set new entry point for far child 2455 2457 entp = extp; 2456 2458 mint = maxt; … … 2469 2471 2470 2472 2473 int VspTree::TraverseRayPacket(RayPacket &rp, const bool useMailboxing) 2474 { 2471 2475 #ifdef USE_SSE 2472 int VspTree::TraverseRayPacket(RayPacket &rp,2473 const bool useMailboxing)2474 {2475 2476 int hits = 0; 2476 2477 … … 2479 2480 float zero = 0.0f; 2480 2481 2481 __m128 one4 = _mm_load_ps(&one); 2482 __m128 zero4 = _mm_load_ps(&zero); 2483 2484 __m128 *entp4; 2485 __m128 *extp4; 2486 2487 union { float mask[4]; __m128 mask4; }; 2482 __m128 one4 = _mm_load1_ps(&one); 2483 __m128 zero4 = _mm_load1_ps(&zero); 2484 2485 union { __m128 mask4; float mask[4];}; 2486 union { __m128 mask4_2; float mask_2[4];}; 2487 2488 2488 mask4 = one4; 2489 2489 2490 __m128 entpX4 = rp.mOriginX4; 2491 __m128 entpY4 = rp.mOriginY4; 2492 __m128 entpZ4 = rp.mOriginZ4; 2493 2494 __m128 extpX4 = rp.mTerminationX4; 2495 __m128 extpY4 = rp.mTerminationY4; 2496 __m128 extpZ4 = rp.mTerminationZ4; 2490 __declspec(align(16)) __m128 entp4[] = {rp.mOriginX4, rp.mOriginY4, rp.mOriginZ4}; 2491 __declspec(align(16)) __m128 extp4[] = {rp.mTerminationX4, rp.mTerminationY4, rp.mTerminationZ4}; 2497 2492 2498 2493 __m128 *origin = &rp.mOriginX4; … … 2511 2506 __m128 minT4 = zero4; 2512 2507 2513 stack<PacketTraversalData *> tStack; 2514 2508 PacketTraversalStack tStack(1000); 2515 2509 2516 2510 VspNode *node = mRoot; … … 2527 2521 { 2528 2522 VspInterior *in = static_cast<VspInterior *>(node); 2529 2530 entp4 = &entpX4; 2531 extp4 = &extpX4; 2532 2523 2533 2524 position = in->GetPosition(); 2534 2525 axis = in->GetAxis(); 2535 2526 2536 position4 = _mm_load _ps(&position);2527 position4 = _mm_load1_ps(&position); 2537 2528 2538 2529 // are the entry points all in near leaf? … … 2540 2531 { 2541 2532 // are the exit points all in near leaf? 2542 if (_mm_movemask_ps(_mm_and_ps(_mm_cmp gt_ps(extp4[axis], position4), mask4)))2533 if (_mm_movemask_ps(_mm_and_ps(_mm_cmple_ps(extp4[axis], position4), mask4))) 2543 2534 { 2544 2535 node = in->GetBack(); … … 2555 2546 else 2556 2547 { 2557 if (_mm_movemask_ps(_mm_and_ps(_mm_cmpgt_ps(position4, extp4[axis]), mask4))) 2548 if (_mm_movemask_ps(_mm_and_ps(_mm_cmple_ps(position4, entp4[axis]), mask4)) && 2549 _mm_movemask_ps(_mm_and_ps(_mm_cmple_ps(position4, extp4[axis]), mask4))) 2558 2550 { 2559 2551 node = in->GetFront(); … … 2573 2565 const __m128 tDist4 = _mm_mul_ps(_mm_sub_ps(position4, origin[axis]), termination[axis]); 2574 2566 2567 mask4 = _mm_and_ps(_mm_cmplt_ps(tDist4, minT4), mask4); 2568 mask4_2 = _mm_and_ps(_mm_cmpgt_ps(tDist4, minT4), mask4); 2569 2575 2570 // push far child for further processing 2576 tStack. push(new PacketTraversalData(farChild, extpX4, extpY4, extpZ4, maxT4, mask4));2571 tStack.Push(PacketTraversalData(farChild, extp4[0], extp4[1], extp4[2], maxT4, mask4_2)); 2577 2572 2578 2573 // compute new exit point 2579 extp X4= _mm_add_ps(_mm_mul_ps(dirX4, tDist4), rp.mOriginX4);2580 extp Y4= _mm_add_ps(_mm_mul_ps(dirY4, tDist4), rp.mOriginY4);2581 extp Z4= _mm_add_ps(_mm_mul_ps(dirZ4, tDist4), rp.mOriginZ4);2574 extp4[0] = _mm_add_ps(_mm_mul_ps(dirX4, tDist4), rp.mOriginX4); 2575 extp4[1] = _mm_add_ps(_mm_mul_ps(dirY4, tDist4), rp.mOriginY4); 2576 extp4[2] = _mm_add_ps(_mm_mul_ps(dirZ4, tDist4), rp.mOriginZ4); 2582 2577 2583 2578 maxT4 = tDist4; 2584 2585 mask4 = _mm_cmplt_ps( maxT4, minT4);2586 2579 } 2587 2580 else … … 2602 2595 for (int i = 0; i < 4; ++i) 2603 2596 { 2597 // push view cells for all valid rays 2604 2598 if (mask[i]) 2605 2599 rp.mViewCells[i].push_back(viewCell); … … 2610 2604 2611 2605 // get the next node from the stack 2612 if (tStack. empty())2606 if (tStack.Empty()) 2613 2607 break; 2614 2615 entpX4 = extpX4; 2616 entpY4 = extpY4; 2617 entpZ4 = extpZ4; 2608 2609 // use memcopy? 2610 entp4[0] = extp4[0]; 2611 entp4[1] = extp4[1]; 2612 entp4[2] = extp4[2]; 2618 2613 2619 2614 minT4 = maxT4; 2615 2616 const PacketTraversalData &s = tStack.Top(); 2617 node = s.mNode; 2620 2618 2621 PacketTraversalData *s = tStack.top(); 2622 node = s->mNode; 2619 extp4[0] = s.mExitPointX4; 2620 extp4[1] = s.mExitPointY4; 2621 extp4[2] = s.mExitPointZ4; 2622 2623 maxT4 = s.mMaxT4; 2624 mask4 = s.mMask4; 2623 2625 2624 extpX4 = s->mExitPointX4; 2625 extpY4 = s->mExitPointY4; 2626 extpZ4 = s->mExitPointZ4; 2627 2628 maxT4 = s->mMaxT4; 2629 2630 mask4 = s->mMask4; 2631 2632 tStack.pop(); 2633 delete s; 2634 } 2635 } 2636 2626 tStack.Pop(); 2627 } 2628 } 2629 2637 2630 return hits; 2638 2631 2639 /* 2640 const int offs[4] = {(rp.dx[0] >= 0) ? 1 : 0, (rp.dy[0] >= 0)? 1 : 0, (rp.dz[0] >= 0)? 1 : 0, 0}; 2641 2642 while (!node->IsLeaf()) 2643 { 2644 PacketTraversalData *tData = tStack.top(); 2645 tStack.pop(); 2646 2647 node = tData->node; 2648 VspInterior *interior = static_cast<VspInterior *>(node); 2649 tn4 = tData->tn4; 2650 tf4 = tData->tf4; 2651 mask = tData->mask4; 2652 2653 position = interior->GetPosition(); 2654 const __m128 position4 = _mm_load_ps(&pos); 2655 2656 const int axis = interior->GetAxis(); 2657 const __m128 d4 = _mm_mul_ps(_mm_sub_ps(splitPos, origin[axis]), termination[axis]); 2658 2659 VspNode* ln = offs[axis] ? interior->GetFront() : interior->GetBack(); 2660 2661 if (!_mm_movemask_ps(_mm_and_ps(_mm_cmpgt_ps(d4, tn4), mask))) 2662 { 2663 node = ln; 2664 continue; 2665 } 2666 2667 node = offs[axis]^1 ? interior->GetFront() : interior->GetBack();// + (offs[aidx]^1); 2668 2669 if (_mm_movemask_ps( _mm_and_ps( _mm_cmplt_ps(d4, tf4), mask))) 2670 { 2671 const __m128 mask2 = _mm_cmpgt_ps(d4, tn4); 2672 const __m128 mask3 = _mm_cmplt_ps(d4, tf4); 2673 2674 2675 tData->tf4 = tf4 = _mm_or_ps(_mm_and_ps(mask3, d4), _mm_andnot_ps( mask3, tf4)); 2676 tData->node = (VspNode *)ln; 2677 tData->mask4 = mask; 2678 tData->tn4 = _mm_or_ps( _mm_and_ps( mask2, d4 ), _mm_andnot_ps( mask2, tn4 ) ); 2679 mask = _mm_cmplt_ps( tn4, tf4 ); 2680 } 2681 }*/ 2682 } 2632 #else 2633 2634 return 0; 2683 2635 #endif 2636 } 2684 2637 2685 2638 -
GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.h
r2347 r2353 1128 1128 int CompressObjects(VspLeaf *leaf); 1129 1129 1130 int TraverseRayPacket(RayPacket &rp, const bool useMailboxing); 1130 1131 1131 1132 #ifdef USE_SSE 1132 1133 struct PacketTraversalData 1133 1134 { 1135 PacketTraversalData () {} 1136 1137 PacketTraversalData (VspNode *n, 1138 const __m128 &px, const __m128 &py, const __m128 &pz, 1139 const __m128 &maxt, 1140 const __m128 &mask): 1141 mNode(n), 1142 mExitPointX4(px), mExitPointY4(py), mExitPointZ4(pz), 1143 mMaxT4(maxt), 1144 mMask4(mask) 1145 {} 1146 1134 1147 VspNode *mNode; 1135 1148 1136 union { float mExitPointX[4]; __m128 mExitPointX4; }; 1137 union { float mExitPointY[4]; __m128 mExitPointY4; }; 1138 union { float mExitPointZ[4]; __m128 mExitPointZ4; }; 1139 1140 union { float mMaxT[4]; __m128 mMaxT4; }; 1141 union { float mMask[4]; __m128 mMask4; }; 1142 1143 PacketTraversalData () {} 1144 PacketTraversalData (VspNode *n, 1145 const __m128 &px, const __m128 &py, const __m128 &pz, 1146 const __m128 &maxt, 1147 const __m128 &mask): 1148 mNode(n), 1149 mExitPointX4(px), mExitPointY4(py), mExitPointZ4(pz), 1150 mMaxT4(maxt), 1151 mMask4(mask) 1152 {} 1149 union { __m128 mExitPointX4; float mExitPointX[4]; }; 1150 union { __m128 mExitPointY4; float mExitPointY[4]; }; 1151 union { __m128 mExitPointZ4; float mExitPointZ[4]; }; 1152 1153 union { __m128 mMaxT4; float mMaxT[4]; }; 1154 union { __m128 mMask4; float mMask[4]; }; 1153 1155 }; 1154 1156 1155 1157 1156 int TraverseRayPacket(RayPacket &rp, const bool useMailboxing); 1158 struct __declspec(align(16)) PacketTraversalStack 1159 { 1160 // for performance 1161 friend class VspTree; 1162 1163 public: 1164 PacketTraversalStack(const int depth): 1165 mStackPtr(0), 1166 //mDepth(depth) 1167 mDepth(1000) 1168 { 1169 //mData = new PacketTraversalData[mDepth]; 1170 } 1171 1172 ~PacketTraversalStack() 1173 { 1174 //delete [] mData; 1175 } 1176 1177 //PacketTraversalStack() {} 1178 1179 void Pop() {-- mStackPtr;} 1180 const PacketTraversalData &Top() const { return mData[mStackPtr - 1];} 1181 1182 void Push(const PacketTraversalData &tData) 1183 { 1184 // note: faster with direct assignments 1185 mData[mStackPtr ++] = tData; 1186 //if (mStackPtr == mDepth) std::cerr << "this can never happen!!" << std::endl; 1187 } 1188 1189 bool Empty() const {return mStackPtr <= 0;} 1190 1191 protected: 1192 1193 // static array to avoid using operator new 1194 //PacketTraversalData *mData; 1195 PacketTraversalData mData[1000]; 1196 1197 int mStackPtr; 1198 int mDepth; 1199 1200 }; 1157 1201 1158 1202 #endif -
GTP/trunk/Lib/Vis/Preprocessing/src/VssRay.h
r2342 r2353 22 22 #define VSS_STORE_VIEWCELLS 1 23 23 24 #ifdef USE_SSE25 26 struct RayPacket27 {28 union { float mOriginX[4]; __m128 mOriginX4; };29 union { float mOriginY[4]; __m128 mOriginY4; };30 union { float mOriginZ[4]; __m128 mOriginZ4; };31 32 union { float mTerminationX[4]; __m128 mTerminationX4; };33 union { float mTerminationY[4]; __m128 mTerminationY4; };34 union { float mTerminationZ[4]; __m128 mTerminationZ4; };35 36 ViewCellContainer mViewCells[4];37 };38 39 40 #endif41 24 42 25 … … 345 328 void PrintStatistics(std::ostream &s); 346 329 int SelectRays(const int number, VssRayContainer &selected, const bool copy=false) const; 347 int 348 GetContributingRays(VssRayContainer &selected, 349 const int minPass 350 ) const; 351 352 }; 353 354 /* 355 struct VssRayDistribution { 356 VssRayDistribution() { mContribution = -1.0f; } 357 SimpleRayContainer mRays; 358 vector<VssRayContainer> mVssRays; 359 float mContribution; 360 float mTime; 361 }; 362 363 struct VssRayDistributionMixture { 364 VssRayDistributionMixture() {} 365 366 vector<VssRayDistribution> distributions; 367 }; 368 */ 369 370 }; 371 372 #endif 330 int GetContributingRays(VssRayContainer &selected, const int minPass) const; 331 332 }; 333 334 335 struct RayPacket 336 { 337 RayPacket(const VssRayContainer &rays) 338 { 339 for (int i = 0; i < 4; ++ i) 340 mOriginX[i] = rays[i]->mOrigin[0]; 341 342 for (int i = 0; i < 4; ++ i) 343 mOriginY[i] = rays[i]->mOrigin[1]; 344 345 for (int i = 0; i < 4; ++ i) 346 mOriginZ[i] = rays[i]->mOrigin[2]; 347 } 348 #ifdef USE_SSE 349 union { float mOriginX[4]; __m128 mOriginX4; }; 350 union { float mOriginY[4]; __m128 mOriginY4; }; 351 union { float mOriginZ[4]; __m128 mOriginZ4; }; 352 353 union { float mTerminationX[4]; __m128 mTerminationX4; }; 354 union { float mTerminationY[4]; __m128 mTerminationY4; }; 355 union { float mTerminationZ[4]; __m128 mTerminationZ4; }; 356 #else 357 float mOriginX[4]; 358 float mOriginY[4]; 359 float mOriginZ[4]; 360 361 float mTerminationX[4]; 362 float mTerminationY[4]; 363 float mTerminationZ[4]; 364 #endif 365 ViewCellContainer mViewCells[4]; 366 }; 367 368 369 }; 370 371 #endif -
GTP/trunk/Lib/Vis/Preprocessing/src/main.cpp
r2176 r2353 184 184 } 185 185 #endif 186 186 187 187 Environment::GetSingleton()->Parse(argc, argv, USE_EXE_PATH); 188 188 MeshKdTree::ParseEnvironment();
Note: See TracChangeset
for help on using the changeset viewer.
