diff --git a/VisualC/SDL/SDL_VS2012_WinRT.vcxproj b/VisualC/SDL/SDL_VS2012_WinRT.vcxproj index 350b25fc6..18123fa86 100644 --- a/VisualC/SDL/SDL_VS2012_WinRT.vcxproj +++ b/VisualC/SDL/SDL_VS2012_WinRT.vcxproj @@ -238,7 +238,6 @@ - diff --git a/src/video/windowsrt/BasicTimer.h b/src/video/windowsrt/BasicTimer.h deleted file mode 100644 index 4f097d4eb..000000000 --- a/src/video/windowsrt/BasicTimer.h +++ /dev/null @@ -1,76 +0,0 @@ -#pragma once - -#include - -// Helper class for basic timing. -ref class BasicTimer sealed -{ -public: - // Initializes internal timer values. - BasicTimer() - { - if (!QueryPerformanceFrequency(&m_frequency)) - { - throw ref new Platform::FailureException(); - } - Reset(); - } - - // Reset the timer to initial values. - void Reset() - { - Update(); - m_startTime = m_currentTime; - m_total = 0.0f; - m_delta = 1.0f / 60.0f; - } - - // Update the timer's internal values. - void Update() - { - if (!QueryPerformanceCounter(&m_currentTime)) - { - throw ref new Platform::FailureException(); - } - - m_total = static_cast( - static_cast(m_currentTime.QuadPart - m_startTime.QuadPart) / - static_cast(m_frequency.QuadPart) - ); - - if (m_lastTime.QuadPart == m_startTime.QuadPart) - { - // If the timer was just reset, report a time delta equivalent to 60Hz frame time. - m_delta = 1.0f / 60.0f; - } - else - { - m_delta = static_cast( - static_cast(m_currentTime.QuadPart - m_lastTime.QuadPart) / - static_cast(m_frequency.QuadPart) - ); - } - - m_lastTime = m_currentTime; - } - - // Duration in seconds between the last call to Reset() and the last call to Update(). - property float Total - { - float get() { return m_total; } - } - - // Duration in seconds between the previous two calls to Update(). - property float Delta - { - float get() { return m_delta; } - } - -private: - LARGE_INTEGER m_frequency; - LARGE_INTEGER m_currentTime; - LARGE_INTEGER m_startTime; - LARGE_INTEGER m_lastTime; - float m_total; - float m_delta; -}; diff --git a/src/video/windowsrt/SDL_WinRTApp.cpp b/src/video/windowsrt/SDL_WinRTApp.cpp index 343273611..12593b425 100644 --- a/src/video/windowsrt/SDL_WinRTApp.cpp +++ b/src/video/windowsrt/SDL_WinRTApp.cpp @@ -1,6 +1,5 @@ #include "SDLmain_WinRT_common.h" #include "SDL_WinRTApp.h" -#include "BasicTimer.h" extern "C" { #include "SDL_assert.h" @@ -90,15 +89,12 @@ void SDL_WinRTApp::Run() SDL_WinRT_main(argc, argv); } - BasicTimer^ timer = ref new BasicTimer(); - while (!m_windowClosed) { if (m_windowVisible) { - timer->Update(); CoreWindow::GetForCurrentThread()->Dispatcher->ProcessEvents(CoreProcessEventsOption::ProcessAllIfPresent); - m_renderer->Update(timer->Total, timer->Delta); + m_renderer->Update(0.0f, 0.0f); m_renderer->Render(); m_renderer->Present(); // This call is synchronized to the display frame rate. }