mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-01 20:12:40 +02:00
Code Issues Projects Releases Wiki Activity

- bugfix to clear surface data cache on game exit (lest we overfill system RAM)

Browse Source
This commit is contained in:
Mark Vejvoda
2011-02-05 05:50:42 +00:00
parent 25f1cdaae6
commit 6052ee6cc7
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/glest_game/game/game.cpp
View File

@@ -1683,6 +1683,7 @@ void Game::render2d(){
str+= "Render FPS: " + intToStr(lastRenderFps) + "[" + intToStr(avgRenderFps) + "]\n"; str+= "Render FPS: " + intToStr(lastRenderFps) + "[" + intToStr(avgRenderFps) + "]\n";
str+= "Update FPS: " + intToStr(lastUpdateFps) + "[" + intToStr(avgUpdateFps) + "]\n"; str+= "Update FPS: " + intToStr(lastUpdateFps) + "[" + intToStr(avgUpdateFps) + "]\n";
str+= "GameCamera pos: " + floatToStr(gameCamera.getPos().x)+","+floatToStr(gameCamera.getPos().y)+","+floatToStr(gameCamera.getPos().z)+"\n"; str+= "GameCamera pos: " + floatToStr(gameCamera.getPos().x)+","+floatToStr(gameCamera.getPos().y)+","+floatToStr(gameCamera.getPos().z)+"\n";
str+= "Cached surfacedata: " + intToStr(renderer.getCachedSurfaceDataSize());
str+= "Time: " + floatToStr(world.getTimeFlow()->getTime(),2)+"\n"; str+= "Time: " + floatToStr(world.getTimeFlow()->getTime(),2)+"\n";
if(SystemFlags::getThreadedLoggerRunning() == true) { if(SystemFlags::getThreadedLoggerRunning() == true) {
str+= "Log buffer count: " + intToStr(SystemFlags::getLogEntryBufferCount())+"\n"; str+= "Log buffer count: " + intToStr(SystemFlags::getLogEntryBufferCount())+"\n";

6
source/glest_game/graphics/renderer.cpp
View File

@@ -154,6 +154,7 @@ Renderer::Renderer() {
textRenderer = NULL; textRenderer = NULL;
particleRenderer = NULL; particleRenderer = NULL;
saveScreenShotThread = NULL; saveScreenShotThread = NULL;
mapSurfaceData.clear();
lastRenderFps=MIN_FPS_NORMAL_RENDERING; lastRenderFps=MIN_FPS_NORMAL_RENDERING;
shadowsOffDueToMinRender=false; shadowsOffDueToMinRender=false;
@@ -231,6 +232,7 @@ Renderer::~Renderer() {
} }
} }
mapSurfaceData.clear();
this->menu = NULL; this->menu = NULL;
this->game = NULL; this->game = NULL;
} }
@@ -310,6 +312,7 @@ void Renderer::initGame(const Game *game){
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
SurfaceData::nextUniqueId = 1; SurfaceData::nextUniqueId = 1;
mapSurfaceData.clear();
this->game= game; this->game= game;
worldToScreenPosCache.clear(); worldToScreenPosCache.clear();
@@ -430,6 +433,8 @@ void Renderer::end() {
//delete 2d list //delete 2d list
glDeleteLists(list2d, 1); glDeleteLists(list2d, 1);
mapSurfaceData.clear();
} }
void Renderer::endGame() { void Renderer::endGame() {
@@ -449,6 +454,7 @@ void Renderer::endGame() {
worldToScreenPosCache.clear(); worldToScreenPosCache.clear();
ReleaseSurfaceVBOs(); ReleaseSurfaceVBOs();
mapSurfaceData.clear();
} }
void Renderer::endMenu() { void Renderer::endMenu() {

1
source/glest_game/graphics/renderer.h
View File

@@ -428,6 +428,7 @@ public:
void renderProgressBar(int size, int x, int y, Font2D *font,int customWidth=-1, string prefixLabel=""); void renderProgressBar(int size, int x, int y, Font2D *font,int customWidth=-1, string prefixLabel="");
static Texture2D * findFactionLogoTexture(string logoFilename); static Texture2D * findFactionLogoTexture(string logoFilename);
int getCachedSurfaceDataSize() const { return mapSurfaceData.size(); }
private: private:
//private misc //private misc