[Orxonox-commit 632] r3164 - in branches/pch/src/orxonox: objects objects/collisionshapes objects/worldentities objects/worldentities/pawns overlays tools
rgrieder at orxonox.net
rgrieder at orxonox.net
Sun Jun 14 11:28:00 CEST 2009
Author: rgrieder
Date: 2009-06-14 11:28:00 +0200 (Sun, 14 Jun 2009)
New Revision: 3164
Modified:
branches/pch/src/orxonox/objects/Scene.cc
branches/pch/src/orxonox/objects/collisionshapes/BoxCollisionShape.cc
branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc
branches/pch/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc
branches/pch/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc
branches/pch/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc
branches/pch/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc
branches/pch/src/orxonox/objects/collisionshapes/WorldEntityCollisionShape.cc
branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc
branches/pch/src/orxonox/objects/worldentities/StaticEntity.cc
branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc
branches/pch/src/orxonox/objects/worldentities/WorldEntity.h
branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.cc
branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.h
branches/pch/src/orxonox/overlays/OverlayText.cc
branches/pch/src/orxonox/tools/BulletConversions.h
Log:
The usual convention with our headers is to use <> for all third party libraries.
Modified: branches/pch/src/orxonox/objects/Scene.cc
===================================================================
--- branches/pch/src/orxonox/objects/Scene.cc 2009-06-14 09:24:42 UTC (rev 3163)
+++ branches/pch/src/orxonox/objects/Scene.cc 2009-06-14 09:28:00 UTC (rev 3164)
@@ -33,10 +33,10 @@
#include <OgreSceneManagerEnumerator.h>
#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"
#include "core/GameMode.h"
Modified: branches/pch/src/orxonox/objects/collisionshapes/BoxCollisionShape.cc
===================================================================
--- branches/pch/src/orxonox/objects/collisionshapes/BoxCollisionShape.cc 2009-06-14 09:24:42 UTC (rev 3163)
+++ branches/pch/src/orxonox/objects/collisionshapes/BoxCollisionShape.cc 2009-06-14 09:28:00 UTC (rev 3164)
@@ -28,7 +28,7 @@
#include "BoxCollisionShape.h"
-#include "BulletCollision/CollisionShapes/btBoxShape.h"
+#include <BulletCollision/CollisionShapes/btBoxShape.h>
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
Modified: branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc
===================================================================
--- branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc 2009-06-14 09:24:42 UTC (rev 3163)
+++ branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc 2009-06-14 09:28:00 UTC (rev 3164)
@@ -28,7 +28,7 @@
#include "CollisionShape.h"
-#include "BulletCollision/CollisionShapes/btCollisionShape.h"
+#include <BulletCollision/CollisionShapes/btCollisionShape.h>
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
Modified: branches/pch/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc
===================================================================
--- branches/pch/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc 2009-06-14 09:24:42 UTC (rev 3163)
+++ branches/pch/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc 2009-06-14 09:28:00 UTC (rev 3164)
@@ -28,7 +28,7 @@
#include "CompoundCollisionShape.h"
-#include "BulletCollision/CollisionShapes/btCompoundShape.h"
+#include <BulletCollision/CollisionShapes/btCompoundShape.h>
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
Modified: branches/pch/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc
===================================================================
--- branches/pch/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc 2009-06-14 09:24:42 UTC (rev 3163)
+++ branches/pch/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc 2009-06-14 09:28:00 UTC (rev 3164)
@@ -28,7 +28,7 @@
#include "ConeCollisionShape.h"
-#include "BulletCollision/CollisionShapes/btConeShape.h"
+#include <BulletCollision/CollisionShapes/btConeShape.h>
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
Modified: branches/pch/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc
===================================================================
--- branches/pch/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc 2009-06-14 09:24:42 UTC (rev 3163)
+++ branches/pch/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc 2009-06-14 09:28:00 UTC (rev 3164)
@@ -28,7 +28,7 @@
#include "PlaneCollisionShape.h"
-#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
+#include <BulletCollision/CollisionShapes/btStaticPlaneShape.h>
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
Modified: branches/pch/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc
===================================================================
--- branches/pch/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc 2009-06-14 09:24:42 UTC (rev 3163)
+++ branches/pch/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc 2009-06-14 09:28:00 UTC (rev 3164)
@@ -28,7 +28,7 @@
#include "SphereCollisionShape.h"
-#include "BulletCollision/CollisionShapes/btSphereShape.h"
+#include <BulletCollision/CollisionShapes/btSphereShape.h>
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
Modified: branches/pch/src/orxonox/objects/collisionshapes/WorldEntityCollisionShape.cc
===================================================================
--- branches/pch/src/orxonox/objects/collisionshapes/WorldEntityCollisionShape.cc 2009-06-14 09:24:42 UTC (rev 3163)
+++ branches/pch/src/orxonox/objects/collisionshapes/WorldEntityCollisionShape.cc 2009-06-14 09:28:00 UTC (rev 3164)
@@ -28,7 +28,7 @@
#include "WorldEntityCollisionShape.h"
-#include "BulletCollision/CollisionShapes/btCompoundShape.h"
+#include <BulletCollision/CollisionShapes/btCompoundShape.h>
#include "util/OrxAssert.h"
#include "core/CoreIncludes.h"
Modified: branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc 2009-06-14 09:24:42 UTC (rev 3163)
+++ branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc 2009-06-14 09:28:00 UTC (rev 3164)
@@ -29,7 +29,7 @@
#include "MobileEntity.h"
#include <OgreSceneNode.h>
-#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include <BulletDynamics/Dynamics/btRigidBody.h>
#include "util/Debug.h"
#include "util/MathConvert.h"
Modified: branches/pch/src/orxonox/objects/worldentities/StaticEntity.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/StaticEntity.cc 2009-06-14 09:24:42 UTC (rev 3163)
+++ branches/pch/src/orxonox/objects/worldentities/StaticEntity.cc 2009-06-14 09:28:00 UTC (rev 3164)
@@ -30,7 +30,7 @@
#include "StaticEntity.h"
#include <OgreSceneNode.h>
-#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include <BulletDynamics/Dynamics/btRigidBody.h>
#include "util/OrxAssert.h"
#include "core/CoreIncludes.h"
Modified: branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc 2009-06-14 09:24:42 UTC (rev 3163)
+++ branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc 2009-06-14 09:28:00 UTC (rev 3164)
@@ -32,7 +32,7 @@
#include <cassert>
#include <OgreSceneNode.h>
#include <OgreSceneManager.h>
-#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include <BulletDynamics/Dynamics/btRigidBody.h>
#include <boost/static_assert.hpp>
#include "util/OrxAssert.h"
Modified: branches/pch/src/orxonox/objects/worldentities/WorldEntity.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/WorldEntity.h 2009-06-14 09:24:42 UTC (rev 3163)
+++ branches/pch/src/orxonox/objects/worldentities/WorldEntity.h 2009-06-14 09:28:00 UTC (rev 3164)
@@ -32,12 +32,12 @@
#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"
#include "core/BaseObject.h"
@@ -442,7 +442,7 @@
};
// 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(); }
inline const Quaternion& WorldEntity::getOrientation() const
Modified: branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.cc 2009-06-14 09:24:42 UTC (rev 3163)
+++ branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.cc 2009-06-14 09:28:00 UTC (rev 3164)
@@ -28,7 +28,7 @@
#include "SpaceShip.h"
-#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include <BulletDynamics/Dynamics/btRigidBody.h>
#include "util/Math.h"
#include "core/CoreIncludes.h"
Modified: branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.h 2009-06-14 09:24:42 UTC (rev 3163)
+++ branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.h 2009-06-14 09:28:00 UTC (rev 3164)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
-#include "LinearMath/btVector3.h"
+#include <LinearMath/btVector3.h>
#include "Pawn.h"
Modified: branches/pch/src/orxonox/overlays/OverlayText.cc
===================================================================
--- branches/pch/src/orxonox/overlays/OverlayText.cc 2009-06-14 09:24:42 UTC (rev 3163)
+++ branches/pch/src/orxonox/overlays/OverlayText.cc 2009-06-14 09:28:00 UTC (rev 3164)
@@ -161,10 +161,10 @@
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());
}
}
Modified: branches/pch/src/orxonox/tools/BulletConversions.h
===================================================================
--- branches/pch/src/orxonox/tools/BulletConversions.h 2009-06-14 09:24:42 UTC (rev 3163)
+++ branches/pch/src/orxonox/tools/BulletConversions.h 2009-06-14 09:28:00 UTC (rev 3164)
@@ -33,8 +33,8 @@
#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
{
More information about the Orxonox-commit
mailing list