Changeset 3164 for code/branches/pch/src/orxonox/objects
- Timestamp:
- Jun 14, 2009, 11:28:00 AM (15 years ago)
- Location:
- code/branches/pch/src/orxonox/objects
- Files:
-
- 14 edited
-
Scene.cc (modified) (1 diff)
-
collisionshapes/BoxCollisionShape.cc (modified) (1 diff)
-
collisionshapes/CollisionShape.cc (modified) (1 diff)
-
collisionshapes/CompoundCollisionShape.cc (modified) (1 diff)
-
collisionshapes/ConeCollisionShape.cc (modified) (1 diff)
-
collisionshapes/PlaneCollisionShape.cc (modified) (1 diff)
-
collisionshapes/SphereCollisionShape.cc (modified) (1 diff)
-
collisionshapes/WorldEntityCollisionShape.cc (modified) (1 diff)
-
worldentities/MobileEntity.cc (modified) (1 diff)
-
worldentities/StaticEntity.cc (modified) (1 diff)
-
worldentities/WorldEntity.cc (modified) (1 diff)
-
worldentities/WorldEntity.h (modified) (2 diffs)
-
worldentities/pawns/SpaceShip.cc (modified) (1 diff)
-
worldentities/pawns/SpaceShip.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/pch/src/orxonox/objects/Scene.cc
r3125 r3164 34 34 #include <OgreSceneNode.h> 35 35 36 #include "BulletCollision/BroadphaseCollision/btAxisSweep3.h"37 #include "BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h"38 #include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"39 #include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"36 #include <BulletCollision/BroadphaseCollision/btAxisSweep3.h> 37 #include <BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h> 38 #include <BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h> 39 #include <BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h> 40 40 41 41 #include "core/CoreIncludes.h" -
code/branches/pch/src/orxonox/objects/collisionshapes/BoxCollisionShape.cc
r3125 r3164 29 29 #include "BoxCollisionShape.h" 30 30 31 #include "BulletCollision/CollisionShapes/btBoxShape.h"31 #include <BulletCollision/CollisionShapes/btBoxShape.h> 32 32 33 33 #include "core/CoreIncludes.h" -
code/branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc
r3149 r3164 29 29 #include "CollisionShape.h" 30 30 31 #include "BulletCollision/CollisionShapes/btCollisionShape.h"31 #include <BulletCollision/CollisionShapes/btCollisionShape.h> 32 32 33 33 #include "core/CoreIncludes.h" -
code/branches/pch/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc
r3149 r3164 29 29 #include "CompoundCollisionShape.h" 30 30 31 #include "BulletCollision/CollisionShapes/btCompoundShape.h"31 #include <BulletCollision/CollisionShapes/btCompoundShape.h> 32 32 33 33 #include "core/CoreIncludes.h" -
code/branches/pch/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc
r3110 r3164 29 29 #include "ConeCollisionShape.h" 30 30 31 #include "BulletCollision/CollisionShapes/btConeShape.h"31 #include <BulletCollision/CollisionShapes/btConeShape.h> 32 32 33 33 #include "core/CoreIncludes.h" -
code/branches/pch/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc
r3125 r3164 29 29 #include "PlaneCollisionShape.h" 30 30 31 #include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"31 #include <BulletCollision/CollisionShapes/btStaticPlaneShape.h> 32 32 33 33 #include "core/CoreIncludes.h" -
code/branches/pch/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc
r3110 r3164 29 29 #include "SphereCollisionShape.h" 30 30 31 #include "BulletCollision/CollisionShapes/btSphereShape.h"31 #include <BulletCollision/CollisionShapes/btSphereShape.h> 32 32 33 33 #include "core/CoreIncludes.h" -
code/branches/pch/src/orxonox/objects/collisionshapes/WorldEntityCollisionShape.cc
r3149 r3164 29 29 #include "WorldEntityCollisionShape.h" 30 30 31 #include "BulletCollision/CollisionShapes/btCompoundShape.h"31 #include <BulletCollision/CollisionShapes/btCompoundShape.h> 32 32 33 33 #include "util/OrxAssert.h" -
code/branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc
r3149 r3164 30 30 31 31 #include <OgreSceneNode.h> 32 #include "BulletDynamics/Dynamics/btRigidBody.h"32 #include <BulletDynamics/Dynamics/btRigidBody.h> 33 33 34 34 #include "util/Debug.h" -
code/branches/pch/src/orxonox/objects/worldentities/StaticEntity.cc
r3149 r3164 31 31 32 32 #include <OgreSceneNode.h> 33 #include "BulletDynamics/Dynamics/btRigidBody.h"33 #include <BulletDynamics/Dynamics/btRigidBody.h> 34 34 35 35 #include "util/OrxAssert.h" -
code/branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc
r3163 r3164 33 33 #include <OgreSceneNode.h> 34 34 #include <OgreSceneManager.h> 35 #include "BulletDynamics/Dynamics/btRigidBody.h"35 #include <BulletDynamics/Dynamics/btRigidBody.h> 36 36 #include <boost/static_assert.hpp> 37 37 -
code/branches/pch/src/orxonox/objects/worldentities/WorldEntity.h
r3163 r3164 33 33 #include "OrxonoxPrereqs.h" 34 34 35 #if def NDEBUG35 #if def NDEBUG 36 36 #include <OgreSceneNode.h> 37 37 #else 38 38 #include <OgrePrerequisites.h> 39 39 #endif 40 #include "LinearMath/btMotionState.h"40 #include <LinearMath/btMotionState.h> 41 41 42 42 #include "util/Math.h" … … 443 443 444 444 // Inline heavily used functions for release builds. In debug, we better avoid including OgreSceneNode here. 445 #if def NDEBUG445 #if def NDEBUG 446 446 inline const Vector3& WorldEntity::getPosition() const 447 447 { return this->node_->getPosition(); } -
code/branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.cc
r3149 r3164 29 29 #include "SpaceShip.h" 30 30 31 #include "BulletDynamics/Dynamics/btRigidBody.h"31 #include <BulletDynamics/Dynamics/btRigidBody.h> 32 32 33 33 #include "util/Math.h" -
code/branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.h
r2662 r3164 32 32 #include "OrxonoxPrereqs.h" 33 33 34 #include "LinearMath/btVector3.h"34 #include <LinearMath/btVector3.h> 35 35 36 36 #include "Pawn.h"
Note: See TracChangeset
for help on using the changeset viewer.
