Changeset 3474 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Mar 10, 2005, 6:39:18 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: redesigning directory structure - created lib and added all importand classes, did exclude collision.* since i couldnt integrate it into the new pnode model (have to do this with fuzzy)

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (2 diffs)
• world_entity.cc (modified) (5 diffs)
• world_entity.h (modified) (3 diffs)

orxonox/trunk/src/world_entities/player.cc

@@ -18 +18 @@
 #include "player.h"
 #include "stdincl.h"
-#include "collision.h"
+//#include "collision.h"
 #include "importer/objModel.h"
 
@@ -76 +76 @@
   bFire = false;
   acceleration = 10.0;
-  setCollision(new CollisionCluster(1.0, Vector(0,0,0)));
+  //setCollision(new CollisionCluster(1.0, Vector(0,0,0)));
 }
 

orxonox/trunk/src/world_entities/world_entity.cc

@@ -20 +20 @@
 #include "world_entity.h"
 #include "stdincl.h"
-#include "collision.h"
+//#include "collision.h"
 
 using namespace std;
@@ -38 +38 @@
   this->setClassName ("WorldEntity");
   this->bDraw = true;
-  collisioncluster = NULL;
+  //  collisioncluster = NULL;
 }
 
@@ -46 +46 @@
 WorldEntity::~WorldEntity ()
 {
-  if( collisioncluster != NULL) delete collisioncluster;
+  // if( collisioncluster != NULL) delete collisioncluster;
 }
 
@@ -85 +85 @@
    Any previously assigned collision hull will be deleted on reassignment
 */
+/*
 void WorldEntity::setCollision (CollisionCluster* newhull)
 {
@@ -91 +92 @@
   collisioncluster = newhull;
 }
-
+*/
 
 /**

orxonox/trunk/src/world_entities/world_entity.h

@@ -10 +10 @@
 #include "p_node.h"
 
-class CollisionCluster;
+//class CollisionCluster;
 class OBJModel;
 
@@ -24 +24 @@
   OBJModel* model;                  //!< The model that should be loaded for this entity.
   
-  void setCollision (CollisionCluster* newhull);
+  //void setCollision (CollisionCluster* newhull);
   
   bool isFree ();
@@ -49 +49 @@
   bool bDraw;                         //!< If it should be visible.
 
-  CollisionCluster* collisioncluster; //!< The collision-Cluster of this entity.
+  //CollisionCluster* collisioncluster; //!< The collision-Cluster of this entity.
 };