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

moved model constructor always behind factory

Browse Source
This commit is contained in:
Will
2013-12-05 21:28:20 +01:00
parent 7e4e98857b 6afadafa1e
commit 46a0dab916
29 changed files with 173 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/shared_lib/sources/graphics/model_manager.cpp
View File

@@ -40,9 +40,8 @@ ModelManager::~ModelManager(){
end();
}
Model *ModelManager::newModel(){
Model *model= GraphicsInterface::getInstance().getFactory()->newModel();
model->setTextureManager(textureManager);
Model *ModelManager::newModel(const string &path,bool deletePixMapAfterLoad,std::map<string,vector<pair<string, string> > > *loadedFileList, string *sourceLoader){
Model *model= GraphicsInterface::getInstance().getFactory()->newModel(path,textureManager,deletePixMapAfterLoad,loadedFileList,sourceLoader);
models.push_back(model);
return model;
}