Fixed the god-awful indentation

This commit is contained in:
mathusummut
2018-05-06 00:01:36 +02:00
parent 643e3820f5
commit 35b7b1f1a6
459 changed files with 204893 additions and 217545 deletions

View File

@@ -22,85 +22,87 @@
using namespace Shared::Util;
using namespace Shared::Platform;
namespace Shared{ namespace Graphics{
namespace Shared {
namespace Graphics {
// =====================================================
// class ModelManager
// =====================================================
// =====================================================
// class ModelManager
// =====================================================
ModelManager::ModelManager(){
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
}
ModelManager::ModelManager() {
if (GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
}
textureManager= NULL;
}
ModelManager::~ModelManager(){
end();
}
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;
}
void ModelManager::init(){
for(size_t i=0; i<models.size(); ++i){
if(models[i] != NULL) {
models[i]->init();
textureManager = NULL;
}
}
}
void ModelManager::end(){
for(size_t i=0; i<models.size(); ++i){
if(models[i] != NULL) {
models[i]->end();
delete models[i];
models[i]=NULL;
ModelManager::~ModelManager() {
end();
}
}
models.clear();
}
void ModelManager::endModel(Model *model,bool mustExistInList) {
if(model != NULL) {
bool found = false;
for(unsigned int idx = 0; idx < models.size(); idx++) {
Model *curModel = models[idx];
if(curModel == model) {
found = true;
models.erase(models.begin() + idx);
break;
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;
}
void ModelManager::init() {
for (size_t i = 0; i < models.size(); ++i) {
if (models[i] != NULL) {
models[i]->init();
}
}
}
if(found == false && mustExistInList == true) {
throw std::runtime_error("found == false in endModel");
void ModelManager::end() {
for (size_t i = 0; i < models.size(); ++i) {
if (models[i] != NULL) {
models[i]->end();
delete models[i];
models[i] = NULL;
}
}
models.clear();
}
model->end();
delete model;
void ModelManager::endModel(Model *model, bool mustExistInList) {
if (model != NULL) {
bool found = false;
for (unsigned int idx = 0; idx < models.size(); idx++) {
Model *curModel = models[idx];
if (curModel == model) {
found = true;
models.erase(models.begin() + idx);
break;
}
}
if (found == false && mustExistInList == true) {
throw std::runtime_error("found == false in endModel");
}
model->end();
delete model;
}
}
void ModelManager::endLastModel(bool mustExistInList) {
bool found = false;
if (models.size() > 0) {
found = true;
size_t index = models.size() - 1;
Model *curModel = models[index];
models.erase(models.begin() + index);
curModel->end();
delete curModel;
}
if (found == false && mustExistInList == true) {
throw std::runtime_error("found == false in endLastModel");
}
}
}
}
void ModelManager::endLastModel(bool mustExistInList) {
bool found = false;
if(models.size() > 0) {
found = true;
size_t index = models.size()-1;
Model *curModel = models[index];
models.erase(models.begin() + index);
curModel->end();
delete curModel;
}
if(found == false && mustExistInList == true) {
throw std::runtime_error("found == false in endLastModel");
}
}
}}//end namespace
}//end namespace