From 6e80cdcfb2afee61759755fcaf1c296f5e744718 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 28 Jan 2011 14:24:30 +0000 Subject: [PATCH] Temporarily disabled the cost estimate code for the 2.9.11 release --- src/osgUtil/IncrementalCompileOperation.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/osgUtil/IncrementalCompileOperation.cpp b/src/osgUtil/IncrementalCompileOperation.cpp index 1f57bf188..ab1d38463 100644 --- a/src/osgUtil/IncrementalCompileOperation.cpp +++ b/src/osgUtil/IncrementalCompileOperation.cpp @@ -282,16 +282,22 @@ double IncrementalCompileOperation::CompileList::estimatedTimeForCompile(Compile bool IncrementalCompileOperation::CompileList::compile(CompileInfo& compileInfo) { +//#define USE_TIME_ESTIMATES + for(CompileOps::iterator itr = _compileOps.begin(); itr != _compileOps.end() && compileInfo.availableTime()>0.0 && compileInfo.maxNumObjectsToCompile>0; ) { + #ifdef USE_TIME_ESTIMATES double estimatedCompileCost = (*itr)->estimatedTimeForCompile(compileInfo); - + #endif + --compileInfo.maxNumObjectsToCompile; + #ifdef USE_TIME_ESTIMATES osg::ElapsedTime timer; - + #endif + CompileOps::iterator saved_itr(itr); ++itr; if ((*saved_itr)->compile(compileInfo)) @@ -299,8 +305,10 @@ bool IncrementalCompileOperation::CompileList::compile(CompileInfo& compileInfo) _compileOps.erase(saved_itr); } + #ifdef USE_TIME_ESTIMATES double actualCompileCost = timer.elapsedTime(); OSG_NOTICE<<"IncrementalCompileOperation::CompileList::compile() estimatedTimForCompile= "<