Changeset 7416 in orxonox.OLD

Timestamp:

Apr 28, 2006, 11:10:19 AM (18 years ago)

Author:

hdavid

Message:

branches/atmospheric_engine: added setClassID

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• atmospheric_engine.cc (modified) (1 diff)
• fog_effect.cc (modified) (4 diffs)
• fog_effect.h (modified) (1 diff)
• sun_effect.cc (modified) (1 diff)
• weather_effect.cc (modified) (1 diff)

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

@@ -32 +32 @@
 AtmosphericEngine::AtmosphericEngine()
 {
-  // this->setClassID(CL_ATMOSPHERIC_ENGINE, "AtmosphericEngine");
+  this->setClassID(CL_ATMOSPHERIC_ENGINE, "AtmosphericEngine");
   // this->bActivated = false;
 }

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

@@ -32 +32 @@
 FogEffect::FogEffect(const TiXmlElement* root)
 {
-  //this->setClassID(CL_FOG_EFFECT, "FogEffect");
+  this->setClassID(CL_FOG_EFFECT, "FogEffect");
 
   this->fogMode = GL_LINEAR;
@@ -58 +58 @@
 
   LoadParam(root, "fog-mode", this, FogEffect, setFogMode);
-
   LoadParam(root, "fog-density", this, FogEffect, setFogDensity);
-
   LoadParam(root, "fog-color", this, FogEffect, setFogColor);
 
-  // LoadParam(root, "test", this, FogEffect, setTest);
 
-
-}
-
-void FogEffect::setTest(int test)
-{
-  PRINTF(0)("\n\ntest: %i\n\n", test);
 }
 
@@ -82 +73 @@
   PRINTF(0)( "Enabling Fog Effect, 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 Fog Effect, mode: %i, density: %f, start: %f, end: %f\n", this->fogMode, this->fogDensity,
-             this->fogStart, this->fogEnd);*/
 
   glEnable(GL_FOG);
@@ -107 +95 @@
 bool FogEffect::deactivate()
 {
+  PRINTF(0)("Deactivating Fog Effect");
         glDisable(GL_FOG);
 }

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

@@ -23 +23 @@
     virtual bool deactivate();
 
-
-    void setTest(int test);
-
     inline void setFogMode(const std::string& mode) { this->fogMode = this->stringToFogMode(mode); }
     inline void setFogDensity(float density) { this->fogDensity = density; }

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

@@ -30 +30 @@
 SunEffect::SunEffect(const TiXmlElement* root)
 {
-  //this->setClassID(CL_SUN_EFFECT, "SunEffect");
+  this->setClassID(CL_SUN_EFFECT, "SunEffect");
   this->bActivated = false;
 }

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

@@ -28 +28 @@
 WeatherEffect::WeatherEffect(const TiXmlElement* root)
 {
-  // this->setClassID(CL_WEATHER_EFFECT, "WeatherEffect");
+  this->setClassID(CL_WEATHER_EFFECT, "WeatherEffect");
   this->bActivated = false;
 }