Changeset 601 for trunk/VUT/GtpVisibilityPreprocessor/src
- Timestamp:
- 02/06/06 23:53:19 (18 years ago)
- Location:
- trunk/VUT/GtpVisibilityPreprocessor/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.cpp
r600 r601 44 44 { 45 45 // clamp to minmax values 46 if (pvs < lower)46 /*if (pvs < lower) 47 47 return (float)lower; 48 48 if (pvs > upper) 49 49 return (float)upper; 50 50 */ 51 51 return (float)pvs; 52 52 } … … 623 623 ++ mergeStats.siblings; 624 624 #endif 625 if (((mergeStats.merged % statsOut) == 0) ||626 (realNumActiveViewCells == mMergeMinViewCells))627 {625 // if (((mergeStats.merged % statsOut) == 0) || 626 // (realNumActiveViewCells == mMergeMinViewCells)) 627 // { 628 628 cout << "merged " << mergeStats.merged << " view cells" << endl; 629 629 … … 635 635 << "#TotalRenderCost\n" << totalRenderCost << endl 636 636 << "#CurrentPvs\n" << mergedVc->GetPvs().GetSize() << endl 637 << "#ExpectedCost\n" << realExpectedCost << endl637 << "#ExpectedCost\n" << realExpectedCost / (float) realNumActiveViewCells << endl 638 638 << "#AvgRenderCost\n" << realAvgRenderCost << endl 639 639 << "#Deviation\n" << mDeviation << endl 640 640 << "#TotalPvs\n" << totalPvs << endl 641 << "#PvsSizeDecrease\n" << -pvsDiff << endl; 642 } 641 << "#PvsSizeDecrease\n" << -pvsDiff << endl 642 << "#Volume\n" << mergedVc->GetVolume() << endl 643 << "#Dummy\n" << (float)mergedVc->GetPvs().GetSize() * mergedVc->GetVolume() / mViewCellsManager->GetViewSpaceBox().GetVolume() << endl; 644 // } 643 645 } 644 646 else -
trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp
r600 r601 189 189 190 190 // TODO: leak? 191 ComputeSampleContributions(constructionSamples, true, false);191 if(0)ComputeSampleContributions(constructionSamples, true, false); 192 192 cout << "finished" << endl; 193 193 … … 211 211 // store viewCells for postprocessing 212 212 const bool storeViewCells = true; 213 ComputeSampleContributions(postProcessSamples, true, storeViewCells);213 if(0)ComputeSampleContributions(postProcessSamples, true, storeViewCells); 214 214 // merge the view cells 215 215 PostProcess(preprocessor->mObjects, postProcessSamples); … … 224 224 visualizationSamples); 225 225 226 ComputeSampleContributions(visualizationSamples, true, storeViewCells);226 if(0)ComputeSampleContributions(visualizationSamples, true, storeViewCells); 227 227 228 228 //Debug << "visualizationsamples: " << mVisualizationSamples << " " << visualizationSamples.size() << endl; … … 2516 2516 cout << "Computing remaining ray contributions ... "; 2517 2517 // recast rest of rays 2518 if (0) 2518 2519 ComputeSampleContributions(savedRays, true, false); 2519 2520 cout << "finished" << endl; … … 2696 2697 2697 2698 VssRayContainer postProcessRays; 2698 GetRaySets(rays, mPostProcessSamples, postProcessRays);2699 if(0)GetRaySets(rays, mPostProcessSamples, postProcessRays); 2699 2700 2700 2701 Debug << "post processing using " << (int)postProcessRays.size() << " samples" << endl; -
trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp
r600 r601 55 55 56 56 57 /********************************************************************** /58 /* class VspBspTree implementation*/59 /********************************************************************** /57 /******************************************************************************/ 58 /* class VspBspTree implementation */ 59 /******************************************************************************/ 60 60 61 61 … … 413 413 const float prop = mUseAreaForPvs ? geom->GetArea() : geom->GetVolume(); 414 414 415 Debug << "herevol: " << geom->GetVolume() << endl; 416 Debug << "herevol:: " << mBox.GetVolume() << endl; 417 415 418 VspBspTraversalData tData(mRoot, 416 419 new PolygonContainer(polys), … … 431 434 mTotalCost = tData.GetCost() / mBox.GetVolume(); 432 435 436 Debug << "**volume** " << mBox.GetVolume() << endl; 437 438 mSplits = 0; 439 mSubdivisionStats 440 << "#Nodes\n" << ++ mSplits << endl 441 << "#RenderCostDecrease\n0\n" << endl 442 << "#TotalRenderCost\n" << mTotalCost << endl; 443 433 444 Debug << "total cost: " << mTotalCost << endl; 434 mSplits = 0;445 435 446 436 447 mBspStats.Start(); … … 664 675 665 676 // if geometry was not already computed 666 if ( !frontData.mGeometry && !backData.mGeometry)677 if (1)//!frontData.mGeometry && !backData.mGeometry) 667 678 { 668 679 frontData.mGeometry = new BspNodeGeometry(); … … 682 693 else 683 694 { 695 //Debug << "here2" << endl; 684 696 frontData.mProbability = frontData.mGeometry->GetVolume(); 685 backData.mProbability = backData.mGeometry->GetVolume(); 697 backData.mProbability = tData.mProbability - frontData.mProbability; 698 //backData.mProbability = backData.mGeometry->GetVolume(); 686 699 } 687 700 } … … 1328 1341 { 1329 1342 pFront = geomFront.GetVolume(); 1330 pBack = pOverall - geomFront.GetVolume(); 1343 //pBack = pOverall - geomFront.GetVolume(); 1344 pBack = geomBack.GetVolume(); 1345 1346 /*Debug << "volume: " << data.mGeometry->GetVolume() << endl; 1347 Debug << "volum1: " << geomFront.GetVolume() << endl; 1348 Debug << "volum2: " << geomBack.GetVolume() << endl; 1349 Debug << "sum_: " << geomFront.GetVolume() + geomBack.GetVolume() << endl;*/ 1331 1350 } 1332 1351 else
Note: See TracChangeset
for help on using the changeset viewer.