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

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgViewer/StatsHandler.cpp

    r12955 r13041  
    267267} 
    268268 
    269 void StatsHandler::addUserStatsLine(const std::string& label, const osg::Vec4& textColor, const osg::Vec4& barColor,  
    270                                     const std::string& timeTakenName, float multiplier, bool average, bool averageInInverseSpace,  
     269void StatsHandler::addUserStatsLine(const std::string& label, const osg::Vec4& textColor, const osg::Vec4& barColor, 
     270                                    const std::string& timeTakenName, float multiplier, bool average, bool averageInInverseSpace, 
    271271                                    const std::string& beginTimeName, const std::string& endTimeName, float maxValue) 
    272272{ 
     
    12271227 
    12281228            UserStatsLine& line = _userStatsLines[i]; 
    1229             createTimeStatsLine(line.label, pos, line.textColor, line.barColor, viewer->getViewerStats(), viewer->getViewerStats(),  
     1229            createTimeStatsLine(line.label, pos, line.textColor, line.barColor, viewer->getViewerStats(), viewer->getViewerStats(), 
    12301230                line.timeTakenName, line.multiplier, line.average, line.averageInInverseSpace, line.beginTimeName, line.endTimeName); 
    1231          
     1231 
    12321232            pos.y() -= _characterSize*_lineHeight; 
    12331233        } 
     
    12361236            pos.x() = _leftPos; 
    12371237 
    1238             createTimeStatsLine("Event", pos, colorUpdate, colorUpdateAlpha, viewer->getViewerStats(), viewer->getViewerStats(),  
     1238            createTimeStatsLine("Event", pos, colorUpdate, colorUpdateAlpha, viewer->getViewerStats(), viewer->getViewerStats(), 
    12391239                "Event traversal time taken", 1000.0, true, false, "Event traversal begin time", "Event traversal end time"); 
    12401240 
     
    12451245            pos.x() = _leftPos; 
    12461246 
    1247             createTimeStatsLine("Update", pos, colorUpdate, colorUpdateAlpha, viewer->getViewerStats(), viewer->getViewerStats(),  
     1247            createTimeStatsLine("Update", pos, colorUpdate, colorUpdateAlpha, viewer->getViewerStats(), viewer->getViewerStats(), 
    12481248                "Update traversal time taken", 1000.0, true, false, "Update traversal begin time", "Update traversal end time"); 
    12491249 
     
    16181618 
    16191619void StatsHandler::createTimeStatsLine(const std::string& lineLabel, 
    1620                                        osg::Vec3 pos, const osg::Vec4& textColor, const osg::Vec4& barColor,  
    1621                                        osg::Stats* viewerStats, osg::Stats* stats,  
    1622                                        const std::string& timeTakenName, float multiplier, bool average, bool averageInInverseSpace,  
     1620                                       osg::Vec3 pos, const osg::Vec4& textColor, const osg::Vec4& barColor, 
     1621                                       osg::Stats* viewerStats, osg::Stats* stats, 
     1622                                       const std::string& timeTakenName, float multiplier, bool average, bool averageInInverseSpace, 
    16231623                                       const std::string& beginTimeName, const std::string& endTimeName) 
    16241624{ 
     
    16791679        pos.x() = _leftPos; 
    16801680 
    1681         createTimeStatsLine("Cull", pos, colorCull, colorCullAlpha, viewerStats, stats,  
     1681        createTimeStatsLine("Cull", pos, colorCull, colorCullAlpha, viewerStats, stats, 
    16821682            "Cull traversal time taken", 1000.0, true, false, "Cull traversal begin time", "Cull traversal end time"); 
    16831683 
     
    16881688        pos.x() = _leftPos; 
    16891689 
    1690         createTimeStatsLine("Draw", pos, colorDraw, colorDrawAlpha, viewerStats, stats,  
     1690        createTimeStatsLine("Draw", pos, colorDraw, colorDrawAlpha, viewerStats, stats, 
    16911691            "Draw traversal time taken", 1000.0, true, false, "Draw traversal begin time", "Draw traversal end time"); 
    16921692 
     
    16981698        pos.x() = _leftPos; 
    16991699 
    1700         createTimeStatsLine("GPU", pos, colorGPU, colorGPUAlpha, viewerStats, stats,  
     1700        createTimeStatsLine("GPU", pos, colorGPU, colorGPUAlpha, viewerStats, stats, 
    17011701            "GPU draw time taken", 1000.0, true, false, "GPU draw begin time", "GPU draw end time"); 
    17021702