Changeset 7112 for code/branches/presentation3

Timestamp:

Jun 3, 2010, 11:00:13 AM (14 years ago)

Author:

rgrieder

Message:

Including Ogre.h slows down compilation time considerably. Use individual includes.

Location:

code/branches/presentation3/src

Files:

• modules/pickup/items/InvisiblePickup.cc (modified) (1 diff)
• modules/pickup/items/InvisiblePickup.h (modified) (1 diff)
• orxonox/graphics/AnimatedModel.cc (modified) (1 diff)
• orxonox/graphics/AnimatedModel.h (modified) (1 diff)

code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.cc

@@ -34 +34 @@
 #include "InvisiblePickup.h"
 
+#include <sstream>
+#include <OgreEntity.h>
+#include <OgreAnimationState.h>
+
+#include "util/StringUtils.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "util/StringUtils.h"
 
 #include "worldentities/pawns/Pawn.h"
 #include "pickup/PickupIdentifier.h"
-
-#include <sstream>
-
-#include <OgreEntity.h>
-#include <Ogre.h>
 
 namespace orxonox

code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.h

@@ -38 +38 @@
 
 #include <string>
+
 #include <worldentities/pawns/Pawn.h>
 #include "worldentities/StaticEntity.h"
-
 #include "pickup/Pickup.h"
 

code/branches/presentation3/src/orxonox/graphics/AnimatedModel.cc

@@ -27 +27 @@
 
 #include "AnimatedModel.h"
+
 #include <OgreEntity.h>
-#include <Ogre.h>
-#include <deque>
+#include <OgreAnimationState.h>
 
 #include "core/CoreIncludes.h"

code/branches/presentation3/src/orxonox/graphics/AnimatedModel.h

@@ -29 +29 @@
 #ifndef _AnimatedModel_H__
 #define _AnimatedModel_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include <string>
+#include "tools/interfaces/Tickable.h"
 #include "Model.h"
-#include "tools/interfaces/Tickable.h"
-#include "OrxonoxPrereqs.h"
-#include <deque>
-#include <string>
-#include "tools/Mesh.h"
-#include "worldentities/StaticEntity.h"
 
 namespace orxonox