X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=blobdiff_plain;f=Source%2FEnvironment%2FSkybox.cpp;h=468329a53a9e69de274d76ad522569a90f1d8ed3;hp=5ace90a08fac8d03210b9027324e878c3fb75eae;hb=8b6e8f3ad7390309795eb35c0959264cb7924402;hpb=531fd8d27258d6c15d6fd221272c74b48602a85a diff --git a/Source/Environment/Skybox.cpp b/Source/Environment/Skybox.cpp index 5ace90a..468329a 100644 --- a/Source/Environment/Skybox.cpp +++ b/Source/Environment/Skybox.cpp @@ -30,8 +30,8 @@ extern float skyboxr; extern float skyboxg; extern float skyboxb; -void SkyBox::load (const std::string& ffront, const std::string& fleft, const std::string& fback, - const std::string& fright, const std::string& fup, const std::string& fdown) +void SkyBox::load(const std::string& ffront, const std::string& fleft, const std::string& fback, + const std::string& fright, const std::string& fup, const std::string& fdown) { front.load(ffront, true); left.load(fleft, true); @@ -68,91 +68,91 @@ void SkyBox::draw() glDisable(GL_LIGHTING); if (skyboxtexture) glEnable(GL_TEXTURE_2D); - glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); front.bind(); - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glBegin(GL_QUADS); - glNormal3f( 0.0f, 0.0f, -1); + glNormal3f(0.0f, 0.0f, -1); glTexCoord2f(0, 0); - glVertex3f(-size, -size, size); + glVertex3f(-size, -size, size); glTexCoord2f(1, 0); - glVertex3f( size, -size, size); + glVertex3f(size, -size, size); glTexCoord2f(1, 1); - glVertex3f( size, size, size); + glVertex3f(size, size, size); glTexCoord2f(0, 1); - glVertex3f(-size, size, size); + glVertex3f(-size, size, size); glEnd(); back.bind(); - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glBegin(GL_QUADS); - glNormal3f( 0.0f, 0.0f, 1); + glNormal3f(0.0f, 0.0f, 1); glTexCoord2f(1, 0); glVertex3f(-size, -size, -size); glTexCoord2f(1, 1); - glVertex3f(-size, size, -size); + glVertex3f(-size, size, -size); glTexCoord2f(0, 1); - glVertex3f( size, size, -size); + glVertex3f(size, size, -size); glTexCoord2f(0, 0); - glVertex3f( size, -size, -size); + glVertex3f(size, -size, -size); glEnd(); up.bind(); - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glBegin(GL_QUADS); - glNormal3f( 0.0f, -1.0f, 0); + glNormal3f(0.0f, -1.0f, 0); glTexCoord2f(0, 1); - glVertex3f(-size, size, -size); + glVertex3f(-size, size, -size); glTexCoord2f(0, 0); - glVertex3f(-size, size, size); + glVertex3f(-size, size, size); glTexCoord2f(1, 0); - glVertex3f( size, size, size); + glVertex3f(size, size, size); glTexCoord2f(1, 1); - glVertex3f( size, size, -size); + glVertex3f(size, size, -size); glEnd(); down.bind(); - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glBegin(GL_QUADS); - glNormal3f( 0.0f, 1.0f, 0); + glNormal3f(0.0f, 1.0f, 0); glTexCoord2f(0, 0); glVertex3f(-size, -size, -size); glTexCoord2f(1, 0); - glVertex3f( size, -size, -size); + glVertex3f(size, -size, -size); glTexCoord2f(1, 1); - glVertex3f( size, -size, size); + glVertex3f(size, -size, size); glTexCoord2f(0, 1); - glVertex3f(-size, -size, size); + glVertex3f(-size, -size, size); glEnd(); right.bind(); - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glBegin(GL_QUADS); - glNormal3f( -1.0f, 0.0f, 0); + glNormal3f(-1.0f, 0.0f, 0); glTexCoord2f(1, 0); - glVertex3f( size, -size, -size); + glVertex3f(size, -size, -size); glTexCoord2f(1, 1); - glVertex3f( size, size, -size); + glVertex3f(size, size, -size); glTexCoord2f(0, 1); - glVertex3f( size, size, size); + glVertex3f(size, size, size); glTexCoord2f(0, 0); - glVertex3f( size, -size, size); + glVertex3f(size, -size, size); glEnd(); left.bind(); - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glBegin(GL_QUADS); - glNormal3f( 1.0f, 0.0f, 0); + glNormal3f(1.0f, 0.0f, 0); glTexCoord2f(0, 0); glVertex3f(-size, -size, -size); glTexCoord2f(1, 0); - glVertex3f(-size, -size, size); + glVertex3f(-size, -size, size); glTexCoord2f(1, 1); - glVertex3f(-size, size, size); + glVertex3f(-size, size, size); glTexCoord2f(0, 1); - glVertex3f(-size, size, -size); + glVertex3f(-size, size, -size); glEnd(); glEnable(GL_CULL_FACE); glDepthMask(1);