Changeset 7392 in orxonox.OLD for branches/atmospheric_engine/src

Timestamp:

Apr 27, 2006, 9:49:33 AM (19 years ago)

Author:

amaechler

Message:

branches/atmospheric_engine: glFog implemented in AtmosEngine

Location:

branches/atmospheric_engine/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/graphics/effects/atmospheric_engine.cc (modified) (3 diffs)
• lib/graphics/effects/atmospheric_engine.h (modified) (2 diffs)
• lib/graphics/effects/fog_effect.cc (modified) (7 diffs)
• lib/graphics/effects/fog_effect.h (modified) (2 diffs)

branches/atmospheric_engine/src/defs/class_id.h

@@ -289 +289 @@
   //CL_SUN_EFFECT                 =    0x        ,
   //CL_WEATHER_EFFECT             =    0x        ,
+  //CL_FOG_EFFECT                 =    0x        ,
 
   // Particles

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

@@ -27 +27 @@
 using namespace std;
 
-
-
 /**
  * @param root The XML-element to load the AtmosphericEngine from
@@ -34 +32 @@
 AtmosphericEngine::AtmosphericEngine()
 {
-  //this->setClassID(CL_ATMOSPHERIC_ENGINE, "AtmosphericEngine");
-  this->bActivated = false;
+  // this->setClassID(CL_ATMOSPHERIC_ENGINE, "AtmosphericEngine");
+  // this->bActivated = false;
 }
 
@@ -92 +90 @@
  *  initializes the graphics effect
  */
-bool AtmosphericEngine::init()
-{}
+//bool AtmosphericEngine::init()
+//{}
 
 

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

@@ -15 +15 @@
 {
   public:
-    virtual ~AtmosphericEngine();
+    ~AtmosphericEngine();
 
     /** @returns a Pointer to the only object of this Class */
     inline static AtmosphericEngine* getInstance() { if (!AtmosphericEngine::singletonRef) AtmosphericEngine::singletonRef = new AtmosphericEngine();  return AtmosphericEngine::singletonRef; };
 
-    virtual void loadParams(const TiXmlElement* root);
+    void loadParams(const TiXmlElement* root);
 
-    virtual bool init();
+    // bool init();
 
-    //virtual bool activate() = 0;
-    //virtual bool deactivate() = 0;
+    void draw() const;
+    void tick(float dt);
 
-    virtual void draw() const;
-    virtual void tick(float dt);
-
-    inline bool isActivated() const { return this->bActivated; }
+    // inline bool isActivated() const { return this->bActivated; }
 
     void loadWeatherEffect(const TiXmlElement* root);
@@ -41 +38 @@
     static AtmosphericEngine*     singletonRef;       //!< Pointer to the only instance of this Class
 
-  protected:
-    bool              bActivated;
+  //protected:
+  //  bool              bActivated;
 };
 

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

@@ -20 +20 @@
 #include "glincl.h"
 
-
+#include "shell_command.h"
+/*SHELL_COMMAND(activateFog, FogEffect, FogEffect::activate)
+  ->setAlias("aFog");
+SHELL_COMMAND(deactivateFog, FogEffect, FogEffect::deactivate)
+  ->setAlias("dFog");*/
 
 using namespace std;
@@ -26 +30 @@
 CREATE_FACTORY(FogEffect, CL_FOG_EFFECT);
 
-
 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;
-*/
+
   if (root != NULL)
     this->loadParams(root);
@@ -54 +57 @@
   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-color", this, FogEffect, setFogColor);
 
-  LoadParam(root, "test", this, FogEffect, setTest);
+  // LoadParam(root, "test", this, FogEffect, setTest);
 
 
@@ -77 +79 @@
 
 bool FogEffect::activate()
-{/*
+{
   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);
   {
-//     GLfloat fogColor[4] = {0.7, 0.6, 0.6, 1.0};
+    //GLfloat fogColor[4] = {0.7, 0.6, 0.6, 1.0};
     GLfloat fogColor[4] = { colorVector.x, colorVector.y, colorVector.z, 1.0};
 
@@ -95 +100 @@
     //glFogi(GL_FOG_COORDINATE_SOURCE, GL_FOG_COORDINATE);
   }
-  glClearColor(0.5, 0.5, 0.5, 1.0);*/
+  glClearColor(0.5, 0.5, 0.5, 1.0);
 }
 
@@ -102 +107 @@
 bool FogEffect::deactivate()
 {
-  //glDisable(GL_FOG);
+        glDisable(GL_FOG);
 }
 
 
-/*
+
 GLint FogEffect::stringToFogMode(const std::string& mode)
 {
@@ -118 +123 @@
     return -1;
 }
-*/
 
+

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

@@ -5 +5 @@
 #ifndef _FOG_EFFECT
 #define _FOG_EFFECT
+
+#include "vector.h"
 
 #include "weather_effect.h"
@@ -24 +26 @@
     void setTest(int test);
 
-    /*inline void setFogMode(const std::string& mode) { this->fogMode = this->stringToFogMode(mode); }
+    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); }
-*/
-
-  private:
-    //GLint stringToFogMode(const std::string& mode);
 
 
   private:
-   /* GLint                   fogMode;
+    GLint stringToFogMode(const std::string& mode);
+
+
+  private:
+    GLint                   fogMode;
     GLfloat                 fogDensity;
     GLfloat                 fogStart;
     GLfloat                 fogEnd;
-    Vector                  colorVector;*/
+    Vector                  colorVector;
 };