Re-enabled FPS display, fix other display issues

2015-08-23 01:53:13 +10:00
parent 915660da0e
commit 41d601ab06
5 changed files with 13 additions and 9 deletions
@@ -185,13 +185,15 @@ void World::RenderFrame(SDL_Renderer* renderer) {
 	//draw UI
 	disconnectButton.DrawTo(renderer);
 	shutdownButton.DrawTo(renderer);
-	std::ostringstream msg;
-	//TODO: FPS
-//	msg << fps.GetFrameRate();
-//	font.DrawStringTo(msg.str(), screen, 0, 0);

 	//FPS
-	fps.Calculate();
+	fpsTextLine.DrawTo(renderer, 0, 0);
+	int fpsRet = fps.Calculate();
+	if (fpsRet != -1) {
+		std::ostringstream msg;
+		msg << "FPS: " << fpsRet;
+		fpsTextLine.SetText(renderer, font, msg.str(), {255, 255, 255, 255});
+	}
 }

 //-------------------------