Merge pull request #63 from uvcat7/framerate-diagnostics

Framerate diagnostics QOL and bugfixes

Author: uvcat7

src/Core/Core.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdint>
+#include <chrono>
 
 namespace Vortex {
 
@@ -51,7 +52,7 @@ struct TimingData;
 typedef const String& StringRef;
 typedef uint64_t TextureHandle;
 
-extern float deltaTime;
+extern std::chrono::duration<double> deltaTime;
 
 extern void HudNote(const char* fmt, ...);
 extern void HudInfo(const char* fmt, ...);

src/Core/TextDraw.cpp

@@ -321,8 +321,6 @@ void Text::draw(vec2i textPos)
 		}
 		batch.flush();
 	}
-
-	VortexCheckGlError();
 }
 
 };

src/Editor/Editing.cpp

@@ -271,8 +271,9 @@ void onKeyRelease(KeyRelease& evt) override
 			noteKeysHeld--;
 			if (noteKeysHeld < 0) noteKeysHeld = 0;
 			finishNotePlacement(col);
-			// Don't advance when we're stepping jumps
-			if (hasJumpToNextNote() && noteKeysHeld == 0 && gView->getSnapType() != ST_NONE)
+			// Don't advance when we're stepping jumps or when music is playing
+			if (hasJumpToNextNote() && gMusic->isPaused()
+				&& noteKeysHeld == 0 && gView->getSnapType() != ST_NONE)
 			{
 				gView->setCursorRow(gView->snapRow(gView->getCursorRow(), gView->hasReverseScroll() ? View::SNAP_UP : View::SNAP_DOWN));
 			}

src/Editor/Editor.cpp

@@ -888,46 +888,46 @@ void tick()
 	notifyChanges();
 
 	vec2i windowSize = gSystem->getWindowSize();
-	recti r = {0, 0, windowSize.x, windowSize.y};
+	recti r = { 0, 0, windowSize.x, windowSize.y };
 
 	gTextOverlay->handleInputs(events);
 
 	GuiMain::setViewSize(r.w, r.h);
-	GuiMain::frameStart(deltaTime, events);
+	GuiMain::frameStart(deltaTime.count(), events);
 
 	vec2i view = gSystem->getWindowSize();
 
 	handleDialogs();
 
-	myGui->tick({0, 0, view.x, view.y}, deltaTime, events);
-	
-	if(!GuiMain::isCapturingText())
+	myGui->tick({ 0, 0, view.x, view.y }, deltaTime.count(), events);
+
+	if (!GuiMain::isCapturingText())
 	{
-		for(KeyPress* press = nullptr; events.next(press);)
+		for (KeyPress* press = nullptr; events.next(press);)
 		{
 			Action::Type action = gShortcuts->getAction(press->keyflags, press->key);
-			if(action)
+			if (action)
 			{
 				Action::perform(action);
 				press->handled = true;
 			}
 		}
 	}
 
-	if(!GuiMain::isCapturingMouse())
+	if (!GuiMain::isCapturingMouse())
 	{
-		for(MouseScroll* scroll = nullptr; events.next(scroll);)
+		for (MouseScroll* scroll = nullptr; events.next(scroll);)
 		{
 			Action::Type action = gShortcuts->getAction(scroll->keyflags, scroll->up);
-			if(action)
+			if (action)
 			{
 				Action::perform(action);
 				scroll->handled = true;
 			}
 		}
 	}
 
-	if(GuiMain::isCapturingMouse())
+	if (GuiMain::isCapturingMouse())
 	{
 		gSystem->setCursor(GuiMain::getCursorIcon());
 	}
@@ -937,14 +937,14 @@ void tick()
 	gMinimap->handleInputs(events);
 	gEditing->handleInputs(events);
 
-	if(gSimfile->isOpen())
+	if (gSimfile->isOpen())
 	{
 		gView->tick();
 	}
 
 	gSelection->handleInputs(events);
 
-	if(gSimfile->isOpen())
+	if (gSimfile->isOpen())
 	{
 		gMusic->tick();
 		gMinimap->tick();
@@ -954,8 +954,8 @@ void tick()
 
 	updateTitle();
 	notifyChanges();
-	
-	if(gSimfile->isOpen())
+
+	if (gSimfile->isOpen())
 	{
 		gNotefield->draw();
 		gMinimap->draw();

src/Editor/Music.cpp

@@ -3,6 +3,7 @@
 #include <limits.h>
 #include <stdint.h>
 #include <math.h>
+#include <chrono>
 
 #include <Core/Vector.h>
 #include <Core/Reference.h>
@@ -19,6 +20,7 @@
 
 #include <Editor/ConvertToOgg.h>
 #include <Editor/Editor.h>
+#include <Editor/View.h>
 #include <Editor/Common.h>
 #include <Editor/TextOverlay.h>
 
@@ -48,7 +50,7 @@ struct MusicImpl : public Music, public MixSource {
 
 Mixer* myMixer;
 Sound mySamples;
-double myPlayTimer;
+std::chrono::steady_clock::time_point myPlayTimer;
 TickData myBeatTick, myNoteTick;
 String myTitle, myArtist;
 int myMusicSpeed;
@@ -673,7 +675,7 @@ void onChanges(int changes)
 		| VCM_TEMPO_CHANGED
 		| VCM_END_ROW_CHANGED;
 
-	if(changes & bits)
+	if((changes & bits) && !gMusic->isPaused() && gView->hasChartPreview())
 	{
 		interruptStream();
 		if(changes & (VCM_TEMPO_CHANGED | VCM_NOTES_CHANGED))

src/Editor/Sound.cpp

@@ -10,6 +10,7 @@
 
 #include <stdint.h>
 #include <limits.h>
+#include <chrono>
 
 namespace Vortex {
 
@@ -93,7 +94,7 @@ class Sound::Thread : public BackgroundThread
 	int myCurrentFrame;
 	int myReservedFrames;
 	uchar myProgress;
-	double myStartTime;
+	std::chrono::steady_clock::time_point myStartTime;
 };
 
 Sound::Thread::~Thread()

src/Editor/TextOverlay.cpp

@@ -432,7 +432,7 @@ void tickHud()
 		{
 			fade += 0.5f;
 		}
-		float delta = clamp(deltaTime * fade, 0.0f, 1.0f);
+		auto delta = clamp(deltaTime.count() * fade, 0.0, 1.0);
 
 		myHud[i].timeLeft -= delta;
 		if(myHud[i].timeLeft <= -0.5f) myHud.erase(i);
@@ -575,7 +575,7 @@ void drawAbout()
 	Text::arrange(Text::BC, "ArrowVortex (beta)");
 	Text::draw(vec2i{size.x / 2, size.y / 2 - 2});
 
-	Text::arrange(Text::TC, "(C) Bram 'Fietsemaker' van de Wetering");
+	Text::arrange(Text::TC, "Bram 'Fietsemaker' van de Wetering");
 	Text::draw(vec2i{size.x / 2, size.y / 2 + 2});
 
 	String buildDate = "Build :: " + System::getBuildData();
@@ -584,7 +584,7 @@ void drawAbout()
 
 	DrawTitleText("ABOUT", "[ESC] close", nullptr);
 
-	auto fps = Str::fmt("%1 FPS").arg(1.0f / max(deltaTime, 0.0001f), 0, 0);
+	auto fps = Str::fmt("%1 FPS").arg(1.0f / max(deltaTime.count(), 0.0001), 0, 0);
 	Text::arrange(Text::TR, fps);
 	Text::draw(vec2i{size.x - 4, 4});
 }

src/System/Debug.cpp

@@ -5,7 +5,8 @@
 #include <io.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <time.h>
+//#include <time.h>
+#include <chrono>
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -17,28 +18,17 @@ namespace Debug {
 
 // ================================================================================================
 // Debug :: timing functions.
-
-static double GetTimeFreq()
-{
-	LARGE_INTEGER i;
-	if(QueryPerformanceFrequency(&i))
-	{
-		return 1.0 / (double)i.QuadPart;
-	}
-	return 1.0;
-}
-
-double getElapsedTime()
+using namespace std::chrono;
+steady_clock::time_point getElapsedTime()
 {
-	static double sTimerFreq = GetTimeFreq();
-	LARGE_INTEGER i;
-	QueryPerformanceCounter(&i);
-	return (double)i.QuadPart * sTimerFreq;
+	return std::chrono::steady_clock::now();
 }
 
-double getElapsedTime(double startTime)
+double getElapsedTime(steady_clock::time_point startTime)
 {
-	return getElapsedTime() - startTime;
+	auto currentTime = steady_clock::now();
+	const duration<double> deltaTime = currentTime - startTime;
+	return deltaTime.count();
 }
 
 // ================================================================================================

src/System/Debug.h

@@ -2,6 +2,7 @@
 
 #include <Core/Core.h>
 #include <assert.h>
+#include <chrono>
 
 #ifndef _DEBUG
 #define VORTEX_DISABLE_ASSERTS
@@ -15,10 +16,10 @@ namespace Debug
 	enum Type { INFO, WARNING, ERROR };
 
 	/// Returns a timestamp of the current time.
-	double getElapsedTime();
+	std::chrono::steady_clock::time_point getElapsedTime();
 
 	/// Returns the number of seconds elapsed since the start time.
-	double getElapsedTime(double startTime);
+	double getElapsedTime(std::chrono::steady_clock::time_point startTime);
 
 	/// Creates a blank log file.
 	void openLogFile();