Changeset 7505 in orxonox.OLD

Timestamp:

May 3, 2006, 1:53:42 PM (18 years ago)

Author:

amaechler

Message:

branches/atmospheric_engine

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• volfog_effect.h (modified) (1 diff)
• volfog_effect.h~ (modified) (4 diffs)

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

@@ -37 +37 @@
     GLfloat                 volfogDensity;
     GLfloat                 volfogStart;
-    GLfloat                 fogEnd;
+    GLfloat                 volfogEnd;
     Vector                  colorVector;
 };

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

@@ -1 +1 @@
 /**
- * @file fog_effect.h
+ * @file volfog_effect.h
  */
 
-#ifndef _FOG_EFFECT
-#define _FOG_EFFECT
+#ifndef _VOLFOG_EFFECT
+#define _VOLFOG_EFFECT
 
 #include "vector.h"
@@ -10 +10 @@
 #include "weather_effect.h"
 
-class FogEffect : public WeatherEffect
+class VolFogEffect : public WeatherEffect
 {
   public:
-    FogEffect(const TiXmlElement* root = NULL);
-    virtual ~FogEffect();
+    VolFogEffect(const TiXmlElement* root = NULL);
+    virtual ~VolFogEffect();
 
     virtual void loadParams(const TiXmlElement* root);
@@ -23 +23 @@
     virtual bool deactivate();
 
-    inline void setFogMode(const std::string& mode) { this->fogMode = this->stringToFogMode(mode); }
-    inline void setFogDensity(float density) { this->fogDensity = density; }
-    inline void setFogRange(float start, float end) { this->fogStart = start; this->fogEnd = end; }
-    inline void setFogColor(float r, float g, float b) { this->colorVector = Vector(r, g, b); }
+    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 stringToFogMode(const std::string& mode);
+    GLint stringToVolFogMode(const std::string& mode);
 
 
   private:
-    GLint                   fogMode;
-    GLfloat                 fogDensity;
-    GLfloat                 fogStart;
+    GLint                   volfogMode;
+    GLfloat                 volfogDensity;
+    GLfloat                 volfogStart;
     GLfloat                 fogEnd;
     Vector                  colorVector;
@@ -42 +42 @@
 
 
-#endif  /* _FOG_EFFECT */
+#endif  /* _VOLFOG_EFFECT */