Changeset 3164

Timestamp:

Jun 14, 2009, 11:28:00 AM (15 years ago)

Author:

rgrieder

Message:

The usual convention with our headers is to use ≠ for all third party libraries.

Location:

code/branches/pch/src/orxonox

Files:

• objects/Scene.cc (modified) (1 diff)
• objects/collisionshapes/BoxCollisionShape.cc (modified) (1 diff)
• objects/collisionshapes/CollisionShape.cc (modified) (1 diff)
• objects/collisionshapes/CompoundCollisionShape.cc (modified) (1 diff)
• objects/collisionshapes/ConeCollisionShape.cc (modified) (1 diff)
• objects/collisionshapes/PlaneCollisionShape.cc (modified) (1 diff)
• objects/collisionshapes/SphereCollisionShape.cc (modified) (1 diff)
• objects/collisionshapes/WorldEntityCollisionShape.cc (modified) (1 diff)
• objects/worldentities/MobileEntity.cc (modified) (1 diff)
• objects/worldentities/StaticEntity.cc (modified) (1 diff)
• objects/worldentities/WorldEntity.cc (modified) (1 diff)
• objects/worldentities/WorldEntity.h (modified) (2 diffs)
• objects/worldentities/pawns/SpaceShip.cc (modified) (1 diff)
• objects/worldentities/pawns/SpaceShip.h (modified) (1 diff)
• overlays/OverlayText.cc (modified) (1 diff)
• tools/BulletConversions.h (modified) (1 diff)

code/branches/pch/src/orxonox/objects/Scene.cc

@@ -34 +34 @@
 #include <OgreSceneNode.h>
 
-#include "BulletCollision/BroadphaseCollision/btAxisSweep3.h"
-#include "BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h"
-#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"
-#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
+#include <BulletCollision/BroadphaseCollision/btAxisSweep3.h>
+#include <BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h>
+#include <BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h>
+#include <BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h>
 
 #include "core/CoreIncludes.h"

code/branches/pch/src/orxonox/objects/collisionshapes/BoxCollisionShape.cc

@@ -29 +29 @@
 #include "BoxCollisionShape.h"
 
-#include "BulletCollision/CollisionShapes/btBoxShape.h"
+#include <BulletCollision/CollisionShapes/btBoxShape.h>
 
 #include "core/CoreIncludes.h"

code/branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc

@@ -29 +29 @@
 #include "CollisionShape.h"
 
-#include "BulletCollision/CollisionShapes/btCollisionShape.h"
+#include <BulletCollision/CollisionShapes/btCollisionShape.h>
 
 #include "core/CoreIncludes.h"

code/branches/pch/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc

@@ -29 +29 @@
 #include "CompoundCollisionShape.h"
 
-#include "BulletCollision/CollisionShapes/btCompoundShape.h"
+#include <BulletCollision/CollisionShapes/btCompoundShape.h>
 
 #include "core/CoreIncludes.h"

code/branches/pch/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc

@@ -29 +29 @@
 #include "ConeCollisionShape.h"
 
-#include "BulletCollision/CollisionShapes/btConeShape.h"
+#include <BulletCollision/CollisionShapes/btConeShape.h>
 
 #include "core/CoreIncludes.h"

code/branches/pch/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc

@@ -29 +29 @@
 #include "PlaneCollisionShape.h"
 
-#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
+#include <BulletCollision/CollisionShapes/btStaticPlaneShape.h>
 
 #include "core/CoreIncludes.h"

code/branches/pch/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc

@@ -29 +29 @@
 #include "SphereCollisionShape.h"
 
-#include "BulletCollision/CollisionShapes/btSphereShape.h"
+#include <BulletCollision/CollisionShapes/btSphereShape.h>
 
 #include "core/CoreIncludes.h"

code/branches/pch/src/orxonox/objects/collisionshapes/WorldEntityCollisionShape.cc

@@ -29 +29 @@
 #include "WorldEntityCollisionShape.h"
 
-#include "BulletCollision/CollisionShapes/btCompoundShape.h"
+#include <BulletCollision/CollisionShapes/btCompoundShape.h>
 
 #include "util/OrxAssert.h"

code/branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc

@@ -30 +30 @@
 
 #include <OgreSceneNode.h>
-#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include <BulletDynamics/Dynamics/btRigidBody.h>
 
 #include "util/Debug.h"

code/branches/pch/src/orxonox/objects/worldentities/StaticEntity.cc

@@ -31 +31 @@
 
 #include <OgreSceneNode.h>
-#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include <BulletDynamics/Dynamics/btRigidBody.h>
 
 #include "util/OrxAssert.h"

code/branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -33 +33 @@
 #include <OgreSceneNode.h>
 #include <OgreSceneManager.h>
-#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include <BulletDynamics/Dynamics/btRigidBody.h>
 #include <boost/static_assert.hpp>
 

code/branches/pch/src/orxonox/objects/worldentities/WorldEntity.h

@@ -33 +33 @@
 #include "OrxonoxPrereqs.h"
 
-#ifdef NDEBUG
+#if def NDEBUG
 #include <OgreSceneNode.h>
 #else
 #include <OgrePrerequisites.h>
 #endif
-#include "LinearMath/btMotionState.h"
+#include <LinearMath/btMotionState.h>
 
 #include "util/Math.h"
@@ -443 +443 @@
 
     // Inline heavily used functions for release builds. In debug, we better avoid including OgreSceneNode here.
-#ifdef NDEBUG
+#if def NDEBUG
     inline const Vector3& WorldEntity::getPosition() const
         { return this->node_->getPosition(); }

code/branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.cc

@@ -29 +29 @@
 #include "SpaceShip.h"
 
-#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include <BulletDynamics/Dynamics/btRigidBody.h>
 
 #include "util/Math.h"

code/branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "LinearMath/btVector3.h"
+#include <LinearMath/btVector3.h>
 
 #include "Pawn.h"

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

@@ -162 +162 @@
     void OverlayText::setAlignment(OverlayText::Alignment alignment)
     {
-        this->text_->setAlignment((Ogre::TextAreaOverlayElement::Alignment)alignment);
+        this->text_->setAlignment(static_cast<Ogre::TextAreaOverlayElement::Alignment>(alignment));
     }
     OverlayText::Alignment OverlayText::getAlignment() const
     {
-        return (OverlayText::Alignment)this->text_->getAlignment();
+        return static_cast<OverlayText::Alignment>(this->text_->getAlignment());
     }
 }

code/branches/pch/src/orxonox/tools/BulletConversions.h

@@ -34 +34 @@
 #include "util/Convert.h"
 #include "util/Math.h"
-#include "LinearMath/btQuaternion.h"
-#include "LinearMath/btVector3.h"
+#include <LinearMath/btQuaternion.h>
+#include <LinearMath/btVector3.h>
 
 namespace orxonox