Changeset 4667 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 23, 2005, 4:40:05 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: lighting model is corrected now in the Particle-engine

Location:

orxonox/trunk/src

Files:

• lib/particles/particle_system.cc (modified) (4 diffs)
• subprojects/particles/particle_fun.cc (modified) (2 diffs)

orxonox/trunk/src/lib/particles/particle_system.cc

@@ -342 +342 @@
 {
   glPushAttrib(GL_ENABLE_BIT);
-  glDisable(GL_LIGHTING);
 
   Particle* drawPart = particles;
@@ -350 +349 @@
     default:
     case PARTICLE_SPRITE:
+      glDisable(GL_LIGHTING);
       glMatrixMode(GL_MODELVIEW);
       glDepthMask(GL_FALSE);
@@ -401 +401 @@
 
     case PARTICLE_SPARK:
+      glDisable(GL_LIGHTING);
       glEnable(GL_LINE_SMOOTH);
       glBegin(GL_LINES);
@@ -433 +434 @@
 
     case PARTICLE_DOT:
+      glDisable(GL_LIGHTING);
       glBegin(GL_POINTS);
       while (likely(drawPart != NULL))

orxonox/trunk/src/subprojects/particles/particle_fun.cc

@@ -23 +23 @@
 #include "stdlibincl.h"
 #include "graphics_engine.h"
+#include "light.h"
 
 #include <dirent.h>
@@ -86 +87 @@
   new PhysicsConnection(system, twirl);
   new PhysicsConnection(system, pointGravity);
+
+  LightManager::getInstance()->addLight();
+  LightManager::getInstance()->setPosition(10, 10, 10);
+
 }