Changeset 7572 in orxonox.OLD

Timestamp:

May 10, 2006, 2:44:18 PM (18 years ago)

Author:

hdavid

Message:

branches/atmospheric_engine

Location:

branches/atmospheric_engine/src

Files:

• Makefile.am (modified) (1 diff)
• defs/class_id.h (modified) (1 diff)
• lib/graphics/Makefile.am (modified) (2 diffs)
• lib/graphics/effects/rain_effect.cc (modified) (1 diff)

branches/atmospheric_engine/src/Makefile.am

@@ -37 +37 @@
                 lib/graphics/effects/fog_effect.cc \
                 lib/graphics/effects/volfog_effect.cc \
+                lib/graphics/effects/rain_effect.cc \
+                lib/graphics/effects/snow_effect.cc \
                 lib/graphics/effects/lense_flare.cc \
                 \

branches/atmospheric_engine/src/defs/class_id.h

@@ -287 +287 @@
   CL_LENSE_FLARE                =    0x00000a12,
   CL_RAIN_EFFECT                =    0x00000a13,
+  CL_SNOW_EFFECT                =    0x00000a14,
   CL_EXPLOSION                  =    0x00000a20,
   CL_LIGHTNING_BOLT             =    0x00000a21,

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

@@ -23 +23 @@
                            effects/volfog_effect.cc \
                            effects/rain_effect.cc \
+                           effects/snow_effect.cc \
                            effects/lense_flare.cc
 
@@ -46 +47 @@
                  effects/volfog_effect.h \
                  effects/rain_effect.h \
+                 effects/snow_effect.h \
                  effects/lense_flare.h
 

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

@@ -74 +74 @@
 bool RainEffect::activate()
 {
-//   PRINTF(0)( "Enabling Rain Effect, mode: %i, density: %f, start: %f, end: %f, color %f, %f, %f\n", this->rainMode, this->rainDensity, this->rainStart, this->rainEnd, this->colorVector.x, this->colorVector.y, this->colorVector.z);
-// 
-//   glEnable(GL_RAIN);
-//   {
-//     //GLfloat rainColor[4] = {0.7, 0.6, 0.6, 1.0};
-//     GLfloat rainColor[4] = { colorVector.x, colorVector.y, colorVector.z, 1.0};
-// 
-//     glRaini(GL_RAIN_MODE, this->rainMode);
-//     glRainfv(GL_RAIN_COLOR, rainColor);
-//     glRainf(GL_RAIN_DENSITY, this->rainDensity);
-//     glHint(GL_RAIN_HINT, GL_DONT_CARE);
-//     glRainf(GL_RAIN_START, this->rainStart);
-//     glRainf(GL_RAIN_END, this->rainEnd);
-// 
-//     //glRaini(GL_RAIN_COORDINATE_SOURCE, GL_RAIN_COORDINATE);
-//   }
-//   glClearColor(0.5, 0.5, 0.5, 1.0);
+  PRINTF(0)("Activating Rain Effect\n");
 }