mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-25 05:29:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/statlogs' into feature/multiresvolume

Browse Source
This commit is contained in:
Matthew Territo
2017-07-19 18:10:35 -06:00
parent 958e020538 82454c02b8
commit 31c19ec3ef
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/performance/performancemanager.cpp
View File

@@ -401,42 +401,42 @@ void PerformanceManager::storeScenePerformanceMeasurements(
std::next(std::begin(entry.renderTime)),
std::end(entry.renderTime)
);
entry.renderTime[PerformanceLayout::NumberValues - 1] = std::chrono::duration_cast<std::chrono::microseconds>(r.renderTime).count();
entry.renderTime[PerformanceLayout::NumberValues - 1] = std::chrono::duration<float, std::micro>(r.renderTime).count();
std::rotate(
std::begin(entry.updateTranslation),
std::next(std::begin(entry.updateTranslation)),
std::end(entry.updateTranslation)
);
entry.updateTranslation[PerformanceLayout::NumberValues - 1] = std::chrono::duration_cast<std::chrono::microseconds>(r.updateTimeTranslation).count();
entry.updateTranslation[PerformanceLayout::NumberValues - 1] = std::chrono::duration<float, std::micro>(r.updateTimeTranslation).count();
std::rotate(
std::begin(entry.updateRotation),
std::next(std::begin(entry.updateRotation)),
std::end(entry.updateRotation)
);
entry.updateRotation[PerformanceLayout::NumberValues - 1] = std::chrono::duration_cast<std::chrono::microseconds>(r.updateTimeRotation).count();
entry.updateRotation[PerformanceLayout::NumberValues - 1] = std::chrono::duration<float, std::micro>(r.updateTimeRotation).count();
std::rotate(
std::begin(entry.updateScaling),
std::next(std::begin(entry.updateScaling)),
std::end(entry.updateScaling)
);
entry.updateScaling[PerformanceLayout::NumberValues - 1] = std::chrono::duration_cast<std::chrono::microseconds>(r.updateTimeScaling).count();
entry.updateScaling[PerformanceLayout::NumberValues - 1] = std::chrono::duration<float, std::micro>(r.updateTimeScaling).count();
std::rotate(
std::begin(entry.updateRenderable),
std::next(std::begin(entry.updateRenderable)),
std::end(entry.updateRenderable)
);
entry.updateRenderable[PerformanceLayout::NumberValues - 1] = std::chrono::duration_cast<std::chrono::microseconds>(r.updateTimeRenderable).count();
entry.updateRenderable[PerformanceLayout::NumberValues - 1] = std::chrono::duration<float, std::micro>(r.updateTimeRenderable).count();
std::rotate(
std::begin(entry.totalTime),
std::next(std::begin(entry.totalTime)),
std::end(entry.totalTime)
);
entry.totalTime[PerformanceLayout::NumberValues - 1] = std::chrono::duration_cast<std::chrono::microseconds>(r.totalTime).count();
entry.totalTime[PerformanceLayout::NumberValues - 1] = std::chrono::duration<float, std::micro>(r.totalTime).count();
// Reset the total after we log it
node->clearPerformanceTotalTime();
}