merging various commits and stashes

client/frame_rate.hpp

@@ -0,0 +1,29 @@
+#ifndef FRAMERATE_HPP_
+#define FRAMERATE_HPP_
+
+#include <ctime>
+
+class FrameRate {
+public:
+	FrameRate() {
+		frameCount = lastFrameRate = tick = 0;
+	}
+	int Calculate() {
+		frameCount++;
+		if (clock() - tick >= CLOCKS_PER_SEC) {
+			lastFrameRate = frameCount;
+			frameCount = 0;
+			tick = clock();
+		}
+		return lastFrameRate;
+	}
+	int GetFrameRate() {
+		return lastFrameRate;
+	}
+private:
+	int frameCount;
+	int lastFrameRate;
+	int tick;
+};
+
+#endif

client/in_game.cpp

@@ -31,7 +31,7 @@ InGame::~InGame() {
 //-------------------------
 
 void InGame::FrameStart() {
-	//
+	frameRate.Calculate();
 }
 
 void InGame::FrameEnd() {
@@ -100,3 +100,11 @@ void InGame::KeyUp(SDL_KeyboardEvent const& key) {
 		break;
 	}
 }
+
+//-------------------------
+//Utilities
+//-------------------------
+
+void InGame::NewPlayer(int index, std::string avatarName, int x, int y) {
+	//
+}

client/in_game.hpp

@@ -4,9 +4,12 @@
 #include "base_scene.hpp"
 
 #include "delta.hpp"
-#include "player.hpp"
+#include "frame_rate.hpp"
+#include "player_manager.hpp"
 #include "surface_manager.hpp"
 
+#include <string>
+
 class InGame : public BaseScene {
 public:
 	//Public access members
@@ -27,9 +30,15 @@ protected:
 	virtual void KeyDown			(SDL_KeyboardEvent const&);
 	virtual void KeyUp				(SDL_KeyboardEvent const&);
 
+	//utilities
+	void NewPlayer(int index, std::string avatarName, int x, int y);
+
 	//members
 	Delta delta;
+	FrameRate frameRate;
 	SurfaceManager surfaceMgr;
+	PlayerManager playerMgr;
+
 	Player* player;
 };
 

client/makefile

@@ -11,7 +11,7 @@ OUTDIR=out
 OUT=$(addprefix $(OUTDIR)/,a)
 
 #source
-SRC=test_systems.cpp in_game.cpp
+SRC=test_systems.cpp in_game.cpp player_manager.cpp
 
 #targets
 all: $(OBJ) $(OUT)

client/player_manager.cpp

@@ -0,0 +1,2 @@
+#include "player_manager.hpp"
+

client/player_manager.hpp

@@ -0,0 +1,11 @@
+#ifndef PLAYERMANAGER_HPP_
+#define PLAYERMANAGER_HPP_
+
+#include "player.hpp"
+
+class PlayerManager {
+public:
+private:
+};
+
+#endif

docs/pseudocode.txt

@@ -28,6 +28,7 @@ Player:
 
 
 PlayerManager:
+	NewPlayer(index, avatar, x, y)
 	Update(delta) //all player objects
 	Synchronize(dataArray) //possible
 
@@ -48,3 +49,6 @@ Receive:
 		player update:
 			PlayerManager.Update(message)
 end
+
+-------------------------
+