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

Timestamp:

Mar 20, 2005, 11:37:26 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: now there is a real speedup in compiling time when dependencies are modified: just realy only includes, what is needed. Byside the speedup, there is more overview! never add an orxonox class to stdincl.h if it doesn't have to be

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (1 diff)
• player.h (modified) (2 diffs)
• primitive.cc (modified) (1 diff)
• primitive.h (modified) (1 diff)
• skysphere.cc (modified) (1 diff)
• skysphere.h (modified) (1 diff)
• terrain.cc (modified) (1 diff)
• world_entity.cc (modified) (1 diff)
• world_entity.h (modified) (1 diff)

orxonox/trunk/src/world_entities/player.cc

@@ -40 +40 @@
 
   travelSpeed = 15.0;
-  velocity = Vector();
+  velocity = new Vector();
   bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
   bFire = false;

orxonox/trunk/src/world_entities/player.h

@@ -12 +12 @@
 class OBJModel;
 class Weapon;
+class Vector;
 
 //! Basic controllable WorldEntity
@@ -48 +49 @@
   Weapon* activeWeapon;  //!< the weapon that is currenty activated
 
-  Vector velocity;       //!< the velocity of the player.
+  Vector* velocity;       //!< the velocity of the player.
   float travelSpeed;     //!< the current speed of the player (to make soft movement)
   float acceleration;    //!< the acceleration of the player.

orxonox/trunk/src/world_entities/primitive.cc

@@ -18 +18 @@
 
 #include "primitive.h"
+
 #include "stdincl.h"
 #include "world_entity.h"
 #include "objModel.h"
+#include "vector.h"
 
 using namespace std;

orxonox/trunk/src/world_entities/primitive.h

@@ -3 +3 @@
 
 #include "world_entity.h"
+#include "glincl.h"
 
 typedef enum PRIMITIVE_FORM {PSPHERE = 0, PCUBE, PSQUARE};
+
+class Material;
+
 
 class Primitive : public WorldEntity 

orxonox/trunk/src/world_entities/skysphere.cc

@@ -26 +26 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
-#include "material.h"
+
 #include "skysphere.h"
 #include "stdincl.h"
+
+#include "material.h"
 #include "vector.h"
-#include "world_entity.h"
+//#include "world_entity.h"
+
 
 using namespace std;

orxonox/trunk/src/world_entities/skysphere.h

@@ -14 +14 @@
 
 /* INCLUDES */
-#include "p_node.h"
 #include "world_entity.h"
 

orxonox/trunk/src/world_entities/terrain.cc

@@ -16 +16 @@
 
 #include "terrain.h"
-
+#include "stdincl.h"
+#include "objModel.h"
+#include "vector.h"
 #include "glincl.h"
 

orxonox/trunk/src/world_entities/world_entity.cc

@@ -19 +19 @@
 
 #include "world_entity.h"
-#include "stdincl.h"
+#include "objModel.h"
+#include "list.h"
+
+//#include "stdincl.h"
 //#include "collision.h"
 

orxonox/trunk/src/world_entities/world_entity.h

@@ -7 +7 @@
 #define _WORLD_ENTITY_H
 
-#include "stdincl.h"
 #include "p_node.h"
-#include "objModel.h"
+#include "comincl.h"
 
 //class CollisionCluster;
 class CharacterAttributes;
+class OBJModel;