Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4667 in orxonox.OLD for orxonox/trunk


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/lib/particles/particle_system.cc

    r4663 r4667  
    342342{
    343343  glPushAttrib(GL_ENABLE_BIT);
    344   glDisable(GL_LIGHTING);
    345344
    346345  Particle* drawPart = particles;
     
    350349    default:
    351350    case PARTICLE_SPRITE:
     351      glDisable(GL_LIGHTING);
    352352      glMatrixMode(GL_MODELVIEW);
    353353      glDepthMask(GL_FALSE);
     
    401401
    402402    case PARTICLE_SPARK:
     403      glDisable(GL_LIGHTING);
    403404      glEnable(GL_LINE_SMOOTH);
    404405      glBegin(GL_LINES);
     
    433434
    434435    case PARTICLE_DOT:
     436      glDisable(GL_LIGHTING);
    435437      glBegin(GL_POINTS);
    436438      while (likely(drawPart != NULL))
  • orxonox/trunk/src/subprojects/particles/particle_fun.cc

    r4666 r4667  
    2323#include "stdlibincl.h"
    2424#include "graphics_engine.h"
     25#include "light.h"
    2526
    2627#include <dirent.h>
     
    8687  new PhysicsConnection(system, twirl);
    8788  new PhysicsConnection(system, pointGravity);
     89
     90  LightManager::getInstance()->addLight();
     91  LightManager::getInstance()->setPosition(10, 10, 10);
     92
    8893}
    8994
Note: See TracChangeset for help on using the changeset viewer.