Changeset 7107 in orxonox.OLD

Timestamp:

Feb 7, 2006, 11:06:19 PM (18 years ago)

Author:

patrick

Message:

trunk: fog patch

Location:

trunk/src

Files:

• lib/graphics/effects/fog_effect.cc (modified) (4 diffs)
• lib/graphics/effects/fog_effect.h (modified) (3 diffs)
• world_entities/camera.cc (modified) (2 diffs)

trunk/src/lib/graphics/effects/fog_effect.cc

@@ -39 +39 @@
   this->setClassID(CL_FOG_EFFECT, "FogEffect");
 
-  this->fogMode = GL_EXP2;
+  this->fogMode = GL_LINEAR;
   this->fogDensity = 0.001f;
   this->fogStart = 10.0f;
@@ -46 +46 @@
   if (root != NULL)
     this->loadParams(root);
+
+  this->activate();
 }
 
@@ -72 +74 @@
       .describe("sets the the fog density of the exponentionl functions");
 
-  LoadParam(root, "fog-range", this, FogEffect, setFogRange)
-      .describe("sets the the range of the linear functions");
+  LoadParam(root, "fog-color", this, FogEffect, setFogColor)
+      .describe("sets the fog color");
+
 }
 
@@ -89 +92 @@
 bool FogEffect::activate()
 {
-  PRINTF(4)( "Enabling Fog Effect, mode: %i, density: %f, start: %f, end: %f\n", this->fogMode, this->fogDensity,
-             this->fogStart, this->fogEnd);
+  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);
 
   glEnable(GL_FOG);
   {
-    GLfloat fogColor[4] = {0.6, 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};
 
     glFogi(GL_FOG_MODE, this->fogMode);

trunk/src/lib/graphics/effects/fog_effect.h

@@ -7 +7 @@
 #define _FOG_EFFECT
 
+#include "vector.h"
 #include "graphics_effect.h"
 
@@ -25 +26 @@
     virtual bool deactivate();
 
-    void setFogMode(const char* mode) { this->fogMode = this->charToFogMode(mode); }
-    void setFogDensity(float density) { this->fogDensity = density; }
-    void setFogRange(float start, float end) { this->fogStart = start; this->fogEnd = end; }
+    inline void setFogMode(const char* mode) { this->fogMode = this->charToFogMode(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); }
 
 
@@ -39 +41 @@
     GLfloat                 fogStart;
     GLfloat                 fogEnd;
+    Vector                  colorVector;
 };
 

trunk/src/world_entities/camera.cc

@@ -181 +181 @@
   Vector targetPosition = this->target->getAbsCoor();
 
-   // Setting the Camera Eye, lookAt and up Vectors
+  glMatrixMode (GL_MODELVIEW);
+  glLoadIdentity();
+
+     // Setting the Camera Eye, lookAt and up Vectors
   gluLookAt(cameraPosition.x, cameraPosition.y, cameraPosition.z,
             targetPosition.x, targetPosition.y, targetPosition.z,
@@ -187 +190 @@
 
 
-  glMatrixMode (GL_MODELVIEW);
-  glLoadIdentity();
-
 }