made performance info viewable by toggle key
This commit is contained in:
parent
ed94e9578c
commit
d2494605e9
|
@ -1,5 +1,6 @@
|
||||||
; === propertyMap File ===
|
; === propertyMap File ===
|
||||||
|
|
||||||
|
RenderInGamePerformance=`
|
||||||
RenderNetworkStatus=N
|
RenderNetworkStatus=N
|
||||||
ShowFullConsole=M
|
ShowFullConsole=M
|
||||||
Screenshot=E
|
Screenshot=E
|
||||||
|
|
|
@ -91,6 +91,7 @@ Game::Game() : ProgramState(NULL) {
|
||||||
pauseStateChanged=false;
|
pauseStateChanged=false;
|
||||||
gameOver=false;
|
gameOver=false;
|
||||||
renderNetworkStatus=false;
|
renderNetworkStatus=false;
|
||||||
|
renderInGamePerformance=false;
|
||||||
showFullConsole=false;
|
showFullConsole=false;
|
||||||
setMarker=false;
|
setMarker=false;
|
||||||
cameraDragAllowed=false;
|
cameraDragAllowed=false;
|
||||||
|
@ -260,6 +261,7 @@ void Game::resetMembers() {
|
||||||
pauseStateChanged=false;
|
pauseStateChanged=false;
|
||||||
gameOver= false;
|
gameOver= false;
|
||||||
renderNetworkStatus= false;
|
renderNetworkStatus= false;
|
||||||
|
renderInGamePerformance=false;
|
||||||
this->speed= 1;
|
this->speed= 1;
|
||||||
showFullConsole= false;
|
showFullConsole= false;
|
||||||
setMarker = false;
|
setMarker = false;
|
||||||
|
@ -4591,8 +4593,12 @@ void Game::keyDown(SDL_KeyboardEvent key) {
|
||||||
configKeys.getSDLKey("SetMarker") == SDLK_LALT) {
|
configKeys.getSDLKey("SetMarker") == SDLK_LALT) {
|
||||||
setMarkerKeyAllowsModifier = true;
|
setMarkerKeyAllowsModifier = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(isKeyPressed(configKeys.getSDLKey("RenderInGamePerformance"),key, false) == true) {
|
||||||
|
renderInGamePerformance = !renderInGamePerformance;
|
||||||
|
}
|
||||||
//if(key == configKeys.getCharKey("RenderNetworkStatus")) {
|
//if(key == configKeys.getCharKey("RenderNetworkStatus")) {
|
||||||
if(isKeyPressed(configKeys.getSDLKey("RenderNetworkStatus"),key, false) == true) {
|
else if(isKeyPressed(configKeys.getSDLKey("RenderNetworkStatus"),key, false) == true) {
|
||||||
renderNetworkStatus= !renderNetworkStatus;
|
renderNetworkStatus= !renderNetworkStatus;
|
||||||
}
|
}
|
||||||
//else if(key == configKeys.getCharKey("ShowFullConsole")) {
|
//else if(key == configKeys.getCharKey("ShowFullConsole")) {
|
||||||
|
@ -5469,12 +5475,18 @@ void Game::render2d() {
|
||||||
str = getDebugStats(factionDebugInfo);
|
str = getDebugStats(factionDebugInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(this->getRenderInGamePerformance() == true) {
|
||||||
|
renderer.renderPerformanceStats();
|
||||||
|
}
|
||||||
|
|
||||||
if(renderer.getShowDebugUI() == true) {
|
if(renderer.getShowDebugUI() == true) {
|
||||||
const Metrics &metrics= Metrics::getInstance();
|
const Metrics &metrics= Metrics::getInstance();
|
||||||
//int mx= metrics.getMinimapX();
|
|
||||||
//int my= metrics.getMinimapY();
|
|
||||||
//int mw= metrics.getMinimapW();
|
|
||||||
int mh= metrics.getMinimapH();
|
int mh= metrics.getMinimapH();
|
||||||
|
|
||||||
|
if(this->getRenderInGamePerformance() == true) {
|
||||||
|
mh = mh + (gamePerformanceCounts.size() * 14);
|
||||||
|
}
|
||||||
|
|
||||||
const Vec4f fontColor=getGui()->getDisplay()->getColor();
|
const Vec4f fontColor=getGui()->getDisplay()->getColor();
|
||||||
|
|
||||||
if(Renderer::renderText3DEnabled == true) {
|
if(Renderer::renderText3DEnabled == true) {
|
||||||
|
@ -5560,8 +5572,6 @@ void Game::render2d() {
|
||||||
renderer.renderClock();
|
renderer.renderClock();
|
||||||
}
|
}
|
||||||
|
|
||||||
renderer.renderPerformanceStats();
|
|
||||||
|
|
||||||
//resource info
|
//resource info
|
||||||
if(photoModeEnabled == false) {
|
if(photoModeEnabled == false) {
|
||||||
if(this->masterserverMode == false) {
|
if(this->masterserverMode == false) {
|
||||||
|
|
|
@ -103,6 +103,7 @@ private:
|
||||||
|
|
||||||
bool gameOver;
|
bool gameOver;
|
||||||
bool renderNetworkStatus;
|
bool renderNetworkStatus;
|
||||||
|
bool renderInGamePerformance;
|
||||||
bool showFullConsole;
|
bool showFullConsole;
|
||||||
bool setMarker;
|
bool setMarker;
|
||||||
bool cameraDragAllowed;
|
bool cameraDragAllowed;
|
||||||
|
@ -339,6 +340,7 @@ public:
|
||||||
void setDisableSpeedChange(bool value) { disableSpeedChange = value; }
|
void setDisableSpeedChange(bool value) { disableSpeedChange = value; }
|
||||||
|
|
||||||
string getGamePerformanceCounts() const;
|
string getGamePerformanceCounts() const;
|
||||||
|
bool getRenderInGamePerformance() const { return renderInGamePerformance; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
//render
|
//render
|
||||||
|
|
|
@ -2223,11 +2223,6 @@ void Renderer::renderPerformanceStats() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Config &config= Config::getInstance();
|
|
||||||
if(config.getBool("ShowInGamePerformance","false") == false) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const Metrics &metrics = Metrics::getInstance();
|
const Metrics &metrics = Metrics::getInstance();
|
||||||
const World *world = game->getWorld();
|
const World *world = game->getWorld();
|
||||||
const Vec4f fontColor = game->getGui()->getDisplay()->getColor();
|
const Vec4f fontColor = game->getGui()->getDisplay()->getColor();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user