Show
Ignore:
Timestamp:
03/21/12 18:36:20 (3 years ago)
Author:
robert
Message:

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgUtil/IncrementalCompileOperation.cpp

    r12534 r13041  
    1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield  
     1/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
    22 * 
    3  * This library is open source and may be redistributed and/or modified under   
    4  * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or  
     3 * This library is open source and may be redistributed and/or modified under 
     4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
    55 * (at your option) any later version.  The full license is in LICENSE file 
    66 * included with this distribution, and on the openscenegraph.org website. 
    7  *  
     7 * 
    88 * This library is distributed in the hope that it will be useful, 
    99 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
    10  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
     10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1111 * OpenSceneGraph Public License for more details. 
    1212*/ 
     
    2828#include <string.h> 
    2929 
    30 namespace osgUtil  
     30namespace osgUtil 
    3131{ 
    3232 
     
    344344{ 
    345345//#define USE_TIME_ESTIMATES 
    346      
     346 
    347347    for(CompileOps::iterator itr = _compileOps.begin(); 
    348348        itr != _compileOps.end() && compileInfo.okToCompile(); 
     
    582582        compileSet->_subgraphToCompile->getBound(); 
    583583    } 
    584      
     584 
    585585    if (callBuildCompileMap) compileSet->buildCompileMap(_contexts); 
    586586 
     
    594594{ 
    595595    // OSG_NOTICE<<"IncrementalCompileOperation::remove(CompileSet* compileSet)"<<std::endl; 
    596      
     596 
    597597    if (!compileSet) return; 
    598598 
     
    648648        } 
    649649    } 
    650      
     650 
    651651    _compiled.clear(); 
    652652} 
     
    659659    //glFinish(); 
    660660    //glFlush(); 
    661      
     661 
    662662    double targetFrameRate = _targetFrameRate; 
    663663    double minimumTimeAvailableForGLCompileAndDeletePerFrame = _minimumTimeAvailableForGLCompileAndDeletePerFrame; 
    664664 
    665665    double targetFrameTime = 1.0/targetFrameRate; 
    666      
     666 
    667667    const osg::FrameStamp* fs = context->getState()->getFrameStamp(); 
    668668    double currentTime = fs ? fs->getReferenceTime() : 0.0; 
    669669 
    670670    double currentElapsedFrameTime = context->getTimeSinceLastClear(); 
    671      
     671 
    672672    OSG_NOTIFY(level)<<"IncrementalCompileOperation()"<<std::endl; 
    673673    OSG_NOTIFY(level)<<"    currentTime = "<<currentTime<<std::endl; 
    674674    OSG_NOTIFY(level)<<"    currentElapsedFrameTime = "<<currentElapsedFrameTime<<std::endl; 
    675      
     675 
    676676    double _flushTimeRatio(0.5); 
    677677    double _conservativeTimeRatio(0.5); 
     
    720720        } 
    721721    } 
    722      
     722 
    723723    //glFush(); 
    724724    //glFinish(); 
     
    770770} 
    771771 
    772          
     772 
    773773void IncrementalCompileOperation::compileAllForNextFrame(unsigned int numFramesToDoCompileAll) 
    774774{