Changeset 3192 for code/branches/pch/src/orxonox/interfaces

Timestamp:

Jun 18, 2009, 10:00:15 AM (15 years ago)

Author:

rgrieder

Message:

Replaced <OgrePrerequisites.h> with "util/OgreForwardRefs.h": I haven't yet realised that OgrePrerequisites.h includes about every single std header by including the OgreMemoryManager.h file.
And while at it, I took care of some type conversions (partially revealed by the missing OgrePrerequisites.h that disabled warnings)

Location:

code/branches/pch/src/orxonox/interfaces

Files:

• RadarViewable.cc (modified) (1 diff)
• RadarViewable.h (modified) (1 diff)

code/branches/pch/src/orxonox/interfaces/RadarViewable.cc

@@ -126 +126 @@
 //Vector3 v = this->getRVWorldPosition();
             //this->line_->setPoint(1, Vector3(0,v.y,0) );
-            this->line_->setPoint(1, Vector3( 0, (int) -Map::getSingletonPtr()->movablePlane_->getDistance( this->getRVWorldPosition() ) ,0 ));
+            this->line_->setPoint(1, Vector3( 0, static_cast<float>(static_cast<int>( -Map::getSingletonPtr()->movablePlane_->getDistance( this->getRVWorldPosition() ) ) ) ,0 ));
             this->line_->update();
             if( Map::getSingletonPtr()->playerShipNode_ )

code/branches/pch/src/orxonox/interfaces/RadarViewable.h

@@ -34 +34 @@
 #include <string>
 #include <cassert>
-#include <OgrePrerequisites.h>
 
 #include "util/Math.h"
+#include "util/OgreForwardRefs.h"
 #include "core/OrxonoxClass.h"