[Orxonox-commit 6067] r10726 - in code/trunk/src: external/bullet/BulletCollision/CollisionDispatch external/bullet/BulletCollision/CollisionShapes external/bullet/BulletDynamics/ConstraintSolver external/bullet/BulletDynamics/Dynamics orxonox/worldentities

[landauf at orxonox.net]

Author: landauf
Date: 2015-10-30 23:52:18 +0100 (Fri, 30 Oct 2015)
New Revision: 10726

Modified:
   code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
   code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h
   code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h
   code/trunk/src/external/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
   code/trunk/src/orxonox/worldentities/WorldEntity.h
Log:
fixed alignment warnings in MSVC14 (caused by SSE instructions in bullet)

Modified: code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
===================================================================
--- code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h	2015-10-30 22:07:34 UTC (rev 10725)
+++ code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h	2015-10-30 22:52:18 UTC (rev 10726)
@@ -63,6 +63,7 @@
 
 
 public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
 
 	enum DispatcherFlags
 	{

Modified: code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h
===================================================================
--- code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h	2015-10-30 22:07:34 UTC (rev 10725)
+++ code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h	2015-10-30 22:52:18 UTC (rev 10726)
@@ -31,6 +31,8 @@
 	btVector3	m_localScaling;
 
 public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
 	btStaticPlaneShape(const btVector3& planeNormal,btScalar planeConstant);
 
 	virtual ~btStaticPlaneShape();

Modified: code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h
===================================================================
--- code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h	2015-10-30 22:07:34 UTC (rev 10725)
+++ code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h	2015-10-30 22:52:18 UTC (rev 10726)
@@ -22,7 +22,7 @@
 #include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
 
 ///btContactConstraint can be automatically created to solve contact constraints using the unified btTypedConstraint interface
-ATTRIBUTE_ALIGNED16(class) btContactConstraint : public btTypedConstraint
+ATTRIBUTE_ALIGNED128(class) btContactConstraint : public btTypedConstraint
 {
 protected:
 

Modified: code/trunk/src/external/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
===================================================================
--- code/trunk/src/external/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h	2015-10-30 22:07:34 UTC (rev 10725)
+++ code/trunk/src/external/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h	2015-10-30 22:52:18 UTC (rev 10726)
@@ -83,7 +83,9 @@
 
 public:
 
+	BT_DECLARE_ALIGNED_ALLOCATOR();
 
+
 	///this btDiscreteDynamicsWorld constructor gets created objects from the user, and will not delete those
 	btDiscreteDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration);
 

Modified: code/trunk/src/orxonox/worldentities/WorldEntity.h
===================================================================
--- code/trunk/src/orxonox/worldentities/WorldEntity.h	2015-10-30 22:07:34 UTC (rev 10725)
+++ code/trunk/src/orxonox/worldentities/WorldEntity.h	2015-10-30 22:52:18 UTC (rev 10726)
@@ -36,6 +36,7 @@
 #  include <OgreSceneNode.h>
 #endif
 #include <LinearMath/btMotionState.h>
+#include <LinearMath/btAlignedAllocator.h>
 
 #include "util/Math.h"
 #include "util/OgreForwardRefs.h"
@@ -73,6 +74,8 @@
         friend class Scene;
 
         public:
+            BT_DECLARE_ALIGNED_ALLOCATOR();
+
             // Define our own transform space enum to avoid Ogre includes here
             /**
             @brief