Changeset 7515 in orxonox.OLD for branches

Timestamp:

May 3, 2006, 3:25:38 PM (19 years ago)

Author:

hdavid

Message:

 

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• fog_effect.cc (modified) (1 diff)
• volfog_effect.cc (modified) (6 diffs)
• volfog_effect.h (modified) (1 diff)

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

@@ -92 +92 @@
 
 
-
 bool FogEffect::deactivate()
 {

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

@@ -21 +21 @@
 
 #include "shell_command.h"
-/*SHELL_COMMAND(activateVolFog, VolFogEffect, VolFogEffect::activate)
-  ->setAlias("aVolFog");
-SHELL_COMMAND(deactivateVolFog, VolFogEffect, VolFogEffect::deactivate)
-  ->setAlias("dVolFog");*/
 
 using namespace std;
@@ -34 +30 @@
   this->setClassID(CL_VOLFOG_EFFECT, "VolFogEffect");
 
-  this->volfogMode = GL_LINEAR;
-  this->volfogDensity = 0.001f;
-  this->volfogStart = 10.0f;
-  this->volfogEnd = 1000.0f;
-
   if (root != NULL)
     this->loadParams(root);
-
+jhljkhlkjhlkjh   
   this->activate();
 }
@@ -47 +38 @@
 
 
-VolFogEffect::~VolFogEffect()
+VolFogEffect::~VolFogEffdect()
 {
   this->deactivate();
@@ -56 +47 @@
 {
   WeatherEffect::loadParams(root);
-
-  LoadParam(root, "volfog-mode", this, VolFogEffect, setVolFogMode);
-  LoadParam(root, "volfog-density", this, VolFogEffect, setVolFogDensity);
-  LoadParam(root, "volfog-color", this, VolFogEffect, setVolFogColor);
-
-
 }
 
@@ -71 +56 @@
 bool VolFogEffect::activate()
 {
-  PRINTF(0)( "Enabling VolFog Effect, mode: %i, density: %f, start: %f, end: %f, color %f, %f, %f\n", this->volfogMode, this->volfogDensity,
-             this->volfogStart, this->volfogEnd, this->colorVector.x, this->colorVector.y, this->colorVector.z);
 
-  glEnable(GL_FOG);
-  {
-    //GLfloat volfogColor[4] = {0.7, 0.6, 0.6, 1.0};
-    GLfloat volfogColor[4] = { colorVector.x, colorVector.y, colorVector.z, 1.0};
-
-    glFogi(GL_FOG_MODE, this->volfogMode);
-    glFogfv(GL_FOG_COLOR, volfogColor);
-    glFogf(GL_FOG_DENSITY, this->volfogDensity);
-    glHint(GL_FOG_HINT, GL_DONT_CARE);
-    glFogf(GL_FOG_START, this->volfogStart);
-    glFogf(GL_FOG_END, this->volfogEnd);
-
-    //glVolFogi(GL_VOLFOG_COORDINATE_SOURCE, GL_VOLFOG_COORDINATE);
-  }
-  glClearColor(0.5, 0.5, 0.5, 1.0);
 }
 
@@ -95 +63 @@
 bool VolFogEffect::deactivate()
 {
-  PRINTF(0)("Deactivating VolFog Effect");
-        glDisable(GL_FOG);
+
 }
 
 
-
-GLint VolFogEffect::stringToVolFogMode(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;
-}
-
-

branches/atmospheric_engine/src/lib/graphics/effects/volfog_effect.h

@@ -23 +23 @@
     virtual bool deactivate();
 
-    inline void setVolFogMode(const std::string& mode) { this->volfogMode = this->stringToVolFogMode(mode); }
-    inline void setVolFogDensity(float density) { this->volfogDensity = density; }
-    inline void setVolFogRange(float start, float end) { this->volfogStart = start; this->volfogEnd = end; }
-    inline void setVolFogColor(float r, float g, float b) { this->colorVector = Vector(r, g, b); }
-
 
   private:
-    GLint stringToVolFogMode(const std::string& mode);
 
-
-  private:
-    GLint                   volfogMode;
-    GLfloat                 volfogDensity;
-    GLfloat                 volfogStart;
-    GLfloat                 volfogEnd;
-    Vector                  colorVector;
 };