summaryrefslogtreecommitdiff
path: root/src/core/frontend/emu_window.cpp
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2017-02-26 17:51:15 -0800
committerGravatar GitHub2017-02-26 17:51:15 -0800
commitb250ce21b9a62cb573540fdb14f30c28fa66e6ad (patch)
treeef55a0cd4a531a097de2152f563d712551972c4b /src/core/frontend/emu_window.cpp
parentMerge pull request #2595 from jroweboy/patch (diff)
parentPerfStats: Re-order and document members better (diff)
downloadyuzu-b250ce21b9a62cb573540fdb14f30c28fa66e6ad.tar.gz
yuzu-b250ce21b9a62cb573540fdb14f30c28fa66e6ad.tar.xz
yuzu-b250ce21b9a62cb573540fdb14f30c28fa66e6ad.zip
Merge pull request #2587 from yuriks/status-bar
Replace built-in Profiler with indicators in status bar
Diffstat (limited to 'src/core/frontend/emu_window.cpp')
-rw-r--r--src/core/frontend/emu_window.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp
index 6b4637741..a155b657d 100644
--- a/src/core/frontend/emu_window.cpp
+++ b/src/core/frontend/emu_window.cpp
@@ -5,7 +5,7 @@
5#include <algorithm> 5#include <algorithm>
6#include <cmath> 6#include <cmath>
7#include "common/assert.h" 7#include "common/assert.h"
8#include "common/profiler_reporting.h" 8#include "core/core.h"
9#include "core/frontend/emu_window.h" 9#include "core/frontend/emu_window.h"
10#include "core/frontend/key_map.h" 10#include "core/frontend/key_map.h"
11#include "video_core/video_core.h" 11#include "video_core/video_core.h"
@@ -104,8 +104,7 @@ void EmuWindow::AccelerometerChanged(float x, float y, float z) {
104void EmuWindow::GyroscopeChanged(float x, float y, float z) { 104void EmuWindow::GyroscopeChanged(float x, float y, float z) {
105 constexpr float FULL_FPS = 60; 105 constexpr float FULL_FPS = 60;
106 float coef = GetGyroscopeRawToDpsCoefficient(); 106 float coef = GetGyroscopeRawToDpsCoefficient();
107 float stretch = 107 float stretch = Core::System::GetInstance().perf_stats.GetLastFrameTimeScale();
108 FULL_FPS / Common::Profiling::GetTimingResultsAggregator()->GetAggregatedResults().fps;
109 std::lock_guard<std::mutex> lock(gyro_mutex); 108 std::lock_guard<std::mutex> lock(gyro_mutex);
110 gyro_x = static_cast<s16>(x * coef * stretch); 109 gyro_x = static_cast<s16>(x * coef * stretch);
111 gyro_y = static_cast<s16>(y * coef * stretch); 110 gyro_y = static_cast<s16>(y * coef * stretch);