[Orxonox-commit 2397] r7112 - in code/branches/presentation3/src: modules/pickup/items orxonox/graphics

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-06-03 11:00:13 +0200 (Thu, 03 Jun 2010)
New Revision: 7112

Modified:
   code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.cc
   code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.h
   code/branches/presentation3/src/orxonox/graphics/AnimatedModel.cc
   code/branches/presentation3/src/orxonox/graphics/AnimatedModel.h
Log:
Including Ogre.h slows down compilation time considerably. Use individual includes.

Modified: code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.cc
===================================================================
--- code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.cc	2010-06-03 08:51:10 UTC (rev 7111)
+++ code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.cc	2010-06-03 09:00:13 UTC (rev 7112)
@@ -33,18 +33,17 @@
 
 #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
 {
 

Modified: code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.h
===================================================================
--- code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.h	2010-06-03 08:51:10 UTC (rev 7111)
+++ code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.h	2010-06-03 09:00:13 UTC (rev 7112)
@@ -37,9 +37,9 @@
 #include "pickup/PickupPrereqs.h"
 
 #include <string>
+
 #include <worldentities/pawns/Pawn.h>
 #include "worldentities/StaticEntity.h"
-
 #include "pickup/Pickup.h"
 
 namespace orxonox {

Modified: code/branches/presentation3/src/orxonox/graphics/AnimatedModel.cc
===================================================================
--- code/branches/presentation3/src/orxonox/graphics/AnimatedModel.cc	2010-06-03 08:51:10 UTC (rev 7111)
+++ code/branches/presentation3/src/orxonox/graphics/AnimatedModel.cc	2010-06-03 09:00:13 UTC (rev 7112)
@@ -26,9 +26,9 @@
  */
 
 #include "AnimatedModel.h"
+
 #include <OgreEntity.h>
-#include <Ogre.h>
-#include <deque>
+#include <OgreAnimationState.h>
 
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"

Modified: code/branches/presentation3/src/orxonox/graphics/AnimatedModel.h
===================================================================
--- code/branches/presentation3/src/orxonox/graphics/AnimatedModel.h	2010-06-03 08:51:10 UTC (rev 7111)
+++ code/branches/presentation3/src/orxonox/graphics/AnimatedModel.h	2010-06-03 09:00:13 UTC (rev 7112)
@@ -28,13 +28,12 @@
 
 #ifndef _AnimatedModel_H__
 #define _AnimatedModel_H__
-#include "Model.h"
-#include "tools/interfaces/Tickable.h"
+
 #include "OrxonoxPrereqs.h"
-#include <deque>
+
 #include <string>
-#include "tools/Mesh.h"
-#include "worldentities/StaticEntity.h"
+#include "tools/interfaces/Tickable.h"
+#include "Model.h"
 
 namespace orxonox
 {