Changeset 7523 in orxonox.OLD

Timestamp:

May 3, 2006, 5:01:22 PM (18 years ago)

Author:

amaechler

Message:

branches/atmospheric_engine:

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• fog_effect.cc (modified) (2 diffs)
• volfog_effect.cc (modified) (8 diffs)
• volfog_effect.h (modified) (1 diff)

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)
+/*#include "shell_command.h"
+SHELL_COMMAND(activateFog, FogEffect, FogEffect::activate)
   ->setAlias("aFog");
 SHELL_COMMAND(deactivateFog, FogEffect, FogEffect::deactivate)
@@ -71 +71 @@
 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, 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);

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

@@ -32 +32 @@
 
 world_vector vertices[NUM_PANELS*4] = {
-        {-5.0, -10.0, 0.0},{5.0, -10.0, 0.0},{5.0, 0.0, 0.0},{-5.0, 0.0, 0.0},
-        {-5.0, -10.0, 10.0},{-5.0, -10.0, 0.0},{-5.0, 0.0, 0.0},{-5.0, 0.0, 10.0},
-        {-5.0, -10.0, 20.0},{-5.0, -10.0, 10.0},{-5.0, 0.0, 10.0},{-5.0, 0.0, 20.0},
-        {5.0, -10.0, 0.0},{5.0, -10.0, 10.0},{5.0, 0.0, 10.0},{5.0, 0.0, 0.0},
-        {5.0, -10.0, 10.0},{5.0, -10.0, 20.0},{5.0, 0.0, 20.0},{5.0, 0.0, 10.0},
-        {-5.0, -10.0, 10.0},{5.0, -10.0, 10.0},{5.0, -10.0, 0.0},{-5.0, -10.0, 0.0}
+        {-50.0, -60.0, 0.0},{50.0, -60.0, 0.0},{50.0, 0.0, 0.0},{-50.0, 0.0, 0.0},
+        {-50.0, -60.0, 60.0},{-50.0, -60.0, 0.0},{-50.0, 0.0, 0.0},{-50.0, 0.0, 60.0},
+        {-50.0, -60.0, 20.0},{-50.0, -60.0, 60.0},{-50.0, 0.0, 60.0},{-50.0, 0.0, 20.0},
+        {50.0, -60.0, 0.0},{50.0, -60.0, 60.0},{50.0, 0.0, 60.0},{50.0, 0.0, 0.0},
+        {50.0, -60.0, 60.0},{50.0, -60.0, 20.0},{50.0, 0.0, 20.0},{50.0, 0.0, 60.0},
+        {-50.0, -60.0, 60.0},{50.0, -60.0, 60.0},{50.0, -60.0, 0.0},{-50.0, -60.0, 0.0}
 };
 
@@ -65 +65 @@
   WeatherEffect::loadParams(root);
 
-  LoadParam(root, "test", this, VolFogEffect, test);
+  LoadParam(root, "fog-altitude", this, VolFogEffect, setFogAltitude);
+  LoadParam(root, "fog-color", this, VolFogEffect, startFogColor);
 }
 
-void VolFogEffect::test(int t)
-{
-PRINTF(0)("test\n\n");
-}
 
 bool VolFogEffect::init()
 {
-
+  PRINTF(0)("Initalize VolFogEffect\n");
 };
 
@@ -82 +79 @@
 bool VolFogEffect::activate()
 {
-  PRINTF(0)("Activate VolFogEffect\n");
+  PRINTF(0)( "Enabling Volumetric Fog Effect, altitude: %i, color %f, %f, %f\n", this->fogAltitude, this->colorVector.x, this->colorVector.y, this->colorVector.z);
+
 }
 
@@ -91 +89 @@
 
 
-void setFogColor(int v)
+void VolFogEffect::setFogColor(int v)
 {
         float z;        /* distance of vertex from edge of fog volume */
@@ -97 +95 @@
 
         z = 0.0 - vertices[v].y;
-        f = (10.0 - z) / (10.0 - 0.0);  /* linear fog: f = (end - z)/(end - start) */
-        glColor4f(0.6, 0.2, 0.0, f);
+        f = (60.0 - z) / (60.0 - 0.0);  /* linear fog: f = (end - z)/(end - start) */
+        glColor4f(this->colorVector.x, this->colorVector.y, this->colorVector.z, f);
 }
 
-        int v;          /* store of next vertex ref */
+// int v;               /* store of next vertex ref */
 
 /**
@@ -108 +106 @@
 void VolFogEffect::draw() const
 {
-        // int v;               /* store of next vertex ref */
+        int v;          /* store of next vertex ref */
         int ref;
 
@@ -118 +116 @@
                 glDepthMask(GL_FALSE);
         
-                v = ref * 4;
-
                 /* restore z buffer writes, set blend params & disable texturing */
 
@@ -131 +127 @@
                 v = ref * 4;
                 glBegin(GL_QUADS);
-                setFogColor(v);
+                //this->setFogColor(v);
                 glVertex3f(vertices[v].x, vertices[v].y, vertices[v].z); v++;
-                setFogColor(v);
+                //this->setFogColor(v);
                 glVertex3f(vertices[v].x, vertices[v].y, vertices[v].z); v++;
-                setFogColor(v);
+                //this->setFogColor(v);
                 glVertex3f(vertices[v].x, vertices[v].y, vertices[v].z); v++;
-                setFogColor(v);
+                //this->setFogColor(v);
                 glVertex3f(vertices[v].x, vertices[v].y, vertices[v].z);
                 glEnd();

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

@@ -23 +23 @@
     virtual bool deactivate();
 
-    void test(int t);
-
-
     virtual void draw() const;
     virtual void tick(float dt);
 
+    inline void startFogColor(float r, float g, float b) { this->colorVector = Vector(r, g, b); }
+    inline void setFogAltitude(float altitude) { this->fogAltitude = altitude; }
+
+
   private:
-    void set_fog_colour(int v);
-
+    void setFogColor(int v);
+    GLfloat                 fogAltitude;
+    Vector                  colorVector;
 };