Changeset 3365 in orxonox.OLD for orxonox/trunk/src/world_entity.h

Timestamp:

Jan 7, 2005, 1:14:33 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/parenting back to the.
merged with command:
svn merge branches/parenting trunk -r 3247:HEAD
resolved all conflicts in favor of parenting.

File:

• orxonox/trunk/src/world_entity.h (modified) (3 diffs)

orxonox/trunk/src/world_entity.h

@@ -8 +8 @@
 
 #include "stdincl.h"
+#include "p_node.h"
 
 class CollisionCluster;
+class Model;
 
 //! Basic class from which all interactive stuff in the world is derived from
-class WorldEntity
+class WorldEntity : public PNode
 {       
   friend class World;
-  
+
  public:
   WorldEntity (bool isFree = false);
   virtual ~WorldEntity ();
+
+  Model* model;
   
-  Location* getLocation ();
-  Placement* getPlacement ();
   void setCollision (CollisionCluster* newhull);
   
@@ -35 +37 @@
   virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);
   virtual void command (Command* cmd);
-  
+
+  void processDraw ();
   virtual void draw ();
-  virtual void getLookat (Location* locbuf);
+  void setDrawable (bool bDraw);
   
   virtual void leftWorld ();
@@ -45 +48 @@
   bool bCollide;
   bool bDraw;
-  
-  WorldEntity* owner;
+
   CollisionCluster* collisioncluster;
-  Placement place;
-  Location loc;
-  
-  void init( Location* spawnloc, WorldEntity* spawnowner);
-  void init( Placement* spawnplc, WorldEntity* spawnowner);
 };