made performance info viewable by toggle key

mk/linux/glestkeys.ini

@@ -1,5 +1,6 @@
 ; === propertyMap File === 
 
+RenderInGamePerformance=`
 RenderNetworkStatus=N
 ShowFullConsole=M
 Screenshot=E

source/glest_game/game/game.cpp

@@ -91,6 +91,7 @@ Game::Game() : ProgramState(NULL) {
 	pauseStateChanged=false;
 	gameOver=false;
 	renderNetworkStatus=false;
+	renderInGamePerformance=false;
 	showFullConsole=false;
 	setMarker=false;
 	cameraDragAllowed=false;
@@ -260,6 +261,7 @@ void Game::resetMembers() {
 	pauseStateChanged=false;
 	gameOver= false;
 	renderNetworkStatus= false;
+	renderInGamePerformance=false;
 	this->speed= 1;
 	showFullConsole= false;
 	setMarker = false;
@@ -4591,8 +4593,12 @@ void Game::keyDown(SDL_KeyboardEvent key) {
 				configKeys.getSDLKey("SetMarker") == SDLK_LALT) {
 				setMarkerKeyAllowsModifier = true;
 			}
+
+			if(isKeyPressed(configKeys.getSDLKey("RenderInGamePerformance"),key, false) == true) {
+				renderInGamePerformance = !renderInGamePerformance;
+			}
 			//if(key == configKeys.getCharKey("RenderNetworkStatus")) {
-			if(isKeyPressed(configKeys.getSDLKey("RenderNetworkStatus"),key, false) == true) {
+			else if(isKeyPressed(configKeys.getSDLKey("RenderNetworkStatus"),key, false) == true) {
 				renderNetworkStatus= !renderNetworkStatus;
 			}
 			//else if(key == configKeys.getCharKey("ShowFullConsole")) {
@@ -5469,12 +5475,18 @@ void Game::render2d() {
 		str = getDebugStats(factionDebugInfo);
 	}
 
+	if(this->getRenderInGamePerformance() == true) {
+		renderer.renderPerformanceStats();
+	}
+
 	if(renderer.getShowDebugUI() == true) {
 		const Metrics &metrics= Metrics::getInstance();
-		//int mx= metrics.getMinimapX();
-		//int my= metrics.getMinimapY();
-		//int mw= metrics.getMinimapW();
 		int mh= metrics.getMinimapH();
+
+		if(this->getRenderInGamePerformance() == true) {
+			mh = mh + (gamePerformanceCounts.size() * 14);
+		}
+
 		const Vec4f fontColor=getGui()->getDisplay()->getColor();
 
 		if(Renderer::renderText3DEnabled == true) {
@@ -5560,8 +5572,6 @@ void Game::render2d() {
 		renderer.renderClock();
 	}
 
-	renderer.renderPerformanceStats();
-
     //resource info
 	if(photoModeEnabled == false) {
 		if(this->masterserverMode == false) {

source/glest_game/game/game.h

@@ -103,6 +103,7 @@ private:
 
 	bool gameOver;
 	bool renderNetworkStatus;
+	bool renderInGamePerformance;
 	bool showFullConsole;
 	bool setMarker;
 	bool cameraDragAllowed;
@@ -339,6 +340,7 @@ public:
 	void setDisableSpeedChange(bool value) { disableSpeedChange = value; }
 
 	string getGamePerformanceCounts() const;
+	bool getRenderInGamePerformance() const { return renderInGamePerformance; }
 
 private:
 	//render

source/glest_game/graphics/renderer.cpp

@@ -2223,11 +2223,6 @@ void Renderer::renderPerformanceStats() {
 		return;
 	}
 
-	Config &config= Config::getInstance();
-	if(config.getBool("ShowInGamePerformance","false") == false) {
-		return;
-	}
-
 	const Metrics &metrics = Metrics::getInstance();
 	const World *world = game->getWorld();
 	const Vec4f fontColor = game->getGui()->getDisplay()->getColor();