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

@@ -19,66 +19,68 @@
using namespace Shared::Util;
namespace Shared{ namespace Graphics{
namespace Shared {
namespace Graphics {
// =====================================================
// class ShaderManager
// =====================================================
// =====================================================
// class ShaderManager
// =====================================================
ShaderManager::ShaderManager() {
if (GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
}
}
ShaderManager::~ShaderManager() {
}
void ShaderManager::init() {
for (unsigned int i = 0; i < shaders.size(); ++i) {
shaders[i]->init();
if (!shaders[i]->compile(logString)) {
throw megaglest_runtime_error("Can't compile shader\n");
}
}
for (unsigned int i = 0; i < shaderPrograms.size(); ++i) {
shaderPrograms[i]->init();
if (!shaderPrograms[i]->link(logString)) {
throw megaglest_runtime_error("Can't link shader\n");
}
}
}
void ShaderManager::end() {
for (unsigned int i = 0; i < shaderPrograms.size(); ++i) {
shaderPrograms[i]->end();
delete shaderPrograms[i];
}
shaderPrograms.clear();
for (unsigned int i = 0; i < shaders.size(); ++i) {
shaders[i]->end();
delete shaders[i];
}
shaders.clear();
}
ShaderProgram *ShaderManager::newShaderProgram() {
ShaderProgram *sp = GraphicsInterface::getInstance().getFactory()->newShaderProgram();
shaderPrograms.push_back(sp);
return sp;
}
VertexShader *ShaderManager::newVertexShader() {
VertexShader *vs = GraphicsInterface::getInstance().getFactory()->newVertexShader();
shaders.push_back(vs);
return vs;
}
FragmentShader *ShaderManager::newFragmentShader() {
FragmentShader *fs = GraphicsInterface::getInstance().getFactory()->newFragmentShader();
shaders.push_back(fs);
return fs;
}
ShaderManager::ShaderManager() {
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
}
}
ShaderManager::~ShaderManager(){
}
void ShaderManager::init(){
for(unsigned int i=0; i<shaders.size(); ++i){
shaders[i]->init();
if(!shaders[i]->compile(logString)){
throw megaglest_runtime_error("Can't compile shader\n");
}
}
for(unsigned int i=0; i<shaderPrograms.size(); ++i){
shaderPrograms[i]->init();
if(!shaderPrograms[i]->link(logString)){
throw megaglest_runtime_error("Can't link shader\n");
}
}
}
void ShaderManager::end(){
for(unsigned int i=0; i<shaderPrograms.size(); ++i){
shaderPrograms[i]->end();
delete shaderPrograms[i];
}
shaderPrograms.clear();
for(unsigned int i=0; i<shaders.size(); ++i){
shaders[i]->end();
delete shaders[i];
}
shaders.clear();
}
ShaderProgram *ShaderManager::newShaderProgram(){
ShaderProgram *sp= GraphicsInterface::getInstance().getFactory()->newShaderProgram();
shaderPrograms.push_back(sp);
return sp;
}
VertexShader *ShaderManager::newVertexShader(){
VertexShader *vs= GraphicsInterface::getInstance().getFactory()->newVertexShader();
shaders.push_back(vs);
return vs;
}
FragmentShader *ShaderManager::newFragmentShader(){
FragmentShader *fs= GraphicsInterface::getInstance().getFactory()->newFragmentShader();
shaders.push_back(fs);
return fs;
}
}}//end namespace
}//end namespace