mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-08 23:10:42 +02:00
Code Issues Projects Releases Wiki Activity

- fixed memory leaks in map editor, g3dviewer and the game

Browse Source
This commit is contained in:
Mark Vejvoda
2012-07-21 20:21:27 +00:00
parent 8d168bdb4c
commit e1054d6e07
4 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/g3d_viewer/main.cpp
View File

@@ -284,7 +284,8 @@ MainWindow::MainWindow( std::pair<string,vector<string> > unitToLoad,
wxSize(Renderer::windowW, Renderer::windowH)),
model(NULL), glCanvas(NULL), renderer(NULL),
initTextureManager(true), timer(NULL),
startupSettingsInited(false)
startupSettingsInited(false),
fileDialog(NULL)
{
this->appPath = appPath;
Properties::setApplicationPath(executable_path(appPath));
@@ -531,6 +532,9 @@ MainWindow::~MainWindow(){
delete timer;
timer = NULL;
delete fileDialog;
fileDialog = NULL;
delete model;
model = NULL;

12
source/g3d_viewer/renderer.cpp
View File

@@ -113,6 +113,11 @@ Renderer::~Renderer() {
//resources
delete particleManager;
delete modelManager;
if(GraphicsInterface::getInstance().getFactory() != NULL) {
delete GraphicsInterface::getInstance().getFactory();
GraphicsInterface::getInstance().setFactory(NULL);
}
}
Renderer * Renderer::getInstance() {
@@ -174,8 +179,11 @@ Model * Renderer::getNewModel() {
void Renderer::init() {
assertGl();
GraphicsFactory *gf= new GraphicsFactoryGl();
GraphicsInterface::getInstance().setFactory(gf);
GraphicsFactory *gf= GraphicsInterface::getInstance().getFactory();
if(gf == NULL) {
gf= new GraphicsFactoryGl();
GraphicsInterface::getInstance().setFactory(gf);
}
modelRenderer= gf->newModelRenderer();
textureManager= gf->newTextureManager();