Changeset 1232 for GTP/trunk/Lib/Vis
- Timestamp:
- 08/19/06 13:48:51 (18 years ago)
- Location:
- GTP/trunk/Lib/Vis
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/Lib/Vis/GtpVisibility.sln
r1225 r1232 1 1 Microsoft Visual Studio Solution File, Format Version 8.00 2 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = " Preprocessor", "..\..\Preprocessing\scripts\Preprocessor.vcproj", "{EABCE292-D598-4600-A1C9-2591E7D62FDA}"2 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EvalStats", "Preprocessing\EvalStats\EvalStats.vcproj", "{935D1BDD-41B0-49F1-A86C-EB49B94DDB20}" 3 3 ProjectSection(ProjectDependencies) = postProject 4 4 EndProjectSection 5 5 EndProject 6 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GtpVisibility", "..\..\OnlineCullingCHC\scripts\GtpVisibility.vcproj", "{101A7691-74F3-48B4-96A3-CF35578F5900}" 7 ProjectSection(ProjectDependencies) = postProject 8 {EABCE292-D598-4600-A1C9-2591E7D62FDA} = {EABCE292-D598-4600-A1C9-2591E7D62FDA} 9 EndProjectSection 10 EndProject 11 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCullingTerrain", "..\..\..\..\App\Demos\Vis\HillyTerrain\OGRE\TestCullingTerrain.vcproj", "{248F19A6-2FE0-4F5D-8928-E0EA10609887}" 12 ProjectSection(ProjectDependencies) = postProject 13 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436} = {80DECC17-BDDD-4412-8CF8-F7C1C17A7436} 14 {101A7691-74F3-48B4-96A3-CF35578F5900} = {101A7691-74F3-48B4-96A3-CF35578F5900} 15 {7319E499-473D-4CE5-9983-725D6E68A55D} = {7319E499-473D-4CE5-9983-725D6E68A55D} 16 EndProjectSection 17 EndProject 18 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_VisibilitySceneManager", "..\..\OnlineCullingCHC\OGRE\scripts\Plugin_VisibilitySceneManager.vcproj", "{80DECC17-BDDD-4412-8CF8-F7C1C17A7436}" 19 ProjectSection(ProjectDependencies) = postProject 20 {101A7691-74F3-48B4-96A3-CF35578F5900} = {101A7691-74F3-48B4-96A3-CF35578F5900} 21 EndProjectSection 22 EndProject 23 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EvalStats", "..\EvalStats\EvalStats.vcproj", "{935D1BDD-41B0-49F1-A86C-EB49B94DDB20}" 6 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GtpVisibility", "OnlineCullingCHC\src\GtpVisibility.vcproj", "{101A7691-74F3-48B4-96A3-CF35578F5900}" 24 7 ProjectSection(ProjectDependencies) = postProject 25 8 EndProjectSection 26 9 EndProject 27 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestPreprocessor", "..\..\Preprocessing\scripts\TestPreprocessor.vcproj", "{69BC58F0-C7EB-4B43-B782-B6F047EF0528}" 28 ProjectSection(ProjectDependencies) = postProject 29 {EABCE292-D598-4600-A1C9-2591E7D62FDA} = {EABCE292-D598-4600-A1C9-2591E7D62FDA} 30 EndProjectSection 31 EndProject 32 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IVReader", "..\..\OnlineCullingCHC\IVReader\scripts\IVReader.vcproj", "{7319E499-473D-4CE5-9983-725D6E68A55D}" 10 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IVReader", "OnlineCullingCHC\IVReader\src\IVReader.vcproj", "{7319E499-473D-4CE5-9983-725D6E68A55D}" 33 11 ProjectSection(ProjectDependencies) = postProject 34 12 EndProjectSection 35 13 EndProject 36 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = " TestKdTree", "..\..\..\..\App\Demos\Vis\KdTreeDemo\OGRE\scripts\TestKdTree.vcproj", "{17F2C6F9-6101-430E-ABF4-71383868EF24}"14 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_VisibilitySceneManager", "OnlineCullingCHC\OGRE\src\Plugin_VisibilitySceneManager.vcproj", "{80DECC17-BDDD-4412-8CF8-F7C1C17A7436}" 37 15 ProjectSection(ProjectDependencies) = postProject 38 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436} = {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}39 {7319E499-473D-4CE5-9983-725D6E68A55D} = {7319E499-473D-4CE5-9983-725D6E68A55D}40 16 EndProjectSection 41 17 EndProject 42 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MultiLevelRayTracing", "..\..\Preprocessing\MultiLevelRayTracing\MultiLevelRayTracing.vcproj", "{F72B85F3-FA3A-4939-8196-596B1250B36E}" 18 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Preprocessor", "Preprocessing\src\Preprocessor.vcproj", "{EABCE292-D598-4600-A1C9-2591E7D62FDA}" 19 ProjectSection(ProjectDependencies) = postProject 20 EndProjectSection 21 EndProject 22 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestPreprocessor", "Preprocessing\src\TestPreprocessor.vcproj", "{69BC58F0-C7EB-4B43-B782-B6F047EF0528}" 23 ProjectSection(ProjectDependencies) = postProject 24 EndProjectSection 25 EndProject 26 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCullingTerrain", "..\..\App\Demos\Vis\HillyTerrain\OGRE\TestCullingTerrain.vcproj", "{248F19A6-2FE0-4F5D-8928-E0EA10609887}" 27 ProjectSection(ProjectDependencies) = postProject 28 EndProjectSection 29 EndProject 30 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestKdTree", "..\..\App\Demos\Vis\KdTreeDemo\OGRE\scripts\TestKdTree.vcproj", "{17F2C6F9-6101-430E-ABF4-71383868EF24}" 43 31 ProjectSection(ProjectDependencies) = postProject 44 32 EndProjectSection … … 52 40 EndGlobalSection 53 41 GlobalSection(ProjectConfiguration) = postSolution 42 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Debug.ActiveCfg = Debug|Win32 43 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Debug.Build.0 = Debug|Win32 44 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Debug Static.ActiveCfg = Debug|Win32 45 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Debug Static.Build.0 = Debug|Win32 46 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Release.ActiveCfg = Release|Win32 47 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Release.Build.0 = Release|Win32 48 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Release Static.ActiveCfg = Release|Win32 49 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Release Static.Build.0 = Release|Win32 50 {101A7691-74F3-48B4-96A3-CF35578F5900}.Debug.ActiveCfg = Debug|Win32 51 {101A7691-74F3-48B4-96A3-CF35578F5900}.Debug.Build.0 = Debug|Win32 52 {101A7691-74F3-48B4-96A3-CF35578F5900}.Debug Static.ActiveCfg = Debug|Win32 53 {101A7691-74F3-48B4-96A3-CF35578F5900}.Debug Static.Build.0 = Debug|Win32 54 {101A7691-74F3-48B4-96A3-CF35578F5900}.Release.ActiveCfg = Release|Win32 55 {101A7691-74F3-48B4-96A3-CF35578F5900}.Release.Build.0 = Release|Win32 56 {101A7691-74F3-48B4-96A3-CF35578F5900}.Release Static.ActiveCfg = Release|Win32 57 {101A7691-74F3-48B4-96A3-CF35578F5900}.Release Static.Build.0 = Release|Win32 58 {7319E499-473D-4CE5-9983-725D6E68A55D}.Debug.ActiveCfg = Debug|Win32 59 {7319E499-473D-4CE5-9983-725D6E68A55D}.Debug.Build.0 = Debug|Win32 60 {7319E499-473D-4CE5-9983-725D6E68A55D}.Debug Static.ActiveCfg = Debug|Win32 61 {7319E499-473D-4CE5-9983-725D6E68A55D}.Debug Static.Build.0 = Debug|Win32 62 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release.ActiveCfg = Release|Win32 63 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release.Build.0 = Release|Win32 64 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release Static.ActiveCfg = Release|Win32 65 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release Static.Build.0 = Release|Win32 66 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Debug.ActiveCfg = Debug|Win32 67 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Debug.Build.0 = Debug|Win32 68 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Debug Static.ActiveCfg = Debug|Win32 69 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Debug Static.Build.0 = Debug|Win32 70 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release.ActiveCfg = Release|Win32 71 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release.Build.0 = Release|Win32 72 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release Static.ActiveCfg = Release|Win32 73 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release Static.Build.0 = Release|Win32 54 74 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Debug.ActiveCfg = Debug|Win32 55 75 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Debug.Build.0 = Debug|Win32 … … 60 80 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Release Static.ActiveCfg = Release|Win32 61 81 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Release Static.Build.0 = Release|Win32 62 { 101A7691-74F3-48B4-96A3-CF35578F5900}.Debug.ActiveCfg = Debug|Win3263 { 101A7691-74F3-48B4-96A3-CF35578F5900}.Debug.Build.0 = Debug|Win3264 { 101A7691-74F3-48B4-96A3-CF35578F5900}.Debug Static.ActiveCfg = Debug|Win3265 { 101A7691-74F3-48B4-96A3-CF35578F5900}.Debug Static.Build.0 = Debug|Win3266 { 101A7691-74F3-48B4-96A3-CF35578F5900}.Release.ActiveCfg = Release|Win3267 { 101A7691-74F3-48B4-96A3-CF35578F5900}.Release.Build.0 = Release|Win3268 { 101A7691-74F3-48B4-96A3-CF35578F5900}.Release Static.ActiveCfg = Release|Win3269 { 101A7691-74F3-48B4-96A3-CF35578F5900}.Release Static.Build.0 = Release|Win3282 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Debug.ActiveCfg = Debug|Win32 83 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Debug.Build.0 = Debug|Win32 84 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Debug Static.ActiveCfg = Debug|Win32 85 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Debug Static.Build.0 = Debug|Win32 86 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release.ActiveCfg = Release|Win32 87 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release.Build.0 = Release|Win32 88 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release Static.ActiveCfg = Release|Win32 89 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release Static.Build.0 = Release|Win32 70 90 {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Debug.ActiveCfg = Debug|Win32 71 91 {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Debug.Build.0 = Debug|Win32 … … 76 96 {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Release Static.ActiveCfg = Release|Win32 77 97 {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Release Static.Build.0 = Release|Win32 78 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Debug.ActiveCfg = Debug|Win3279 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Debug.Build.0 = Debug|Win3280 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Debug Static.ActiveCfg = Debug|Win3281 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Debug Static.Build.0 = Debug|Win3282 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release.ActiveCfg = Release|Win3283 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release.Build.0 = Release|Win3284 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release Static.ActiveCfg = Release|Win3285 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release Static.Build.0 = Release|Win3286 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Debug.ActiveCfg = Debug|Win3287 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Debug.Build.0 = Debug|Win3288 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Debug Static.ActiveCfg = Debug|Win3289 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Debug Static.Build.0 = Debug|Win3290 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Release.ActiveCfg = Release|Win3291 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Release.Build.0 = Release|Win3292 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Release Static.ActiveCfg = Release|Win3293 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Release Static.Build.0 = Release|Win3294 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Debug.ActiveCfg = Debug|Win3295 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Debug.Build.0 = Debug|Win3296 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Debug Static.ActiveCfg = Debug|Win3297 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Debug Static.Build.0 = Debug|Win3298 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release.ActiveCfg = Release|Win3299 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release.Build.0 = Release|Win32100 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release Static.ActiveCfg = Release|Win32101 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release Static.Build.0 = Release|Win32102 {7319E499-473D-4CE5-9983-725D6E68A55D}.Debug.ActiveCfg = Debug|Win32103 {7319E499-473D-4CE5-9983-725D6E68A55D}.Debug.Build.0 = Debug|Win32104 {7319E499-473D-4CE5-9983-725D6E68A55D}.Debug Static.ActiveCfg = Debug|Win32105 {7319E499-473D-4CE5-9983-725D6E68A55D}.Debug Static.Build.0 = Debug|Win32106 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release.ActiveCfg = Release|Win32107 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release.Build.0 = Release|Win32108 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release Static.ActiveCfg = Release|Win32109 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release Static.Build.0 = Release|Win32110 98 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Debug.ActiveCfg = Debug|Win32 111 99 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Debug.Build.0 = Debug|Win32 … … 116 104 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Release Static.ActiveCfg = Release|Win32 117 105 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Release Static.Build.0 = Release|Win32 118 {F72B85F3-FA3A-4939-8196-596B1250B36E}.Debug.ActiveCfg = Debug|Win32119 {F72B85F3-FA3A-4939-8196-596B1250B36E}.Debug.Build.0 = Debug|Win32120 {F72B85F3-FA3A-4939-8196-596B1250B36E}.Debug Static.ActiveCfg = Debug|Win32121 {F72B85F3-FA3A-4939-8196-596B1250B36E}.Debug Static.Build.0 = Debug|Win32122 {F72B85F3-FA3A-4939-8196-596B1250B36E}.Release.ActiveCfg = Release|Win32123 {F72B85F3-FA3A-4939-8196-596B1250B36E}.Release.Build.0 = Release|Win32124 {F72B85F3-FA3A-4939-8196-596B1250B36E}.Release Static.ActiveCfg = Release|Win32125 {F72B85F3-FA3A-4939-8196-596B1250B36E}.Release Static.Build.0 = Release|Win32126 106 EndGlobalSection 127 107 GlobalSection(ExtensibilityGlobals) = postSolution -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp
r1221 r1232 1109 1109 } 1110 1110 //----------------------------------------------------------------------- 1111 const Pass *KdTreeSceneManager::_setPass( Pass* pass, bool evenIfSuppressed)1111 const Pass *KdTreeSceneManager::_setPass(const Pass* pass, bool evenIfSuppressed) 1112 1112 { 1113 1113 if (mRenderMethod == KdTree::KDRM_INTERNAL) … … 1122 1122 const bool useDepthPass = 1123 1123 (mIsDepthPassPhase && !mHierarchyInterface->IsBoundingBoxQuery()); 1124 1125 Pass *usedPass = useDepthPass ? mDepthPass : pass;1126 1127 1124 1128 1125 const IlluminationRenderStage savedStage = mIlluminationStage; … … 1158 1155 } 1159 1156 1157 const Pass *usedPass = useDepthPass ? mDepthPass : pass; 1158 1160 1159 // save old depth write: needed for item buffer 1161 1160 const bool IsDepthWrite = usedPass->getDepthWriteEnabled(); … … 1164 1163 if (!mEnableDepthWrite) 1165 1164 { 1166 usedPass->setDepthWriteEnabled(false);1165 // usedPass->setDepthWriteEnabled(false); 1167 1166 } 1168 1167 //else if (mIsItemBufferPass) {usedPass = mItemBufferPass;} … … 1176 1175 if (!mEnableDepthWrite) 1177 1176 { 1178 usedPass->setDepthWriteEnabled(IsDepthWrite);1177 // usedPass->setDepthWriteEnabled(IsDepthWrite); 1179 1178 } 1180 1179 -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp
r1221 r1232 207 207 } 208 208 //----------------------------------------------------------------------- 209 const Pass *OcclusionCullingSceneManager::_setPass( Pass* pass, bool evenIfSuppressed)209 const Pass *OcclusionCullingSceneManager::_setPass(const Pass* pass, bool evenIfSuppressed) 210 210 { 211 211 if (NORMAL_RENDER_HACK) … … 220 220 const bool useDepthPass = 221 221 (mIsDepthPassPhase && !mHierarchyInterface->IsBoundingBoxQuery()); 222 223 Pass *usedPass = useDepthPass ? mDepthPass : pass;224 225 222 226 223 const IlluminationRenderStage savedStage = mIlluminationStage; … … 256 253 } 257 254 255 const Pass *usedPass = useDepthPass ? mDepthPass : pass; 256 258 257 // save old depth write: needed for item buffer 259 258 const bool IsDepthWrite = usedPass->getDepthWriteEnabled(); … … 262 261 if (!mEnableDepthWrite) 263 262 { 264 usedPass->setDepthWriteEnabled(false);263 //usedPass->setDepthWriteEnabled(false); 265 264 } 266 265 //else if (mIsItemBufferPass) {usedPass = mItemBufferPass;} … … 274 273 if (!mEnableDepthWrite) 275 274 { 276 usedPass->setDepthWriteEnabled(IsDepthWrite);275 //usedPass->setDepthWriteEnabled(IsDepthWrite); 277 276 } 278 277 -
GTP/trunk/Lib/Vis/OnlineCullingCHC/src/GtpVisibility.vcproj
r1226 r1232 128 128 </File> 129 129 <File 130 RelativePath="..\include\QueryManager.h">131 </File>132 <File133 130 RelativePath="..\src\StopAndWaitCullingManager.cpp"> 134 131 </File> … … 175 172 </File> 176 173 <File 174 RelativePath="..\include\QueryManager.h"> 175 </File> 176 <File 177 177 RelativePath="..\include\StopAndWaitCullingManager.h"> 178 178 </File> -
GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp
r1221 r1232 15 15 #include "VspOspTree.h" 16 16 #include "ObjParser.h" 17 #ifdef INTEL_COMPILER 17 18 #include "ArchModeler2MLRT.hxx" 18 19 #endif 19 20 20 21 namespace GtpVisibilityPreprocessor { … … 755 756 { 756 757 case INTEL_RAYCASTER: 758 #ifdef INTEL_COMPILER 757 759 return mlrtaLoadAS(externKdTree.c_str()); 760 #endif 758 761 case INTERNAL_RAYCASTER: 759 762 default:
Note: See TracChangeset
for help on using the changeset viewer.