X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FSkybox.cpp;h=0797722026b6d0b4672f33cbc3e1d3bd7658227d;hb=65748e01b54fd8c4e1b5dd8de7d99f430d10870c;hp=776d05e0e8c8e0b005227ce37a608584f44efdaa;hpb=24004d6ab1e68faaf85ece11b566449997da5013;p=lugaru.git diff --git a/Source/Skybox.cpp b/Source/Skybox.cpp index 776d05e..0797722 100644 --- a/Source/Skybox.cpp +++ b/Source/Skybox.cpp @@ -1,22 +1,21 @@ /* Copyright (C) 2003, 2010 - Wolfire Games +Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) This file is part of Lugaru. -Lugaru is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. +Lugaru is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. -This program is distributed in the hope that it will be useful, +Lugaru is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with Lugaru. If not, see . */ #include "Skybox.h" @@ -30,9 +29,8 @@ extern float skyboxr; extern float skyboxg; extern float skyboxb; -void -SkyBox::load (const char *ffront, const char *fleft, const char *fback, - const char *fright, const char *fup, const char *fdown) +void SkyBox::load (const char *ffront, const char *fleft, const char *fback, + const char *fright, const char *fup, const char *fdown) { front.load(ffront, true, false); left.load(fleft, true, false); @@ -42,7 +40,7 @@ SkyBox::load (const char *ffront, const char *fleft, const char *fback, down.load(fdown, true, false); } -void SkyBox::draw() +void SkyBox::draw() { static float size = viewdistance / 4; glPushMatrix(); @@ -52,9 +50,12 @@ void SkyBox::draw() M[13] = 0; M[14] = 0; glLoadMatrixf(M); - if (environment == 2)glScalef(1 + blurness / 1000, 1, 1 + blurness / 1000); - if (environment != 2)glColor3f(.85 * skyboxr, .85 * skyboxg, .95 * skyboxb); - else glColor3f(1 * skyboxr, .95 * skyboxg, .95 * skyboxb); + if (environment == 2) + glScalef(1 + blurness / 1000, 1, 1 + blurness / 1000); + if (environment != 2) + glColor3f(.85 * skyboxr, .85 * skyboxg, .95 * skyboxb); + else + glColor3f(1 * skyboxr, .95 * skyboxg, .95 * skyboxb); if (!skyboxtexture) { glDisable(GL_TEXTURE_2D); @@ -64,7 +65,8 @@ void SkyBox::draw() glDisable(GL_CULL_FACE); glEnable(GL_BLEND); glDisable(GL_LIGHTING); - if (skyboxtexture)glEnable(GL_TEXTURE_2D); + if (skyboxtexture) + glEnable(GL_TEXTURE_2D); glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ); front.bind(); glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );