Changeset 7379 in orxonox.OLD

Timestamp:

Apr 26, 2006, 3:52:46 PM (18 years ago)

Author:

hdavid

Message:

branches/atmospheric_engine: basic framework

Location:

branches/atmospheric_engine/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/graphics/Makefile.am (modified) (2 diffs)
• lib/graphics/effects/atmospheric_engine.cc (added)
• lib/graphics/effects/atmospheric_engine.h (added)
• lib/graphics/effects/fog_effect.cc (modified) (7 diffs)
• lib/graphics/effects/fog_effect.h (modified) (3 diffs)
• lib/graphics/effects/sun_effects.cc (added)
• lib/graphics/effects/sun_effects.h (added)
• lib/graphics/effects/weather_effects.cc (added)
• lib/graphics/effects/weather_effects.h (added)
• story_entities/game_world_data.cc (modified) (2 diffs)

branches/atmospheric_engine/src/defs/class_id.h

@@ -286 +286 @@
 
 
+  //CL_ATMOSPHERIC_ENGINE         =    0x        ,
+  //CL_SUN_EFFECTS                =    0x        ,
+  //CL_WEATHER_EFFECTS            =    0x        ,
+
   // Particles
   CL_PARTICLE_SYSTEM            =    0x00a02000,

branches/atmospheric_engine/src/lib/graphics/Makefile.am

@@ -17 +17 @@
                            \
                            effects/graphics_effect.cc \
+                           effects/atmospheric_engine.cc \
+                           effects/weather_effects.cc \
+                           effects/sun_effects.cc \
                            effects/fog_effect.cc \
                            effects/lense_flare.cc
@@ -35 +38 @@
                  \
                  effects/graphics_effect.h \
+                 effects/atmospheric_engine.h \
+                 effects/weather_effects.h \
+                 effects/sun_effects.h \
                  effects/fog_effect.h \
                  effects/lense_flare.h

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

@@ -1 @@
-
-
 /*
    orxonox - the future of 3D-vertical-scrollers
@@ -12 +10 @@
 
 ### File Specific:
-   main-programmer: Patrick Boenzli
+   main-programmer: hdavid, amaechler
 */
-
-#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GRAPHICS
 
 #include "fog_effect.h"
@@ -31 +27 @@
 
 
-/**
- *  default constructor
- * @param root The XML-element to load the FogEffect from
- */
- FogEffect::FogEffect(const TiXmlElement* root)
+FogEffect::FogEffect(const TiXmlElement* root)
 {
-  this->setClassID(CL_FOG_EFFECT, "FogEffect");
-
+  //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);
@@ -51 +43 @@
 
 
-/**
- *  destroys a FogEffect
- */
+
 FogEffect::~FogEffect()
 {
@@ -60 +50 @@
 
 
-/**
- * @param root The XML-element to load the FogEffect from
- */
 void FogEffect::loadParams(const TiXmlElement* root)
 {
-  GraphicsEffect::loadParams(root);
+  WeatherEffects::loadParams(root);
 
+/*
+  LoadParam(root, "fog-mode", this, FogEffect, setFogMode);
 
-  LoadParam(root, "fog-mode", this, FogEffect, setFogMode)
-      .describe("sets the the fog mode {GL_LINEAR, GL_EXP, GL_EXP2}");
+  LoadParam(root, "fog-density", this, FogEffect, setFogDensity);
 
-  LoadParam(root, "fog-density", this, FogEffect, setFogDensity)
-      .describe("sets the the fog density of the exponentionl functions");
+  LoadParam(root, "fog-color", this, FogEffect, setFogColor);*/
 
-  LoadParam(root, "fog-color", this, FogEffect, setFogColor)
-      .describe("sets the fog color");
+  LoadParam(root, "test", this, FogEffect, setTest);
+
 
 }
 
+void FogEffect::setTest(int test)
+{
+  PRINTF(0)("\n\ntest: %i\n\n", test);
+}
 
-/**
- * initializes the fog effect
- */
 bool FogEffect::init()
 {}
 
 
-/**
- * activates the fog effect
- */
+
 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);
@@ -109 +95 @@
     //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);*/
 }
 
 
-/**
- * deactivates the fog effect
- */
+
 bool FogEffect::deactivate()
 {
-  glDisable(GL_FOG);
+  //glDisable(GL_FOG);
 }
 
 
-/**
- * converts a gl mode char to a GLint
- * @param mode the mode character
- */
+/*
 GLint FogEffect::stringToFogMode(const std::string& mode)
 {
@@ -137 +118 @@
     return -1;
 }
+*/
 

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

@@ -1 +1 @@
 /**
  * @file fog_effect.h
- *  atmospheric fog
  */
 
@@ -7 +6 @@
 #define _FOG_EFFECT
 
-#include "vector.h"
-#include "graphics_effect.h"
+#include "weather_effects.h"
 
-class TiXmlElement;
-
-//! A class that handles FogEffects. The FogEffectManager operates on this.
-class FogEffect : public GraphicsEffect
+class FogEffect : public WeatherEffects
 {
   public:
@@ -26 +21 @@
     virtual bool deactivate();
 
-    inline void setFogMode(const std::string& mode) { this->fogMode = this->stringToFogMode(mode); }
+
+    void setTest(int test);
+
+    /*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 stringToFogMode(const std::string& mode);
-
-
-  private:
-    GLint                   fogMode;
+   /* GLint                   fogMode;
     GLfloat                 fogDensity;
     GLfloat                 fogStart;
     GLfloat                 fogEnd;
-    Vector                  colorVector;
+    Vector                  colorVector;*/
 };
 
 
-#endif /* _FOG_EFFECT */
+#endif  /* _FOG_EFFECT */

branches/atmospheric_engine/src/story_entities/game_world_data.cc

@@ -45 +45 @@
 
 #include "graphics_engine.h"
+#include "effects/atmospheric_engine.h"
 #include "event_handler.h"
 #include "sound_engine.h"
@@ -322 +323 @@
   LoadParamXML(root, "LightManager", LightManager::getInstance(), LightManager, loadParams);
   LoadParamXML(root, "GraphicsEngine", GraphicsEngine::getInstance(), GraphicsEngine, loadParams);
+  LoadParamXML(root, "AtmosphericEngine", AtmosphericEngine::getInstance(), AtmosphericEngine, loadParams);
 
   LoadParam(root, "Music", this, GameWorldData, setSoundTrack);