Last change
on this file since 3605 was
3605,
checked in by bensch, 19 years ago
|
orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader
Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h
solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit
Conflits in world.cc are a MESS: fix it
|
File size:
622 bytes
|
Rev | Line | |
---|
[3524] | 1 | #ifndef _PRIMITIVE_H |
---|
| 2 | #define _PRIMITIVE_H |
---|
| 3 | |
---|
| 4 | #include "world_entity.h" |
---|
| 5 | |
---|
| 6 | typedef enum PRIMITIVE_FORM {PSPHERE = 0, PCUBE, PSQUARE}; |
---|
| 7 | |
---|
| 8 | class Primitive : public WorldEntity |
---|
| 9 | { |
---|
| 10 | friend class World; |
---|
| 11 | |
---|
| 12 | public: |
---|
| 13 | Primitive (PRIMITIVE_FORM form); |
---|
[3531] | 14 | virtual ~Primitive (); |
---|
| 15 | |
---|
[3524] | 16 | virtual void tick (float time); |
---|
[3578] | 17 | virtual void hit (WorldEntity* weapon, Vector* loc); |
---|
[3524] | 18 | virtual void collide (WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags); |
---|
| 19 | virtual void draw (); |
---|
| 20 | |
---|
[3586] | 21 | private: |
---|
| 22 | GLUquadricObj *object; //!< the object to be rendered |
---|
| 23 | Material *material; //!< A Material for the SkySphere. |
---|
| 24 | |
---|
[3524] | 25 | }; |
---|
| 26 | |
---|
| 27 | #endif /* _PRIMITIVE_H */ |
---|
Note: See
TracBrowser
for help on using the repository browser.