![(please configure the [header_logo] section in trac.ini)](/trac/gametools/chrome/site/your_project_logo.png){kind=logo}
Changeset 2233
- Timestamp:
- 03/12/07 13:17:08 (17 years ago)
- Location:
- GTP/trunk/Lib/Vis/Preprocessing/src
- Files:
-
- 11 edited
-
BvHierarchy.cpp (modified) (1 diff)
-
BvHierarchy.h (modified) (3 diffs)
-
HierarchyManager.cpp (modified) (4 diffs)
-
HierarchyManager.h (modified) (1 diff)
-
Preprocessor.icproj (modified) (8 diffs)
-
Preprocessor.vcproj (modified) (2 diffs)
-
TestPreprocessor.vcproj (modified) (1 diff)
-
VspBspTree.cpp (modified) (11 diffs)
-
VspTree.cpp (modified) (24 diffs)
-
VspTree.h (modified) (2 diffs)
-
VssRay.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp
r2229 r2233 1866 1866 1867 1867 1868 float BvHierarchy::EvalAbsCost(const ObjectContainer &objects)1869 {1870 float result;1871 #if USE_BETTER_RENDERCOST_EST1872 ObjectContainer::const_iterator oit, oit_end = objects.end();1873 1874 for (oit = objects.begin(); oit != oit_end; ++ oit)1875 {1876 result += ViewCellsManager::GetRendercost(*oit);1877 }1878 #else1879 result = (float)objects.size();1880 #endif1881 1882 #if BOUND_RENDERCOST1883 result = max(result, MIN_RENDERCOST);1884 #endif1885 1886 return result;1887 }1888 1889 1890 1868 float BvHierarchy::EvalSahCost(BvhLeaf *leaf) const 1891 1869 { -
GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.h
r2227 r2233 644 644 { 645 645 // hack: we use the simpler but faster version 646 if (!object) 647 return NULL; 646 //if (!object) return NULL; 648 647 649 648 return object->mBvhLeaf; … … 676 675 ///////////////////////////////// 677 676 678 static float EvalAbsCost(const ObjectContainer &objects);677 static inline float EvalAbsCost(const ObjectContainer &objects); 679 678 680 679 void CollectObjects(const AxisAlignedBox3 &box, ObjectContainer &objects); … … 1101 1100 }; 1102 1101 1102 1103 float BvHierarchy::EvalAbsCost(const ObjectContainer &objects) 1104 { 1105 float result; 1106 1107 #if USE_BETTER_RENDERCOST_EST 1108 1109 ObjectContainer::const_iterator oit, oit_end = objects.end(); 1110 1111 for (oit = objects.begin(); oit != oit_end; ++ oit) 1112 { 1113 result += ViewCellsManager::GetRendercost(*oit); 1114 } 1115 1116 #else 1117 1118 result = (float)objects.size(); 1119 1120 #endif 1121 1122 #if BOUND_RENDERCOST 1123 result = max(result, MIN_RENDERCOST); 1124 #endif 1125 1126 return result; 1103 1127 } 1104 1128 1129 } 1130 1105 1131 #endif -
GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp
r2232 r2233 872 872 const float newPvs = alpha * childPvs + (1.0f - alpha) * totalPvs; 873 873 #endif 874 //cout << "b ";// << avgRaysPerObjects << "";874 //cout << "b "; 875 875 //cout << "alpha " << alpha << " beta: " << beta << " child: " << childPvs << " parent: " << totalPvs << endl; 876 876 877 if ( (newPvs < childPvs - Limits::Small) || (newPvs > totalPvs + Limits::Small))878 cout << "w: " << newPvs << " < child ("879 877 if (0 && 878 ((newPvs < childPvs - Limits::Small) || (newPvs > totalPvs + Limits::Small))) 879 cout << "w: " << newPvs << " < child (" << childPvs << ") or > parent (" << totalPvs << ")" << endl; 880 880 881 881 return newPvs; … … 1659 1659 { 1660 1660 1661 if (!obj) 1662 return NULL; 1661 if (!obj) return NULL; 1663 1662 1664 1663 switch (mObjectSpaceSubdivisionType) … … 1678 1677 } 1679 1678 } 1679 1680 1680 1681 1681 Intersectable *HierarchyManager::GetIntersectable(const VssRay &ray, … … 1688 1688 ray.GetSampleData(isTermination, pt, &obj, &node); 1689 1689 1690 if (!obj) 1691 return NULL; 1690 if (!obj) return NULL; 1692 1691 1693 1692 switch (mObjectSpaceSubdivisionType) -
GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.h
r2228 r2233 46 46 47 47 48 #define COUNT_ORIGIN_OBJECTS 148 #define COUNT_ORIGIN_OBJECTS 0 49 49 #define USE_AVGRAYCONTRI 0 50 50 -
GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.icproj
r2232 r2233 18 18 CharacterSet="2"/> 19 19 <Tool 20 Name="DebugTool"/>21 <Tool22 20 Name="CppCmplrTool" 23 21 Optimization="0" 24 22 AdditionalIncludeDirectories="..\include;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;Timer;..\src\sparsehash\src;..\src\sparsehash\src\windows;..\src\sparsehash\src\google;..\src\sparsehash\src\google\sparsehash" 25 23 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NO_QT" 26 MinimalRebuild=" 1"24 MinimalRebuild="TRUE" 27 25 BasicRuntimeChecks="3" 28 26 RuntimeLibrary="3" 29 RuntimeTypeInfo=" 1"27 RuntimeTypeInfo="TRUE" 30 28 UsePrecompiledHeader="0" 31 29 BrowseInformation="1" 32 30 WarningLevel="3" 33 Detect64BitPortabilityProblems=" 1"31 Detect64BitPortabilityProblems="TRUE" 34 32 DebugInformationFormat="3"/> 35 33 <Tool 36 Name="LinkerTool" 37 DelayImpLib=""/> 34 Name="CustomTool"/> 38 35 <Tool 39 36 Name="LibrarianTool"/> 40 37 <Tool 38 Name="MidlCmplrTool"/> 39 <Tool 40 Name="PostBuildEventTool"/> 41 <Tool 42 Name="PreBuildEventTool"/> 43 <Tool 44 Name="PreLinkEventTool"/> 45 <Tool 41 46 Name="ResCmplrTool"/> 42 47 <Tool 43 Name="MidlCmplrTool"/> 44 <Tool 45 Name="BscMakeTool"/> 46 <Tool 47 Name="PreBuildEventTool"/> 48 <Tool 49 Name="PreLinkEventTool"/> 50 <Tool 51 Name="PostBuildEventTool"/> 52 <Tool 53 Name="CustomTool"/> 54 <Tool 55 Name="CustomNodeTool"/> 48 Name="VCWebServiceProxyGeneratorTool"/> 49 <Tool 50 Name="VCXMLDataGeneratorTool"/> 51 <Tool 52 Name="VCManagedWrapperGeneratorTool"/> 53 <Tool 54 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 55 <Tool 56 Name="DebugTool"/> 56 57 </Configuration> 57 58 <Configuration … … 64 65 CharacterSet="2"/> 65 66 <Tool 66 Name="DebugTool"/>67 <Tool68 67 Name="CppCmplrTool" 69 68 Optimization="3" 70 GlobalOptimizations=" 1"69 GlobalOptimizations="TRUE" 71 70 InlineFunctionExpansion="2" 72 EnableIntrinsicFunctions=" 1"71 EnableIntrinsicFunctions="TRUE" 73 72 FavorSizeOrSpeed="1" 74 OmitFramePointers=" 1"75 EnableFiberSafeOptimizations=" 1"73 OmitFramePointers="TRUE" 74 EnableFiberSafeOptimizations="TRUE" 76 75 OptimizeForProcessor="0" 77 OptimizeForWindowsApplication=" 1"76 OptimizeForWindowsApplication="TRUE" 78 77 AdditionalIncludeDirectories="..\include;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;Timer" 79 78 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_VERBOSE_PVS" 80 ExceptionHandling=" 1"79 ExceptionHandling="TRUE" 81 80 RuntimeLibrary="2" 82 DisableLanguageExtensions=" 0"83 ForceConformanceInForLoopScope=" 0"84 RuntimeTypeInfo=" 0"81 DisableLanguageExtensions="FALSE" 82 ForceConformanceInForLoopScope="FALSE" 83 RuntimeTypeInfo="FALSE" 85 84 UsePrecompiledHeader="0" 86 85 BrowseInformation="1" 87 86 WarningLevel="2" 88 Detect64BitPortabilityProblems=" 1"87 Detect64BitPortabilityProblems="TRUE" 89 88 DebugInformationFormat="3"/> 90 89 <Tool 91 Name="LinkerTool" 92 DelayImpLib=""/> 90 Name="CustomTool"/> 93 91 <Tool 94 92 Name="LibrarianTool"/> 95 93 <Tool 94 Name="MidlCmplrTool"/> 95 <Tool 96 Name="PostBuildEventTool"/> 97 <Tool 98 Name="PreBuildEventTool"/> 99 <Tool 100 Name="PreLinkEventTool"/> 101 <Tool 96 102 Name="ResCmplrTool"/> 97 103 <Tool 98 Name="MidlCmplrTool"/> 99 <Tool 100 Name="BscMakeTool"/> 101 <Tool 102 Name="PreBuildEventTool"/> 103 <Tool 104 Name="PreLinkEventTool"/> 105 <Tool 106 Name="PostBuildEventTool"/> 107 <Tool 108 Name="CustomTool"/> 109 <Tool 110 Name="CustomNodeTool"/> 104 Name="VCWebServiceProxyGeneratorTool"/> 105 <Tool 106 Name="VCXMLDataGeneratorTool"/> 107 <Tool 108 Name="VCManagedWrapperGeneratorTool"/> 109 <Tool 110 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 111 <Tool 112 Name="DebugTool"/> 111 113 </Configuration> 112 114 <Configuration … … 119 121 CharacterSet="2"/> 120 122 <Tool 121 Name="DebugTool"/>122 <Tool123 123 Name="CppCmplrTool" 124 124 Optimization="2" 125 GlobalOptimizations=" 0"125 GlobalOptimizations="FALSE" 126 126 InlineFunctionExpansion="0" 127 EnableIntrinsicFunctions=" 0"127 EnableIntrinsicFunctions="FALSE" 128 128 FavorSizeOrSpeed="1" 129 OmitFramePointers=" 0"130 EnableFiberSafeOptimizations=" 0"129 OmitFramePointers="FALSE" 130 EnableFiberSafeOptimizations="FALSE" 131 131 OptimizeForProcessor="3" 132 OptimizeForWindowsApplication=" 1"132 OptimizeForWindowsApplication="TRUE" 133 133 AdditionalIncludeDirectories="..\include;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl";..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\..\Preprocessing\MultiLevelRayTracing" 134 134 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_INTERNAL" 135 MinimalRebuild=" 1"136 ExceptionHandling=" 1"135 MinimalRebuild="TRUE" 136 ExceptionHandling="TRUE" 137 137 RuntimeLibrary="2" 138 DisableLanguageExtensions=" 0"139 ForceConformanceInForLoopScope=" 0"140 RuntimeTypeInfo=" 1"138 DisableLanguageExtensions="FALSE" 139 ForceConformanceInForLoopScope="FALSE" 140 RuntimeTypeInfo="TRUE" 141 141 UsePrecompiledHeader="0" 142 142 WarningLevel="2" 143 Detect64BitPortabilityProblems=" 1"143 Detect64BitPortabilityProblems="TRUE" 144 144 DebugInformationFormat="3"/> 145 145 <Tool 146 Name="LinkerTool" 147 DelayImpLib=""/> 146 Name="CustomTool"/> 148 147 <Tool 149 148 Name="LibrarianTool"/> 150 149 <Tool 150 Name="MidlCmplrTool"/> 151 <Tool 152 Name="PostBuildEventTool"/> 153 <Tool 154 Name="PreBuildEventTool"/> 155 <Tool 156 Name="PreLinkEventTool"/> 157 <Tool 151 158 Name="ResCmplrTool"/> 152 159 <Tool 153 Name="MidlCmplrTool"/> 154 <Tool 155 Name="BscMakeTool"/> 156 <Tool 157 Name="PreBuildEventTool"/> 158 <Tool 159 Name="PreLinkEventTool"/> 160 <Tool 161 Name="PostBuildEventTool"/> 162 <Tool 163 Name="CustomTool"/> 164 <Tool 165 Name="CustomNodeTool"/> 160 Name="VCWebServiceProxyGeneratorTool"/> 161 <Tool 162 Name="VCXMLDataGeneratorTool"/> 163 <Tool 164 Name="VCManagedWrapperGeneratorTool"/> 165 <Tool 166 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 167 <Tool 168 Name="DebugTool"/> 166 169 </Configuration> 167 170 <Configuration … … 174 177 CharacterSet="2"/> 175 178 <Tool 176 Name="DebugTool"/>177 <Tool178 179 Name="CppCmplrTool" 179 180 Optimization="0" 180 181 InlineFunctionExpansion="0" 181 182 FavorSizeOrSpeed="0" 182 OptimizeForWindowsApplication=" 1"183 OptimizeForWindowsApplication="TRUE" 183 184 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" 184 185 PreprocessorDefinitions="WIN32;NDEBUG;_LIB" 185 ExceptionHandling=" 1"186 ExceptionHandling="TRUE" 186 187 RuntimeLibrary="2" 187 DisableLanguageExtensions=" 0"188 ForceConformanceInForLoopScope=" 0"189 RuntimeTypeInfo=" 1"188 DisableLanguageExtensions="FALSE" 189 ForceConformanceInForLoopScope="FALSE" 190 RuntimeTypeInfo="TRUE" 190 191 UsePrecompiledHeader="0" 191 192 WarningLevel="2" 192 Detect64BitPortabilityProblems=" 1"193 Detect64BitPortabilityProblems="TRUE" 193 194 DebugInformationFormat="3"/> 194 195 <Tool 195 Name="LinkerTool" 196 DelayImpLib=""/> 196 Name="CustomTool"/> 197 197 <Tool 198 198 Name="LibrarianTool"/> 199 199 <Tool 200 Name="MidlCmplrTool"/> 201 <Tool 202 Name="PostBuildEventTool"/> 203 <Tool 204 Name="PreBuildEventTool"/> 205 <Tool 206 Name="PreLinkEventTool"/> 207 <Tool 200 208 Name="ResCmplrTool"/> 201 209 <Tool 202 Name="MidlCmplrTool"/> 203 <Tool 204 Name="BscMakeTool"/> 205 <Tool 206 Name="PreBuildEventTool"/> 207 <Tool 208 Name="PreLinkEventTool"/> 209 <Tool 210 Name="PostBuildEventTool"/> 211 <Tool 212 Name="CustomTool"/> 213 <Tool 214 Name="CustomNodeTool"/> 210 Name="VCWebServiceProxyGeneratorTool"/> 211 <Tool 212 Name="VCXMLDataGeneratorTool"/> 213 <Tool 214 Name="VCManagedWrapperGeneratorTool"/> 215 <Tool 216 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 217 <Tool 218 Name="DebugTool"/> 215 219 </Configuration> 216 220 <Configuration … … 223 227 CharacterSet="2"/> 224 228 <Tool 225 Name="DebugTool"/>226 <Tool227 229 Name="CppCmplrTool" 228 230 Optimization="3" 229 GlobalOptimizations=" 1"231 GlobalOptimizations="TRUE" 230 232 InlineFunctionExpansion="0" 231 EnableIntrinsicFunctions=" 1"233 EnableIntrinsicFunctions="TRUE" 232 234 FavorSizeOrSpeed="1" 233 OmitFramePointers=" 1"234 EnableFiberSafeOptimizations=" 1"235 OmitFramePointers="TRUE" 236 EnableFiberSafeOptimizations="TRUE" 235 237 OptimizeForProcessor="3" 236 OptimizeForWindowsApplication=" 1"238 OptimizeForWindowsApplication="TRUE" 237 239 AdditionalIncludeDirectories="..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\MultiLevelRayTracing;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl";"$(CG_INC_PATH)";Timer;..\src\sparsehash\src\google\sparsehash;..\src\sparsehash\src\windows;..\src\sparsehash\src\google;..\src\sparsehash\src;..\src\ootl\;..\src\ootl\src\;..\src\ootl\src\cpp;..\src\ootl\src\cpp\include\;..\src\ootl\src\include\ootl;..\src\ootl\src\include\ootl\sandbox;..\src\ootl\src\cpp\include\ootl\mswin" 238 240 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_INTERNAL;USE_QT;USE_HASH_PV" 239 ExceptionHandling=" 1"241 ExceptionHandling="TRUE" 240 242 RuntimeLibrary="2" 241 243 EnableEnhancedInstructionSet="2" 242 DisableLanguageExtensions=" 0"243 ForceConformanceInForLoopScope=" 0"244 RuntimeTypeInfo=" 0"244 DisableLanguageExtensions="FALSE" 245 ForceConformanceInForLoopScope="FALSE" 246 RuntimeTypeInfo="FALSE" 245 247 UsePrecompiledHeader="0" 246 248 BrowseInformation="1" 247 249 WarningLevel="2" 248 Detect64BitPortabilityProblems=" 1"250 Detect64BitPortabilityProblems="TRUE" 249 251 DebugInformationFormat="3"/> 250 252 <Tool 251 Name="LinkerTool" 252 DelayImpLib=""/> 253 Name="CustomTool"/> 253 254 <Tool 254 255 Name="LibrarianTool" 255 256 OutputFile="../lib/Release/$(ProjectName).lib"/> 256 257 <Tool 258 Name="MidlCmplrTool"/> 259 <Tool 260 Name="PostBuildEventTool"/> 261 <Tool 262 Name="PreBuildEventTool"/> 263 <Tool 264 Name="PreLinkEventTool"/> 265 <Tool 257 266 Name="ResCmplrTool"/> 258 267 <Tool 259 Name="MidlCmplrTool"/> 260 <Tool 261 Name="BscMakeTool"/> 262 <Tool 263 Name="PreBuildEventTool"/> 264 <Tool 265 Name="PreLinkEventTool"/> 266 <Tool 267 Name="PostBuildEventTool"/> 268 <Tool 269 Name="CustomTool"/> 270 <Tool 271 Name="CustomNodeTool"/> 268 Name="VCWebServiceProxyGeneratorTool"/> 269 <Tool 270 Name="VCXMLDataGeneratorTool"/> 271 <Tool 272 Name="VCManagedWrapperGeneratorTool"/> 273 <Tool 274 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 275 <Tool 276 Name="DebugTool"/> 272 277 </Configuration> 273 278 <Configuration … … 281 286 WholeProgramOptimization="1"/> 282 287 <Tool 283 Name="DebugTool"/>284 <Tool285 288 Name="CppCmplrTool" 286 289 Optimization="3" 287 GlobalOptimizations=" 1"290 GlobalOptimizations="TRUE" 288 291 InlineFunctionExpansion="2" 289 EnableIntrinsicFunctions=" 1"292 EnableIntrinsicFunctions="TRUE" 290 293 FavorSizeOrSpeed="1" 291 OmitFramePointers=" 1"292 EnableFiberSafeOptimizations=" 1"294 OmitFramePointers="TRUE" 295 EnableFiberSafeOptimizations="TRUE" 293 296 OptimizeForProcessor="1" 294 OptimizeForWindowsApplication=" 1"297 OptimizeForWindowsApplication="TRUE" 295 298 AdditionalIncludeDirectories="..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\MultiLevelRayTracing;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include"" 296 299 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_INTERNAL;NO_QT" 297 StringPooling=" 1"298 ExceptionHandling=" 1"300 StringPooling="TRUE" 301 ExceptionHandling="TRUE" 299 302 RuntimeLibrary="2" 300 303 EnableEnhancedInstructionSet="2" 301 DisableLanguageExtensions=" 0"302 ForceConformanceInForLoopScope=" 0"303 RuntimeTypeInfo=" 0"304 DisableLanguageExtensions="FALSE" 305 ForceConformanceInForLoopScope="FALSE" 306 RuntimeTypeInfo="FALSE" 304 307 UsePrecompiledHeader="0" 305 308 BrowseInformation="1" 306 309 WarningLevel="2" 307 Detect64BitPortabilityProblems=" 1"310 Detect64BitPortabilityProblems="TRUE" 308 311 DebugInformationFormat="3" 309 312 UseProcExt="3" 310 313 RequireProcExt="3"/> 311 314 <Tool 312 Name="LinkerTool" 313 DelayImpLib=""/> 315 Name="CustomTool"/> 314 316 <Tool 315 317 Name="LibrarianTool" 316 318 OutputFile="../lib/Release/Preprocessor.lib"/> 317 319 <Tool 320 Name="MidlCmplrTool"/> 321 <Tool 322 Name="PostBuildEventTool"/> 323 <Tool 324 Name="PreBuildEventTool"/> 325 <Tool 326 Name="PreLinkEventTool"/> 327 <Tool 318 328 Name="ResCmplrTool"/> 319 329 <Tool 320 Name="MidlCmplrTool"/> 321 <Tool 322 Name="BscMakeTool"/> 323 <Tool 324 Name="PreBuildEventTool"/> 325 <Tool 326 Name="PreLinkEventTool"/> 327 <Tool 328 Name="PostBuildEventTool"/> 329 <Tool 330 Name="CustomTool"/> 331 <Tool 332 Name="CustomNodeTool"/> 330 Name="VCWebServiceProxyGeneratorTool"/> 331 <Tool 332 Name="VCXMLDataGeneratorTool"/> 333 <Tool 334 Name="VCManagedWrapperGeneratorTool"/> 335 <Tool 336 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 337 <Tool 338 Name="DebugTool"/> 333 339 </Configuration> 334 340 <Configuration … … 341 347 CharacterSet="2"/> 342 348 <Tool 343 Name="DebugTool"/>344 <Tool345 349 Name="CppCmplrTool" 346 350 Optimization="3" … … 348 352 FavorSizeOrSpeed="0" 349 353 OptimizeForProcessor="3" 350 OptimizeForWindowsApplication=" 1"354 OptimizeForWindowsApplication="TRUE" 351 355 AdditionalIncludeDirectories="..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\MultiLevelRayTracing;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl";"$(CG_INC_PATH)";Timer" 352 356 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_QT;ATI" 353 ExceptionHandling=" 1"357 ExceptionHandling="TRUE" 354 358 RuntimeLibrary="2" 355 DisableLanguageExtensions=" 0"356 ForceConformanceInForLoopScope=" 0"357 RuntimeTypeInfo=" 1"359 DisableLanguageExtensions="FALSE" 360 ForceConformanceInForLoopScope="FALSE" 361 RuntimeTypeInfo="TRUE" 358 362 UsePrecompiledHeader="0" 359 363 BrowseInformation="1" 360 364 WarningLevel="2" 361 Detect64BitPortabilityProblems=" 1"365 Detect64BitPortabilityProblems="TRUE" 362 366 DebugInformationFormat="3"/> 363 367 <Tool 364 Name="LinkerTool" 365 DelayImpLib=""/> 368 Name="CustomTool"/> 366 369 <Tool 367 370 Name="LibrarianTool" 368 371 OutputFile="../lib/Release/$(ProjectName).lib"/> 369 372 <Tool 373 Name="MidlCmplrTool"/> 374 <Tool 375 Name="PostBuildEventTool"/> 376 <Tool 377 Name="PreBuildEventTool"/> 378 <Tool 379 Name="PreLinkEventTool"/> 380 <Tool 370 381 Name="ResCmplrTool"/> 371 382 <Tool 372 Name="MidlCmplrTool"/> 373 <Tool 374 Name="BscMakeTool"/> 375 <Tool 376 Name="PreBuildEventTool"/> 377 <Tool 378 Name="PreLinkEventTool"/> 379 <Tool 380 Name="PostBuildEventTool"/> 381 <Tool 382 Name="CustomTool"/> 383 <Tool 384 Name="CustomNodeTool"/> 383 Name="VCWebServiceProxyGeneratorTool"/> 384 <Tool 385 Name="VCXMLDataGeneratorTool"/> 386 <Tool 387 Name="VCManagedWrapperGeneratorTool"/> 388 <Tool 389 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 390 <Tool 391 Name="DebugTool"/> 385 392 </Configuration> 386 393 </Configurations> 387 394 <Files> 395 <Filter 396 Name="Source Files" 397 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" 398 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> 399 <File 400 RelativePath="..\src\AxisAlignedBox3.cpp"> 401 </File> 402 <File 403 RelativePath="..\src\AxisAlignedBox3.h"> 404 </File> 405 <File 406 RelativePath="..\src\Beam.cpp"> 407 </File> 408 <File 409 RelativePath="..\src\Beam.h"> 410 </File> 411 <File 412 RelativePath=".\Timer\BenchTimer.cpp"> 413 </File> 414 <File 415 RelativePath=".\Timer\BenchTimer.h"> 416 </File> 417 <File 418 RelativePath=".\BitVectorPvs.h"> 419 </File> 420 <File 421 RelativePath="..\src\BoostPreprocessorThread.cpp"> 422 </File> 423 <File 424 RelativePath="..\src\BoostPreprocessorThread.h"> 425 </File> 426 <File 427 RelativePath="..\src\BoundingBoxConverter.h"> 428 </File> 429 <File 430 RelativePath=".\BvHierarchy.cpp"> 431 </File> 432 <File 433 RelativePath=".\BvHierarchy.h"> 434 </File> 435 <File 436 RelativePath="..\src\Camera.cpp"> 437 </File> 438 <File 439 RelativePath="..\src\Camera.h"> 440 </File> 441 <File 442 RelativePath=".\CombinedPreprocessor.cpp"> 443 </File> 444 <File 445 RelativePath=".\CombinedPreprocessor.h"> 446 </File> 447 <File 448 RelativePath="..\src\common.cpp"> 449 </File> 450 <File 451 RelativePath="..\src\common.h"> 452 </File> 453 <File 454 RelativePath="..\src\Containers.h"> 455 </File> 456 <File 457 RelativePath=".\DefaultPvs.h"> 458 </File> 459 <File 460 RelativePath="..\src\dual_depth.cg"> 461 </File> 462 <File 463 RelativePath="..\src\Environment.cpp"> 464 </File> 465 <File 466 RelativePath="..\src\Environment.h"> 467 </File> 468 <File 469 RelativePath="..\src\ExactPreprocessor.cpp"> 470 </File> 471 <File 472 RelativePath="..\src\ExactPreprocessor.h"> 473 </File> 474 <File 475 RelativePath="..\src\Exporter.cpp"> 476 </File> 477 <File 478 RelativePath="..\src\Exporter.h"> 479 </File> 480 <File 481 RelativePath="..\src\FlexibleHeap.h"> 482 </File> 483 <File 484 RelativePath="..\src\glInterface.h"> 485 </File> 486 <File 487 RelativePath=".\GlobalLinesRenderer.cpp"> 488 </File> 489 <File 490 RelativePath=".\GlobalLinesRenderer.h"> 491 </File> 492 <File 493 RelativePath=".\GvsPreprocessor.cpp"> 494 </File> 495 <File 496 RelativePath=".\GvsPreprocessor.h"> 497 </File> 498 <File 499 RelativePath="..\src\GzBinFileInputStream.cpp"> 500 </File> 501 <File 502 RelativePath="..\src\GzBinFileInputStream.h"> 503 </File> 504 <File 505 RelativePath="..\src\GzFileInputSource.cpp"> 506 </File> 507 <File 508 RelativePath="..\src\GzFileInputSource.h"> 509 </File> 510 <File 511 RelativePath="..\src\gzstream.cpp"> 512 </File> 513 <File 514 RelativePath="..\src\gzstream.h"> 515 </File> 516 <File 517 RelativePath="..\src\Halton.cpp"> 518 </File> 519 <File 520 RelativePath="..\src\Halton.h"> 521 </File> 522 <File 523 RelativePath=".\HashPvs.h"> 524 </File> 525 <File 526 RelativePath=".\HashPvs2.h"> 527 </File> 528 <File 529 RelativePath=".\HierarchyManager.cpp"> 530 </File> 531 <File 532 RelativePath=".\HierarchyManager.h"> 533 </File> 534 <File 535 RelativePath=".\IntelRayCaster.cpp"> 536 </File> 537 <File 538 RelativePath=".\IntelRayCaster.h"> 539 </File> 540 <File 541 RelativePath=".\InternalRayCaster.cpp"> 542 </File> 543 <File 544 RelativePath=".\InternalRayCaster.h"> 545 </File> 546 <File 547 RelativePath=".\Intersectable.cpp"> 548 </File> 549 <File 550 RelativePath=".\Intersectable.h"> 551 </File> 552 <File 553 RelativePath=".\IntersectableWrapper.cpp"> 554 </File> 555 <File 556 RelativePath=".\IntersectableWrapper.h"> 557 </File> 558 <File 559 RelativePath=".\IntersectionBoundingBoxConverter.cpp"> 560 </File> 561 <File 562 RelativePath=".\IntersectionBoundingBoxConverter.h"> 563 </File> 564 <File 565 RelativePath="..\src\KdTree.cpp"> 566 </File> 567 <File 568 RelativePath="..\src\KdTree.h"> 569 </File> 570 <File 571 RelativePath="..\src\LogManager.cpp"> 572 </File> 573 <File 574 RelativePath="..\src\LogManager.h"> 575 </File> 576 <File 577 RelativePath="..\src\Material.cpp"> 578 </File> 579 <File 580 RelativePath="..\src\Material.h"> 581 </File> 582 <File 583 RelativePath="..\src\Matrix4x4.cpp"> 584 </File> 585 <File 586 RelativePath="..\src\Matrix4x4.h"> 587 </File> 588 <File 589 RelativePath=".\Timer\merror.cpp"> 590 </File> 591 <File 592 RelativePath=".\Timer\merror.h"> 593 </File> 594 <File 595 RelativePath="..\src\Mesh.cpp"> 596 </File> 597 <File 598 RelativePath="..\src\Mesh.h"> 599 </File> 600 <File 601 RelativePath="..\src\MeshKdTree.cpp"> 602 </File> 603 <File 604 RelativePath="..\src\MeshKdTree.h"> 605 </File> 606 <File 607 RelativePath=".\Timer\mstring.h"> 608 </File> 609 <File 610 RelativePath=".\Mutation.cpp"> 611 </File> 612 <File 613 RelativePath=".\Mutation.h"> 614 </File> 615 <File 616 RelativePath="..\src\MutualVisibility.cpp"> 617 </File> 618 <File 619 RelativePath="..\src\MutualVisibility.h"> 620 </File> 621 <File 622 RelativePath=".\ObjectPvs.cpp"> 623 </File> 624 <File 625 RelativePath=".\ObjectPvs.h"> 626 </File> 627 <File 628 RelativePath=".\ObjectsParser.cpp"> 629 </File> 630 <File 631 RelativePath=".\ObjectsParser.h"> 632 </File> 633 <File 634 RelativePath=".\ObjExporter.cpp"> 635 </File> 636 <File 637 RelativePath=".\ObjExporter.h"> 638 </File> 639 <File 640 RelativePath="..\src\ObjParser.cpp"> 641 </File> 642 <File 643 RelativePath="..\src\ObjParser.h"> 644 </File> 645 <File 646 RelativePath="..\src\OcclusionQuery.cpp"> 647 </File> 648 <File 649 RelativePath="..\src\OcclusionQuery.h"> 650 </File> 651 <File 652 RelativePath=".\OspTree.cpp"> 653 </File> 654 <File 655 RelativePath=".\OspTree.h"> 656 </File> 657 <File 658 RelativePath="..\src\Parser.h"> 659 </File> 660 <File 661 RelativePath=".\Timer\PerfTimer.h"> 662 </File> 663 <File 664 RelativePath=".\Timer\PerfTimerSkeleton.h"> 665 </File> 666 <File 667 RelativePath="..\src\Plane3.cpp"> 668 </File> 669 <File 670 RelativePath="..\src\Plane3.h"> 671 </File> 672 <File 673 RelativePath="..\src\ply.h"> 674 </File> 675 <File 676 RelativePath="..\src\plyfile.c"> 677 </File> 678 <File 679 RelativePath="..\src\PlyParser.cpp"> 680 </File> 681 <File 682 RelativePath="..\src\PlyParser.h"> 683 </File> 684 <File 685 RelativePath="..\src\Polygon3.cpp"> 686 </File> 687 <File 688 RelativePath="..\src\Polygon3.h"> 689 </File> 690 <File 691 RelativePath="..\src\Polytope.cpp"> 692 </File> 693 <File 694 RelativePath="..\src\Polytope.h"> 695 </File> 696 <File 697 RelativePath="..\src\Preprocessor.cpp"> 698 </File> 699 <File 700 RelativePath="..\src\Preprocessor.h"> 701 <FileConfiguration 702 Name="Release|Win32"> 703 <Tool 704 Name="CustomTool" 705 Description="" 706 CommandLine="" 707 Outputs=""/> 708 </FileConfiguration> 709 <FileConfiguration 710 Name="mlrt|Win32"> 711 <Tool 712 Name="CustomTool" 713 Description="" 714 CommandLine="" 715 Outputs=""/> 716 </FileConfiguration> 717 <FileConfiguration 718 Name="Release_Internal|Win32"> 719 <Tool 720 Name="CustomTool" 721 Description="" 722 CommandLine="" 723 Outputs=""/> 724 </FileConfiguration> 725 <FileConfiguration 726 Name="Release Internal|Win32"> 727 <Tool 728 Name="CustomTool" 729 Description="" 730 CommandLine="" 731 Outputs=""/> 732 </FileConfiguration> 733 <FileConfiguration 734 Name="release_noqt|Win32"> 735 <Tool 736 Name="CustomTool" 737 Description="" 738 CommandLine="" 739 Outputs=""/> 740 </FileConfiguration> 741 <FileConfiguration 742 Name="Release_Qt|Win32"> 743 <Tool 744 Name="CustomTool" 745 Description="" 746 CommandLine="" 747 Outputs=""/> 748 </FileConfiguration> 749 </File> 750 <File 751 RelativePath=".\PreprocessorFactory.cpp"> 752 </File> 753 <File 754 RelativePath=".\PreprocessorFactory.h"> 755 </File> 756 <File 757 RelativePath="..\src\PreprocessorThread.cpp"> 758 </File> 759 <File 760 RelativePath="..\src\PreprocessorThread.h"> 761 <FileConfiguration 762 Name="Release|Win32"> 763 <Tool 764 Name="CustomTool" 765 Description="" 766 CommandLine="" 767 Outputs=""/> 768 </FileConfiguration> 769 <FileConfiguration 770 Name="mlrt|Win32"> 771 <Tool 772 Name="CustomTool" 773 Description="" 774 CommandLine="" 775 Outputs=""/> 776 </FileConfiguration> 777 <FileConfiguration 778 Name="Release_Internal|Win32"> 779 <Tool 780 Name="CustomTool" 781 Description="" 782 CommandLine="" 783 Outputs=""/> 784 </FileConfiguration> 785 <FileConfiguration 786 Name="Release Internal|Win32"> 787 <Tool 788 Name="CustomTool" 789 Description="" 790 CommandLine="" 791 Outputs=""/> 792 </FileConfiguration> 793 <FileConfiguration 794 Name="release_noqt|Win32"> 795 <Tool 796 Name="CustomTool" 797 Description="" 798 CommandLine="" 799 Outputs=""/> 800 </FileConfiguration> 801 <FileConfiguration 802 Name="Release_Qt|Win32"> 803 <Tool 804 Name="CustomTool" 805 Description="" 806 CommandLine="" 807 Outputs=""/> 808 </FileConfiguration> 809 </File> 810 <File 811 RelativePath="..\src\Pvs.h"> 812 </File> 813 <File 814 RelativePath=".\PvsBase.h"> 815 </File> 816 <File 817 RelativePath=".\PvsDefinitions.h"> 818 </File> 819 <File 820 RelativePath="..\src\Ray.cpp"> 821 </File> 822 <File 823 RelativePath="..\src\Ray.h"> 824 </File> 825 <File 826 RelativePath=".\RayCaster.cpp"> 827 </File> 828 <File 829 RelativePath=".\RayCaster.h"> 830 </File> 831 <File 832 RelativePath="..\src\RayInfo.cpp"> 833 </File> 834 <File 835 RelativePath="..\src\RayInfo.h"> 836 </File> 837 <File 838 RelativePath=".\Timer\RDTSCTimer.cpp"> 839 </File> 840 <File 841 RelativePath=".\Timer\RDTSCTimer.h"> 842 </File> 843 <File 844 RelativePath="..\src\Rectangle3.cpp"> 845 </File> 846 <File 847 RelativePath="..\src\Rectangle3.h"> 848 </File> 849 <File 850 RelativePath="..\src\RenderSampler.cpp"> 851 </File> 852 <File 853 RelativePath="..\src\RenderSampler.h"> 854 </File> 855 <File 856 RelativePath="..\src\RenderSimulator.cpp"> 857 </File> 858 <File 859 RelativePath="..\src\RenderSimulator.h"> 860 </File> 861 <File 862 RelativePath=".\RenderTexture.cpp"> 863 </File> 864 <File 865 RelativePath=".\RenderTexture.h"> 866 </File> 867 <File 868 RelativePath="..\src\ResourceManager.h"> 869 </File> 870 <File 871 RelativePath="..\src\RssPreprocessor.cpp"> 872 </File> 873 <File 874 RelativePath="..\src\RssPreprocessor.h"> 875 </File> 876 <File 877 RelativePath="..\src\RssTree.cpp"> 878 </File> 879 <File 880 RelativePath="..\src\RssTree.h"> 881 </File> 882 <File 883 RelativePath="..\src\SamplingPreprocessor.cpp"> 884 </File> 885 <File 886 RelativePath="..\src\SamplingPreprocessor.h"> 887 </File> 888 <File 889 RelativePath="..\src\SamplingStrategy.cpp"> 890 </File> 891 <File 892 RelativePath="..\src\SamplingStrategy.h"> 893 </File> 894 <File 895 RelativePath="..\src\SceneGraph.cpp"> 896 </File> 897 <File 898 RelativePath="..\src\SceneGraph.h"> 899 </File> 900 <File 901 RelativePath="..\src\Statistics.h"> 902 </File> 903 <File 904 RelativePath=".\SubdivisionCandidate.cpp"> 905 </File> 906 <File 907 RelativePath=".\SubdivisionCandidate.h"> 908 </File> 909 <File 910 RelativePath="..\src\Tetrahedron3.cpp"> 911 </File> 912 <File 913 RelativePath="..\src\Tetrahedron3.h"> 914 </File> 915 <File 916 RelativePath=".\Trackball.cpp"> 917 </File> 918 <File 919 RelativePath=".\Trackball.h"> 920 </File> 921 <File 922 RelativePath=".\TraversalTree.cpp"> 923 </File> 924 <File 925 RelativePath=".\TraversalTree.h"> 926 </File> 927 <File 928 RelativePath="..\src\Triangle3.cpp"> 929 </File> 930 <File 931 RelativePath="..\src\Triangle3.h"> 932 </File> 933 <File 934 RelativePath="..\src\UnigraphicsParser.cpp"> 935 </File> 936 <File 937 RelativePath="..\src\UnigraphicsParser.h"> 938 </File> 939 <File 940 RelativePath="..\src\Vector3.cpp"> 941 </File> 942 <File 943 RelativePath="..\src\Vector3.h"> 944 </File> 945 <File 946 RelativePath="..\src\ViewCell.cpp"> 947 </File> 948 <File 949 RelativePath="..\src\ViewCell.h"> 950 </File> 951 <File 952 RelativePath="..\src\ViewCellBsp.cpp"> 953 </File> 954 <File 955 RelativePath="..\src\ViewCellBsp.h"> 956 </File> 957 <File 958 RelativePath="..\src\ViewCellsManager.cpp"> 959 </File> 960 <File 961 RelativePath="..\src\ViewCellsManager.h"> 962 </File> 963 <File 964 RelativePath="..\src\ViewCellsParser.cpp"> 965 </File> 966 <File 967 RelativePath="..\src\ViewCellsParser.h"> 968 </File> 969 <File 970 RelativePath="..\src\ViewCellsParserXerces.h"> 971 </File> 972 <File 973 RelativePath="..\src\VrmlExporter.cpp"> 974 </File> 975 <File 976 RelativePath="..\src\VrmlExporter.h"> 977 </File> 978 <File 979 RelativePath="..\src\VspBspTree.cpp"> 980 </File> 981 <File 982 RelativePath="..\src\VspBspTree.h"> 983 </File> 984 <File 985 RelativePath=".\VspTree.cpp"> 986 </File> 987 <File 988 RelativePath=".\VspTree.h"> 989 </File> 990 <File 991 RelativePath="..\src\VssPreprocessor.cpp"> 992 </File> 993 <File 994 RelativePath="..\src\VssPreprocessor.h"> 995 </File> 996 <File 997 RelativePath="..\src\VssRay.cpp"> 998 </File> 999 <File 1000 RelativePath="..\src\VssRay.h"> 1001 </File> 1002 <File 1003 RelativePath="..\src\VssTree.cpp"> 1004 </File> 1005 <File 1006 RelativePath="..\src\VssTree.h"> 1007 </File> 1008 <File 1009 RelativePath="..\src\X3dExporter.cpp"> 1010 </File> 1011 <File 1012 RelativePath="..\src\X3dExporter.h"> 1013 </File> 1014 <File 1015 RelativePath="..\src\X3dParser.cpp"> 1016 </File> 1017 <File 1018 RelativePath="..\src\X3dParser.h"> 1019 </File> 1020 </Filter> 1021 <Filter 1022 Name="Header Files" 1023 Filter="h;hpp;hxx;hm;inl;inc;xsd" 1024 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> 1025 <File 1026 RelativePath="..\include\AxisAlignedBox3.h"> 1027 </File> 1028 <File 1029 RelativePath="..\include\Containers.h"> 1030 </File> 1031 <File 1032 RelativePath="..\include\ExactPreprocessor.h"> 1033 </File> 1034 <File 1035 RelativePath="..\include\KdTree.h"> 1036 </File> 1037 <File 1038 RelativePath="..\include\Mesh.h"> 1039 </File> 1040 <File 1041 RelativePath="..\include\Plane3.h"> 1042 </File> 1043 <File 1044 RelativePath="..\include\Preprocessor.h"> 1045 </File> 1046 <File 1047 RelativePath="..\include\SamplingPreprocessor.h"> 1048 </File> 1049 <File 1050 RelativePath="..\include\SceneGraph.h"> 1051 </File> 1052 <File 1053 RelativePath="..\include\Vector3.h"> 1054 </File> 1055 <File 1056 RelativePath="..\include\ViewCell.h"> 1057 </File> 1058 <File 1059 RelativePath="..\src\X3dParserXerces.h"> 1060 </File> 1061 </Filter> 1062 <Filter 1063 Name="Renderer" 1064 Filter=""> 1065 <File 1066 RelativePath="..\src\GlRenderer.cpp"> 1067 </File> 1068 <File 1069 RelativePath="..\src\GlRenderer.h"> 1070 </File> 1071 <File 1072 RelativePath="..\src\Renderer.cpp"> 1073 </File> 1074 <File 1075 RelativePath="..\src\Renderer.h"> 1076 </File> 1077 </Filter> 1078 <Filter 1079 Name="ootl" 1080 Filter=""> 1081 <Filter 1082 Name="include" 1083 Filter=""> 1084 <File 1085 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_adapters.hpp"> 1086 </File> 1087 <File 1088 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_benchmark.hpp"> 1089 </File> 1090 <File 1091 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_bool_stack.hpp"> 1092 </File> 1093 <File 1094 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_dictionary.hpp"> 1095 </File> 1096 <File 1097 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_fft.hpp"> 1098 </File> 1099 <File 1100 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_fft_test.hpp"> 1101 </File> 1102 <File 1103 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_functions.hpp"> 1104 </File> 1105 <File 1106 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_generators.hpp"> 1107 </File> 1108 <File 1109 RelativePath=".\ootl\src\include\ootl\ootl_hash.hpp"> 1110 </File> 1111 <File 1112 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_iterable.hpp"> 1113 </File> 1114 <File 1115 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_iterators.hpp"> 1116 </File> 1117 <File 1118 RelativePath=".\ootl\src\include\ootl\ootl_list.hpp"> 1119 </File> 1120 <File 1121 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_map.hpp"> 1122 </File> 1123 <File 1124 RelativePath=".\ootl\src\include\ootl\ootl_misc.hpp"> 1125 </File> 1126 <File 1127 RelativePath=".\ootl\src\include\ootl\mswin\ootl_mswin.hpp"> 1128 </File> 1129 <File 1130 RelativePath=".\ootl\src\include\ootl\mswin\ootl_mswin_console.hpp"> 1131 </File> 1132 <File 1133 RelativePath=".\ootl\src\include\ootl\mswin\ootl_mswin_gdi.hpp"> 1134 </File> 1135 <File 1136 RelativePath=".\ootl\src\include\ootl\mswin\ootl_mswin_simple_win.hpp"> 1137 </File> 1138 <File 1139 RelativePath=".\ootl\src\include\ootl\ootl_object.hpp"> 1140 </File> 1141 <File 1142 RelativePath=".\ootl\src\include\ootl\ootl_output.hpp"> 1143 </File> 1144 <File 1145 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_polar.hpp"> 1146 </File> 1147 <File 1148 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_predicate.hpp"> 1149 </File> 1150 <File 1151 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_procedure.hpp"> 1152 </File> 1153 <File 1154 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_ptr.hpp"> 1155 </File> 1156 <File 1157 RelativePath=".\ootl\src\include\ootl\ootl_stack.hpp"> 1158 </File> 1159 <File 1160 RelativePath=".\ootl\src\include\ootl\ootl_string.hpp"> 1161 </File> 1162 <File 1163 RelativePath=".\ootl\src\include\ootl\ootl_string_utils.hpp"> 1164 </File> 1165 <File 1166 RelativePath=".\ootl\src\include\ootl\ootl_tester.hpp"> 1167 </File> 1168 <File 1169 RelativePath=".\ootl\src\include\ootl\ootl_timer.hpp"> 1170 </File> 1171 <File 1172 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_valarray.hpp"> 1173 </File> 1174 <File 1175 RelativePath=".\ootl\src\include\ootl\ootl_vlist.hpp"> 1176 </File> 1177 </Filter> 1178 </Filter> 1179 <Filter 1180 Name="google" 1181 Filter=""> 1182 <File 1183 RelativePath=".\sparsehash\src\google\sparsehash\config.h"> 1184 </File> 1185 <File 1186 RelativePath=".\sparsehash\src\google\dense_hash_map"> 1187 </File> 1188 <File 1189 RelativePath=".\sparsehash\src\google\dense_hash_set"> 1190 </File> 1191 <File 1192 RelativePath=".\sparsehash\src\google\sparsehash\densehashtable.h"> 1193 </File> 1194 <File 1195 RelativePath=".\sparsehash\src\windows\hash_fun.h"> 1196 </File> 1197 <File 1198 RelativePath=".\sparsehash\src\google\sparsehash\hash_fun.h"> 1199 </File> 1200 <File 1201 RelativePath=".\sparsehash\src\windows\hash_map.h"> 1202 </File> 1203 <File 1204 RelativePath=".\sparsehash\src\google\sparse_hash_map"> 1205 </File> 1206 <File 1207 RelativePath=".\sparsehash\src\google\sparse_hash_set"> 1208 </File> 1209 <File 1210 RelativePath=".\sparsehash\src\google\sparsehash\sparsehashtable.h"> 1211 </File> 1212 <File 1213 RelativePath=".\sparsehash\src\google\sparsetable"> 1214 </File> 1215 <File 1216 RelativePath=".\sparsehash\src\windows\stl_hash_fun.h"> 1217 </File> 1218 </Filter> 388 1219 <File 389 RelativePath=".\AxisAlignedBox3.cpp"/> 390 <File 391 RelativePath=".\AxisAlignedBox3.h"/> 392 <File 393 RelativePath=".\Beam.cpp"/> 394 <File 395 RelativePath=".\Beam.h"/> 396 <File 397 RelativePath=".\Timer\BenchTimer.cpp"/> 398 <File 399 RelativePath=".\Timer\BenchTimer.h"/> 400 <File 401 RelativePath=".\BitVectorPvs.h"/> 402 <File 403 RelativePath=".\BoostPreprocessorThread.cpp"/> 404 <File 405 RelativePath=".\BoostPreprocessorThread.h"/> 406 <File 407 RelativePath=".\BoundingBoxConverter.h"/> 408 <File 409 RelativePath=".\BvHierarchy.cpp"/> 410 <File 411 RelativePath=".\BvHierarchy.h"/> 412 <File 413 RelativePath=".\Camera.cpp"/> 414 <File 415 RelativePath=".\Camera.h"/> 416 <File 417 RelativePath=".\CombinedPreprocessor.cpp"/> 418 <File 419 RelativePath=".\CombinedPreprocessor.h"/> 420 <File 421 RelativePath=".\common.cpp"/> 422 <File 423 RelativePath=".\common.h"/> 424 <File 425 RelativePath=".\Containers.h"/> 426 <File 427 RelativePath=".\DefaultPvs.h"/> 428 <File 429 RelativePath=".\dual_depth.cg"/> 430 <File 431 RelativePath=".\Environment.cpp"/> 432 <File 433 RelativePath=".\Environment.h"/> 434 <File 435 RelativePath=".\ExactPreprocessor.cpp"/> 436 <File 437 RelativePath=".\ExactPreprocessor.h"/> 438 <File 439 RelativePath=".\Exporter.cpp"/> 440 <File 441 RelativePath=".\Exporter.h"/> 442 <File 443 RelativePath=".\FlexibleHeap.h"/> 444 <File 445 RelativePath=".\glInterface.h"/> 446 <File 447 RelativePath=".\GlobalLinesRenderer.cpp"/> 448 <File 449 RelativePath=".\GlobalLinesRenderer.h"/> 450 <File 451 RelativePath=".\GvsPreprocessor.cpp"/> 452 <File 453 RelativePath=".\GvsPreprocessor.h"/> 454 <File 455 RelativePath=".\GzBinFileInputStream.cpp"/> 456 <File 457 RelativePath=".\GzBinFileInputStream.h"/> 458 <File 459 RelativePath=".\GzFileInputSource.cpp"/> 460 <File 461 RelativePath=".\GzFileInputSource.h"/> 462 <File 463 RelativePath=".\gzstream.cpp"/> 464 <File 465 RelativePath=".\gzstream.h"/> 466 <File 467 RelativePath=".\Halton.cpp"/> 468 <File 469 RelativePath=".\Halton.h"/> 470 <File 471 RelativePath=".\HashPvs.h"/> 472 <File 473 RelativePath=".\HashPvs2.h"/> 474 <File 475 RelativePath=".\HierarchyManager.cpp"/> 476 <File 477 RelativePath=".\HierarchyManager.h"/> 478 <File 479 RelativePath=".\IntelRayCaster.cpp"/> 480 <File 481 RelativePath=".\IntelRayCaster.h"/> 482 <File 483 RelativePath=".\InternalRayCaster.cpp"/> 484 <File 485 RelativePath=".\InternalRayCaster.h"/> 486 <File 487 RelativePath=".\Intersectable.cpp"/> 488 <File 489 RelativePath=".\Intersectable.h"/> 490 <File 491 RelativePath=".\IntersectableWrapper.cpp"/> 492 <File 493 RelativePath=".\IntersectableWrapper.h"/> 494 <File 495 RelativePath=".\IntersectionBoundingBoxConverter.cpp"/> 496 <File 497 RelativePath=".\IntersectionBoundingBoxConverter.h"/> 498 <File 499 RelativePath=".\KdTree.cpp"/> 500 <File 501 RelativePath=".\KdTree.h"/> 502 <File 503 RelativePath=".\LogManager.cpp"/> 504 <File 505 RelativePath=".\LogManager.h"/> 506 <File 507 RelativePath=".\Material.cpp"/> 508 <File 509 RelativePath=".\Material.h"/> 510 <File 511 RelativePath=".\Matrix4x4.cpp"/> 512 <File 513 RelativePath=".\Matrix4x4.h"/> 514 <File 515 RelativePath=".\Timer\merror.cpp"/> 516 <File 517 RelativePath=".\Timer\merror.h"/> 518 <File 519 RelativePath=".\Mesh.cpp"/> 520 <File 521 RelativePath=".\Mesh.h"/> 522 <File 523 RelativePath=".\MeshKdTree.cpp"/> 524 <File 525 RelativePath=".\MeshKdTree.h"/> 526 <File 527 RelativePath=".\Timer\mstring.h"/> 528 <File 529 RelativePath=".\Mutation.cpp"/> 530 <File 531 RelativePath=".\Mutation.h"/> 532 <File 533 RelativePath=".\MutualVisibility.cpp"/> 534 <File 535 RelativePath=".\MutualVisibility.h"/> 536 <File 537 RelativePath=".\ObjectPvs.cpp"/> 538 <File 539 RelativePath=".\ObjectPvs.h"/> 540 <File 541 RelativePath=".\ObjectsParser.cpp"/> 542 <File 543 RelativePath=".\ObjectsParser.h"/> 544 <File 545 RelativePath=".\ObjExporter.cpp"/> 546 <File 547 RelativePath=".\ObjExporter.h"/> 548 <File 549 RelativePath=".\ObjParser.cpp"/> 550 <File 551 RelativePath=".\ObjParser.h"/> 552 <File 553 RelativePath=".\OcclusionQuery.cpp"/> 554 <File 555 RelativePath=".\OcclusionQuery.h"/> 556 <File 557 RelativePath=".\OspTree.cpp"/> 558 <File 559 RelativePath=".\OspTree.h"/> 560 <File 561 RelativePath=".\Parser.h"/> 562 <File 563 RelativePath=".\Timer\PerfTimer.h"/> 564 <File 565 RelativePath=".\Timer\PerfTimerSkeleton.h"/> 566 <File 567 RelativePath=".\Plane3.cpp"/> 568 <File 569 RelativePath=".\Plane3.h"/> 570 <File 571 RelativePath=".\ply.h"/> 572 <File 573 RelativePath=".\plyfile.c"/> 574 <File 575 RelativePath=".\PlyParser.cpp"/> 576 <File 577 RelativePath=".\PlyParser.h"/> 578 <File 579 RelativePath=".\Polygon3.cpp"/> 580 <File 581 RelativePath=".\Polygon3.h"/> 582 <File 583 RelativePath=".\Polytope.cpp"/> 584 <File 585 RelativePath=".\Polytope.h"/> 586 <File 587 RelativePath=".\Preprocessor.cpp"/> 588 <File 589 RelativePath=".\Preprocessor.h"> 590 <FileConfiguration 591 Name="Release|Win32"> 592 <Tool 593 Name="CustomTool" 594 Description="" 595 CommandLine="" 596 Outputs=""/> 597 </FileConfiguration> 598 <FileConfiguration 599 Name="mlrt|Win32"> 600 <Tool 601 Name="CustomTool" 602 Description="" 603 CommandLine="" 604 Outputs=""/> 605 </FileConfiguration> 606 <FileConfiguration 607 Name="Release_Internal|Win32"> 608 <Tool 609 Name="CustomTool" 610 Description="" 611 CommandLine="" 612 Outputs=""/> 613 </FileConfiguration> 614 <FileConfiguration 615 Name="Release Internal|Win32"> 616 <Tool 617 Name="CustomTool" 618 Description="" 619 CommandLine="" 620 Outputs=""/> 621 </FileConfiguration> 622 <FileConfiguration 623 Name="release_noqt|Win32"> 624 <Tool 625 Name="CustomTool" 626 Description="" 627 CommandLine="" 628 Outputs=""/> 629 </FileConfiguration> 630 <FileConfiguration 631 Name="Release_Qt|Win32"> 632 <Tool 633 Name="CustomTool" 634 Description="" 635 CommandLine="" 636 Outputs=""/> 637 </FileConfiguration> 1220 RelativePath=".\VTune\Preprocessor.vpj"> 638 1221 </File> 639 <File640 RelativePath=".\PreprocessorFactory.cpp"/>641 <File642 RelativePath=".\PreprocessorFactory.h"/>643 <File644 RelativePath=".\PreprocessorThread.cpp"/>645 <File646 RelativePath=".\PreprocessorThread.h">647 <FileConfiguration648 Name="Release|Win32">649 <Tool650 Name="CustomTool"651 Description=""652 CommandLine=""653 Outputs=""/>654 </FileConfiguration>655 <FileConfiguration656 Name="mlrt|Win32">657 <Tool658 Name="CustomTool"659 Description=""660 CommandLine=""661 Outputs=""/>662 </FileConfiguration>663 <FileConfiguration664 Name="Release_Internal|Win32">665 <Tool666 Name="CustomTool"667 Description=""668 CommandLine=""669 Outputs=""/>670 </FileConfiguration>671 <FileConfiguration672 Name="Release Internal|Win32">673 <Tool674 Name="CustomTool"675 Description=""676 CommandLine=""677 Outputs=""/>678 </FileConfiguration>679 <FileConfiguration680 Name="release_noqt|Win32">681 <Tool682 Name="CustomTool"683 Description=""684 CommandLine=""685 Outputs=""/>686 </FileConfiguration>687 <FileConfiguration688 Name="Release_Qt|Win32">689 <Tool690 Name="CustomTool"691 Description=""692 CommandLine=""693 Outputs=""/>694 </FileConfiguration>695 </File>696 <File697 RelativePath=".\Pvs.h"/>698 <File699 RelativePath=".\PvsBase.h"/>700 <File701 RelativePath=".\PvsDefinitions.h"/>702 <File703 RelativePath=".\Ray.cpp"/>704 <File705 RelativePath=".\Ray.h"/>706 <File707 RelativePath=".\RayCaster.cpp"/>708 <File709 RelativePath=".\RayCaster.h"/>710 <File711 RelativePath=".\RayInfo.cpp"/>712 <File713 RelativePath=".\RayInfo.h"/>714 <File715 RelativePath=".\Timer\RDTSCTimer.cpp"/>716 <File717 RelativePath=".\Timer\RDTSCTimer.h"/>718 <File719 RelativePath=".\Rectangle3.cpp"/>720 <File721 RelativePath=".\Rectangle3.h"/>722 <File723 RelativePath=".\RenderSampler.cpp"/>724 <File725 RelativePath=".\RenderSampler.h"/>726 <File727 RelativePath=".\RenderSimulator.cpp"/>728 <File729 RelativePath=".\RenderSimulator.h"/>730 <File731 RelativePath=".\RenderTexture.cpp"/>732 <File733 RelativePath=".\RenderTexture.h"/>734 <File735 RelativePath=".\ResourceManager.h"/>736 <File737 RelativePath=".\RssPreprocessor.cpp"/>738 <File739 RelativePath=".\RssPreprocessor.h"/>740 <File741 RelativePath=".\RssTree.cpp"/>742 <File743 RelativePath=".\RssTree.h"/>744 <File745 RelativePath=".\SamplingPreprocessor.cpp"/>746 <File747 RelativePath=".\SamplingPreprocessor.h"/>748 <File749 RelativePath=".\SamplingStrategy.cpp"/>750 <File751 RelativePath=".\SamplingStrategy.h"/>752 <File753 RelativePath=".\SceneGraph.cpp"/>754 <File755 RelativePath=".\SceneGraph.h"/>756 <File757 RelativePath=".\Statistics.h"/>758 <File759 RelativePath=".\SubdivisionCandidate.cpp"/>760 <File761 RelativePath=".\SubdivisionCandidate.h"/>762 <File763 RelativePath=".\Tetrahedron3.cpp"/>764 <File765 RelativePath=".\Tetrahedron3.h"/>766 <File767 RelativePath=".\Trackball.cpp"/>768 <File769 RelativePath=".\Trackball.h"/>770 <File771 RelativePath=".\TraversalTree.cpp"/>772 <File773 RelativePath=".\TraversalTree.h"/>774 <File775 RelativePath=".\Triangle3.cpp"/>776 <File777 RelativePath=".\Triangle3.h"/>778 <File779 RelativePath=".\UnigraphicsParser.cpp"/>780 <File781 RelativePath=".\UnigraphicsParser.h"/>782 <File783 RelativePath=".\Vector3.cpp"/>784 <File785 RelativePath=".\Vector3.h"/>786 <File787 RelativePath=".\ViewCell.cpp"/>788 <File789 RelativePath=".\ViewCell.h"/>790 <File791 RelativePath=".\ViewCellBsp.cpp"/>792 <File793 RelativePath=".\ViewCellBsp.h"/>794 <File795 RelativePath=".\ViewCellsManager.cpp"/>796 <File797 RelativePath=".\ViewCellsManager.h"/>798 <File799 RelativePath=".\ViewCellsParser.cpp"/>800 <File801 RelativePath=".\ViewCellsParser.h"/>802 <File803 RelativePath=".\ViewCellsParserXerces.h"/>804 <File805 RelativePath=".\VrmlExporter.cpp"/>806 <File807 RelativePath=".\VrmlExporter.h"/>808 <File809 RelativePath=".\VspBspTree.cpp"/>810 <File811 RelativePath=".\VspBspTree.h"/>812 <File813 RelativePath=".\VspTree.cpp"/>814 <File815 RelativePath=".\VspTree.h"/>816 <File817 RelativePath=".\VssPreprocessor.cpp"/>818 <File819 RelativePath=".\VssPreprocessor.h"/>820 <File821 RelativePath=".\VssRay.cpp"/>822 <File823 RelativePath=".\VssRay.h"/>824 <File825 RelativePath=".\VssTree.cpp"/>826 <File827 RelativePath=".\VssTree.h"/>828 <File829 RelativePath=".\X3dExporter.cpp"/>830 <File831 RelativePath=".\X3dExporter.h"/>832 <File833 RelativePath=".\X3dParser.cpp"/>834 <File835 RelativePath=".\X3dParser.h"/>836 <File837 RelativePath="..\include\AxisAlignedBox3.h"/>838 <File839 RelativePath="..\include\Containers.h"/>840 <File841 RelativePath="..\include\ExactPreprocessor.h"/>842 <File843 RelativePath="..\include\KdTree.h"/>844 <File845 RelativePath="..\include\Mesh.h"/>846 <File847 RelativePath="..\include\Plane3.h"/>848 <File849 RelativePath="..\include\Preprocessor.h"/>850 <File851 RelativePath="..\include\SamplingPreprocessor.h"/>852 <File853 RelativePath="..\include\SceneGraph.h"/>854 <File855 RelativePath="..\include\Vector3.h"/>856 <File857 RelativePath="..\include\ViewCell.h"/>858 <File859 RelativePath=".\X3dParserXerces.h"/>860 <File861 RelativePath=".\GlRenderer.cpp"/>862 <File863 RelativePath=".\GlRenderer.h"/>864 <File865 RelativePath=".\Renderer.cpp"/>866 <File867 RelativePath=".\Renderer.h"/>868 <File869 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_adapters.hpp"/>870 <File871 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_benchmark.hpp"/>872 <File873 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_bool_stack.hpp"/>874 <File875 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_dictionary.hpp"/>876 <File877 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_fft.hpp"/>878 <File879 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_fft_test.hpp"/>880 <File881 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_functions.hpp"/>882 <File883 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_generators.hpp"/>884 <File885 RelativePath=".\ootl\src\include\ootl\ootl_hash.hpp"/>886 <File887 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_iterable.hpp"/>888 <File889 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_iterators.hpp"/>890 <File891 RelativePath=".\ootl\src\include\ootl\ootl_list.hpp"/>892 <File893 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_map.hpp"/>894 <File895 RelativePath=".\ootl\src\include\ootl\ootl_misc.hpp"/>896 <File897 RelativePath=".\ootl\src\include\ootl\mswin\ootl_mswin.hpp"/>898 <File899 RelativePath=".\ootl\src\include\ootl\mswin\ootl_mswin_console.hpp"/>900 <File901 RelativePath=".\ootl\src\include\ootl\mswin\ootl_mswin_gdi.hpp"/>902 <File903 RelativePath=".\ootl\src\include\ootl\mswin\ootl_mswin_simple_win.hpp"/>904 <File905 RelativePath=".\ootl\src\include\ootl\ootl_object.hpp"/>906 <File907 RelativePath=".\ootl\src\include\ootl\ootl_output.hpp"/>908 <File909 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_polar.hpp"/>910 <File911 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_predicate.hpp"/>912 <File913 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_procedure.hpp"/>914 <File915 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_ptr.hpp"/>916 <File917 RelativePath=".\ootl\src\include\ootl\ootl_stack.hpp"/>918 <File919 RelativePath=".\ootl\src\include\ootl\ootl_string.hpp"/>920 <File921 RelativePath=".\ootl\src\include\ootl\ootl_string_utils.hpp"/>922 <File923 RelativePath=".\ootl\src\include\ootl\ootl_tester.hpp"/>924 <File925 RelativePath=".\ootl\src\include\ootl\ootl_timer.hpp"/>926 <File927 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_valarray.hpp"/>928 <File929 RelativePath=".\ootl\src\include\ootl\ootl_vlist.hpp"/>930 <File931 RelativePath=".\sparsehash\src\google\sparsehash\config.h"/>932 <File933 RelativePath=".\sparsehash\src\google\dense_hash_map"/>934 <File935 RelativePath=".\sparsehash\src\google\dense_hash_set"/>936 <File937 RelativePath=".\sparsehash\src\google\sparsehash\densehashtable.h"/>938 <File939 RelativePath=".\sparsehash\src\google\sparsehash\hash_fun.h"/>940 <File941 RelativePath=".\sparsehash\src\windows\hash_fun.h"/>942 <File943 RelativePath=".\sparsehash\src\windows\hash_map.h"/>944 <File945 RelativePath=".\sparsehash\src\google\sparse_hash_map"/>946 <File947 RelativePath=".\sparsehash\src\google\sparse_hash_set"/>948 <File949 RelativePath=".\sparsehash\src\google\sparsehash\sparsehashtable.h"/>950 <File951 RelativePath=".\sparsehash\src\google\sparsetable"/>952 <File953 RelativePath=".\sparsehash\src\windows\stl_hash_fun.h"/>954 <File955 RelativePath=".\VTune\Preprocessor.vpj"/>956 1222 </Files> 957 1223 </VisualStudioProject> -
GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.vcproj
r2232 r2233 207 207 Name="Release Internal|Win32" 208 208 OutputDirectory="..\libRelease" 209 IntermediateDirectory=".. .\obj\Release"209 IntermediateDirectory="..\obj\Release" 210 210 ConfigurationType="4" 211 211 CharacterSet="2"> … … 1168 1168 </File> 1169 1169 <File 1170 RelativePath=".\sparsehash\src\windows\hash_fun.h"> 1171 </File> 1172 <File 1170 1173 RelativePath=".\sparsehash\src\google\sparsehash\hash_fun.h"> 1171 </File>1172 <File1173 RelativePath=".\sparsehash\src\windows\hash_fun.h">1174 1174 </File> 1175 1175 <File -
GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.vcproj
r2232 r2233 215 215 Name="VCLinkerTool" 216 216 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 QtCore4.lib qtmain.lib cg.lib cgGL.lib QtOpenGL4.lib Qt3Support4.lib QtTest4.lib QtGui4.lib QtInterface.lib" 217 OutputFile="../bin/release/Preprocessor 2.exe"217 OutputFile="../bin/release/Preprocessor.exe" 218 218 LinkIncremental="1" 219 219 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;"$(QTDIR)\lib";.\QtInterface\Release;"$(CG_LIB_PATH)"" -
GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp
r2124 r2233 1277 1277 1278 1278 // only count termination objects? 1279 if (COUNT_ORIGIN_OBJECTS && ray->mOriginObject) 1279 #if COUNT_ORIGIN_OBJECTS 1280 1281 if (ray->mOriginObject) 1280 1282 { 1281 1283 if (vc->AddPvsSample(ray->mOriginObject, ray->mPdf, contribution)) … … 1284 1286 sc += contribution; 1285 1287 } 1286 1288 #endif 1287 1289 sampleContributions += sc; 1288 1290 … … 1402 1404 Intersectable *tObject = (*ri).mRay->mTerminationObject; 1403 1405 1404 if (COUNT_ORIGIN_OBJECTS && oObject) 1406 #if COUNT_ORIGIN_OBJECTS 1407 1408 if (oObject) 1405 1409 { 1406 1410 if (!oObject->Mailed()) … … 1414 1418 } 1415 1419 } 1420 #endif 1416 1421 1417 1422 if (tObject) … … 1444 1449 case SortableEntry::ERayMin: 1445 1450 { 1446 if (COUNT_ORIGIN_OBJECTS && oObject && !oObject->Mailed()) 1451 #if COUNT_ORIGIN_OBJECTS 1452 if (oObject && !oObject->Mailed()) 1447 1453 { 1448 1454 oObject->Mail(); 1449 1455 ++ pvsl; 1450 1456 } 1451 1457 #endif 1452 1458 if (tObject && !tObject->Mailed()) 1453 1459 { … … 1460 1466 case SortableEntry::ERayMax: 1461 1467 { 1462 if (COUNT_ORIGIN_OBJECTS && oObject) 1468 #if COUNT_ORIGIN_OBJECTS 1469 if (oObject) 1463 1470 { 1464 1471 if (-- oObject->mCounter == 0) 1465 1472 -- pvsr; 1466 1473 } 1467 1474 #endif 1468 1475 if (tObject) 1469 1476 { … … 1996 2003 AddObjToPvs(ray->mTerminationObject, cf, pvsFront, pvsBack, totalPvs); 1997 2004 1998 if (COUNT_ORIGIN_OBJECTS) 1999 { 2000 AddObjToPvs(ray->mOriginObject, cf, pvsFront, pvsBack, totalPvs); 2001 } 2005 #if COUNT_ORIGIN_OBJECTS 2006 AddObjToPvs(ray->mOriginObject, cf, pvsFront, pvsBack, totalPvs); 2007 #endif 2002 2008 } 2003 2009 … … 2107 2113 AddObjToPvs(ray->mTerminationObject, cf, pvsFront, pvsBack, totalPvs); 2108 2114 2109 if (COUNT_ORIGIN_OBJECTS) 2110 { 2111 AddObjToPvs(ray->mOriginObject, cf, pvsFront, pvsBack, totalPvs); 2112 } 2115 #if COUNT_ORIGIN_OBJECTS 2116 AddObjToPvs(ray->mOriginObject, cf, pvsFront, pvsBack, totalPvs); 2117 #endif 2113 2118 } 2114 2119 … … 2296 2301 AddObjToPvs((*rit).mRay->mTerminationObject, side, pvsFront, pvsBack, pvsTotal); 2297 2302 2298 if (COUNT_ORIGIN_OBJECTS) 2299 { 2300 AddObjToPvs((*rit).mRay->mOriginObject, side, pvsFront, pvsBack, pvsTotal); 2301 } 2303 #if COUNT_ORIGIN_OBJECTS 2304 AddObjToPvs((*rit).mRay->mOriginObject, side, pvsFront, pvsBack, pvsTotal); 2305 #endif 2302 2306 } 2303 2307 … … 3377 3381 VssRay *ray = (*rit).mRay; 3378 3382 3379 if (COUNT_ORIGIN_OBJECTS && ray->mOriginObject) 3383 #if COUNT_ORIGIN_OBJECTS 3384 if (ray->mOriginObject) 3380 3385 { 3381 3386 if (!ray->mOriginObject->Mailed()) … … 3385 3390 } 3386 3391 } 3387 3392 #endif 3388 3393 if (ray->mTerminationObject) 3389 3394 { -
GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp
r2231 r2233 1412 1412 1413 1413 const int leaves = mVspStats.Leaves(); 1414 const bool showViz = ( (axis == 0) && (leaves == 500));1414 const bool showViz = (leaves % 30 == 0); 1415 1415 1416 1416 if (showViz) 1417 1417 { 1418 //cout << "========================== exporting split ===================" << endl; 1419 1418 1420 Exporter *exporter; 1419 1421 1420 exporter = Exporter::GetExporter("split.wrl"); 1422 char str[64]; sprintf(str, "vc-%04d_%d.wrl", leaves, axis); 1423 1424 exporter = Exporter::GetExporter(str); 1425 1426 Material m; 1427 m.mDiffuseColor.r = 1.0f; 1428 m.mDiffuseColor.g = 0.0f; 1429 m.mDiffuseColor.b = 0.0f; 1430 1431 exporter->SetForcedMaterial(m); 1421 1432 exporter->SetWireframe(); 1422 1433 1423 1434 exporter->ExportBox(tData.mBoundingBox); 1424 1435 1436 exporter->ResetForcedMaterial(); 1437 1425 1438 RayInfoContainer::const_iterator rit, rit_end = tData.mRays->end(); 1426 1439 1427 1440 exporter->SetFilled(); 1428 1441 1442 m.mDiffuseColor.r = 0.0f; 1443 m.mDiffuseColor.g = 1.0f; 1444 m.mDiffuseColor.b = 0.0f; 1445 1446 exporter->SetForcedMaterial(m); 1447 1448 // create unique ids for pvs heuristics 1449 Intersectable::NewMail(3); 1450 1451 float a = 0, b = 0, c = 0; 1452 1453 // this is the main ray classification loop! 1454 for(rit = tData.mRays->begin(); rit != rit_end; ++ rit) 1455 { 1456 VssRay *ray = (*rit).mRay; 1457 1458 // determine the side of this ray with respect to the plane 1459 float t; 1460 const int side = (*rit).ComputeRayIntersection(axis, position, t); 1461 1462 UpdateContributionsToPvs(*ray, true, side, a, b, c); 1463 UpdateContributionsToPvs(*ray, false, side, a, b, c); 1464 } 1465 1466 1429 1467 for (rit = tData.mRays->begin(); rit != rit_end; ++ rit) 1430 1468 { 1431 1469 RayInfo rayInf = *rit; 1432 1470 1433 1471 // export objects 1434 1472 VssRay *ray = rayInf.mRay; 1435 1473 BvhLeaf *leaf = mBvHierarchy->GetLeaf(ray->mTerminationObject); 1474 1475 //left and right 1476 if (leaf->Mailed(2)) 1477 { 1478 m.mDiffuseColor.r = 0.0f; 1479 m.mDiffuseColor.g = 1.0f; 1480 m.mDiffuseColor.b = 1.0f; 1481 } 1482 else if (leaf->Mailed(1)) // only right 1483 { 1484 m.mDiffuseColor.r = 0.0f; 1485 m.mDiffuseColor.g = 1.0f; 1486 m.mDiffuseColor.b = 0.0f; 1487 } 1488 else // left 1489 { 1490 m.mDiffuseColor.r = 0.0f; 1491 m.mDiffuseColor.g = 0.0f; 1492 m.mDiffuseColor.b = 1.0f; 1493 } 1494 1495 exporter->SetForcedMaterial(m); 1496 1436 1497 exporter->ExportIntersectable(leaf); 1437 1498 1438 1499 } 1439 1500 1501 m.mDiffuseColor.r = 1.0f; 1502 m.mDiffuseColor.g = 0.0f; 1503 m.mDiffuseColor.b = 1.0f; 1504 1505 exporter->SetForcedMaterial(m); 1440 1506 AxisAlignedBox3 vizPlaneBox; 1441 1507 vizPlaneBox = tData.mBoundingBox; 1442 1508 1443 Vector3 scale(1, 1, 1); scale[axis] = 0.05f; 1444 vizPlaneBox.Scale(scale); 1509 vizPlaneBox.SetMin(axis, position - 0.01); 1510 vizPlaneBox.SetMax(axis, position + 0.01); 1511 1445 1512 exporter->ExportBox(vizPlaneBox); 1446 1513 … … 1737 1804 const float renderCost = mViewCellsManager->EvalRenderCost(obj); 1738 1805 1739 // object in no pvs => new1806 // object in none of the pvss => new object 1740 1807 if (!obj->Mailed() && !obj->Mailed(1) && !obj->Mailed(2)) 1741 1808 { … … 2312 2379 2313 2380 { 2314 Intersectable *obj; 2315 Vector3 pt; 2316 KdNode *node; 2317 2318 ray.GetSampleData(isTermination, pt, &obj, &node); 2319 if (!obj) return 0; 2320 2321 switch(mHierarchyManager->GetObjectSpaceSubdivisionType()) 2322 { 2323 case HierarchyManager::NO_OBJ_SUBDIV: 2381 2382 #if HACK_PERFORMANCE 2383 2384 BvhLeaf *bvhleaf = mBvHierarchy->GetLeaf(mTerminationObject); 2385 2386 if (!bvhleaf->Mailed()) 2387 { 2388 bvhleaf->Mail(); 2389 return 1; 2390 } 2391 #else 2392 Intersectable *obj; 2393 Vector3 pt; 2394 KdNode *node; 2395 2396 ray.GetSampleData(isTermination, pt, &obj, &node); 2397 2398 if (!obj) return 0; 2399 2400 switch(mHierarchyManager->GetObjectSpaceSubdivisionType()) 2401 { 2402 case HierarchyManager::NO_OBJ_SUBDIV: 2324 2403 { 2325 2404 if (!obj->Mailed()) … … 2328 2407 return 1; 2329 2408 } 2330 2409 2331 2410 return 0; 2332 2411 } 2333 2412 2334 2413 case HierarchyManager::KD_BASED_OBJ_SUBDIV: 2335 2414 { 2336 2415 KdLeaf *leaf = mHierarchyManager->mOspTree->GetLeaf(pt, node); … … 2340 2419 return 1; 2341 2420 } 2342 2421 2343 2422 return 0; 2344 2423 } … … 2352 2431 return 1; 2353 2432 } 2354 2433 2355 2434 return 0; 2356 2435 } … … 2358 2437 break; 2359 2438 } 2360 2439 #endif 2361 2440 return 0; 2362 2441 } … … 3004 3083 const bool onlyUnmailed) const 3005 3084 { 3085 3086 #if HACK_PERFORMANCE 3087 3088 SubdivisionCandidate *candidate; 3089 3090 BvhLeaf *leaf = mBvHierarchy->GetLeaf(ray.mTerminationObject); 3091 3092 if (!leaf->Mailed()) 3093 { 3094 leaf->Mail(); 3095 candidate = leaf->GetSubdivisionCandidate(); 3096 } 3097 else 3098 { 3099 candidate = NULL; 3100 } 3101 #else 3102 3103 SubdivisionCandidate *candidate = NULL; 3006 3104 3007 3105 Intersectable *obj; … … 3012 3110 3013 3111 if (!obj) return; 3014 3015 SubdivisionCandidate *candidate = NULL; 3016 3112 3017 3113 switch (mHierarchyManager->GetObjectSpaceSubdivisionType()) 3018 3114 { … … 3044 3140 break; 3045 3141 } 3142 #endif 3046 3143 3047 3144 // is this leaf still a split candidate? … … 3081 3178 const bool isTermination) const 3082 3179 { 3180 int pvs = 0; 3181 3182 #if HACK_PERFORMANCE 3183 3184 BvhLeaf *leaf = mBvHierarchy->GetLeaf(ray.mTerminationObject); 3185 3186 // simple render cost evaluation 3187 if (-- leaf->mCounter == 0) 3188 //pvs += (int)leaf->mObjects.size(); 3189 pvs += mBvHierarchy::EvalAbsCost((int)leaf->mObjects.size()); 3190 3191 #else 3192 3083 3193 Intersectable *obj; 3084 3194 Vector3 pt; … … 3087 3197 ray.GetSampleData(isTermination, pt, &obj, &node); 3088 3198 3089 if (!obj) 3090 return 0; 3091 3092 int pvs = 0; 3199 if (!obj) return 0; 3093 3200 3094 3201 switch (mHierarchyManager->GetObjectSpaceSubdivisionType()) … … 3111 3218 { 3112 3219 BvhLeaf *leaf = mBvHierarchy->GetLeaf(obj); 3113 3220 3221 // simple render cost evaluation 3114 3222 if (-- leaf->mCounter == 0) 3115 3223 pvs += (int)leaf->mObjects.size(); 3224 //pvs += (int)BvHierarchy::EvalAbsCost(leaf->mObjects); 3116 3225 break; 3117 3226 } … … 3119 3228 break; 3120 3229 } 3121 3230 #endif 3122 3231 return pvs; 3123 3232 } … … 3127 3236 { 3128 3237 float pvsSize = 0; 3238 3239 #if HACK_PERFORMANCE 3240 BvhLeaf *leaf = mBvHierarchy->GetLeaf(ray.mTerminationObject); 3241 3242 if (!leaf->Mailed()) 3243 { 3244 leaf->Mail(); 3245 leaf->mCounter = 0; 3246 pvsSize += (int)leaf->mObjects.size(); 3247 } 3248 3249 ++ leaf->mCounter; 3250 3251 #else 3129 3252 3130 3253 Intersectable *obj; … … 3134 3257 ray.GetSampleData(isTermination, pt, &obj, &node); 3135 3258 3136 if (!obj) 3137 return 0; 3259 if (!obj) return 0; 3138 3260 3139 3261 switch (mHierarchyManager->GetObjectSpaceSubdivisionType()) … … 3174 3296 break; 3175 3297 } 3176 3298 #endif 3177 3299 return pvsSize; 3178 3300 } … … 3182 3304 const bool isTermination) const 3183 3305 { 3306 #if HACK_PERFORMANCE 3307 3308 BvhLeaf *leaf = mBvHierarchy->GetLeaf(ray.mTerminationObject); 3309 3310 if (!leaf->Mailed()) 3311 { 3312 leaf->Mail(); 3313 pvs += (int)leaf->mObjects.size(); 3314 } 3315 3316 #else 3317 3184 3318 Intersectable *obj; 3185 3319 Vector3 pt; … … 3223 3357 break; 3224 3358 } 3225 3359 #endif 3226 3360 return pvs; 3227 3361 } … … 3235 3369 float &totalPvs) const 3236 3370 { 3371 #if HACK_PERFORMANCE 3372 3373 BvhLeaf *leaf = mBvHierarchy->GetLeaf(ray.mTerminationObject); 3374 UpdateContributionsToPvs(leaf, cf, frontPvs, backPvs, totalPvs, false); 3375 3376 #else 3377 3237 3378 Intersectable *obj; 3238 3379 Vector3 pt; … … 3264 3405 } 3265 3406 } 3407 #endif 3266 3408 } 3267 3409 … … 3273 3415 float &pvsBack, 3274 3416 float &totalPvs) const 3275 { 3417 { 3418 #if HACK_PERFORMANCE 3419 3420 BvhLeaf *leaf = mBvHierarchy->GetLeaf(ray.mTerminationObject); 3421 UpdateContributionsToPvs(leaf, cf, pvsFront, pvsBack, totalPvs, true); 3422 3423 3424 #else 3425 3276 3426 Intersectable *obj; 3277 3427 Vector3 pt; … … 3296 3446 break; 3297 3447 } 3448 #endif 3298 3449 } 3299 3450 3300 3451 3301 3452 int VspTree::EvalContributionToPvs(const VssRay &ray, const bool isTermination) const 3302 { 3453 { 3454 3455 #if HACK_PERFORMANCE 3456 int pvs = 0; 3457 3458 BvhLeaf *bvhleaf = mBvHierarchy->GetLeaf(ray.mTerminationObject); 3459 3460 if (!bvhleaf->Mailed()) 3461 { 3462 bvhleaf->Mail(); 3463 pvs += (int)bvhleaf->mObjects.size(); 3464 } 3465 3466 #else 3467 3303 3468 Intersectable *obj; 3304 3469 Vector3 pt; … … 3342 3507 break; 3343 3508 } 3344 3509 #endif 3345 3510 return pvs; 3346 3511 } -
GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.h
r2228 r2233 523 523 } 524 524 525 bool Apply(SplitQueue &splitQueue, bool terminationCriteriaMet, SubdivisionCandidateContainer &dirtyList) 525 bool Apply(SplitQueue &splitQueue, 526 bool terminationCriteriaMet, 527 SubdivisionCandidateContainer &dirtyList) 526 528 { 527 529 VspNode *n = sVspTree->Subdivide(splitQueue, this, terminationCriteriaMet); … … 921 923 /** Evaluates contribution of max event to pvs 922 924 */ 923 inline int EvalMaxEventContribution( 924 const VssRay &ray, const bool isTermination) const; 925 inline int EvalMaxEventContribution(const VssRay &ray, const bool isTermination) const; 925 926 926 927 /** Evaluates contribution of kd leaf when encountering a min event 927 928 */ 928 929 inline int EvalMinEventContribution(KdLeaf *leaf) const; 930 929 931 /** Evaluates contribution of kd leaf when encountering a max event 930 932 */ -
GTP/trunk/Lib/Vis/Preprocessing/src/VssRay.h
r2176 r2233 252 252 253 253 }; 254 254 255 255 256 inline void VssRay::GetSampleData(const bool isTermination, … … 272 273 } 273 274 275 274 276 void 275 277 GenerateExtendedConvexCombinationWeights(float &w1,
Note: See TracChangeset
for help on using the changeset viewer.
