Added braces to all statements with clang-tidy and ran clang-format again

[lugaru.git] / Source / Environment / Skybox.cpp

diff --git a/Source/Environment/Skybox.cpp b/Source/Environment/Skybox.cpp
index 97dcd6da08d3ea64ac7c115b81a1acce18ac495c..51fe46627cfa345db165d389f8ebd7d15554a7ca 100644 (file)
--- 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);
@@ -66,105 +66,96 @@ void SkyBox::draw()
     glDisable(GL_CULL_FACE);
     glEnable(GL_BLEND);
     glDisable(GL_LIGHTING);
-    if (skyboxtexture)
+    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);
     glPopMatrix();
 }
-
-SkyBox::~SkyBox()
-{
-    front.destroy();
-    left.destroy();
-    back.destroy();
-    right.destroy();
-    up.destroy();
-    down.destroy();
-}