Changeset 2588
- Timestamp:
- 01/10/08 13:17:34 (17 years ago)
- Location:
- GTP/trunk/Lib/Vis/Preprocessing/src
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp
r2575 r2588 525 525 //TestEvaluation(sc); 526 526 527 #ifdef PERFTIMER527 #ifdef USE_PERFTIMER 528 528 // fill view cells cache 529 529 mNodeTimer.Entry(); … … 636 636 UpdateViewCells(sc); 637 637 638 #ifdef PERFTIMER638 #ifdef USE_PERFTIMER 639 639 mNodeTimer.Exit(); 640 640 #endif … … 651 651 ) 652 652 { 653 #ifdef PERFTIMER653 #ifdef USE_PERFTIMER 654 654 mSubdivTimer.Entry(); 655 655 #endif … … 724 724 } 725 725 726 #ifdef PERFTIMER726 #ifdef USE_PERFTIMER 727 727 mSubdivTimer.Exit(); 728 728 #endif … … 788 788 const bool preprocessViewCells) 789 789 { 790 #ifdef PERFTIMER790 #ifdef USE_PERFTIMER 791 791 mPlaneTimer.Entry(); 792 792 #endif … … 834 834 } 835 835 836 #ifdef PERFTIMER836 #ifdef USE_PERFTIMER 837 837 mPlaneTimer.Exit(); 838 838 #endif … … 840 840 /////////////////// 841 841 842 #ifdef PERFTIMER842 #ifdef USE_PERFTIMER 843 843 mEvalTimer.Entry(); 844 844 #endif … … 997 997 #endif 998 998 999 #ifdef PERFTIMER999 #ifdef USE_PERFTIMER 1000 1000 mEvalTimer.Exit(); 1001 1001 #endif … … 1691 1691 const int axis) 1692 1692 { 1693 #ifdef PERFTIMER1693 #ifdef USE_PERFTIMER 1694 1694 mSortTimer.Entry(); 1695 1695 #endif … … 1700 1700 CreateLocalSubdivisionCandidates(*objects, &mSubdivisionCandidates, !mUseGlobalSorting, axis); 1701 1701 1702 #ifdef PERFTIMER1702 #ifdef USE_PERFTIMER 1703 1703 mSortTimer.Exit(); 1704 1704 #endif … … 1858 1858 bool useVisibilityBasedHeuristics) 1859 1859 { 1860 #ifdef PERFTIMER1860 #ifdef USE_PERFTIMER 1861 1861 mSplitTimer.Entry(); 1862 1862 #endif … … 1945 1945 backObjects = nBackObjects[bestAxis]; 1946 1946 1947 #ifdef PERFTIMER1947 #ifdef USE_PERFTIMER 1948 1948 mSplitTimer.Exit(); 1949 1949 #endif … … 2298 2298 //-- use view cells cache 2299 2299 2300 #ifdef PERFTIMER2300 #ifdef USE_PERFTIMER 2301 2301 mCollectTimer.Entry(); 2302 2302 #endif … … 2332 2332 } 2333 2333 2334 #ifdef PERFTIMER2334 #ifdef USE_PERFTIMER 2335 2335 mCollectTimer.Exit(); 2336 2336 #endif … … 2345 2345 const bool onlyUnmailedRays) 2346 2346 { 2347 #ifdef PERFTIMER2347 #ifdef USE_PERFTIMER 2348 2348 mCollectTimer.Entry(); 2349 2349 #endif … … 2389 2389 } 2390 2390 2391 #ifdef PERFTIMER2391 #ifdef USE_PERFTIMER 2392 2392 mCollectTimer.Exit(); 2393 2393 #endif … … 2465 2465 const bool onlyUnmailedRays) 2466 2466 { 2467 #ifdef PERFTIMER2467 #ifdef USE_PERFTIMER 2468 2468 mCollectTimer.Entry(); 2469 2469 #endif … … 2509 2509 } 2510 2510 2511 #ifdef PERFTIMER2511 #ifdef USE_PERFTIMER 2512 2512 mCollectTimer.Exit(); 2513 2513 #endif -
GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.h
r2575 r2588 15 15 #include "HierarchyManager.h" 16 16 17 #ifdef PERFTIMER17 #ifdef USE_PERFTIMER 18 18 #include "Timer/PerfTimer.h" 19 #endif // PERFTIMER19 #endif // USE_PERFTIMER 20 20 21 21 namespace GtpVisibilityPreprocessor { … … 681 681 void CreateUniqueObjectIds(); 682 682 683 #ifdef PERFTIMER683 #ifdef USE_PERFTIMER 684 684 PerfTimer mNodeTimer; 685 685 PerfTimer mSubdivTimer; -
GTP/trunk/Lib/Vis/Preprocessing/src/DifferenceSampling.cpp
r2575 r2588 6 6 #include "ViewCellsManager.h" 7 7 #include "Preprocessor.h" 8 #ifdef PERFTIMER8 #ifdef USE_PERFTIMER 9 9 #include "Timer/PerfTimer.h" 10 10 #endif … … 15 15 16 16 17 #ifdef PERFTIMER17 #ifdef USE_PERFTIMER 18 18 PerfTimer sFilterTimer; 19 19 #endif … … 68 68 69 69 70 #ifdef PERFTIMER70 #ifdef USE_PERFTIMER 71 71 sFilterTimer.Entry(); 72 72 #endif … … 78 78 filteredPvs); 79 79 80 #ifdef PERFTIMER80 #ifdef USE_PERFTIMER 81 81 sFilterTimer.Exit(); 82 82 #endif -
GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp
r2587 r2588 84 84 mSceneGraph->CollectObjects(&mObjects); 85 85 86 #if 1 86 87 viewCellsManager->GetViewPoint(mViewPoint); 87 88 88 mViewDirection = Vector3(0,0,1); 89 89 #else 90 mViewPoint = Vector3(1099.9,183.0,-387); 91 mViewDirection = Vector3(-0.6,0,-0.8); 92 #endif 90 93 mFrame = 0; 91 94 mWireFrame = false; -
GTP/trunk/Lib/Vis/Preprocessing/src/Halton.cpp
r2575 r2588 1 #include "common.h" 1 2 #include "Halton.h" 2 3 3 #ifdef PERFTIMER4 #ifdef USE_PERFTIMER 4 5 #include "Timer/PerfTimer.h" 5 6 #endif 7 6 8 7 9 #define PREGENERATE_HALTON 0 … … 10 12 11 13 12 #ifdef PERFTIMER14 #ifdef USE_PERFTIMER 13 15 PerfTimer haltonTimer; 14 16 #endif -
GTP/trunk/Lib/Vis/Preprocessing/src/HavranRayCaster.cpp
r2585 r2588 190 190 191 191 #if 0 192 SimpleRayContainer::const_iterator sit, sit_end = rays.end(); 193 192 SimpleRayContainer::const_iterator sit = rays.begin() + offset; 193 SimpleRayContainer::const_iterator sit_end = sit + 16; 194 194 195 // no acceleration for ray bundles implemented right now 195 196 for (sit = rays.begin(); sit != sit_end; ++ sit) -
GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp
r2575 r2588 409 409 double sortTime, evalTime, nodeTime, splitTime, subdTime, planeTime, collectTime, viewCellsTime; 410 410 411 #ifdef PERFTIMER411 #ifdef USE_PERFTIMER 412 412 sortTime = mBvHierarchy->mSortTimer.TotalTime(); 413 413 evalTime = mBvHierarchy->mEvalTimer.TotalTime(); … … 417 417 planeTime = mBvHierarchy->mPlaneTimer.TotalTime(); 418 418 collectTime = mBvHierarchy->mCollectTimer.TotalTime(); 419 #endif // #ifdef PERFTIMER419 #endif // #ifdef USE_PERFTIMER 420 420 421 421 cout << "bvh times" … … 439 439 << endl; 440 440 441 #ifdef PERFTIMER441 #ifdef USE_PERFTIMER 442 442 sortTime = mVspTree->mSortTimer.TotalTime(); 443 443 evalTime = mVspTree->mEvalTimer.TotalTime(); -
GTP/trunk/Lib/Vis/Preprocessing/src/Makefile
r2585 r2588 1 1 ############################################################################# 2 2 # Makefile for building: preprocessor 3 # Generated by qmake (2.00a) (Qt 4.1.2) on: st 9. I 14:48:5420083 # Generated by qmake (2.00a) (Qt 4.1.2) on: ?t 10. I 11:42:01 2008 4 4 # Project: preprocessor.pro 5 5 # Template: app -
GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp
r2586 r2588 1102 1102 1103 1103 KdTreeStatistics(cout); 1104 sceneBox = mKdTree->GetBox(); 1105 1104 1106 cout << mKdTree->GetBox() << endl; 1105 1107 -
GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.h
r2582 r2588 208 208 /// kD-tree organizing the scene graph (occluders + occludees) + viewcells 209 209 KdTree *mKdTree; 210 210 AxisAlignedBox3 sceneBox; 211 211 /// View space partition bsp tree 212 212 VspBspTree *mVspBspTree; -
GTP/trunk/Lib/Vis/Preprocessing/src/SamplingStrategy.cpp
r2586 r2588 8 8 #include "RssTree.h" 9 9 #include "Mutation.h" 10 #if TODO11 10 #include "FilterBasedDistribution.h" 12 #endif13 11 #include "DifferenceSampling.h" 14 12 15 13 16 #ifdef PERFTIMER14 #ifdef USE_PERFTIMER 17 15 #include "Timer/PerfTimer.h" 18 16 #endif … … 21 19 22 20 23 #ifdef PERFTIMER21 #ifdef USE_PERFTIMER 24 22 extern PerfTimer haltonTimer; 25 23 extern PerfTimer pvsTimer; … … 216 214 217 215 218 bool SpatialBoxBasedDistribution::GenerateSample(SimpleRay &ray) 219 { 220 221 Vector3 origin, direction; 222 223 float r[6]; 224 sHalton.GetNext(6, r); 225 226 mPreprocessor.mViewCellsManager->GetViewPoint(origin, Vector3(r[0], 227 r[1], 228 r[2])); 229 230 direction = mPreprocessor.sceneBox.GetRandomPoint(Vector3(r[3], 231 r[4], 232 r[5])) - origin; 233 234 const float c = Magnitude(direction); 235 236 if (c <= Limits::Small) 237 return false; 238 239 const float pdf = 1.0f; 240 241 direction *= 1.0f / c; 242 ray = SimpleRay(origin, direction, SPATIAL_BOX_BASED_DISTRIBUTION, pdf); 243 244 //cout << "d " << direction << " o: " << origin; 245 246 return true; 216 bool 217 SpatialBoxBasedDistribution::GenerateSample(SimpleRay &ray) 218 { 219 220 Vector3 origin, direction; 221 222 float r[6]; 223 sHalton.GetNext(6, r); 224 225 // mPreprocessor.mViewCellsManager->GetViewPoint(origin, Vector3(r[0], 226 // r[1], 227 // r[2])); 228 229 origin = mPreprocessor.sceneBox.GetRandomPoint(Vector3(r[0], 230 r[1], 231 r[2])); 232 233 direction = mPreprocessor.sceneBox.GetRandomPoint(Vector3(r[3], 234 r[4], 235 r[5])) - origin; 236 237 // cout<<mPreprocessor.sceneBox<<endl; 238 // cout<<r[0]<<" "<<r[1]<<" "<<r[2]<<" "<<r[3]<<" "<<r[4]<<" "<<r[5]<<endl; 239 // cout << " o: " << origin << "d " << direction << endl; 240 241 const float c = Magnitude(direction); 242 243 if (c <= Limits::Small) 244 return false; 245 246 const float pdf = 1.0f; 247 248 direction *= 1.0f / c; 249 ray = SimpleRay(origin, direction, SPATIAL_BOX_BASED_DISTRIBUTION, pdf); 250 251 252 return true; 247 253 } 248 254 … … 250 256 bool ReverseObjectBasedDistribution::GenerateSample(SimpleRay &ray) 251 257 { 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 258 Vector3 origin, direction; 259 260 mPreprocessor.mViewCellsManager->GetViewPoint(origin); 261 262 Vector3 point; 263 Vector3 normal; 264 265 const int i = (int)RandomValue(0, (float)mPreprocessor.mObjects.size() - 0.5f); 266 267 Intersectable *object = mPreprocessor.mObjects[i]; 268 269 object->GetRandomSurfacePoint(point, normal); 270 271 direction = origin - point; 272 273 // $$ jb the pdf is yet not correct for all sampling methods! 274 const float c = Magnitude(direction); 275 276 if ((c <= Limits::Small) || (DotProd(direction, normal) < 0)) 271 277 { 272 273 } 274 275 276 277 278 279 280 281 282 283 284 278 return false; 279 } 280 281 // $$ jb the pdf is yet not correct for all sampling methods! 282 const float pdf = 1.0f; 283 284 direction *= 1.0f / c; 285 // a little offset 286 point += direction * 0.001f; 287 288 ray = SimpleRay(point, direction, REVERSE_OBJECT_BASED_DISTRIBUTION, pdf); 289 290 return true; 285 291 } 286 292 … … 607 613 if (1) 608 614 { 609 #ifdef PERFTIMER610 611 612 613 614 615 616 617 618 619 620 615 #ifdef USE_PERFTIMER 616 const float vcTime = viewCellCastTimer.TotalTime(); 617 const float pvsTime = pvsTimer.TotalTime(); 618 const float haltonTime = haltonTimer.TotalTime(); 619 620 cout << "view cell cast time: " << vcTime << " s" << endl; 621 cout << "pvs time: " << pvsTime << " s" << endl; 622 cout << "halton time: "<< haltonTime << " s" << endl; 623 624 Debug << "view cell cast time: " << vcTime << " s" << endl; 625 Debug << "pvs time: " << pvsTime << " s" << endl; 626 Debug << "halton time: "<< haltonTime << " s" << endl; 621 627 #else 622 623 628 cout << "Timers not supported" << endl; 629 Debug << "Timers for PVS,Halton,Viewcell not supported" << endl; 624 630 #endif 625 631 } … … 735 741 } else 736 742 if (strcmp(curr, "filter_based")==0) { 737 #if TODO738 743 mDistributions.push_back(new FilterBasedDistribution(mPreprocessor)); 739 #endif740 744 } 741 745 else if (strcmp(curr, "difference")==0) { -
GTP/trunk/Lib/Vis/Preprocessing/src/SimpleRay.h
r2575 r2588 54 54 55 55 SimpleRay(const Vector3 &o, 56 57 58 59 60 56 const Vector3 &d, 57 const unsigned char distribution, 58 const float weight, 59 const unsigned char flags = F_BIDIRECTIONAL 60 ): 61 61 mOrigin(o), 62 62 mDirection(d), -
GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp
r2575 r2588 15 15 #include "BvHierarchy.h" 16 16 17 #ifdef PERFTIMER17 #ifdef USE_PERFTIMER 18 18 #include "Timer/PerfTimer.h" 19 19 #endif … … 25 25 #define TYPE_LEAF -3 26 26 27 #ifdef PERFTIMER27 #ifdef USE_PERFTIMER 28 28 static PerfTimer sPvsTimer; 29 29 static PerfTimer sSearchTimer; … … 2688 2688 Intersectable *obj; 2689 2689 2690 #ifdef PERFTIMER2690 #ifdef USE_PERFTIMER 2691 2691 sPvsTimer.Entry(); 2692 2692 #endif … … 2706 2706 } 2707 2707 2708 #ifdef PERFTIMER2708 #ifdef USE_PERFTIMER 2709 2709 sPvsTimer.Exit(); 2710 2710 #endif … … 2743 2743 queue<ViewCell *> tStack; 2744 2744 2745 #ifdef PERFTIMER2745 #ifdef USE_PERFTIMER 2746 2746 sPvsTimer.Start(); 2747 2747 #endif … … 2781 2781 } 2782 2782 2783 #ifdef PERFTIMER2783 #ifdef USE_PERFTIMER 2784 2784 Debug << "needed " << sPvsTimer.TotalTime() << " secs for pvs loading" << endl; 2785 2785 #endif -
GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp
r2586 r2588 25 25 #include "SceneGraph.h" 26 26 27 #ifdef PERFTIMER27 #ifdef USE_PERFTIMER 28 28 #include "Timer/PerfTimer.h" 29 #endif // PERFTIMER29 #endif // USE_PERFTIMER 30 30 31 31 #define USE_RAY_LENGTH_AS_CONTRIBUTION 0 … … 43 43 44 44 45 #ifdef PERFTIMER45 #ifdef USE_PERFTIMER 46 46 PerfTimer viewCellCastTimer; 47 47 PerfTimer pvsTimer; … … 1083 1083 int id; 1084 1084 1085 #ifdef PERFTIMER1085 #ifdef USE_PERFTIMER 1086 1086 PerfTimer boxTimer; 1087 1087 … … 1099 1099 1100 1100 1101 #ifdef PERFTIMER1101 #ifdef USE_PERFTIMER 1102 1102 boxTimer.Exit(); 1103 1103 … … 2128 2128 } 2129 2129 2130 #ifdef PERFTIMER2130 #ifdef USE_PERFTIMER 2131 2131 cout << "view cell cast time: " << viewCellCastTimer.TotalTime() << " s" << endl; 2132 2132 Debug << "view cell cast time: " << viewCellCastTimer.TotalTime() << " s" << endl; … … 2896 2896 ViewCell::NewMail(); 2897 2897 2898 #ifdef PERFTIMER2898 #ifdef USE_PERFTIMER 2899 2899 viewCellCastTimer.Entry(); 2900 2900 #endif … … 2917 2917 } 2918 2918 2919 #ifdef PERFTIMER2919 #ifdef USE_PERFTIMER 2920 2920 viewCellCastTimer.Exit(); 2921 2921 #endif … … 2938 2938 Intersectable *terminationObj; 2939 2939 2940 #ifdef PERFTIMER2940 #ifdef USE_PERFTIMER 2941 2941 objTimer.Entry(); 2942 2942 #endif … … 2944 2944 terminationObj = ray.mTerminationObject; 2945 2945 2946 #ifdef PERFTIMER2946 #ifdef USE_PERFTIMER 2947 2947 objTimer.Exit(); 2948 2948 … … 2972 2972 { 2973 2973 if (rand() < (RAND_MAX / 10)) 2974 cout << "rayd: " /*<< ray.GetOrigin() << " " << ray.GetTermination() << " "*/ << Normalize(ray.GetDir()) << " " << endl;2974 // cout << "rayd: " /*<< ray.GetOrigin() << " " << ray.GetTermination() << " "*/ << Normalize(ray.GetDir()) << " " << endl; 2975 2975 mVizBuffer.AddRay(&ray); 2976 2976 } 2977 2977 #endif 2978 #ifdef PERFTIMER2978 #ifdef USE_PERFTIMER 2979 2979 pvsTimer.Exit(); 2980 2980 #endif … … 7223 7223 CLEAR_CONTAINER(tmpRays); 7224 7224 7225 #ifdef PERFTIMER7225 #ifdef USE_PERFTIMER 7226 7226 cout << "view cell cast time: " << viewCellCastTimer.TotalTime() << " s" << endl; 7227 7227 Debug << "view cell cast time: " << viewCellCastTimer.TotalTime() << " s" << endl; -
GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsParser.cpp
r2575 r2588 147 147 EndObjectSpaceHierarchy(); 148 148 Debug << "object space hierarchy parsed" << endl; 149 #ifdef PERFTIMER149 #ifdef USE_PERFTIMER 150 150 mObjectTimer.Exit(); 151 151 #endif … … 156 156 CreateViewCellsManager(); 157 157 158 #ifdef PERFTIMER158 #ifdef USE_PERFTIMER 159 159 Debug << "pvs time: " << mPvsTimer.TotalTime() << endl; 160 160 Debug << "object time: " << mObjectTimer.TotalTime() << endl; … … 301 301 const long startTime = GetTime(); 302 302 303 #ifdef PERFTIMER303 #ifdef USE_PERFTIMER 304 304 mBoxTimer.Entry(); 305 305 #endif … … 324 324 << TimeDiff(startTime, GetTime()) * 1e-6 << " secs" << endl; 325 325 326 #ifdef PERFTIMER326 #ifdef USE_PERFTIMER 327 327 mBoxTimer.Exit(); 328 328 #endif … … 487 487 488 488 mCurrentState = PARSE_OBJECTSPACE_HIERARCHY; 489 #ifdef PERFTIMER489 #ifdef USE_PERFTIMER 490 490 mObjectTimer.Entry(); 491 491 #endif … … 547 547 } 548 548 549 #ifdef PERFTIMER549 #ifdef USE_PERFTIMER 550 550 mPvsTimer.Entry(); 551 551 #endif … … 591 591 } 592 592 593 #ifdef PERFTIMER593 #ifdef USE_PERFTIMER 594 594 mPvsTimer.Exit(); 595 595 #endif -
GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsParserXerces.h
r2575 r2588 15 15 #endif 16 16 17 #ifdef PERFTIMER17 #ifdef USE_PERFTIMER 18 18 #include "Timer/PerfTimer.h" 19 19 #endif … … 168 168 int nObjects; 169 169 170 #ifdef PERFTIMER170 #ifdef USE_PERFTIMER 171 171 PerfTimer mBoxTimer; 172 172 PerfTimer mPvsTimer; -
GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp
r2575 r2588 709 709 const bool globalCriteriaMet) 710 710 { 711 #ifdef PERFTIMER711 #ifdef USE_PERFTIMER 712 712 mSubdivTimer.Entry(); 713 713 #endif … … 790 790 } 791 791 792 #ifdef PERFTIMER792 #ifdef USE_PERFTIMER 793 793 mSubdivTimer.Exit(); 794 794 #endif … … 800 800 bool computeSplitPlane) 801 801 { 802 #ifdef PERFTIMER802 #ifdef USE_PERFTIMER 803 803 mPlaneTimer.Entry(); 804 804 #endif … … 823 823 } 824 824 825 #ifdef PERFTIMER825 #ifdef USE_PERFTIMER 826 826 mPlaneTimer.Exit(); 827 827 mEvalTimer.Entry(); … … 924 924 925 925 //cout << "vsp render cost decrease=" << renderCostDecr << endl; 926 #ifdef PERFTIMER926 #ifdef USE_PERFTIMER 927 927 mEvalTimer.Exit(); 928 928 #endif … … 957 957 VspTraversalData &backData) 958 958 { 959 #ifdef PERFTIMER959 #ifdef USE_PERFTIMER 960 960 mNodeTimer.Entry(); 961 961 #endif … … 1052 1052 interior->mTimeStamp = mHierarchyManager->mTimeStamp ++; 1053 1053 1054 #ifdef PERFTIMER1054 #ifdef USE_PERFTIMER 1055 1055 mNodeTimer.Exit(); 1056 1056 #endif … … 1114 1114 float maxBand) 1115 1115 { 1116 #ifdef PERFTIMER1116 #ifdef USE_PERFTIMER 1117 1117 mSortTimer.Entry(); 1118 1118 #endif … … 1166 1166 sort(mLocalSubdivisionCandidates->begin(), mLocalSubdivisionCandidates->end()); 1167 1167 1168 #ifdef PERFTIMER1168 #ifdef USE_PERFTIMER 1169 1169 mSortTimer.Exit(); 1170 1170 #endif … … 1587 1587 float &pBack) 1588 1588 { 1589 #ifdef PERFTIMER1589 #ifdef USE_PERFTIMER 1590 1590 mSplitTimer.Entry(); 1591 1591 #endif … … 1685 1685 pBack = nProbBack[bestAxis]; 1686 1686 1687 #ifdef PERFTIMER1687 #ifdef USE_PERFTIMER 1688 1688 mSplitTimer.Exit(); 1689 1689 #endif … … 3174 3174 void VspTree::GetViewCells(const VssRay &ray, ViewCellContainer &viewCells) 3175 3175 { 3176 #ifdef PERFTIMER3176 #ifdef USE_PERFTIMER 3177 3177 mViewCellsTimer.Entry(); 3178 3178 #endif … … 3193 3193 CastLineSegment(origin, termination, viewCells, false); 3194 3194 3195 #ifdef PERFTIMER3195 #ifdef USE_PERFTIMER 3196 3196 mViewCellsTimer.Exit(); 3197 3197 #endif -
GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.h
r2575 r2588 12 12 #include "SubdivisionCandidate.h" 13 13 #include "HierarchyManager.h" 14 #ifdef PERFTIMER14 #ifdef USE_PERFTIMER 15 15 #include "Timer/PerfTimer.h" 16 #endif // PERFTIMER16 #endif // USE_PERFTIMER 17 17 18 18 … … 672 672 //////////// 673 673 674 #ifdef PERFTIMER674 #ifdef USE_PERFTIMER 675 675 PerfTimer mSortTimer; 676 676 PerfTimer mSplitTimer; -
GTP/trunk/Lib/Vis/Preprocessing/src/common.h
r2585 r2588 30 30 #if defined(_MSC_VER) 31 31 // use perftimer only on msvc 32 #define PERFTIMER32 #define USE_PERFTIMER 33 33 34 34 // define __SSE__ macro as it is not defined under MSVC -
GTP/trunk/Lib/Vis/Preprocessing/src/default.env
r2583 r2588 53 53 useGlDebugger false 54 54 # 0 = INTERNAL 1 = MLRT 2 = HAVRAN 55 rayCastMethod 255 rayCastMethod 1 56 56 57 57 # type sampling -
GTP/trunk/Lib/Vis/Preprocessing/src/run_test2
r2583 r2588 46 46 #PREFIX=../work/plots/atlanta2-rss9 47 47 48 #-rss_distributions=direction+spatial+mutation \ 48 49 49 50 $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 50 -rss_distributions=direction+spatial +mutation\51 -rss_distributions=direction+spatial \ 51 52 -view_cells_use_kd_pvs+ -af_use_kd_pvs+ -view_cells_filter_width=1.0 \ 52 53 -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4a.xml \
Note: See TracChangeset
for help on using the changeset viewer.