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

@@ -24,137 +24,139 @@
using namespace Shared::Util;
using namespace Shared::Platform;
namespace Shared{ namespace Graphics{
namespace Shared {
namespace Graphics {
// =====================================================
// class TextureManager
// =====================================================
// =====================================================
// class TextureManager
// =====================================================
TextureManager::TextureManager() {
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
}
TextureManager::TextureManager() {
if (GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
}
textureFilter= Texture::fBilinear;
maxAnisotropy= 1;
}
textureFilter = Texture::fBilinear;
maxAnisotropy = 1;
}
TextureManager::~TextureManager(){
end();
}
TextureManager::~TextureManager() {
end();
}
void TextureManager::initTexture(Texture *texture) {
if(texture != NULL) {
texture->init(textureFilter, maxAnisotropy);
}
}
void TextureManager::endTexture(Texture *texture,bool mustExistInList) {
if(texture != NULL) {
bool found = false;
for(unsigned int idx = 0; idx < textures.size(); idx++) {
Texture *curTexture = textures[idx];
if(curTexture == texture) {
found = true;
textures.erase(textures.begin() + idx);
break;
void TextureManager::initTexture(Texture *texture) {
if (texture != NULL) {
texture->init(textureFilter, maxAnisotropy);
}
}
if(found == false && mustExistInList == true) {
throw std::runtime_error("found == false in endTexture");
void TextureManager::endTexture(Texture *texture, bool mustExistInList) {
if (texture != NULL) {
bool found = false;
for (unsigned int idx = 0; idx < textures.size(); idx++) {
Texture *curTexture = textures[idx];
if (curTexture == texture) {
found = true;
textures.erase(textures.begin() + idx);
break;
}
}
if (found == false && mustExistInList == true) {
throw std::runtime_error("found == false in endTexture");
}
texture->end();
delete texture;
}
}
texture->end();
delete texture;
}
}
void TextureManager::endLastTexture(bool mustExistInList) {
bool found = false;
if(textures.size() > 0) {
found = true;
int index = (int)textures.size()-1;
Texture *curTexture = textures[index];
textures.erase(textures.begin() + index);
void TextureManager::endLastTexture(bool mustExistInList) {
bool found = false;
if (textures.size() > 0) {
found = true;
int index = (int) textures.size() - 1;
Texture *curTexture = textures[index];
textures.erase(textures.begin() + index);
curTexture->end();
delete curTexture;
}
if(found == false && mustExistInList == true) {
throw std::runtime_error("found == false in endLastTexture");
}
}
void TextureManager::init(bool forceInit) {
for(unsigned int i=0; i<textures.size(); ++i){
Texture *texture = textures[i];
if(texture == NULL) {
throw std::runtime_error("texture == NULL during init");
curTexture->end();
delete curTexture;
}
if (found == false && mustExistInList == true) {
throw std::runtime_error("found == false in endLastTexture");
}
}
if(forceInit == true) {
texture->reseInitState();
void TextureManager::init(bool forceInit) {
for (unsigned int i = 0; i < textures.size(); ++i) {
Texture *texture = textures[i];
if (texture == NULL) {
throw std::runtime_error("texture == NULL during init");
}
if (forceInit == true) {
texture->reseInitState();
}
if (forceInit == true) {
texture->end(false);
}
texture->init(textureFilter, maxAnisotropy);
}
}
if(forceInit == true) {
texture->end(false);
void TextureManager::end() {
for (unsigned int i = 0; i < textures.size(); ++i) {
if (textures[i] != NULL) {
textures[i]->end();
delete textures[i];
}
}
textures.clear();
}
texture->init(textureFilter, maxAnisotropy);
void TextureManager::setFilter(Texture::Filter textureFilter) {
this->textureFilter = textureFilter;
}
void TextureManager::setMaxAnisotropy(int maxAnisotropy) {
this->maxAnisotropy = maxAnisotropy;
}
Texture *TextureManager::getTexture(const string &path) {
for (unsigned int i = 0; i < textures.size(); ++i) {
if (textures[i]->getPath() == path) {
return textures[i];
}
}
return NULL;
}
Texture1D *TextureManager::newTexture1D() {
Texture1D *texture1D = GraphicsInterface::getInstance().getFactory()->newTexture1D();
textures.push_back(texture1D);
return texture1D;
}
Texture2D *TextureManager::newTexture2D() {
Texture2D *texture2D = GraphicsInterface::getInstance().getFactory()->newTexture2D();
textures.push_back(texture2D);
return texture2D;
}
Texture3D *TextureManager::newTexture3D() {
Texture3D *texture3D = GraphicsInterface::getInstance().getFactory()->newTexture3D();
textures.push_back(texture3D);
return texture3D;
}
TextureCube *TextureManager::newTextureCube() {
TextureCube *textureCube = GraphicsInterface::getInstance().getFactory()->newTextureCube();
textures.push_back(textureCube);
return textureCube;
}
}
}
void TextureManager::end(){
for(unsigned int i=0; i<textures.size(); ++i){
if(textures[i] != NULL) {
textures[i]->end();
delete textures[i];
}
}
textures.clear();
}
void TextureManager::setFilter(Texture::Filter textureFilter){
this->textureFilter= textureFilter;
}
void TextureManager::setMaxAnisotropy(int maxAnisotropy){
this->maxAnisotropy= maxAnisotropy;
}
Texture *TextureManager::getTexture(const string &path){
for(unsigned int i=0; i<textures.size(); ++i){
if(textures[i]->getPath()==path){
return textures[i];
}
}
return NULL;
}
Texture1D *TextureManager::newTexture1D(){
Texture1D *texture1D= GraphicsInterface::getInstance().getFactory()->newTexture1D();
textures.push_back(texture1D);
return texture1D;
}
Texture2D *TextureManager::newTexture2D(){
Texture2D *texture2D= GraphicsInterface::getInstance().getFactory()->newTexture2D();
textures.push_back(texture2D);
return texture2D;
}
Texture3D *TextureManager::newTexture3D(){
Texture3D *texture3D= GraphicsInterface::getInstance().getFactory()->newTexture3D();
textures.push_back(texture3D);
return texture3D;
}
TextureCube *TextureManager::newTextureCube(){
TextureCube *textureCube= GraphicsInterface::getInstance().getFactory()->newTextureCube();
textures.push_back(textureCube);
return textureCube;
}
}}//end namespace
}//end namespace