merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

Still need to verify to make sure no unwanted renaming is introduced.

src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h

@@ -16,8 +16,8 @@ subject to the following restrictions:
 #ifndef MANIFOLD_CONTACT_POINT_H
 #define MANIFOLD_CONTACT_POINT_H
 
-#include "LinearMath/SimdVector3.h"
-#include "LinearMath/SimdTransformUtil.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransformUtil.h"
 
 
 
@@ -25,17 +25,17 @@ subject to the following restrictions:
 
 /// ManifoldContactPoint collects and maintains persistent contactpoints.
 /// used to improve stability and performance of rigidbody dynamics response.
-class ManifoldPoint
+class btManifoldPoint
 	{
 		public:
-			ManifoldPoint()
+			btManifoldPoint()
 				:m_userPersistentData(0)
 			{
 			}
 
-			ManifoldPoint( const SimdVector3 &pointA, const SimdVector3 &pointB, 
-					const SimdVector3 &normal, 
-					SimdScalar distance ) :
+			btManifoldPoint( const btVector3 &pointA, const btVector3 &pointB, 
+					const btVector3 &normal, 
+					btScalar distance ) :
 					m_localPointA( pointA ), 
 					m_localPointB( pointB ), 
 					m_normalWorldOnB( normal ), 
@@ -51,12 +51,12 @@ class ManifoldPoint
 
 			
 
-			SimdVector3 m_localPointA;			
-			SimdVector3 m_localPointB;			
-			SimdVector3	m_positionWorldOnB;
+			btVector3 m_localPointA;			
+			btVector3 m_localPointB;			
+			btVector3	m_positionWorldOnB;
 			///m_positionWorldOnA is redundant information, see GetPositionWorldOnA(), but for clarity
-			SimdVector3	m_positionWorldOnA;
-			SimdVector3 m_normalWorldOnB;
+			btVector3	m_positionWorldOnA;
+			btVector3 m_normalWorldOnB;
 		
 			float	m_distance1;
 			float	m_combinedFriction;
@@ -76,12 +76,12 @@ class ManifoldPoint
 				return m_lifeTime;
 			}
 
-			SimdVector3 GetPositionWorldOnA() {
+			btVector3 GetPositionWorldOnA() {
 				return m_positionWorldOnA;
 //				return m_positionWorldOnB + m_normalWorldOnB * m_distance1;
 			}
 
-			const SimdVector3& GetPositionWorldOnB()
+			const btVector3& GetPositionWorldOnB()
 			{
 				return m_positionWorldOnB;
 			}