Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4338 in orxonox.OLD for orxonox/trunk/src/lib/graphics/light.h


Ignore:
Timestamp:
May 27, 2005, 9:16:53 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged branches/physics back to the trunk
merged with command
svn merge -r 3866:HEAD . ../../trunk/
many conflict that i tried to resolv
@patrick: i hope i did not interfere with your stuff :/

File:
1 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/lib/graphics/light.h

    r3603 r4338  
    1111#define _LIGHT_H
    1212
    13 #include "world_entity.h"
     13#include "p_node.h"
    1414#include "glincl.h"
    1515
    … …  
    2121
    2222//! A class that handles Lights. The LightManager operates on this.
    23 class Light : public WorldEntity
     23class Light : public PNode
    2424{
    2525 public:
Note: See TracChangeset for help on using the changeset viewer.