Changeset 7652 in orxonox.OLD for branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.cc

Timestamp:

May 17, 2006, 6:41:58 PM (19 years ago)

Author:

amaechler

Message:

branches/atmosphere_engine: cosmetics2

File:

• branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.cc (modified) (8 diffs)

branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.cc

@@ -1 +1 @@
 /*
-   orxonox - the future of 3D-vertical-scrollers
+        orxonox - the future of 3D-vertical-scrollers
 
-   Copyright (C) 2004 orx
+        Copyright (C) 2004 orx
 
-   This program 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, or (at your option)
-   any later version.
+        This program 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, or (at your option)
+        any later version.
 
 ### File Specific:
-   main-programmer: hdavid, amaechler
+        main-programmer: hdavid, amaechler
 */
 
@@ -22 +22 @@
 /*#include "shell_command.h"
 SHELL_COMMAND(activateFog, FogEffect, FogEffect::activate)
-  ->setAlias("aFog");
+        ->setAlias("aFog");
 SHELL_COMMAND(deactivateFog, FogEffect, FogEffect::deactivate)
-  ->setAlias("dFog");*/
+        ->setAlias("dFog");*/
 
 using namespace std;
@@ -32 +32 @@
 FogEffect::FogEffect(const TiXmlElement* root)
 {
-  this->setClassID(CL_FOG_EFFECT, "FogEffect");
-  
-  this->fogMode = GL_LINEAR;
-  this->fogDensity = 0.001f;
-  this->fogStart = 10.0f;
-  this->fogEnd = 1000.0f;
+        this->setClassID(CL_FOG_EFFECT, "FogEffect");
+        
+        this->fogMode = GL_LINEAR;
+        this->fogDensity = 0.001f;
+        this->fogStart = 10.0f;
+        this->fogEnd = 1000.0f;
 
-  if (root != NULL)
-    this->loadParams(root);
+        if (root != NULL)
+                this->loadParams(root);
 
-  this->activate();
+        this->activate();
 }
 
@@ -49 +49 @@
 FogEffect::~FogEffect()
 {
-  this->deactivate();
+        this->deactivate();
 }
 
@@ -55 +55 @@
 void FogEffect::loadParams(const TiXmlElement* root)
 {
-  WeatherEffect::loadParams(root);
+        WeatherEffect::loadParams(root);
 
-  LoadParam(root, "fog-mode", this, FogEffect, setFogMode);
-  LoadParam(root, "fog-density", this, FogEffect, setFogDensity);
-  LoadParam(root, "fog-color", this, FogEffect, setFogColor);
+        LoadParam(root, "fog-mode", this, FogEffect, setFogMode);
+        LoadParam(root, "fog-density", this, FogEffect, setFogDensity);
+        LoadParam(root, "fog-color", this, FogEffect, setFogColor);
 
 
@@ -71 +71 @@
 bool FogEffect::activate()
 {
-  PRINTF(0)( "Enabling FogEffect, mode: %i, density: %f, start: %f, end: %f, color %f, %f, %f\n", this->fogMode, this->fogDensity, this->fogStart, this->fogEnd, this->colorVector.x, this->colorVector.y, this->colorVector.z);
+        PRINTF(0)( "Enabling FogEffect, mode: %i, density: %f, start: %f, end: %f, color %f, %f, %f\n", this->fogMode, this->fogDensity, this->fogStart, this->fogEnd, this->colorVector.x, this->colorVector.y, this->colorVector.z);
 
-  glEnable(GL_FOG);
-  {
-    //GLfloat fogColor[4] = {0.7, 0.6, 0.6, 1.0};
-    GLfloat fogColor[4] = { colorVector.x, colorVector.y, colorVector.z, 1.0};
+        glEnable(GL_FOG);
+        {
+                //GLfloat fogColor[4] = {0.7, 0.6, 0.6, 1.0};
+                GLfloat fogColor[4] = { colorVector.x, colorVector.y, colorVector.z, 1.0};
 
-    glFogi(GL_FOG_MODE, this->fogMode);
-    glFogfv(GL_FOG_COLOR, fogColor);
-    glFogf(GL_FOG_DENSITY, this->fogDensity);
-    glHint(GL_FOG_HINT, GL_DONT_CARE);
-    glFogf(GL_FOG_START, this->fogStart);
-    glFogf(GL_FOG_END, this->fogEnd);
+                glFogi(GL_FOG_MODE, this->fogMode);
+                glFogfv(GL_FOG_COLOR, fogColor);
+                glFogf(GL_FOG_DENSITY, this->fogDensity);
+                glHint(GL_FOG_HINT, GL_DONT_CARE);
+                glFogf(GL_FOG_START, this->fogStart);
+                glFogf(GL_FOG_END, this->fogEnd);
 
-    //glFogi(GL_FOG_COORDINATE_SOURCE, GL_FOG_COORDINATE);
-  }
-  glClearColor(0.5, 0.5, 0.5, 1.0);
+                //glFogi(GL_FOG_COORDINATE_SOURCE, GL_FOG_COORDINATE);
+        }
+        glClearColor(0.5, 0.5, 0.5, 1.0);
 }
 
@@ -93 +93 @@
 bool FogEffect::deactivate()
 {
-  PRINTF(0)("Deactivating FogEffect\n");
+        PRINTF(0)("Deactivating FogEffect\n");
         glDisable(GL_FOG);
 }
@@ -101 +101 @@
 GLint FogEffect::stringToFogMode(const std::string& mode)
 {
-  if(mode == "GL_LINEAR")
-    return GL_LINEAR;
-  else if(mode == "GL_EXP")
-    return GL_EXP;
-  else if(mode == "GL_EXP2" )
-    return GL_EXP2;
-  else
-    return -1;
+        if(mode == "GL_LINEAR")
+                return GL_LINEAR;
+        else if(mode == "GL_EXP")
+                return GL_EXP;
+        else if(mode == "GL_EXP2" )
+                return GL_EXP2;
+        else
+                return -1;
 }