![(please configure the [header_logo] section in trac.ini)](/trac/gametools/chrome/site/your_project_logo.png){kind=logo}
Changeset 2199 for GTP/trunk/Lib/Vis
- Timestamp:
- 03/07/07 16:26:58 (18 years ago)
- Location:
- GTP/trunk/Lib/Vis
- Files:
-
- 22 edited
-
GtpVisibility.sln (modified) (4 diffs)
-
OnlineCullingCHC/ObjReader/src/ObjReader.vcproj (modified) (1 diff)
-
Preprocessing/scripts/preprocess_visibility_internal.sh (modified) (1 diff)
-
Preprocessing/src/BvHierarchy.cpp (modified) (17 diffs)
-
Preprocessing/src/BvHierarchy.h (modified) (1 diff)
-
Preprocessing/src/HashPvs.h (modified) (2 diffs)
-
Preprocessing/src/HierarchyManager.cpp (modified) (6 diffs)
-
Preprocessing/src/Intersectable.h (modified) (1 diff)
-
Preprocessing/src/Preprocessor.icproj (modified) (21 diffs)
-
Preprocessing/src/Preprocessor.vcproj (modified) (4 diffs)
-
Preprocessing/src/Pvs.h (modified) (1 diff)
-
Preprocessing/src/SamplingStrategy.cpp (modified) (4 diffs)
-
Preprocessing/src/TestPreprocessor.icproj (modified) (5 diffs)
-
Preprocessing/src/TestPreprocessor.vcproj (modified) (2 diffs)
-
Preprocessing/src/ViewCell.cpp (modified) (1 diff)
-
Preprocessing/src/ViewCell.h (modified) (2 diffs)
-
Preprocessing/src/ViewCellsManager.cpp (modified) (5 diffs)
-
Preprocessing/src/ViewCellsManager.h (modified) (3 diffs)
-
Preprocessing/src/VspTree.cpp (modified) (2 diffs)
-
Preprocessing/src/VspTree.h (modified) (1 diff)
-
Preprocessing/src/VssPreprocessor.cpp (modified) (2 diffs)
-
Preprocessing/src/VssPreprocessor.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/Lib/Vis/GtpVisibility.sln
r2130 r2199 8 8 EndProjectSection 9 9 EndProject 10 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IVReader", "OnlineCullingCHC\IVReader\src\IVReader.vcproj", "{ 7319E499-473D-4CE5-9983-725D6E68A55D}"10 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IVReader", "OnlineCullingCHC\IVReader\src\IVReader.vcproj", "{5776B40B-5FCE-46D5-8F7C-3912E24E0638}" 11 11 ProjectSection(ProjectDependencies) = postProject 12 12 EndProjectSection … … 14 14 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_VisibilitySceneManager", "OnlineCullingCHC\OGRE\src\Plugin_VisibilitySceneManager.vcproj", "{80DECC17-BDDD-4412-8CF8-F7C1C17A7436}" 15 15 ProjectSection(ProjectDependencies) = postProject 16 {5776B40B-5FCE-46D5-8F7C-3912E24E0638} = {5776B40B-5FCE-46D5-8F7C-3912E24E0638} 17 {5776B40B-5FCE-46D5-8F7C-3912E24E0638} = {5776B40B-5FCE-46D5-8F7C-3912E24E0638} 18 {5776B40B-5FCE-46D5-8F7C-3912E24E0638} = {5776B40B-5FCE-46D5-8F7C-3912E24E0638} 19 {EABCE292-D598-4600-A1C9-2591E7D62FDA} = {EABCE292-D598-4600-A1C9-2591E7D62FDA} 16 20 {101A7691-74F3-48B4-96A3-CF35578F5900} = {101A7691-74F3-48B4-96A3-CF35578F5900} 21 EndProjectSection 22 EndProject 23 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Preprocessor", "Preprocessing\src\Preprocessor.vcproj", "{EABCE292-D598-4600-A1C9-2591E7D62FDA}" 24 ProjectSection(ProjectDependencies) = postProject 25 EndProjectSection 26 EndProject 27 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestPreprocessor", "Preprocessing\src\TestPreprocessor.vcproj", "{69BC58F0-C7EB-4B43-B782-B6F047EF0528}" 28 ProjectSection(ProjectDependencies) = postProject 17 29 {EABCE292-D598-4600-A1C9-2591E7D62FDA} = {EABCE292-D598-4600-A1C9-2591E7D62FDA} 18 {7319E499-473D-4CE5-9983-725D6E68A55D} = {7319E499-473D-4CE5-9983-725D6E68A55D}19 {7319E499-473D-4CE5-9983-725D6E68A55D} = {7319E499-473D-4CE5-9983-725D6E68A55D}20 {7319E499-473D-4CE5-9983-725D6E68A55D} = {7319E499-473D-4CE5-9983-725D6E68A55D}21 EndProjectSection22 EndProject23 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Preprocessor", "Preprocessing\src\Preprocessor.vcproj", "{EABCE292-D598-4600-A1C9-2591E7D62FDA}"24 ProjectSection(ProjectDependencies) = postProject25 EndProjectSection26 EndProject27 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestPreprocessor", "Preprocessing\src\TestPreprocessor.vcproj", "{69BC58F0-C7EB-4B43-B782-B6F047EF0528}"28 ProjectSection(ProjectDependencies) = postProject29 {EABCE292-D598-4600-A1C9-2591E7D62FDA} = {EABCE292-D598-4600-A1C9-2591E7D62FDA}30 30 EndProjectSection 31 31 EndProject 32 32 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCullingTerrain", "..\..\App\Demos\Vis\HillyTerrain\OGRE\TestCullingTerrain.vcproj", "{248F19A6-2FE0-4F5D-8928-E0EA10609887}" 33 33 ProjectSection(ProjectDependencies) = postProject 34 {5776B40B-5FCE-46D5-8F7C-3912E24E0638} = {5776B40B-5FCE-46D5-8F7C-3912E24E0638} 34 35 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436} = {80DECC17-BDDD-4412-8CF8-F7C1C17A7436} 35 36 {101A7691-74F3-48B4-96A3-CF35578F5900} = {101A7691-74F3-48B4-96A3-CF35578F5900} 36 {7319E499-473D-4CE5-9983-725D6E68A55D} = {7319E499-473D-4CE5-9983-725D6E68A55D}37 37 EndProjectSection 38 38 EndProject 39 39 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestKdTree", "..\..\App\Demos\Vis\KdTreeDemo\OGRE\scripts\TestKdTree.vcproj", "{17F2C6F9-6101-430E-ABF4-71383868EF24}" 40 40 ProjectSection(ProjectDependencies) = postProject 41 {5776B40B-5FCE-46D5-8F7C-3912E24E0638} = {5776B40B-5FCE-46D5-8F7C-3912E24E0638} 41 42 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436} = {80DECC17-BDDD-4412-8CF8-F7C1C17A7436} 42 {7319E499-473D-4CE5-9983-725D6E68A55D} = {7319E499-473D-4CE5-9983-725D6E68A55D} 43 EndProjectSection 44 EndProject 45 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ObjReader", "OnlineCullingCHC\ObjReader\src\ObjReader.vcproj", "{7319E499-473D-4CE5-9983-725D6E68A55D}" 43 EndProjectSection 44 EndProject 45 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ObjReader", "OnlineCullingCHC\ObjReader\src\ObjReader.vcproj", "{5776B40B-5FCE-46D5-8F7C-3912E24E0638}" 46 46 ProjectSection(ProjectDependencies) = postProject 47 47 EndProjectSection … … 166 166 {101A7691-74F3-48B4-96A3-CF35578F5900}.Universal Unicode Release.ActiveCfg = Release|Win32 167 167 {101A7691-74F3-48B4-96A3-CF35578F5900}.Universal Unicode Release.Build.0 = Release|Win32 168 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Debug.ActiveCfg = Debug|Win32169 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Debug.Build.0 = Debug|Win32170 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Debug Static.ActiveCfg = Debug|Win32171 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Debug Static.Build.0 = Debug|Win32172 { 7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Debug.ActiveCfg = Debug|Win32173 { 7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Debug.Build.0 = Debug|Win32174 { 7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Release.ActiveCfg = Release|Win32175 { 7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Release.Build.0 = Release|Win32176 { 7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Unicode Debug.ActiveCfg = Debug|Win32177 { 7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Unicode Debug.Build.0 = Debug|Win32178 { 7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Unicode Release.ActiveCfg = Release|Win32179 { 7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Unicode Release.Build.0 = Release|Win32180 { 7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Universal Debug.ActiveCfg = Debug|Win32181 { 7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Universal Debug.Build.0 = Debug|Win32182 { 7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Universal Release.ActiveCfg = Release|Win32183 { 7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Universal Release.Build.0 = Release|Win32184 { 7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Universal Unicode Debug.ActiveCfg = Debug|Win32185 { 7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Universal Unicode Debug.Build.0 = Debug|Win32186 { 7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Universal Unicode Release.ActiveCfg = Release|Win32187 { 7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Universal Unicode Release.Build.0 = Release|Win32188 { 7319E499-473D-4CE5-9983-725D6E68A55D}.mlrt.ActiveCfg = mlrt|Win32189 { 7319E499-473D-4CE5-9983-725D6E68A55D}.mlrt.Build.0 = mlrt|Win32190 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Release.ActiveCfg = Release|Win32191 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Release.Build.0 = Release|Win32192 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Release Internal.ActiveCfg = Release Internal|Win32193 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Release Internal.Build.0 = Release Internal|Win32194 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Release Static.ActiveCfg = Release|Win32195 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Release Static.Build.0 = Release|Win32196 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Release_Internal.ActiveCfg = Release_Internal|Win32197 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Release_Internal.Build.0 = Release_Internal|Win32198 { 7319E499-473D-4CE5-9983-725D6E68A55D}.release_noqt.ActiveCfg = Release_qt|Win32199 { 7319E499-473D-4CE5-9983-725D6E68A55D}.release_noqt.Build.0 = Release_qt|Win32200 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Release_qt.ActiveCfg = Release_qt|Win32201 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Release_qt.Build.0 = Release_qt|Win32202 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Unicode Debug.ActiveCfg = Debug|Win32203 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Unicode Debug.Build.0 = Debug|Win32204 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Unicode Release.ActiveCfg = Release|Win32205 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Unicode Release.Build.0 = Release|Win32206 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Universal Debug.ActiveCfg = Debug|Win32207 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Universal Debug.Build.0 = Debug|Win32208 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Universal Release.ActiveCfg = Release|Win32209 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Universal Release.Build.0 = Release|Win32210 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Universal Unicode Debug.ActiveCfg = Debug|Win32211 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Universal Unicode Debug.Build.0 = Debug|Win32212 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Universal Unicode Release.ActiveCfg = Release|Win32213 { 7319E499-473D-4CE5-9983-725D6E68A55D}.Universal Unicode Release.Build.0 = Release|Win32168 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Debug.ActiveCfg = Debug|Win32 169 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Debug.Build.0 = Debug|Win32 170 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Debug Static.ActiveCfg = Debug|Win32 171 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Debug Static.Build.0 = Debug|Win32 172 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.DLL Debug.ActiveCfg = Debug|Win32 173 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.DLL Debug.Build.0 = Debug|Win32 174 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.DLL Release.ActiveCfg = Release|Win32 175 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.DLL Release.Build.0 = Release|Win32 176 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.DLL Unicode Debug.ActiveCfg = Debug|Win32 177 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.DLL Unicode Debug.Build.0 = Debug|Win32 178 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.DLL Unicode Release.ActiveCfg = Release|Win32 179 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.DLL Unicode Release.Build.0 = Release|Win32 180 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.DLL Universal Debug.ActiveCfg = Debug|Win32 181 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.DLL Universal Debug.Build.0 = Debug|Win32 182 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.DLL Universal Release.ActiveCfg = Release|Win32 183 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.DLL Universal Release.Build.0 = Release|Win32 184 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.DLL Universal Unicode Debug.ActiveCfg = Debug|Win32 185 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.DLL Universal Unicode Debug.Build.0 = Debug|Win32 186 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.DLL Universal Unicode Release.ActiveCfg = Release|Win32 187 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.DLL Universal Unicode Release.Build.0 = Release|Win32 188 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.mlrt.ActiveCfg = mlrt|Win32 189 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.mlrt.Build.0 = mlrt|Win32 190 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release.ActiveCfg = Release|Win32 191 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release.Build.0 = Release|Win32 192 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release Internal.ActiveCfg = Release Internal|Win32 193 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release Internal.Build.0 = Release Internal|Win32 194 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release Static.ActiveCfg = Release|Win32 195 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release Static.Build.0 = Release|Win32 196 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release_Internal.ActiveCfg = Release_Internal|Win32 197 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release_Internal.Build.0 = Release_Internal|Win32 198 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.release_noqt.ActiveCfg = Release_qt|Win32 199 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.release_noqt.Build.0 = Release_qt|Win32 200 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release_qt.ActiveCfg = Release_qt|Win32 201 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Release_qt.Build.0 = Release_qt|Win32 202 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Unicode Debug.ActiveCfg = Debug|Win32 203 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Unicode Debug.Build.0 = Debug|Win32 204 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Unicode Release.ActiveCfg = Release|Win32 205 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Unicode Release.Build.0 = Release|Win32 206 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Universal Debug.ActiveCfg = Debug|Win32 207 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Universal Debug.Build.0 = Debug|Win32 208 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Universal Release.ActiveCfg = Release|Win32 209 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Universal Release.Build.0 = Release|Win32 210 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Universal Unicode Debug.ActiveCfg = Debug|Win32 211 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Universal Unicode Debug.Build.0 = Debug|Win32 212 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Universal Unicode Release.ActiveCfg = Release|Win32 213 {5776B40B-5FCE-46D5-8F7C-3912E24E0638}.Universal Unicode Release.Build.0 = Release|Win32 214 214 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Debug.ActiveCfg = Debug|Win32 215 215 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Debug.Build.0 = Debug|Win32 … … 442 442 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Universal Unicode Release.ActiveCfg = Release|Win32 443 443 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Universal Unicode Release.Build.0 = Release|Win32 444 {7319E499-473D-4CE5-9983-725D6E68A55D}.Debug.ActiveCfg = Debug|Win32445 {7319E499-473D-4CE5-9983-725D6E68A55D}.Debug.Build.0 = Debug|Win32446 {7319E499-473D-4CE5-9983-725D6E68A55D}.Debug Static.ActiveCfg = Debug|Win32447 {7319E499-473D-4CE5-9983-725D6E68A55D}.Debug Static.Build.0 = Debug|Win32448 {7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Debug.ActiveCfg = Debug|Win32449 {7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Debug.Build.0 = Debug|Win32450 {7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Release.ActiveCfg = Release|Win32451 {7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Release.Build.0 = Release|Win32452 {7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Unicode Debug.ActiveCfg = Debug|Win32453 {7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Unicode Debug.Build.0 = Debug|Win32454 {7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Unicode Release.ActiveCfg = Release|Win32455 {7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Unicode Release.Build.0 = Release|Win32456 {7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Universal Debug.ActiveCfg = Debug|Win32457 {7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Universal Debug.Build.0 = Debug|Win32458 {7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Universal Release.ActiveCfg = Release|Win32459 {7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Universal Release.Build.0 = Release|Win32460 {7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Universal Unicode Debug.ActiveCfg = Debug|Win32461 {7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Universal Unicode Debug.Build.0 = Debug|Win32462 {7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Universal Unicode Release.ActiveCfg = Release|Win32463 {7319E499-473D-4CE5-9983-725D6E68A55D}.DLL Universal Unicode Release.Build.0 = Release|Win32464 {7319E499-473D-4CE5-9983-725D6E68A55D}.mlrt.ActiveCfg = mlrt|Win32465 {7319E499-473D-4CE5-9983-725D6E68A55D}.mlrt.Build.0 = mlrt|Win32466 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release.ActiveCfg = Release|Win32467 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release.Build.0 = Release|Win32468 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release Internal.ActiveCfg = Release Internal|Win32469 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release Internal.Build.0 = Release Internal|Win32470 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release Static.ActiveCfg = Release|Win32471 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release Static.Build.0 = Release|Win32472 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release_Internal.ActiveCfg = Release_Internal|Win32473 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release_Internal.Build.0 = Release_Internal|Win32474 {7319E499-473D-4CE5-9983-725D6E68A55D}.release_noqt.ActiveCfg = Release_qt|Win32475 {7319E499-473D-4CE5-9983-725D6E68A55D}.release_noqt.Build.0 = Release_qt|Win32476 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release_qt.ActiveCfg = Release_qt|Win32477 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release_qt.Build.0 = Release_qt|Win32478 {7319E499-473D-4CE5-9983-725D6E68A55D}.Unicode Debug.ActiveCfg = Debug|Win32479 {7319E499-473D-4CE5-9983-725D6E68A55D}.Unicode Debug.Build.0 = Debug|Win32480 {7319E499-473D-4CE5-9983-725D6E68A55D}.Unicode Release.ActiveCfg = Release|Win32481 {7319E499-473D-4CE5-9983-725D6E68A55D}.Unicode Release.Build.0 = Release|Win32482 {7319E499-473D-4CE5-9983-725D6E68A55D}.Universal Debug.ActiveCfg = Debug|Win32483 {7319E499-473D-4CE5-9983-725D6E68A55D}.Universal Debug.Build.0 = Debug|Win32484 {7319E499-473D-4CE5-9983-725D6E68A55D}.Universal Release.ActiveCfg = Release|Win32485 {7319E499-473D-4CE5-9983-725D6E68A55D}.Universal Release.Build.0 = Release|Win32486 {7319E499-473D-4CE5-9983-725D6E68A55D}.Universal Unicode Debug.ActiveCfg = Debug|Win32487 {7319E499-473D-4CE5-9983-725D6E68A55D}.Universal Unicode Debug.Build.0 = Debug|Win32488 {7319E499-473D-4CE5-9983-725D6E68A55D}.Universal Unicode Release.ActiveCfg = Release|Win32489 {7319E499-473D-4CE5-9983-725D6E68A55D}.Universal Unicode Release.Build.0 = Release|Win32490 444 EndGlobalSection 491 445 GlobalSection(ExtensibilityGlobals) = postSolution -
GTP/trunk/Lib/Vis/OnlineCullingCHC/ObjReader/src/ObjReader.vcproj
r2183 r2199 4 4 Version="7.10" 5 5 Name="ObjReader" 6 ProjectGUID="{ 7319E499-473D-4CE5-9983-725D6E68A55D}"6 ProjectGUID="{5776B40B-5FCE-46D5-8F7C-3912E24E0638}" 7 7 Keyword="Win32Proj"> 8 8 <Platforms> -
GTP/trunk/Lib/Vis/Preprocessing/scripts/preprocess_visibility_internal.sh
r2162 r2199 13 13 export PATH=$PATH:../bin 14 14 15 #NUM_SAMPLE_RAYS=100000000016 NUM_SAMPLE_RAYS=2000000015 NUM_SAMPLE_RAYS=200000000 16 #NUM_SAMPLE_RAYS=50000000 17 17 18 18 $PREPROCESSOR -total_samples=$NUM_SAMPLE_RAYS \ -
GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp
r2198 r2199 27 27 #define USE_VOLUMES_FOR_HEURISTICS 1 28 28 #define TEST_POWERPLANT 0 29 29 #define USE_BETTER_RENDERCOST_EST 0 30 30 31 //int BvhNode::sMailId = 10000; 31 32 //int BvhNode::sReservedMailboxes = 1; … … 172 173 } 173 174 } 175 176 174 177 175 178 /******************************************************************/ … … 673 676 // high avg ray contri, the result is influenced by undersampling 674 677 splitCandidate.SetAvgRayContribution(avgRayContri); 675 const float viewSpaceVol = 678 const float viewSpaceVol = GetViewSpaceVolume(); 676 679 677 680 const float oldVolume = EvalViewCellsVolume(leaf->mObjects) / viewSpaceVol; … … 1046 1049 Intersectable *obj = (*cit).mObject; 1047 1050 1048 const float renderCost = mViewCellsManager->EvalRenderCost(obj); 1051 #if USE_BETTER_RENDERCOST_EST 1052 const float renderCost = ViewCellsManager::EvalRenderCost(obj); 1049 1053 1050 1054 objectsLeft += renderCost; 1051 1055 objectsRight -= renderCost; 1052 1056 1057 const bool noValidSplit = ((objectsLeft <= Limits::Small) || (objectsRight <= Limits::Small)); 1058 1059 #else 1060 ++ objectsLeft; 1061 -- objectsRight; 1062 1063 const bool noValidSplit = !objectsLeft || !objectsRight; 1064 #endif 1053 1065 const AxisAlignedBox3 obox = obj->GetBox(); 1054 1066 … … 1070 1082 ar = rbox.SurfaceArea(); 1071 1083 1072 const bool noValidSplit = ((objectsLeft <= Limits::Small) || (objectsRight <= Limits::Small));1073 1084 const float sum = noValidSplit ? 1e25f : objectsLeft * al + objectsRight * ar; 1074 1085 … … 1317 1328 float volRight = totalVol; 1318 1329 1330 #if USE_BETTER_RENDERCOST_EST 1319 1331 const float nTotalObjects = EvalAbsCost(tData.mNode->mObjects); 1320 1332 float nObjectsLeft = 0; 1321 1333 float nObjectsRight = nTotalObjects; 1334 #else 1335 const int nTotalObjects = (int)EvalAbsCost(tData.mNode->mObjects); 1336 int nObjectsLeft = 0; 1337 int nObjectsRight = (int)nTotalObjects; 1338 #endif 1322 1339 1323 1340 const float viewSpaceVol = … … 1362 1379 EvalHeuristicsContribution(object, volLeft, volRight); 1363 1380 1364 const float rc = mViewCellsManager->EvalRenderCost(object); 1365 1381 #if USE_BETTER_RENDERCOST_EST 1382 1383 const float rc = ViewCellsManager::EvalRenderCost(object); 1384 1366 1385 nObjectsLeft += rc; 1367 1386 nObjectsRight -= rc; … … 1370 1389 const bool noValidSplit = ((nObjectsLeft <= Limits::Small) || 1371 1390 (nObjectsRight <= Limits::Small)); 1372 1391 #else 1392 ++ nObjectsLeft; 1393 -- nObjectsRight; 1394 1395 // split is only valid if #objects on left and right is not zero 1396 const bool noValidSplit = !nObjectsLeft || !nObjectsRight; 1397 1398 #endif 1399 1373 1400 // the heuristics 1374 1401 const float sum = noValidSplit ? … … 1378 1405 if (printStats) 1379 1406 { 1380 PrintHeuristics(nObjectsRight, sum, volLeft, volRight, viewSpaceVol, 1407 PrintHeuristics(nObjectsRight, sum, volLeft, 1408 volRight, viewSpaceVol, 1381 1409 sumStats, vollStats, volrStats); 1382 1410 } … … 1432 1460 void BvHierarchy::PrepareLocalSubdivisionCandidates(const BvhTraversalData &tData, 1433 1461 const int axis) 1434 {mSort2Timer.Entry(); 1462 { 1463 mSortTimer.Entry(); 1464 1435 1465 //-- insert object queries 1436 1466 ObjectContainer *objects = mUseGlobalSorting ? … … 1438 1468 1439 1469 CreateLocalSubdivisionCandidates(*objects, &mSubdivisionCandidates, !mUseGlobalSorting, axis); 1440 mSort2Timer.Exit(); 1470 1471 mSortTimer.Exit(); 1441 1472 } 1442 1473 … … 1466 1497 for (oit = objects.begin(); oit < oit_end; ++ oit) 1467 1498 { 1468 Intersectable *object = *oit; 1469 const AxisAlignedBox3 &box = object->GetBox(); 1470 const float midPt = (box.Min(axis) + box.Max(axis)) * 0.5f; 1471 1472 (*subdivisionCandidates)->push_back(SortableEntry(object, midPt)); 1499 (*subdivisionCandidates)->push_back(SortableEntry(*oit, (*oit)->GetBox().Center(axis))); 1473 1500 } 1474 1501 … … 1502 1529 const bool onlyUnmailed = true; 1503 1530 1504 const int numRays = CollectViewCells(tData.mNode->mObjects, 1505 viewCells, 1506 setCounter, 1507 onlyUnmailed); 1508 1509 //cout << "number of rays: " << numRays << endl; 1531 1532 CollectViewCells(tData.mNode->mObjects, 1533 viewCells, 1534 setCounter, 1535 onlyUnmailed); 1510 1536 1511 1537 ViewCellContainer::const_iterator vit, vit_end = viewCells.end(); 1538 1512 1539 for (vit = viewCells.begin(); vit != vit_end; ++ vit) 1513 1540 { … … 1520 1547 } 1521 1548 1522 // we will mail view cells switching to the back side1549 // mail view cells that go from front node to back node 1523 1550 ViewCell::NewMail(); 1524 1551 … … 1536 1563 // (also multiple times, if they are pierced by several rays) 1537 1564 ViewCellContainer viewCells; 1565 1538 1566 const bool useMailboxing = false; 1539 1540 CollectViewCells(obj, viewCells, useMailboxing, false, true); 1567 const bool setCounter = false; 1568 const bool onlyUnmailedRays = true; 1569 1570 CollectViewCells(obj, viewCells, useMailboxing, setCounter, onlyUnmailedRays); 1541 1571 1542 1572 // classify view cells and compute volume contri accordingly … … 1551 1581 // view cells can also be seen from left child node 1552 1582 ViewCell *viewCell = *vit; 1583 1553 1584 #if USE_VOLUMES_FOR_HEURISTICS 1554 1585 const float vol = viewCell->GetVolume(); … … 2248 2279 int nViewCells = 0; 2249 2280 2250 //ViewCell::NewMail();2281 ViewCell::NewMail(); 2251 2282 ObjectContainer::const_iterator oit, oit_end = objects.end(); 2252 2283 -
GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.h
r2198 r2199 660 660 PerfTimer mSplitTimer; 661 661 PerfTimer mPlaneTimer; 662 PerfTimer mSort 2Timer;662 PerfTimer mSortTimer; 663 663 PerfTimer mCollectTimer; 664 664 -
GTP/trunk/Lib/Vis/Preprocessing/src/HashPvs.h
r2176 r2199 13 13 14 14 15 template<typename T>15 /*template<typename T> 16 16 struct my_hash_compare 17 17 { … … 32 32 return a < b; 33 33 } 34 }; 34 };*/ 35 35 36 36 -
GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp
r2198 r2199 163 163 "Hierarchy.useTraversalTree", mUseTraversalTree); 164 164 165 // for comparing it with byte - value166 mTermMaxMemory *= (1024.0f * 1024.0f);167 168 165 Debug << "******** Hierarchy Manager Options ***********" << endl; 169 166 Debug << "max leaves: " << mTermMaxLeaves << endl; … … 182 179 Debug << "max avg ray contribution: " << mMaxAvgRayContri << endl; 183 180 181 // for comparing it with byte - value 182 mTermMaxMemory *= (1024.0f * 1024.0f); 184 183 185 184 switch (mConstructionType) … … 415 414 double sortTime, evalTime, nodeTime, splitTime, subdTime, planeTime, collectTime, viewCellsTime; 416 415 417 sortTime = mBvHierarchy->mSort 2Timer.TotalTime();416 sortTime = mBvHierarchy->mSortTimer.TotalTime(); 418 417 evalTime = mBvHierarchy->mEvalTimer.TotalTime(); 419 418 nodeTime = mBvHierarchy->mNodeTimer.TotalTime(); … … 534 533 cout << "\n" << ospSteps << " object space partition steps taken" << endl; 535 534 536 // create view space 535 PrintTimings(true); 536 537 /////////////// 538 //-- create view space 537 539 PrepareViewSpaceSubdivision(viewSpaceQueue, sampleRays, objects); 538 540 539 541 dirtyList.clear(); 540 541 542 // view space subdivision started 542 543 mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType; … … 554 555 555 556 dirtyList.clear(); 557 PrintTimings(false); 556 558 } 557 559 else … … 1175 1177 mHierarchyStats.mTotalCost = mBvHierarchy->mTotalCost; 1176 1178 1177 1178 1179 //mHierarchyStats.mPvsEntries -= mBvHierarchy->mPvsEntries + 1; 1179 1180 mHierarchyStats.mPvsEntries = mBvHierarchy->CountViewCells(objects); -
GTP/trunk/Lib/Vis/Preprocessing/src/Intersectable.h
r2198 r2199 6 6 #include "Mailable.h" 7 7 8 #define STORE_VIEWCELLS_WITH_BVH 08 #define STORE_VIEWCELLS_WITH_BVH 1 9 9 10 10 namespace GtpVisibilityPreprocessor { -
GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.icproj
r1292 r2199 22 22 Name="CppCmplrTool" 23 23 Optimization="0" 24 AdditionalIncludeDirectories="..\include;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost "25 PreprocessorDefinitions="WIN32;_DEBUG;_LIB; "24 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 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NO_QT" 26 26 MinimalRebuild="1" 27 27 BasicRuntimeChecks="3" … … 29 29 RuntimeTypeInfo="1" 30 30 UsePrecompiledHeader="0" 31 BrowseInformation="1" 31 32 WarningLevel="3" 32 33 Detect64BitPortabilityProblems="1" … … 66 67 <Tool 67 68 Name="CppCmplrTool" 68 Optimization="0" 69 InlineFunctionExpansion="0" 70 FavorSizeOrSpeed="0" 69 Optimization="3" 70 GlobalOptimizations="1" 71 InlineFunctionExpansion="2" 72 EnableIntrinsicFunctions="1" 73 FavorSizeOrSpeed="1" 74 OmitFramePointers="1" 75 EnableFiberSafeOptimizations="1" 76 OptimizeForProcessor="0" 71 77 OptimizeForWindowsApplication="1" 72 AdditionalIncludeDirectories="..\include;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost "73 PreprocessorDefinitions="WIN32;NDEBUG;_LIB "78 AdditionalIncludeDirectories="..\include;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;Timer" 79 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_VERBOSE_PVS" 74 80 ExceptionHandling="1" 75 81 RuntimeLibrary="2" 76 82 DisableLanguageExtensions="0" 77 83 ForceConformanceInForLoopScope="0" 78 RuntimeTypeInfo=" 1"84 RuntimeTypeInfo="0" 79 85 UsePrecompiledHeader="0" 86 BrowseInformation="1" 80 87 WarningLevel="2" 81 88 Detect64BitPortabilityProblems="1" … … 211 218 <Tool 212 219 Name="GeneralTool" 220 OutputDirectory="Release" 221 IntermediateDirectory="Release" 222 ConfigurationType="4" 223 CharacterSet="2"/> 224 <Tool 225 Name="DebugTool"/> 226 <Tool 227 Name="CppCmplrTool" 228 Optimization="3" 229 GlobalOptimizations="1" 230 InlineFunctionExpansion="0" 231 EnableIntrinsicFunctions="1" 232 FavorSizeOrSpeed="1" 233 OmitFramePointers="1" 234 EnableFiberSafeOptimizations="1" 235 OptimizeForProcessor="3" 236 OptimizeForWindowsApplication="1" 237 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 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_INTERNAL;USE_QT;USE_HASH_PVS" 239 ExceptionHandling="1" 240 RuntimeLibrary="2" 241 EnableEnhancedInstructionSet="2" 242 DisableLanguageExtensions="0" 243 ForceConformanceInForLoopScope="0" 244 RuntimeTypeInfo="0" 245 UsePrecompiledHeader="0" 246 BrowseInformation="1" 247 WarningLevel="2" 248 Detect64BitPortabilityProblems="1" 249 DebugInformationFormat="3"/> 250 <Tool 251 Name="LinkerTool" 252 DelayImpLib=""/> 253 <Tool 254 Name="LibrarianTool" 255 OutputFile="../lib/Release/$(ProjectName).lib"/> 256 <Tool 257 Name="ResCmplrTool"/> 258 <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"/> 272 </Configuration> 273 <Configuration 274 Name="release_noqt|Win32"> 275 <Tool 276 Name="GeneralTool" 277 OutputDirectory="$(ConfigurationName)" 278 IntermediateDirectory="$(ConfigurationName)" 279 ConfigurationType="4" 280 CharacterSet="2"/> 281 <Tool 282 Name="DebugTool"/> 283 <Tool 284 Name="CppCmplrTool" 285 Optimization="3" 286 GlobalOptimizations="1" 287 InlineFunctionExpansion="2" 288 EnableIntrinsicFunctions="1" 289 FavorSizeOrSpeed="1" 290 OmitFramePointers="1" 291 EnableFiberSafeOptimizations="1" 292 OptimizeForProcessor="0" 293 OptimizeForWindowsApplication="1" 294 AdditionalIncludeDirectories="..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\MultiLevelRayTracing;Timer" 295 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_INTERNAL;NO_QT" 296 StringPooling="1" 297 ExceptionHandling="1" 298 RuntimeLibrary="2" 299 EnableEnhancedInstructionSet="2" 300 DisableLanguageExtensions="0" 301 ForceConformanceInForLoopScope="0" 302 RuntimeTypeInfo="0" 303 UsePrecompiledHeader="0" 304 BrowseInformation="1" 305 WarningLevel="2" 306 Detect64BitPortabilityProblems="1" 307 DebugInformationFormat="3"/> 308 <Tool 309 Name="LinkerTool" 310 DelayImpLib=""/> 311 <Tool 312 Name="LibrarianTool" 313 OutputFile="../lib/Release/$(ProjectName).lib"/> 314 <Tool 315 Name="ResCmplrTool"/> 316 <Tool 317 Name="MidlCmplrTool"/> 318 <Tool 319 Name="BscMakeTool"/> 320 <Tool 321 Name="PreBuildEventTool"/> 322 <Tool 323 Name="PreLinkEventTool"/> 324 <Tool 325 Name="PostBuildEventTool"/> 326 <Tool 327 Name="CustomTool"/> 328 <Tool 329 Name="CustomNodeTool"/> 330 </Configuration> 331 <Configuration 332 Name="Release_Qt|Win32"> 333 <Tool 334 Name="GeneralTool" 213 335 OutputDirectory="$(ConfigurationName)" 214 336 IntermediateDirectory="$(ConfigurationName)" … … 224 346 OptimizeForProcessor="3" 225 347 OptimizeForWindowsApplication="1" 226 AdditionalIncludeDirectories="..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\MultiLevelRayTracing "227 PreprocessorDefinitions="WIN32;NDEBUG;_LIB; GTP_INTERNAL"348 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" 349 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_QT;ATI" 228 350 ExceptionHandling="1" 229 351 RuntimeLibrary="2" … … 232 354 RuntimeTypeInfo="1" 233 355 UsePrecompiledHeader="0" 356 BrowseInformation="1" 234 357 WarningLevel="2" 235 358 Detect64BitPortabilityProblems="1" … … 269 392 RelativePath=".\Beam.h"/> 270 393 <File 394 RelativePath=".\Timer\BenchTimer.cpp"/> 395 <File 396 RelativePath=".\Timer\BenchTimer.h"/> 397 <File 398 RelativePath=".\BitVectorPvs.h"/> 399 <File 271 400 RelativePath=".\BoostPreprocessorThread.cpp"/> 272 401 <File … … 283 412 RelativePath=".\Camera.h"/> 284 413 <File 414 RelativePath=".\CombinedPreprocessor.cpp"/> 415 <File 416 RelativePath=".\CombinedPreprocessor.h"/> 417 <File 285 418 RelativePath=".\common.cpp"/> 286 419 <File … … 289 422 RelativePath=".\Containers.h"/> 290 423 <File 424 RelativePath=".\DefaultPvs.h"/> 425 <File 291 426 RelativePath=".\dual_depth.cg"/> 292 427 <File … … 307 442 RelativePath=".\glInterface.h"/> 308 443 <File 444 RelativePath=".\GlobalLinesRenderer.cpp"/> 445 <File 446 RelativePath=".\GlobalLinesRenderer.h"/> 447 <File 448 RelativePath=".\GvsPreprocessor.cpp"/> 449 <File 450 RelativePath=".\GvsPreprocessor.h"/> 451 <File 309 452 RelativePath=".\GzBinFileInputStream.cpp"/> 310 453 <File … … 323 466 RelativePath=".\Halton.h"/> 324 467 <File 468 RelativePath=".\HashPvs.h"/> 469 <File 325 470 RelativePath=".\HierarchyManager.cpp"/> 326 471 <File 327 472 RelativePath=".\HierarchyManager.h"/> 328 473 <File 474 RelativePath=".\IntelRayCaster.cpp"/> 475 <File 476 RelativePath=".\IntelRayCaster.h"/> 477 <File 478 RelativePath=".\InternalRayCaster.cpp"/> 479 <File 480 RelativePath=".\InternalRayCaster.h"/> 481 <File 482 RelativePath=".\Intersectable.cpp"/> 483 <File 329 484 RelativePath=".\Intersectable.h"/> 330 485 <File 331 RelativePath=".\KdIntersectable.cpp"/> 332 <File 333 RelativePath=".\KdIntersectable.h"/> 486 RelativePath=".\IntersectableWrapper.cpp"/> 487 <File 488 RelativePath=".\IntersectableWrapper.h"/> 489 <File 490 RelativePath=".\IntersectionBoundingBoxConverter.cpp"/> 491 <File 492 RelativePath=".\IntersectionBoundingBoxConverter.h"/> 334 493 <File 335 494 RelativePath=".\KdTree.cpp"/> … … 349 508 RelativePath=".\Matrix4x4.h"/> 350 509 <File 510 RelativePath=".\Timer\merror.cpp"/> 511 <File 512 RelativePath=".\Timer\merror.h"/> 513 <File 351 514 RelativePath=".\Mesh.cpp"/> 352 515 <File … … 357 520 RelativePath=".\MeshKdTree.h"/> 358 521 <File 522 RelativePath=".\Timer\mstring.h"/> 523 <File 524 RelativePath=".\Mutation.cpp"/> 525 <File 526 RelativePath=".\Mutation.h"/> 527 <File 359 528 RelativePath=".\MutualVisibility.cpp"/> 360 529 <File 361 530 RelativePath=".\MutualVisibility.h"/> 362 531 <File 532 RelativePath=".\ObjectPvs.cpp"/> 533 <File 534 RelativePath=".\ObjectPvs.h"/> 535 <File 536 RelativePath=".\ObjectsParser.cpp"/> 537 <File 538 RelativePath=".\ObjectsParser.h"/> 539 <File 540 RelativePath=".\ObjExporter.cpp"/> 541 <File 542 RelativePath=".\ObjExporter.h"/> 543 <File 363 544 RelativePath=".\ObjParser.cpp"/> 364 545 <File … … 375 556 RelativePath=".\Parser.h"/> 376 557 <File 558 RelativePath=".\Timer\PerfTimer.h"/> 559 <File 560 RelativePath=".\Timer\PerfTimerSkeleton.h"/> 561 <File 377 562 RelativePath=".\Plane3.cpp"/> 378 563 <File … … 430 615 Outputs=""/> 431 616 </FileConfiguration> 617 <FileConfiguration 618 Name="release_noqt|Win32"> 619 <Tool 620 Name="CustomTool" 621 Description="" 622 CommandLine="" 623 Outputs=""/> 624 </FileConfiguration> 625 <FileConfiguration 626 Name="Release_Qt|Win32"> 627 <Tool 628 Name="CustomTool" 629 Description="" 630 CommandLine="" 631 Outputs=""/> 632 </FileConfiguration> 432 633 </File> 433 634 <File 635 RelativePath=".\PreprocessorFactory.cpp"/> 636 <File 637 RelativePath=".\PreprocessorFactory.h"/> 638 <File 434 639 RelativePath=".\PreprocessorThread.cpp"/> 435 640 <File … … 467 672 Outputs=""/> 468 673 </FileConfiguration> 674 <FileConfiguration 675 Name="release_noqt|Win32"> 676 <Tool 677 Name="CustomTool" 678 Description="" 679 CommandLine="" 680 Outputs=""/> 681 </FileConfiguration> 682 <FileConfiguration 683 Name="Release_Qt|Win32"> 684 <Tool 685 Name="CustomTool" 686 Description="" 687 CommandLine="" 688 Outputs=""/> 689 </FileConfiguration> 469 690 </File> 470 691 <File 471 RelativePath=".\Pvs.cpp"/>472 <File473 692 RelativePath=".\Pvs.h"/> 474 693 <File 694 RelativePath=".\PvsBase.h"/> 695 <File 696 RelativePath=".\PvsDefinitions.h"/> 697 <File 475 698 RelativePath=".\Ray.cpp"/> 476 699 <File 477 700 RelativePath=".\Ray.h"/> 478 701 <File 702 RelativePath=".\RayCaster.cpp"/> 703 <File 704 RelativePath=".\RayCaster.h"/> 705 <File 479 706 RelativePath=".\RayInfo.cpp"/> 480 707 <File 481 708 RelativePath=".\RayInfo.h"/> 482 709 <File 710 RelativePath=".\Timer\RDTSCTimer.cpp"/> 711 <File 712 RelativePath=".\Timer\RDTSCTimer.h"/> 713 <File 483 714 RelativePath=".\Rectangle3.cpp"/> 484 715 <File … … 493 724 RelativePath=".\RenderSimulator.h"/> 494 725 <File 726 RelativePath=".\RenderTexture.cpp"/> 727 <File 728 RelativePath=".\RenderTexture.h"/> 729 <File 495 730 RelativePath=".\ResourceManager.h"/> 496 731 <File … … 517 752 RelativePath=".\Statistics.h"/> 518 753 <File 754 RelativePath=".\SubdivisionCandidate.cpp"/> 755 <File 519 756 RelativePath=".\SubdivisionCandidate.h"/> 520 757 <File … … 523 760 RelativePath=".\Tetrahedron3.h"/> 524 761 <File 762 RelativePath=".\Trackball.cpp"/> 763 <File 764 RelativePath=".\Trackball.h"/> 765 <File 766 RelativePath=".\TraversalTree.cpp"/> 767 <File 768 RelativePath=".\TraversalTree.h"/> 769 <File 525 770 RelativePath=".\Triangle3.cpp"/> 526 771 <File … … 585 830 RelativePath=".\X3dParser.h"/> 586 831 <File 832 RelativePath="..\include\AxisAlignedBox3.h"/> 833 <File 834 RelativePath="..\include\Containers.h"/> 835 <File 836 RelativePath="..\include\ExactPreprocessor.h"/> 837 <File 838 RelativePath="..\include\KdTree.h"/> 839 <File 840 RelativePath="..\include\Mesh.h"/> 841 <File 842 RelativePath="..\include\Plane3.h"/> 843 <File 844 RelativePath="..\include\Preprocessor.h"/> 845 <File 846 RelativePath="..\include\SamplingPreprocessor.h"/> 847 <File 848 RelativePath="..\include\SceneGraph.h"/> 849 <File 850 RelativePath="..\include\Vector3.h"/> 851 <File 852 RelativePath="..\include\ViewCell.h"/> 853 <File 587 854 RelativePath=".\X3dParserXerces.h"/> 588 855 <File 589 RelativePath="..\include\AxisAlignedBox3.h"/>590 <File591 RelativePath="..\include\Containers.h"/>592 <File593 RelativePath="..\include\ExactPreprocessor.h"/>594 <File595 RelativePath="..\include\KdTree.h"/>596 <File597 RelativePath="..\include\Mesh.h"/>598 <File599 RelativePath="..\include\Plane3.h"/>600 <File601 RelativePath="..\include\Preprocessor.h"/>602 <File603 RelativePath="..\include\SamplingPreprocessor.h"/>604 <File605 RelativePath="..\include\SceneGraph.h"/>606 <File607 RelativePath="..\include\Vector3.h"/>608 <File609 RelativePath="..\include\ViewCell.h"/>610 <File611 856 RelativePath=".\GlRenderer.cpp"/> 612 857 <File … … 617 862 RelativePath=".\Renderer.h"/> 618 863 <File 619 RelativePath=".\vtune\Preprocessor.vpj"/> 864 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_adapters.hpp"/> 865 <File 866 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_benchmark.hpp"/> 867 <File 868 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_bool_stack.hpp"/> 869 <File 870 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_dictionary.hpp"/> 871 <File 872 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_fft.hpp"/> 873 <File 874 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_fft_test.hpp"/> 875 <File 876 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_functions.hpp"/> 877 <File 878 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_generators.hpp"/> 879 <File 880 RelativePath=".\ootl\src\include\ootl\ootl_hash.hpp"/> 881 <File 882 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_iterable.hpp"/> 883 <File 884 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_iterators.hpp"/> 885 <File 886 RelativePath=".\ootl\src\include\ootl\ootl_list.hpp"/> 887 <File 888 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_map.hpp"/> 889 <File 890 RelativePath=".\ootl\src\include\ootl\ootl_misc.hpp"/> 891 <File 892 RelativePath=".\ootl\src\include\ootl\mswin\ootl_mswin.hpp"/> 893 <File 894 RelativePath=".\ootl\src\include\ootl\mswin\ootl_mswin_console.hpp"/> 895 <File 896 RelativePath=".\ootl\src\include\ootl\mswin\ootl_mswin_gdi.hpp"/> 897 <File 898 RelativePath=".\ootl\src\include\ootl\mswin\ootl_mswin_simple_win.hpp"/> 899 <File 900 RelativePath=".\ootl\src\include\ootl\ootl_object.hpp"/> 901 <File 902 RelativePath=".\ootl\src\include\ootl\ootl_output.hpp"/> 903 <File 904 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_polar.hpp"/> 905 <File 906 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_predicate.hpp"/> 907 <File 908 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_procedure.hpp"/> 909 <File 910 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_ptr.hpp"/> 911 <File 912 RelativePath=".\ootl\src\include\ootl\ootl_stack.hpp"/> 913 <File 914 RelativePath=".\ootl\src\include\ootl\ootl_string.hpp"/> 915 <File 916 RelativePath=".\ootl\src\include\ootl\ootl_string_utils.hpp"/> 917 <File 918 RelativePath=".\ootl\src\include\ootl\ootl_tester.hpp"/> 919 <File 920 RelativePath=".\ootl\src\include\ootl\ootl_timer.hpp"/> 921 <File 922 RelativePath=".\ootl\src\include\ootl\sandbox\ootl_valarray.hpp"/> 923 <File 924 RelativePath=".\ootl\src\include\ootl\ootl_vlist.hpp"/> 925 <File 926 RelativePath=".\sparsehash\src\google\sparsehash\config.h"/> 927 <File 928 RelativePath=".\sparsehash\src\google\dense_hash_map"/> 929 <File 930 RelativePath=".\sparsehash\src\google\dense_hash_set"/> 931 <File 932 RelativePath=".\sparsehash\src\google\sparsehash\densehashtable.h"/> 933 <File 934 RelativePath=".\sparsehash\src\windows\hash_fun.h"/> 935 <File 936 RelativePath=".\sparsehash\src\google\sparsehash\hash_fun.h"/> 937 <File 938 RelativePath=".\sparsehash\src\windows\hash_map.h"/> 939 <File 940 RelativePath=".\sparsehash\src\google\sparse_hash_map"/> 941 <File 942 RelativePath=".\sparsehash\src\google\sparse_hash_set"/> 943 <File 944 RelativePath=".\sparsehash\src\google\sparsehash\sparsehashtable.h"/> 945 <File 946 RelativePath=".\sparsehash\src\google\sparsetable"/> 947 <File 948 RelativePath=".\sparsehash\src\windows\stl_hash_fun.h"/> 949 <File 950 RelativePath=".\VTune\Preprocessor.vpj"/> 620 951 </Files> 621 952 </VisualStudioProject> -
GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.vcproj
r2187 r2199 260 260 <Configuration 261 261 Name="release_noqt|Win32" 262 OutputDirectory=" $(ConfigurationName)"263 IntermediateDirectory=" $(ConfigurationName)"262 OutputDirectory="Release" 263 IntermediateDirectory="Release" 264 264 ConfigurationType="4" 265 265 CharacterSet="2"> … … 268 268 Optimization="3" 269 269 GlobalOptimizations="TRUE" 270 InlineFunctionExpansion=" 0"270 InlineFunctionExpansion="2" 271 271 EnableIntrinsicFunctions="TRUE" 272 272 FavorSizeOrSpeed="1" … … 495 495 <File 496 496 RelativePath=".\HashPvs.h"> 497 </File>498 <File499 RelativePath=".\HashPvs2.h">500 497 </File> 501 498 <File … … 1166 1163 </File> 1167 1164 <File 1165 RelativePath=".\sparsehash\src\windows\hash_fun.h"> 1166 </File> 1167 <File 1168 1168 RelativePath=".\sparsehash\src\google\sparsehash\hash_fun.h"> 1169 </File>1170 <File1171 RelativePath=".\sparsehash\src\windows\hash_fun.h">1172 1169 </File> 1173 1170 <File -
GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.h
r2176 r2199 515 515 516 516 517 template <typename T, typename S> void VerbosePvs<T, S>::Clear(const bool trim = true)517 template <typename T, typename S> void VerbosePvs<T, S>::Clear(const bool trim) 518 518 { 519 519 mEntries.clear(); -
GTP/trunk/Lib/Vis/Preprocessing/src/SamplingStrategy.cpp
r2187 r2199 211 211 float r[6]; 212 212 sHalton.GetNext(6, r); 213 213 214 mPreprocessor.mViewCellsManager->GetViewPoint(origin, Vector3(r[0], 214 215 r[1], … … 219 220 r[5]) 220 221 ) - origin; 221 //cout << "z";222 222 223 const float c = Magnitude(direction); 223 224 … … 478 479 int i; 479 480 // pickup a distribution 480 for (i=0; i < mDistributions.size()-1; i++)481 for (i=0; i < (int)mDistributions.size()-1; i++) 481 482 if (r < mDistributions[i]->mRatio) 482 483 break; 483 484 484 485 bool result = mDistributions[i]->GenerateSample(ray); 485 486 … … 632 633 } else 633 634 if (strcmp(curr, "spatial")==0) { 635 Debug << "here4 spatialbox" << endl; 634 636 mDistributions.push_back(new SpatialBoxBasedDistribution(mPreprocessor)); 635 637 } else -
GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.icproj
r1292 r2199 22 22 Name="CppCmplrTool" 23 23 Optimization="0" 24 AdditionalIncludeDirectories="..\include;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost "25 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE "24 AdditionalIncludeDirectories="..\include;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\src\sparsehash\src\" 25 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NO_QT" 26 26 MinimalRebuild="1" 27 27 BasicRuntimeChecks="3" 28 28 RuntimeLibrary="3" 29 29 UsePrecompiledHeader="0" 30 BrowseInformation="1" 30 31 WarningLevel="3" 31 32 Detect64BitPortabilityProblems="1" … … 73 74 <Tool 74 75 Name="CppCmplrTool" 75 Optimization="0" 76 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\MultiLevelRayTracing" 77 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" 78 RuntimeLibrary="2" 79 RuntimeTypeInfo="1" 80 UsePrecompiledHeader="0" 76 Optimization="3" 77 GlobalOptimizations="1" 78 InlineFunctionExpansion="2" 79 EnableIntrinsicFunctions="1" 80 FavorSizeOrSpeed="1" 81 OmitFramePointers="1" 82 EnableFiberSafeOptimizations="1" 83 OptimizeForProcessor="0" 84 OptimizeForWindowsApplication="1" 85 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\MultiLevelRayTracing;Timer" 86 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NO_QT;USE_VERBOSE_PVS" 87 RuntimeLibrary="2" 88 EnableEnhancedInstructionSet="2" 89 RuntimeTypeInfo="0" 90 UsePrecompiledHeader="0" 91 BrowseInformation="1" 81 92 WarningLevel="3" 82 93 Detect64BitPortabilityProblems="1" … … 184 195 Name="CppCmplrTool" 185 196 Optimization="3" 186 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;"$(QTDIR)\include\QtOpenGl";..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces" 187 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL" 188 RuntimeLibrary="2" 189 RuntimeTypeInfo="1" 197 GlobalOptimizations="1" 198 InlineFunctionExpansion="2" 199 EnableIntrinsicFunctions="1" 200 FavorSizeOrSpeed="1" 201 OmitFramePointers="1" 202 EnableFiberSafeOptimizations="1" 203 OptimizeForProcessor="3" 204 OptimizeForWindowsApplication="1" 205 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;"$(QTDIR)\include\QtOpenGl";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtCore";"$(QTDIR)\include";QtInterface;..\src\sparsehash\src\;..\src\ootl\src\include\ootl;..\src\ootl\src\include\ootl\sandbox;$(NOINHERIT)" 206 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;USE_QT;USE_CG;USE_HASH_PVS" 207 ExceptionHandling="1" 208 RuntimeLibrary="2" 209 EnableEnhancedInstructionSet="2" 210 RuntimeTypeInfo="0" 211 UsePrecompiledHeader="0" 212 WarningLevel="3" 213 Detect64BitPortabilityProblems="1" 214 DebugInformationFormat="3"/> 215 <Tool 216 Name="LinkerTool" 217 DelayImpLib="" 218 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" 219 OutputFile="../bin/release/Preprocessor.exe" 220 LinkIncremental="1" 221 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)"" 222 GenerateDebugInformation="0" 223 SubSystem="1" 224 LargeAddressAware="2" 225 OptimizeReferences="2" 226 EnableCOMDATFolding="2" 227 OptimizeForWindows98="1" 228 TargetMachine="1" 229 FixedBaseAddress="1"/> 230 <Tool 231 Name="LibrarianTool"/> 232 <Tool 233 Name="ResCmplrTool"/> 234 <Tool 235 Name="MidlCmplrTool"/> 236 <Tool 237 Name="BscMakeTool"/> 238 <Tool 239 Name="PreBuildEventTool"/> 240 <Tool 241 Name="PreLinkEventTool"/> 242 <Tool 243 Name="PostBuildEventTool"/> 244 <Tool 245 Name="CustomTool"/> 246 <Tool 247 Name="CustomNodeTool"/> 248 </Configuration> 249 <Configuration 250 Name="release_noqt|Win32"> 251 <Tool 252 Name="GeneralTool" 253 OutputDirectory="$(ConfigurationName)" 254 IntermediateDirectory="$(ConfigurationName)" 255 ConfigurationType="1" 256 CharacterSet="2"/> 257 <Tool 258 Name="DebugTool"/> 259 <Tool 260 Name="CppCmplrTool" 261 Optimization="3" 262 GlobalOptimizations="1" 263 InlineFunctionExpansion="2" 264 EnableIntrinsicFunctions="1" 265 FavorSizeOrSpeed="1" 266 OmitFramePointers="1" 267 EnableFiberSafeOptimizations="1" 268 OptimizeForProcessor="0" 269 OptimizeForWindowsApplication="1" 270 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;"$(QTDIR)\include\QtOpenGl";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtCore";"$(QTDIR)\include"" 271 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;NO_QT" 272 StringPooling="1" 273 MinimalRebuild="0" 274 RuntimeLibrary="2" 275 EnableEnhancedInstructionSet="2" 276 RuntimeTypeInfo="0" 190 277 UsePrecompiledHeader="0" 191 278 WarningLevel="3" … … 199 286 LinkIncremental="1" 200 287 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" 288 GenerateDebugInformation="0" 289 SubSystem="1" 290 LargeAddressAware="0" 291 OptimizeReferences="2" 292 EnableCOMDATFolding="2" 293 OptimizeForWindows98="1" 294 TargetMachine="1" 295 FixedBaseAddress="1"/> 296 <Tool 297 Name="LibrarianTool"/> 298 <Tool 299 Name="ResCmplrTool"/> 300 <Tool 301 Name="MidlCmplrTool"/> 302 <Tool 303 Name="BscMakeTool"/> 304 <Tool 305 Name="PreBuildEventTool"/> 306 <Tool 307 Name="PreLinkEventTool"/> 308 <Tool 309 Name="PostBuildEventTool"/> 310 <Tool 311 Name="CustomTool"/> 312 <Tool 313 Name="CustomNodeTool"/> 314 </Configuration> 315 <Configuration 316 Name="Release_Qt|Win32"> 317 <Tool 318 Name="GeneralTool" 319 OutputDirectory="$(ConfigurationName)" 320 IntermediateDirectory="$(ConfigurationName)" 321 ConfigurationType="1" 322 CharacterSet="2"/> 323 <Tool 324 Name="DebugTool"/> 325 <Tool 326 Name="CppCmplrTool" 327 Optimization="3" 328 GlobalOptimizations="1" 329 InlineFunctionExpansion="2" 330 FavorSizeOrSpeed="1" 331 EnableFiberSafeOptimizations="1" 332 OptimizeForProcessor="3" 333 OptimizeForWindowsApplication="1" 334 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;"$(QTDIR)\include\QtOpenGl";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtCore";"$(QTDIR)\include";QtInterface" 335 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_QT" 336 RuntimeLibrary="2" 337 RuntimeTypeInfo="1" 338 UsePrecompiledHeader="0" 339 WarningLevel="3" 340 Detect64BitPortabilityProblems="1" 341 DebugInformationFormat="3"/> 342 <Tool 343 Name="LinkerTool" 344 DelayImpLib="" 345 AdditionalDependencies="xerces-c_2.lib glew32.lib zdll.lib zziplib.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib Preprocessor.lib QtCore4.lib qtmain.lib cg.lib cgGL.lib QtOpenGL4.lib Qt3Support4.lib QtTest4.lib QtGui4.lib QtInterface.lib" 346 OutputFile="../bin/release/Preprocessor.exe" 347 LinkIncremental="1" 348 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)"" 201 349 GenerateDebugInformation="0" 202 350 SubSystem="1" … … 229 377 RelativePath=".\main.cpp"/> 230 378 <File 231 RelativePath=".\ vtune\TestPreprocessor.vpj"/>379 RelativePath=".\VTune\TestPreprocessor.vpj"/> 232 380 </Files> 233 381 </VisualStudioProject> -
GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.vcproj
r2198 r2199 247 247 <Configuration 248 248 Name="release_noqt|Win32" 249 OutputDirectory=" $(ConfigurationName)"250 IntermediateDirectory=" $(ConfigurationName)"249 OutputDirectory="Release" 250 IntermediateDirectory="Release" 251 251 ConfigurationType="1" 252 252 CharacterSet="2"> … … 281 281 LinkIncremental="1" 282 282 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" 283 GenerateDebugInformation=" TRUE"283 GenerateDebugInformation="FALSE" 284 284 SubSystem="1" 285 285 LargeAddressAware="0" -
GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp
r2164 r2199 167 167 168 168 169 float ViewCell::GetVolume() const170 {171 return mVolume;172 }173 174 175 void ViewCell::SetVolume(float volume)176 {177 mVolume = volume;178 }179 180 181 169 void ViewCell::SetMesh(Mesh *mesh) 182 170 { 183 171 mMesh = mesh; 184 }185 186 187 float ViewCell::GetArea() const188 {189 return mArea;190 }191 192 193 void ViewCell::SetArea(float area)194 {195 mArea = area;196 172 } 197 173 -
GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.h
r2176 r2199 173 173 */ 174 174 void SetPvs(const ObjectPvs &pvs); 175 /** Type of view cell s.175 /** Type of view cell. 176 176 */ 177 177 int Type() const; … … 181 181 /** Returns volume of the view cell. 182 182 */ 183 float GetVolume() const; 183 inline float GetVolume() const 184 { 185 return mVolume; 186 } 187 /** Sets the volume of the view cell. 188 */ 189 inline void SetVolume(float volume) 190 { 191 mVolume = volume; 192 } 184 193 /** Returns area of the view cell. 185 194 */ 186 float GetArea() const;187 /** Sets the volume of the view cell.188 */189 void SetVolume(float volume);195 inline float GetArea() const 196 { 197 return mArea; 198 } 190 199 /** Sets the area of the view cell. 191 200 */ 192 void SetArea(float area); 201 void SetArea(float area) 202 { 203 mArea = area; 204 } 193 205 /** if this view cell is the root of a view cell hierarchy 194 206 */ -
GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp
r2198 r2199 83 83 mViewCellsTree->SetViewCellsManager(this); 84 84 mSamplesStat.Reset(); 85 } 86 87 88 int ViewCellsManager::CastPassSamples2(const int samplesPerPass, 89 VssRayContainer &passSamples) const 90 { 85 mStats.open("mystats.log"); 86 } 87 88 89 int ViewCellsManager::CastEvaluationSamples(const int samplesPerPass, 90 VssRayContainer &passSamples) 91 { 92 static int pass = 0; 93 static int totalRays = 0; 94 95 SimpleRayContainer rays; 96 rays.reserve(samplesPerPass); 97 passSamples.reserve(samplesPerPass * 2); 98 91 99 long startTime = GetTime(); 92 100 93 SimpleRayContainer simpleRays; 94 95 simpleRays.reserve(samplesPerPass); 96 passSamples.reserve(samplesPerPass * 2); // always creates double rays 97 98 // create one third of each type 99 int castRays = 0; 100 101 mMixtureDistribution->GenerateSamples(mSamplesPerPass, simpleRays); 102 103 cout << "generated " << (int)simpleRays.size() << " samples in " 104 << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl; 105 106 startTime = GetTime(); 107 108 // shoot simple ray and add it to importance samples 109 mPreprocessor->CastRays(simpleRays, passSamples, true); 110 111 cout << "cast " << samplesPerPass << " samples in " 112 << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl; 101 //cout<<"Progress :"<<i/1e6f<<"M rays, "<<(100.0f*i)/mTotalSamples<<"%"<<endl; 102 103 //rays.clear(); 104 //passSamples.clear(); 105 106 mMixtureDistribution->GenerateSamples(samplesPerPass, rays); 107 108 bool doubleRays = true; 109 bool pruneInvalidRays = true; 110 mPreprocessor->CastRays(rays, passSamples, doubleRays, pruneInvalidRays); 113 111 114 112 mMixtureDistribution->ComputeContributions(passSamples); 113 mMixtureDistribution->UpdateDistributions(passSamples); 114 115 Real time = TimeDiff(startTime, GetTime()); 116 PrintPvsStatistics(mStats); 117 118 mStats << 119 "#Pass\n" << pass ++ <<endl<< 120 "#Time\n" << time <<endl<< 121 "#TotalSamples\n" <<totalRays<<endl; 122 123 float last = 0.0f; 124 125 for (int k=0; k < 6; ++ k) 126 { 127 float ratio = 0.0f; 128 129 if (k < mMixtureDistribution->mDistributions.size()) 130 { 131 ratio = mMixtureDistribution->mDistributions[k]->mRatio-last; 132 last = mMixtureDistribution->mDistributions[k]->mRatio; 133 } 134 135 mStats << "#Distribution"<<k<<endl<< ratio<<endl; 136 } 137 138 139 totalRays += samplesPerPass; 115 140 116 141 return (int)passSamples.size(); … … 173 198 Debug << mStrategies[i] << " "; 174 199 Debug << endl; 175 176 // now decode distribution string177 char buff[1024];178 Environment::GetSingleton()->GetStringValue("RssPreprocessor.distributions", buff);179 180 mMixtureDistribution = new MixtureDistribution(*mPreprocessor);181 mMixtureDistribution->Construct(buff);182 183 200 184 201 // sampling type for view cells construction samples … … 301 318 Debug << "export pvs for view cells: " << mExportPvs << endl; 302 319 Debug << "use kd pvs " << mUseKdPvs << endl; 320 303 321 Debug << endl; 304 322 } … … 805 823 mPreprocessor = preprocessor; 806 824 825 // now decode distribution string 826 char mix[1024]; 827 Environment::GetSingleton()->GetStringValue("RssPreprocessor.distributions", mix); 828 Debug << "using mixture distributions: " << mix << endl; 829 830 mMixtureDistribution = new MixtureDistribution(*mPreprocessor); 831 mMixtureDistribution->Construct(mix); 807 832 808 833 /////////////////////////////////////////////////////// … … 6873 6898 Debug << "casting " << samplesPerPass << " samples ... "; 6874 6899 6875 if (1) 6876 { 6900 if (0) 6877 6901 CastPassSamples(samplesPerPass, evalStrats, evaluationSamples); 6878 }6879 6902 else 6880 {6881 6903 // use mixed distributions 6882 CastPassSamples2(samplesPerPass, evaluationSamples); 6883 } 6904 CastEvaluationSamples(samplesPerPass, evaluationSamples); 6884 6905 6885 6906 castSamples += samplesPerPass; -
GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.h
r2176 r2199 623 623 const float width) const; 624 624 625 626 625 627 ////////////////////////////////////////////////////////////////// 626 628 … … 704 706 VssRayContainer &vssRays) const; 705 707 706 int Cast PassSamples2(const int samplesPerPass,707 VssRayContainer &passSamples)const;708 int CastEvaluationSamples(const int samplesPerPass, 709 VssRayContainer &passSamples);// const; 708 710 709 711 /** Parse the options from the environment file. … … 797 799 798 800 801 ofstream mStats; 799 802 Preprocessor *mPreprocessor; 800 803 -
GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp
r2198 r2199 996 996 interior->mTimeStamp = mHierarchyManager->mTimeStamp ++; 997 997 998 #if WORK_WITH_VIEWCELL_PVS999 // create front and back view cell1000 // add front and back view cell to1001 // "potentially visible view cells"1002 // of the objects in front and back pvs1003 1004 AddViewCellReferences(frontLeaf->GetViewCell());1005 AddViewCellReferences(backLeaf->GetViewCell());1006 #endif1007 1008 998 mNodeTimer.Exit(); 1009 999 … … 2931 2921 VspTraversalData vData(leaf, 0, &rays, pvsCost, prop, mBoundingBox); 2932 2922 2933 #if WORK_WITH_VIEWCELL_PVS2934 // add first view cell to all the objects view cell pvs2935 ObjectPvsEntries::const_iterator oit,2936 oit_end = leaf->GetViewCell()->GetPvs().mEntries.end();2937 2938 for (oit = leaf->GetViewCell()->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)2939 {2940 Intersectable *obj = (*oit).first;2941 obj->mViewCellPvs.AddSample(leaf->GetViewCell(), 1);2942 }2943 #endif2944 2945 2923 mTotalCost = vData.mCorrectedRenderCost = vData.mRenderCost = pvsCost; 2946 2924 mPvsEntries = EvalPvsEntriesSize(rays); -
GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.h
r2198 r2199 897 897 @param rightPvs updates the right pvs 898 898 */ 899 void EvalHeuristics(const SortableEntry &ve, float &pvsLeft, float &pvsRight) const;899 inline void EvalHeuristics(const SortableEntry &ve, float &pvsLeft, float &pvsRight) const; 900 900 901 901 /** Evaluates contribution of min event to pvs 902 902 */ 903 in t EvalMinEventContribution(903 inline int EvalMinEventContribution( 904 904 const VssRay &ray, const bool isTermination) const; 905 905 906 906 /** Evaluates contribution of max event to pvs 907 907 */ 908 in t EvalMaxEventContribution(908 inline int EvalMaxEventContribution( 909 909 const VssRay &ray, const bool isTermination) const; 910 910 911 911 /** Evaluates contribution of kd leaf when encountering a min event 912 912 */ 913 in t EvalMinEventContribution(KdLeaf *leaf) const;913 inline int EvalMinEventContribution(KdLeaf *leaf) const; 914 914 /** Evaluates contribution of kd leaf when encountering a max event 915 915 */ 916 in t EvalMaxEventContribution(KdLeaf *leaf) const;916 inline int EvalMaxEventContribution(KdLeaf *leaf) const; 917 917 918 918 /** Prepares objects for the heuristics. -
GTP/trunk/Lib/Vis/Preprocessing/src/VssPreprocessor.cpp
r2198 r2199 143 143 VssPreprocessor::ExportRays(const char *filename, 144 144 const VssRayContainer &vssRays, 145 const int number 145 const int number, 146 const bool exportScene 146 147 ) 147 148 { … … 422 423 423 424 mViewCellsManager->GetViewPoint(viewpoint); 424 const Vector3 direction = GetDirection(viewpoint, &mViewCellsManager->GetViewSpaceBox()); 425 AxisAlignedBox3 vspBox = mViewCellsManager->GetViewSpaceBox(); 426 const Vector3 direction = GetDirection(viewpoint, &vspBox); 425 427 426 428 const SimpleRay sray(viewpoint, direction, -
GTP/trunk/Lib/Vis/Preprocessing/src/VssPreprocessor.h
r2176 r2199 52 52 ); 53 53 54 55 bool 56 ExportRays(const char *filename, 57 const VssRayContainer &vssRays, 58 const int number 59 ); 54 virtual bool 55 ExportRays(const char *filename, 56 const VssRayContainer &vssRays, 57 const int number, 58 const bool exportScene = false 59 ); 60 60 61 61 62 int
Note: See TracChangeset
for help on using the changeset viewer.
