Changeset 1616

Timestamp:

Jun 22, 2008, 12:30:06 AM (16 years ago)

Author:

rgrieder

Message:

• precompiled header files have disadvantages too…

Location:

code/branches/hud/src/orxonox

Files:

• OrxonoxStableHeaders.h (modified) (1 diff)
• Radar.cc (modified) (1 diff)
• RadarListener.cc (modified) (1 diff)
• RadarViewable.cc (modified) (2 diffs)
• RadarViewable.h (modified) (2 diffs)
• overlays/OrxonoxOverlay.cc (modified) (1 diff)
• overlays/OverlayGroup.cc (modified) (1 diff)
• overlays/OverlayText.cc (modified) (1 diff)
• overlays/hud/HUDBar.cc (modified) (1 diff)
• overlays/hud/HUDFPSText.cc (modified) (1 diff)
• overlays/hud/HUDFPSText.h (modified) (1 diff)
• overlays/hud/HUDNavigation.cc (modified) (1 diff)
• overlays/hud/HUDNavigation.h (modified) (1 diff)
• overlays/hud/HUDRTRText.cc (modified) (1 diff)
• overlays/hud/HUDRTRText.h (modified) (1 diff)
• overlays/hud/HUDRadar.cc (modified) (1 diff)
• overlays/hud/HUDSpeedBar.cc (modified) (1 diff)
• overlays/hud/HUDSpeedBar.h (modified) (1 diff)
• tools/WindowEventListener.cc (modified) (1 diff)

code/branches/hud/src/orxonox/OrxonoxStableHeaders.h

@@ -37 +37 @@
 #include "util/OrxonoxPlatform.h"
 
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && 0
 
 // including std headers here is useless since they're already precompiled

code/branches/hud/src/orxonox/Radar.cc

@@ -38 +38 @@
 #include "objects/SpaceShip.h"
 #include "core/CoreIncludes.h"
+#include "core/ConsoleCommand.h"
 #include "RadarListener.h"
-//#include "core/ConfigValueIncludes.h"
 
 namespace orxonox

code/branches/hud/src/orxonox/RadarListener.cc

@@ -29 +29 @@
 #include "OrxonoxStableHeaders.h"
 #include "RadarListener.h"
+#include "core/CoreIncludes.h"
 
 namespace orxonox

code/branches/hud/src/orxonox/RadarViewable.cc

@@ -30 +30 @@
 #include "RadarViewable.h"
 #include "core/Debug.h"
+#include "core/CoreIncludes.h"
+#include "objects/WorldEntity.h"
 #include "Radar.h"
 
@@ -57 +59 @@
         this->radarObjectDescription_ = str;
     }
+
+    const Vector3& RadarViewable::getWorldPosition() const
+    {
+        validate();
+        return this->radarObject_->getWorldPosition();
+    }
+
+    Vector3 RadarViewable::getOrientedVelocity() const
+    {
+        validate();
+        return this->radarObject_->getOrientation() * this->radarObject_->getVelocity();
+    }
 }

code/branches/hud/src/orxonox/RadarViewable.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include <string>
+#include "util/Math.h"
+#include "core/Debug.h"
 #include "core/OrxonoxClass.h"
-#include "util/Math.h"
 
 namespace orxonox
@@ -64 +65 @@
 
         const WorldEntity* getWorldEntity() const { return this->radarObject_; }
-        const Vector3& getWorldPosition() const { validate(); return this->radarObject_->getWorldPosition(); }
-        Vector3 getOrientedVelocity() const
-            { validate(); return this->radarObject_->getOrientation() * this->radarObject_->getVelocity(); }
+        const Vector3& getWorldPosition() const;
+        Vector3 getOrientedVelocity() const;
 
         Shape getRadarObjectType() const { return this->radarObjectType_; }

code/branches/hud/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -36 +36 @@
 #include "util/String.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+#include "core/ConsoleCommand.h"
 #include "GraphicsEngine.h"
 

code/branches/hud/src/orxonox/overlays/OverlayGroup.cc

@@ -33 +33 @@
 #include "core/ConsoleCommand.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 #include "OrxonoxOverlay.h"
 

code/branches/hud/src/orxonox/overlays/OverlayText.cc

@@ -36 +36 @@
 #include "util/Convert.h"
 #include "util/String.h"
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 
 namespace orxonox

code/branches/hud/src/orxonox/overlays/hud/HUDBar.cc

@@ -38 +38 @@
 
 #include "util/Convert.h"
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 
 namespace orxonox

code/branches/hud/src/orxonox/overlays/hud/HUDFPSText.cc

@@ -30 +30 @@
 #include "HUDFPSText.h"
 #include <OgreTextAreaOverlayElement.h>
+#include "core/CoreIncludes.h"
 #include "GraphicsEngine.h"
 #include "util/Convert.h"

code/branches/hud/src/orxonox/overlays/hud/HUDFPSText.h

@@ -33 +33 @@
 
 #include "overlays/OverlayText.h"
+#include "objects/Tickable.h"
 
 namespace orxonox

code/branches/hud/src/orxonox/overlays/hud/HUDNavigation.cc

@@ -36 +36 @@
 #include "util/Math.h"
 #include "util/String.h"
+#include "util/Convert.h"
 #include "core/ConsoleCommand.h"
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 #include "objects/SpaceShip.h"
 #include "objects/Projectile.h"

code/branches/hud/src/orxonox/overlays/hud/HUDNavigation.h

@@ -34 +34 @@
 #include <OgrePrerequisites.h>
 #include "overlays/OrxonoxOverlay.h"
+#include "objects/Tickable.h"
 
 namespace orxonox

code/branches/hud/src/orxonox/overlays/hud/HUDRTRText.cc

@@ -30 +30 @@
 #include "HUDRTRText.h"
 #include <OgreTextAreaOverlayElement.h>
+#include "core/CoreIncludes.h"
+#include "util/Convert.h"
 #include "GraphicsEngine.h"
-#include "util/Convert.h"
 
 namespace orxonox

code/branches/hud/src/orxonox/overlays/hud/HUDRTRText.h

@@ -33 +33 @@
 
 #include "overlays/OverlayText.h"
+#include "objects/Tickable.h"
 
 namespace orxonox

code/branches/hud/src/orxonox/overlays/hud/HUDRadar.cc

@@ -36 +36 @@
 #include "util/Math.h"
 #include "core/ConsoleCommand.h"
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 #include "objects/SpaceShip.h"
 #include "objects/WorldEntity.h"

code/branches/hud/src/orxonox/overlays/hud/HUDSpeedBar.cc

@@ -30 +30 @@
 #include "OrxonoxStableHeaders.h"
 #include "HUDSpeedBar.h"
+#include "core/CoreIncludes.h"
 #include "objects/SpaceShip.h"
 

code/branches/hud/src/orxonox/overlays/hud/HUDSpeedBar.h

@@ -34 +34 @@
 
 #include "HUDBar.h"
+#include "objects/Tickable.h"
 
 namespace orxonox

code/branches/hud/src/orxonox/tools/WindowEventListener.cc

@@ -29 +29 @@
 #include "OrxonoxStableHeaders.h"
 #include "WindowEventListener.h"
+#include "core/CoreIncludes.h"
 
 namespace orxonox