Changeset 5511 in orxonox.OLD

Timestamp:

Nov 8, 2005, 11:19:09 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: more cleanup of the WorldEntity (includes rearanged)

Location:

trunk/src

Files:

• lib/collision_detection/obb_tree_node.cc (modified) (1 diff)
• lib/lang/base_object.h (modified) (1 diff)
• lib/particles/particle_system.cc (modified) (1 diff)
• world_entities/npc2.cc (modified) (1 diff)
• world_entities/npc2.h (modified) (1 diff)
• world_entities/power_ups/laser_power_up.h (modified) (1 diff)
• world_entities/power_ups/turret_power_up.h (modified) (1 diff)
• world_entities/skybox.cc (modified) (1 diff)
• world_entities/skybox.h (modified) (1 diff)
• world_entities/skysphere.cc (modified) (1 diff)
• world_entities/skysphere.h (modified) (1 diff)
• world_entities/terrain.cc (modified) (1 diff)
• world_entities/weapons/laser.cc (modified) (1 diff)
• world_entities/weapons/projectile.cc (modified) (1 diff)
• world_entities/weapons/rocket.cc (modified) (1 diff)
• world_entities/weapons/test_bullet.cc (modified) (1 diff)
• world_entities/weapons/turret.cc (modified) (1 diff)
• world_entities/weapons/turret.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)
• world_entities/world_entity.h (modified) (3 diffs)

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -27 +27 @@
 #include "color.h"
 
+#include "debug.h"
 #include "stdincl.h"
 #include "lin_alg.h"

trunk/src/lib/lang/base_object.h

@@ -11 +11 @@
 
 #include "class_id.h"
+#include "debug.h"
 #ifndef NULL
 #define NULL     0    //!< NULL

trunk/src/lib/particles/particle_system.cc

@@ -22 +22 @@
 
 #include "field.h"
+#include "model.h"
 
 #include "load_param.h"

trunk/src/world_entities/npc2.cc

@@ -25 +25 @@
 #include "list.h"
 #include "stdlibincl.h"
+#include "debug.h"
+
 
 using namespace std;

trunk/src/world_entities/npc2.h

@@ -5 +5 @@
 #include "world_entity.h"
 #include "physics_interface.h"
+
+#include "glincl.h"
 
 class AI;

trunk/src/world_entities/power_ups/laser_power_up.h

@@ -8 +8 @@
 
 #include "power_up.h"
+
+/* FORWARD DEFINITION */
+class Material;
 
 class LaserPowerUp : public PowerUp {

trunk/src/world_entities/power_ups/turret_power_up.h

@@ -8 +8 @@
 
 #include "power_up.h"
+
+/* FORWARD DEFINITION */
+class Material;
 
 class TurretPowerUp : public PowerUp {

trunk/src/world_entities/skybox.cc

@@ -20 +20 @@
 #include "load_param.h"
 #include "factory.h"
+#include "model.h"
+
 
 using namespace std;

trunk/src/world_entities/skybox.h

@@ -14 +14 @@
 
 /* FORWARD DECLARATION */
+class Material;
 
 //! A Class to handle a SkyBox

trunk/src/world_entities/skysphere.cc

@@ -30 +30 @@
 
 #include "material.h"
-#include "vector.h"
-//#include "world_entity.h"
+#include "debug.h"
 
 

trunk/src/world_entities/skysphere.h

@@ -15 +15 @@
 /* INCLUDES */
 #include "world_entity.h"
+#include "glincl.h"
 
 /* FORWARD DECLARATION */

trunk/src/world_entities/terrain.cc

@@ -23 +23 @@
 
 #include "resource_manager.h"
+#include "model.h"
+
+#include "glincl.h"
 
 using namespace std;

trunk/src/world_entities/weapons/laser.cc

@@ -23 +23 @@
 #include "list.h"
 #include "class_list.h"
+#include "model.h"
 
 #include "particle_engine.h"

trunk/src/world_entities/weapons/projectile.cc

@@ -23 +23 @@
 #include "null_parent.h"
 #include "model.h"
-#include "vector.h"
 
 #include "garbage_collector.h"

trunk/src/world_entities/weapons/rocket.cc

@@ -20 +20 @@
 #include "fast_factory.h"
 
+#include "model.h"
 #include "state.h"
 #include "list.h"

trunk/src/world_entities/weapons/test_bullet.cc

@@ -20 +20 @@
 #include "fast_factory.h"
 
+#include "model.h"
 #include "state.h"
 #include "list.h"

trunk/src/world_entities/weapons/turret.cc

@@ -18 +18 @@
 
 #include "weapon_manager.h"
-#include "test_bullet.h"
+#include "projectile.h"
+
+#include "model.h"
+#include "p_node.h"
 
 #include "null_parent.h"
 #include "state.h"
-#include "vector.h"
 #include "list.h"
 #include "animation3d.h"

trunk/src/world_entities/weapons/turret.h

@@ -30 +30 @@
   private:
   };
+
 #endif /* _TURRET_H */

trunk/src/world_entities/world_entity.cc

@@ -20 +20 @@
 #include "shell_command.h"
 
+#include "model.h"
 #include "resource_manager.h"
 #include "load_param.h"

trunk/src/world_entities/world_entity.h

@@ -8 +8 @@
 
 #include "p_node.h"
-#include "model.h"
+
+#include "glincl.h"
 
 // FORWARD DECLARATION
@@ -14 +15 @@
 class SoundSource;
 class BVTree;
+class Model;
 
 //class CharacterAttributes;
@@ -32 +34 @@
   void setVisibiliy (bool visibility) { this->bVisible = visibility; };
   /** @returns true if the entity is visible, false otherwise */
-  bool isVisible() const { return this->bVisible; };
+  inline bool isVisible() const { return this->bVisible; };