Merged the new frame rate system into dev-char

client/in_world.cpp

@@ -34,6 +34,7 @@ InWorld::InWorld() {
 	cout << "entering InWorld" << endl;
 #endif
 	cout << "Client Index: " << infoMgr->GetClientIndex() << endl;
+	font.SetSurface(surfaceMgr->Get("font"));
 	pc.GetSprite()->SetSurface(surfaceMgr->Get("elliot"), 32, 48);
 }
 
@@ -61,7 +62,13 @@ void InWorld::FrameEnd() {
 }
 
 void InWorld::Render(SDL_Surface* const screen) {
+	ClockFrameRate();
+
 	pc.DrawTo(screen);
+
+	//since we're using this twice, make a tmp var
+	string fps = itos(GetFrameRate());
+	font.DrawStringTo(fps, screen, screen->w - fps.size() * font.GetCharW(), 0);
 }
 
 //-------------------------

client/in_world.hpp

@@ -35,6 +35,7 @@
 #include "udp_network_utility.hpp"
 #include "button.hpp"
 #include "raster_font.hpp"
+#include "frame_rate.hpp"
 
 //debugging
 #include "player_character.hpp"
@@ -73,6 +74,7 @@ protected:
 	InformationManager* infoMgr = ServiceLocator<InformationManager>::Get();
 
 	//members
+	RasterFont font;
 	PlayerCharacter pc;
 };
 

libs/Codebase/frame_rate.cpp

@@ -21,6 +21,24 @@
 */
 #include "frame_rate.hpp"
 
-int FrameRate::frameCount = 0;
+#include <chrono>
-int FrameRate::lastFrameRate = 0;
+
-FrameRate::Clock::time_point FrameRate::tick = FrameRate::Clock::now();
+typedef std::chrono::high_resolution_clock Clock;
+
+static int frameCount = 0;
+static int lastFrameRate = 0;
+static Clock::time_point tick = Clock::now();
+
+int ClockFrameRate() {
+	frameCount++;
+	if (Clock::now() - tick >= std::chrono::duration<int>(1)) {
+		lastFrameRate = frameCount;
+		frameCount = 0;
+		tick = Clock::now();
+	}
+	return lastFrameRate;
+}
+
+int GetFrameRate() {
+	return lastFrameRate;
+}

libs/Codebase/frame_rate.hpp

@@ -22,27 +22,7 @@
 #ifndef FRAMERATE_HPP_
 #define FRAMERATE_HPP_
 
-#include <chrono>
+int ClockFrameRate();
-
+int GetFrameRate();
-class FrameRate {
-public:
-	typedef std::chrono::high_resolution_clock Clock;
-
-	FrameRate() = delete;
-	static int Calculate() {
-		frameCount++;
-		if (Clock::now() - tick >= std::chrono::duration<int>(1)) {
-			lastFrameRate = frameCount;
-			frameCount = 0;
-			tick = Clock::now();
-		}
-		return lastFrameRate;
-	}
-	static int GetFrameRate() { return lastFrameRate; }
-private:
-	static int frameCount;
-	static int lastFrameRate;
-	static Clock::time_point tick;
-};
 
 #endif