Changeset 7562 in orxonox.OLD

Timestamp:

May 10, 2006, 9:52:35 AM (18 years ago)

Author:

amaechler

Message:

branches/atmosphere_engine:

Location:

branches/atmospheric_engine/src/lib/graphics

Files:

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

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

@@ -22 +22 @@
                            effects/fog_effect.cc \
                            effects/volfog_effect.cc \
+                           effects/rain_effect.cc \
                            effects/lense_flare.cc
 
@@ -44 +45 @@
                  effects/fog_effect.h \
                  effects/volfog_effect.h \
+                 effects/rain_effect.h \
                  effects/lense_flare.h
 

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

@@ -19 +19 @@
 
 #include "glincl.h"
+
+// *****
+
+#include "material.h"
+#include "state.h"
+#include "shell_command.h"
+
+#include "parser/tinyxml/tinyxml.h"
+#include <algorithm>
 
 using namespace std;
@@ -91 +100 @@
 }
 
-void RainEffect::draw()
+void RainEffect::draw() const
 {
-  Particle* drawPart = particles;
+//  Particle* drawPart = ParticleSystem::particles;
 
-  glDepthMask(GL_FALSE);
-  glPushAttrib(GL_ENABLE_BIT);
-
-  glDisable(GL_LIGHTING);
-  glDisable(GL_TEXTURE_2D);
-
-  glEnable(GL_LINE_SMOOTH);
-  glEnable(GL_BLEND);
-  glBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA);
-
-  glLineWidth(2.0);
-  glBegin(GL_LINES);
-  while (likely(drawPart != NULL))
-  {
-  //    printf("%f %f %f %f\n", drawPart->color[0], drawPart->color[1], drawPart->color[2], drawPart->color[3]);
-    glColor4fv(drawPart->color);
-    glVertex3f(drawPart->position.x,  drawPart->position.y,  drawPart->position.z);
-    glVertex3f(drawPart->position.x - drawPart->velocity.x * drawPart->radius,
-               drawPart->position.y - drawPart->velocity.y * drawPart->radius,
-               drawPart->position.z - drawPart->velocity.z * drawPart->radius);
-    drawPart = drawPart->next;
-  }
-  glEnd();
-
-  glDepthMask(GL_TRUE);
-  glPopAttrib();
+//   glDepthMask(GL_FALSE);
+//   glPushAttrib(GL_ENABLE_BIT);
+// 
+//   glDisable(GL_LIGHTING);
+//   glDisable(GL_TEXTURE_2D);
+// 
+//   glEnable(GL_LINE_SMOOTH);
+//   glEnable(GL_BLEND);
+//   glBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA);
+// 
+//   glLineWidth(2.0);
+//   glBegin(GL_LINES);
+//   while (likely(drawPart != NULL))
+//   {
+//   //    printf("%f %f %f %f\n", drawPart->color[0], drawPart->color[1], drawPart->color[2], drawPart->color[3]);
+//     glColor4fv(drawPart->color);
+//     glVertex3f(drawPart->position.x,  drawPart->position.y,  drawPart->position.z);
+//     glVertex3f(drawPart->position.x - drawPart->velocity.x * drawPart->radius,
+//                drawPart->position.y - drawPart->velocity.y * drawPart->radius,
+//                drawPart->position.z - drawPart->velocity.z * drawPart->radius);
+//     drawPart = drawPart->next;
+//   }
+//   glEnd();
+// 
+//   glDepthMask(GL_TRUE);
+//   glPopAttrib();
 }

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

@@ -6 +6 @@
 #define _RAIN_EFFECT
 
-// #include "vector.h"
+#include "vector.h"
 #include "particle_system.h"
 #include "material.h"
 
 #include "weather_effect.h"
+
 
 class RainEffect : public WeatherEffect