diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2005-10-30 09:44:42 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2005-10-30 09:44:42 +0300 |
| commit | 281f236e6ea4838d121b0872475520fac36d03f7 (patch) | |
| tree | 418fc8d0957bced577d9a7e8b733cbc22f7b383d /extern | |
| parent | cb9988332ad1a65390a94865092d86e961e85c66 (diff) | |
Minor changes in Bullet:
- on Ton's request use double versions of cos,sin,tan, sqrt etc.
just like Solid in MT_Scalar #if defined (__sun) || defined (__sun__) || defined (__sparc) || defined (__APPLE__)
- updated an url in the header of files
Diffstat (limited to 'extern')
110 files changed, 263 insertions, 234 deletions
diff --git a/extern/bullet/Bullet/BroadphaseCollision/BroadphaseInterface.h b/extern/bullet/Bullet/BroadphaseCollision/BroadphaseInterface.h index 29c6a64eedc..6f2f76ff812 100644 --- a/extern/bullet/Bullet/BroadphaseCollision/BroadphaseInterface.h +++ b/extern/bullet/Bullet/BroadphaseCollision/BroadphaseInterface.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/BroadphaseCollision/BroadphaseProxy.cpp b/extern/bullet/Bullet/BroadphaseCollision/BroadphaseProxy.cpp index b7c6c72c8be..4be50358256 100644 --- a/extern/bullet/Bullet/BroadphaseCollision/BroadphaseProxy.cpp +++ b/extern/bullet/Bullet/BroadphaseCollision/BroadphaseProxy.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/BroadphaseCollision/BroadphaseProxy.h b/extern/bullet/Bullet/BroadphaseCollision/BroadphaseProxy.h index 9dfeb370347..2f4ed2c1653 100644 --- a/extern/bullet/Bullet/BroadphaseCollision/BroadphaseProxy.h +++ b/extern/bullet/Bullet/BroadphaseCollision/BroadphaseProxy.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/BroadphaseCollision/CollisionAlgorithm.cpp b/extern/bullet/Bullet/BroadphaseCollision/CollisionAlgorithm.cpp index a4e20359aea..4f73fe2f6ad 100644 --- a/extern/bullet/Bullet/BroadphaseCollision/CollisionAlgorithm.cpp +++ b/extern/bullet/Bullet/BroadphaseCollision/CollisionAlgorithm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/BroadphaseCollision/CollisionAlgorithm.h b/extern/bullet/Bullet/BroadphaseCollision/CollisionAlgorithm.h index 5699f1019df..7981b41acf2 100644 --- a/extern/bullet/Bullet/BroadphaseCollision/CollisionAlgorithm.h +++ b/extern/bullet/Bullet/BroadphaseCollision/CollisionAlgorithm.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/BroadphaseCollision/CollisionDispatcher.cpp b/extern/bullet/Bullet/BroadphaseCollision/CollisionDispatcher.cpp index 65a7b616fb2..4883bd9f8f9 100644 --- a/extern/bullet/Bullet/BroadphaseCollision/CollisionDispatcher.cpp +++ b/extern/bullet/Bullet/BroadphaseCollision/CollisionDispatcher.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/BroadphaseCollision/CollisionDispatcher.h b/extern/bullet/Bullet/BroadphaseCollision/CollisionDispatcher.h index 7787ed417c5..6d39ec7dea1 100644 --- a/extern/bullet/Bullet/BroadphaseCollision/CollisionDispatcher.h +++ b/extern/bullet/Bullet/BroadphaseCollision/CollisionDispatcher.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/BroadphaseCollision/SimpleBroadphase.cpp b/extern/bullet/Bullet/BroadphaseCollision/SimpleBroadphase.cpp index 5d72376825d..663cae2949a 100644 --- a/extern/bullet/Bullet/BroadphaseCollision/SimpleBroadphase.cpp +++ b/extern/bullet/Bullet/BroadphaseCollision/SimpleBroadphase.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/BroadphaseCollision/SimpleBroadphase.h b/extern/bullet/Bullet/BroadphaseCollision/SimpleBroadphase.h index 754d004d111..df6964d0ad9 100644 --- a/extern/bullet/Bullet/BroadphaseCollision/SimpleBroadphase.h +++ b/extern/bullet/Bullet/BroadphaseCollision/SimpleBroadphase.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/BoxShape.cpp b/extern/bullet/Bullet/CollisionShapes/BoxShape.cpp index 6cbab4ff03a..b3274435263 100644 --- a/extern/bullet/Bullet/CollisionShapes/BoxShape.cpp +++ b/extern/bullet/Bullet/CollisionShapes/BoxShape.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/BoxShape.h b/extern/bullet/Bullet/CollisionShapes/BoxShape.h index 451ae2370b6..1cb0d822b76 100644 --- a/extern/bullet/Bullet/CollisionShapes/BoxShape.h +++ b/extern/bullet/Bullet/CollisionShapes/BoxShape.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/CollisionShape.cpp b/extern/bullet/Bullet/CollisionShapes/CollisionShape.cpp index 4bd1619cbf3..9efe0b0b68e 100644 --- a/extern/bullet/Bullet/CollisionShapes/CollisionShape.cpp +++ b/extern/bullet/Bullet/CollisionShapes/CollisionShape.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/CollisionShape.h b/extern/bullet/Bullet/CollisionShapes/CollisionShape.h index c43ce933a2f..615782f8147 100644 --- a/extern/bullet/Bullet/CollisionShapes/CollisionShape.h +++ b/extern/bullet/Bullet/CollisionShapes/CollisionShape.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/ConeShape.cpp b/extern/bullet/Bullet/CollisionShapes/ConeShape.cpp index 40e762125ac..07db8822f7e 100644 --- a/extern/bullet/Bullet/CollisionShapes/ConeShape.cpp +++ b/extern/bullet/Bullet/CollisionShapes/ConeShape.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, @@ -41,7 +41,7 @@ SimdVector3 ConeShape::ConeLocalSupport(const SimdVector3& v) const return tmp; } else { - SimdScalar s = sqrtf(v[coneindices[0]] * v[coneindices[0]] + v[coneindices[2]] * v[coneindices[2]]); + SimdScalar s = SimdSqrt(v[coneindices[0]] * v[coneindices[0]] + v[coneindices[2]] * v[coneindices[2]]); if (s > SIMD_EPSILON) { SimdScalar d = m_radius / s; SimdVector3 tmp; diff --git a/extern/bullet/Bullet/CollisionShapes/ConeShape.h b/extern/bullet/Bullet/CollisionShapes/ConeShape.h index 88117e1bec3..5a6b27c904d 100644 --- a/extern/bullet/Bullet/CollisionShapes/ConeShape.h +++ b/extern/bullet/Bullet/CollisionShapes/ConeShape.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.cpp b/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.cpp index 8e493ba5bc0..1cea1d02f08 100644 --- a/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.cpp +++ b/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, @@ -34,7 +34,7 @@ SimdVector3 ConvexHullShape::LocalGetSupportingVertexWithoutMargin(const SimdVec vec.setValue(1,0,0); } else { - float rlen = 1.f / sqrtf(lenSqr ); + float rlen = 1.f / SimdSqrt(lenSqr ); vec *= rlen; } diff --git a/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.h b/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.h index 5be0b61da6f..a06bcb1e9dc 100644 --- a/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.h +++ b/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/ConvexShape.cpp b/extern/bullet/Bullet/CollisionShapes/ConvexShape.cpp index d6bf5dba5b3..8be67b9b6c8 100644 --- a/extern/bullet/Bullet/CollisionShapes/ConvexShape.cpp +++ b/extern/bullet/Bullet/CollisionShapes/ConvexShape.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/ConvexShape.h b/extern/bullet/Bullet/CollisionShapes/ConvexShape.h index 1ec962c591c..b1e6f9e9924 100644 --- a/extern/bullet/Bullet/CollisionShapes/ConvexShape.h +++ b/extern/bullet/Bullet/CollisionShapes/ConvexShape.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/CylinderShape.cpp b/extern/bullet/Bullet/CollisionShapes/CylinderShape.cpp index 4af83d55a68..c6bce486ac1 100644 --- a/extern/bullet/Bullet/CollisionShapes/CylinderShape.cpp +++ b/extern/bullet/Bullet/CollisionShapes/CylinderShape.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, @@ -50,7 +50,7 @@ const int ZZ = 2; SimdVector3 tmp; SimdScalar d ; - SimdScalar s = sqrtf(v[XX] * v[XX] + v[ZZ] * v[ZZ]); + SimdScalar s = SimdSqrt(v[XX] * v[XX] + v[ZZ] * v[ZZ]); if (s != SimdScalar(0.0)) { d = radius / s; @@ -91,7 +91,7 @@ const int ZZ = 2; SimdVector3 tmp; SimdScalar d ; - SimdScalar s = sqrtf(v[XX] * v[XX] + v[ZZ] * v[ZZ]); + SimdScalar s = SimdSqrt(v[XX] * v[XX] + v[ZZ] * v[ZZ]); if (s != SimdScalar(0.0)) { d = radius / s; @@ -128,7 +128,7 @@ const int ZZ = 1; SimdVector3 tmp; SimdScalar d ; - SimdScalar s = sqrtf(v[XX] * v[XX] + v[ZZ] * v[ZZ]); + SimdScalar s = SimdSqrt(v[XX] * v[XX] + v[ZZ] * v[ZZ]); if (s != SimdScalar(0.0)) { d = radius / s; diff --git a/extern/bullet/Bullet/CollisionShapes/CylinderShape.h b/extern/bullet/Bullet/CollisionShapes/CylinderShape.h index 4fa40e92f1e..8b1cb66685a 100644 --- a/extern/bullet/Bullet/CollisionShapes/CylinderShape.h +++ b/extern/bullet/Bullet/CollisionShapes/CylinderShape.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/MinkowskiSumShape.cpp b/extern/bullet/Bullet/CollisionShapes/MinkowskiSumShape.cpp index abb1bfd2449..474064e5a21 100644 --- a/extern/bullet/Bullet/CollisionShapes/MinkowskiSumShape.cpp +++ b/extern/bullet/Bullet/CollisionShapes/MinkowskiSumShape.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/MinkowskiSumShape.h b/extern/bullet/Bullet/CollisionShapes/MinkowskiSumShape.h index a286b66252b..8fa0cee463b 100644 --- a/extern/bullet/Bullet/CollisionShapes/MinkowskiSumShape.h +++ b/extern/bullet/Bullet/CollisionShapes/MinkowskiSumShape.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/MultiSphereShape.cpp b/extern/bullet/Bullet/CollisionShapes/MultiSphereShape.cpp index d2e7fcc273e..93787081a34 100644 --- a/extern/bullet/Bullet/CollisionShapes/MultiSphereShape.cpp +++ b/extern/bullet/Bullet/CollisionShapes/MultiSphereShape.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, @@ -47,7 +47,7 @@ MultiSphereShape::MultiSphereShape (const SimdVector3& inertiaHalfExtents,const vec.setValue(1,0,0); } else { - float rlen = 1.f / sqrtf(lenSqr ); + float rlen = 1.f / SimdSqrt(lenSqr ); vec *= rlen; } diff --git a/extern/bullet/Bullet/CollisionShapes/MultiSphereShape.h b/extern/bullet/Bullet/CollisionShapes/MultiSphereShape.h index fd23be65e84..323831c06ca 100644 --- a/extern/bullet/Bullet/CollisionShapes/MultiSphereShape.h +++ b/extern/bullet/Bullet/CollisionShapes/MultiSphereShape.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/PolyhedralConvexShape.cpp b/extern/bullet/Bullet/CollisionShapes/PolyhedralConvexShape.cpp index 84b164dd5c6..55f29bab960 100644 --- a/extern/bullet/Bullet/CollisionShapes/PolyhedralConvexShape.cpp +++ b/extern/bullet/Bullet/CollisionShapes/PolyhedralConvexShape.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, @@ -29,7 +29,7 @@ SimdVector3 PolyhedralConvexShape::LocalGetSupportingVertexWithoutMargin(const S vec.setValue(1,0,0); } else { - float rlen = 1.f / sqrtf(lenSqr ); + float rlen = 1.f / SimdSqrt(lenSqr ); vec *= rlen; } diff --git a/extern/bullet/Bullet/CollisionShapes/PolyhedralConvexShape.h b/extern/bullet/Bullet/CollisionShapes/PolyhedralConvexShape.h index faab0f39523..9c3764ae014 100644 --- a/extern/bullet/Bullet/CollisionShapes/PolyhedralConvexShape.h +++ b/extern/bullet/Bullet/CollisionShapes/PolyhedralConvexShape.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/Simplex1to4Shape.cpp b/extern/bullet/Bullet/CollisionShapes/Simplex1to4Shape.cpp index 8a3833c20b1..8fae9cc4037 100644 --- a/extern/bullet/Bullet/CollisionShapes/Simplex1to4Shape.cpp +++ b/extern/bullet/Bullet/CollisionShapes/Simplex1to4Shape.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/Simplex1to4Shape.h b/extern/bullet/Bullet/CollisionShapes/Simplex1to4Shape.h index 8feb995a26c..a7533efa5cf 100644 --- a/extern/bullet/Bullet/CollisionShapes/Simplex1to4Shape.h +++ b/extern/bullet/Bullet/CollisionShapes/Simplex1to4Shape.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/SphereShape.cpp b/extern/bullet/Bullet/CollisionShapes/SphereShape.cpp index 6afb0fe5091..8c28cca172e 100644 --- a/extern/bullet/Bullet/CollisionShapes/SphereShape.cpp +++ b/extern/bullet/Bullet/CollisionShapes/SphereShape.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, @@ -25,11 +25,11 @@ SimdVector3 SphereShape::LocalGetSupportingVertexWithoutMargin(const SimdVector3 float radius = m_radius - GetMargin(); SimdScalar len = vec.length2(); - if (fabsf(len) < 0.0001f) + if (SimdFabs(len) < 0.0001f) { return SimdVector3(m_localScaling[0] * radius,m_localScaling[1]*radius,m_localScaling[2]*radius); } - return vec * (m_localScaling*(radius / sqrtf(len))); + return vec * (m_localScaling*(radius / SimdSqrt(len))); } SimdVector3 SphereShape::LocalGetSupportingVertex(const SimdVector3& vec)const diff --git a/extern/bullet/Bullet/CollisionShapes/SphereShape.h b/extern/bullet/Bullet/CollisionShapes/SphereShape.h index 240d9befce8..82c00ea43eb 100644 --- a/extern/bullet/Bullet/CollisionShapes/SphereShape.h +++ b/extern/bullet/Bullet/CollisionShapes/SphereShape.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/StridingMeshInterface.cpp b/extern/bullet/Bullet/CollisionShapes/StridingMeshInterface.cpp index b5194200a37..8fd761f06cb 100644 --- a/extern/bullet/Bullet/CollisionShapes/StridingMeshInterface.cpp +++ b/extern/bullet/Bullet/CollisionShapes/StridingMeshInterface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/StridingMeshInterface.h b/extern/bullet/Bullet/CollisionShapes/StridingMeshInterface.h index d212c6f8904..ba8a925c8dd 100644 --- a/extern/bullet/Bullet/CollisionShapes/StridingMeshInterface.h +++ b/extern/bullet/Bullet/CollisionShapes/StridingMeshInterface.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/TriangleCallback.h b/extern/bullet/Bullet/CollisionShapes/TriangleCallback.h index 67d95565891..0e464d09e8b 100644 --- a/extern/bullet/Bullet/CollisionShapes/TriangleCallback.h +++ b/extern/bullet/Bullet/CollisionShapes/TriangleCallback.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/TriangleMesh.cpp b/extern/bullet/Bullet/CollisionShapes/TriangleMesh.cpp index b528a9329ed..d02b9600985 100644 --- a/extern/bullet/Bullet/CollisionShapes/TriangleMesh.cpp +++ b/extern/bullet/Bullet/CollisionShapes/TriangleMesh.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/TriangleMesh.h b/extern/bullet/Bullet/CollisionShapes/TriangleMesh.h index 37e29bf3b08..0b0b937bf12 100644 --- a/extern/bullet/Bullet/CollisionShapes/TriangleMesh.h +++ b/extern/bullet/Bullet/CollisionShapes/TriangleMesh.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/TriangleMeshShape.cpp b/extern/bullet/Bullet/CollisionShapes/TriangleMeshShape.cpp index 259e673759a..0c20f78c1df 100644 --- a/extern/bullet/Bullet/CollisionShapes/TriangleMeshShape.cpp +++ b/extern/bullet/Bullet/CollisionShapes/TriangleMeshShape.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/TriangleMeshShape.h b/extern/bullet/Bullet/CollisionShapes/TriangleMeshShape.h index 6ca8fef8ef0..926191bddbb 100644 --- a/extern/bullet/Bullet/CollisionShapes/TriangleMeshShape.h +++ b/extern/bullet/Bullet/CollisionShapes/TriangleMeshShape.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/CollisionShapes/TriangleShape.h b/extern/bullet/Bullet/CollisionShapes/TriangleShape.h index 58f83a82e8c..60ea95da5d0 100644 --- a/extern/bullet/Bullet/CollisionShapes/TriangleShape.h +++ b/extern/bullet/Bullet/CollisionShapes/TriangleShape.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/BU_AlgebraicPolynomialSolver.cpp b/extern/bullet/Bullet/NarrowPhaseCollision/BU_AlgebraicPolynomialSolver.cpp index 8253e61f17f..592fac5a248 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/BU_AlgebraicPolynomialSolver.cpp +++ b/extern/bullet/Bullet/NarrowPhaseCollision/BU_AlgebraicPolynomialSolver.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, @@ -22,7 +22,7 @@ int BU_AlgebraicPolynomialSolver::Solve2Quadratic(SimdScalar p, SimdScalar q) basic_h_local = p * 0.5f; basic_h_local_delta = basic_h_local * basic_h_local - q; if (basic_h_local_delta > 0.0f) { - basic_h_local_delta = sqrtf(basic_h_local_delta); + basic_h_local_delta = SimdSqrt(basic_h_local_delta); m_roots[0] = - basic_h_local + basic_h_local_delta; m_roots[1] = - basic_h_local - basic_h_local_delta; return 2; @@ -42,7 +42,7 @@ int BU_AlgebraicPolynomialSolver::Solve2QuadraticFull(SimdScalar a,SimdScalar b, SimdScalar radical = b * b - 4.0f * a * c; if(radical >= 0.f) { - SimdScalar sqrtRadical = sqrtf(radical); + SimdScalar sqrtRadical = SimdSqrt(radical); SimdScalar idenom = 1.0f/(2.0f * a); m_roots[0]=(-b + sqrtRadical) * idenom; m_roots[1]=(-b - sqrtRadical) * idenom; @@ -53,8 +53,8 @@ int BU_AlgebraicPolynomialSolver::Solve2QuadraticFull(SimdScalar a,SimdScalar b, #define cubic_rt(x) \ - ((x) > 0.0f ? powf((SimdScalar)(x), 0.333333333333333333333333f) : \ - ((x) < 0.0f ? -powf((SimdScalar)-(x), 0.333333333333333333333333f) : 0.0f)) + ((x) > 0.0f ? SimdPow((SimdScalar)(x), 0.333333333333333333333333f) : \ + ((x) < 0.0f ? -SimdPow((SimdScalar)-(x), 0.333333333333333333333333f) : 0.0f)) @@ -146,7 +146,7 @@ int BU_AlgebraicPolynomialSolver::Solve3Cubic(SimdScalar lead, SimdScalar a, Sim /* */ /* one real and two complex roots. note that v = -p / u. */ /* */ - u = -q + sqrtf(delta); + u = -q + SimdSqrt(delta); u = cubic_rt(u); m_roots[0] = u - p / u - a; return 1; @@ -155,14 +155,14 @@ int BU_AlgebraicPolynomialSolver::Solve3Cubic(SimdScalar lead, SimdScalar a, Sim /* */ /* Casus irreducibilis: we have three real roots */ /* */ - r = sqrtf(-p); + r = SimdSqrt(-p); p *= -r; r *= 2.0; - phi = acosf(-q / p) / 3.0f; + phi = SimdAcos(-q / p) / 3.0f; dummy = SIMD_2_PI / 3.0f; - m_roots[0] = r * cosf(phi) - a; - m_roots[1] = r * cosf(phi + dummy) - a; - m_roots[2] = r * cosf(phi - dummy) - a; + m_roots[0] = r * SimdCos(phi) - a; + m_roots[1] = r * SimdCos(phi + dummy) - a; + m_roots[2] = r * SimdCos(phi - dummy) - a; return 3; } else { @@ -258,23 +258,23 @@ int BU_AlgebraicPolynomialSolver::Solve4Quartic(SimdScalar lead, SimdScalar a, S if (m_roots[0] > 0.0f) { if (num_roots > 1) { if ((m_roots[1] > 0.0f) && (m_roots[1] != m_roots[0])) { - u = sqrtf(m_roots[1]); + u = SimdSqrt(m_roots[1]); m_roots[2] = u - a; m_roots[3] = -u - a; - u = sqrtf(m_roots[0]); + u = SimdSqrt(m_roots[0]); m_roots[0] = u - a; m_roots[1] = -u - a; return 4; } else { - u = sqrtf(m_roots[0]); + u = SimdSqrt(m_roots[0]); m_roots[0] = u - a; m_roots[1] = -u - a; return 2; } } else { - u = sqrtf(m_roots[0]); + u = SimdSqrt(m_roots[0]); m_roots[0] = u - a; m_roots[1] = -u - a; return 2; @@ -319,14 +319,14 @@ int BU_AlgebraicPolynomialSolver::Solve4Quartic(SimdScalar lead, SimdScalar a, S if (SimdEqual(u, SIMD_EPSILON)) u = 0.0; else if (u > 0.0f) - u = sqrtf(u); + u = SimdSqrt(u); else return 0; if (SimdEqual(v, SIMD_EPSILON)) v = 0.0; else if (v > 0.0f) - v = sqrtf(v); + v = SimdSqrt(v); else return 0; diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/BU_AlgebraicPolynomialSolver.h b/extern/bullet/Bullet/NarrowPhaseCollision/BU_AlgebraicPolynomialSolver.h index 32986eb2e72..e2d763e4277 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/BU_AlgebraicPolynomialSolver.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/BU_AlgebraicPolynomialSolver.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/BU_Collidable.cpp b/extern/bullet/Bullet/NarrowPhaseCollision/BU_Collidable.cpp index fa8091a2e93..9542889bc26 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/BU_Collidable.cpp +++ b/extern/bullet/Bullet/NarrowPhaseCollision/BU_Collidable.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/BU_Collidable.h b/extern/bullet/Bullet/NarrowPhaseCollision/BU_Collidable.h index 79164426fc4..939e0972a60 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/BU_Collidable.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/BU_Collidable.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/BU_CollisionPair.cpp b/extern/bullet/Bullet/NarrowPhaseCollision/BU_CollisionPair.cpp index 3f60f5dfb86..942c721fadf 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/BU_CollisionPair.cpp +++ b/extern/bullet/Bullet/NarrowPhaseCollision/BU_CollisionPair.cpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, @@ -148,9 +148,9 @@ bool BU_CollisionPair::calcTimeOfImpact( linvel.setValue(0.,0.,0.); } SimdVector3 angvel; - angvel[0] = 2.f * asinf (qrel[0]); - angvel[1] = 2.f * asinf (qrel[1]); - angvel[2] = 2.f * asinf (qrel[2]); + angvel[0] = 2.f * SimdAsin (qrel[0]); + angvel[1] = 2.f * SimdAsin (qrel[1]); + angvel[2] = 2.f * SimdAsin (qrel[2]); if (angvel.length() < SCREWEPSILON) { diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/BU_CollisionPair.h b/extern/bullet/Bullet/NarrowPhaseCollision/BU_CollisionPair.h index 6bc09c21cd5..7d38139e65d 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/BU_CollisionPair.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/BU_CollisionPair.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/BU_EdgeEdge.cpp b/extern/bullet/Bullet/NarrowPhaseCollision/BU_EdgeEdge.cpp index 26a4fe74fbf..130a8ea85b0 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/BU_EdgeEdge.cpp +++ b/extern/bullet/Bullet/NarrowPhaseCollision/BU_EdgeEdge.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, @@ -156,7 +156,7 @@ bool BU_EdgeEdge::GetTimeOfImpact( //edge doesn't intersect the circle (motion of the vertex) return false; } - SimdScalar rad = sqrtf(r2); + SimdScalar rad = SimdSqrt(r2); if (SimdFuzzyZero(disc)) { @@ -192,14 +192,14 @@ bool BU_EdgeEdge::GetTimeOfImpact( { SimdScalar mu; - intersectPt.setY((-2.f*aa*bb+2.f*sqrtf(disc))/(2.f*(aa*aa+1.f))); + intersectPt.setY((-2.f*aa*bb+2.f*SimdSqrt(disc))/(2.f*(aa*aa+1.f))); intersectPt.setX(aa*intersectPt.y()+bb); mu = ((intersectPt.getY()-c.getY())/v.getY()); if (0.f <= mu && mu <= 1.f) { hit = Calc2DRotationPointPoint(rotPt,rad,screwAB.GetW(),intersectPt,minTime); } - intersectPt.setY((-2.f*aa*bb-2.f*sqrtf(disc))/(2.f*(aa*aa+1.f))); + intersectPt.setY((-2.f*aa*bb-2.f*SimdSqrt(disc))/(2.f*(aa*aa+1.f))); intersectPt.setX(aa*intersectPt.y()+bb); mu = ((intersectPt.getY()-c.getY())/v.getY()); if (0 <= mu && mu <= 1) @@ -211,14 +211,14 @@ bool BU_EdgeEdge::GetTimeOfImpact( { SimdScalar mu; - intersectPt.setX((-2.f*aa*bb+2.f*sqrtf(disc))/(2*(aa*aa+1.f))); + intersectPt.setX((-2.f*aa*bb+2.f*SimdSqrt(disc))/(2*(aa*aa+1.f))); intersectPt.setY(aa*intersectPt.x()+bb); mu = ((intersectPt.getX()-c.getX())/v.getX()); if (0 <= mu && mu <= 1) { hit = Calc2DRotationPointPoint(rotPt,rad,screwAB.GetW(),intersectPt,minTime); } - intersectPt.setX((-2.f*aa*bb-2.f*sqrtf(disc))/(2.f*(aa*aa+1.f))); + intersectPt.setX((-2.f*aa*bb-2.f*SimdSqrt(disc))/(2.f*(aa*aa+1.f))); intersectPt.setY(aa*intersectPt.x()+bb); mu = ((intersectPt.getX()-c.getX())/v.getX()); if (0.f <= mu && mu <= 1.f) @@ -325,7 +325,7 @@ bool BU_EdgeEdge::GetTimeOfImpactGeneralCase( t1 = v.y()*s; t2 = t1*u.x(); t3 = v.x()*s; t4 = t3*u.y(); - t7 = tanf(w/2.0f); + t7 = SimdTan(w/2.0f); t8 = 1.0f/t7; t10 = 1.0f/v.z(); aa = (t2-t4)*t8*t10; @@ -382,7 +382,7 @@ bool BU_EdgeEdge::GetTimeOfImpactGeneralCase( t2 = t1*vx; t3 = ux*s; t4 = t3*vy; - t7 = tanf(w/2.0f); + t7 = SimdTan(w/2.0f); t8 = 1/t7; t10 = 1/uz; t13 = ux*az; @@ -438,12 +438,12 @@ bool BU_EdgeEdge::GetTimeOfImpactGeneralCase( if (!SimdFuzzyZero(v.z())) { SimdScalar A1=(ux-ux*tau*tau-2.f*tau*uy)-((1.f+tau*tau)*vx*uz/vz); - SimdScalar B1=((1.f+tau*tau)*(cx*tanf(1.f/2.f*w)*vz+ - vx*az*tanf(1.f/2.f*w)-vx*cz*tanf(1.f/2.f*w)+ - vx*s*tau)/tanf(1.f/2.f*w)/vz)-(ax-ax*tau*tau-2.f*tau*ay); + SimdScalar B1=((1.f+tau*tau)*(cx*SimdTan(1.f/2.f*w)*vz+ + vx*az*SimdTan(1.f/2.f*w)-vx*cz*SimdTan(1.f/2.f*w)+ + vx*s*tau)/SimdTan(1.f/2.f*w)/vz)-(ax-ax*tau*tau-2.f*tau*ay); lambda = B1/A1; - mu = (a.z()-c.z()+lambda*u.z()+(s*tau)/(tanf(w/2.f)))/v.z(); + mu = (a.z()-c.z()+lambda*u.z()+(s*tau)/(SimdTan(w/2.f)))/v.z(); //double check in original equation @@ -456,8 +456,8 @@ bool BU_EdgeEdge::GetTimeOfImpactGeneralCase( SimdScalar rhs = c.x()+mu*v.x(); - rhs = ((1.f+tau*tau)*(cx*tanf(1.f/2.f*w)*vz+vx*az*tanf(1.f/2.f*w)- - vx*cz*tanf(1.f/2.f*w)+vx*s*tau)/(tanf(1.f/2.f*w)*vz))- + rhs = ((1.f+tau*tau)*(cx*SimdTan(1.f/2.f*w)*vz+vx*az*SimdTan(1.f/2.f*w)- + vx*cz*SimdTan(1.f/2.f*w)+vx*s*tau)/(SimdTan(1.f/2.f*w)*vz))- (ax-ax*tau*tau-2.f*tau*ay); @@ -479,7 +479,7 @@ bool BU_EdgeEdge::GetTimeOfImpactGeneralCase( } - SimdScalar t = 2.f*atanf(tau)/screwAB.GetW(); + SimdScalar t = 2.f*SimdAtan(tau)/screwAB.GetW(); //tau = tan (wt/2) so 2*atan (tau)/w if (t>=0.f && t<minTime) { @@ -518,8 +518,8 @@ bool BU_EdgeEdge::Calc2DRotationPointPoint(const SimdPoint3& rotPt, SimdScalar r // now calculate the planeEquation for the vertex motion, // and check if the intersectionpoint is at the positive side - SimdPoint3 rotPt1(cosf(rotW)*rotPt.x()-sinf(rotW)*rotPt.y(), - sinf(rotW)*rotPt.x()+cosf(rotW)*rotPt.y(), + SimdPoint3 rotPt1(SimdCos(rotW)*rotPt.x()-SimdSin(rotW)*rotPt.y(), + SimdSin(rotW)*rotPt.x()+SimdCos(rotW)*rotPt.y(), 0.f); SimdVector3 rotVec = rotPt1-rotPt; @@ -542,7 +542,7 @@ bool BU_EdgeEdge::Calc2DRotationPointPoint(const SimdPoint3& rotPt, SimdScalar r //hypothenuse = sqrt(r2); SimdScalar adjacent = intersectPt.dot(rotPt)/rotRadius; SimdScalar hypo = rotRadius; - SimdScalar alpha = acosf(adjacent/hypo); + SimdScalar alpha = SimdAcos(adjacent/hypo); SimdScalar t = alpha / rotW; if (t >= 0 && t < minTime) { diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/BU_EdgeEdge.h b/extern/bullet/Bullet/NarrowPhaseCollision/BU_EdgeEdge.h index 32eed8bc898..b653bf44093 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/BU_EdgeEdge.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/BU_EdgeEdge.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/BU_MotionStateInterface.h b/extern/bullet/Bullet/NarrowPhaseCollision/BU_MotionStateInterface.h index 637271511e2..6f1576a525f 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/BU_MotionStateInterface.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/BU_MotionStateInterface.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/BU_Screwing.cpp b/extern/bullet/Bullet/NarrowPhaseCollision/BU_Screwing.cpp index f347dc4b49a..e0fc5e02ea2 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/BU_Screwing.cpp +++ b/extern/bullet/Bullet/NarrowPhaseCollision/BU_Screwing.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Stephane Redon / Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Stephane Redon / Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, @@ -31,14 +31,14 @@ BU_Screwing::BU_Screwing(const SimdVector3& relLinVel,const SimdVector3& relAngV // u : vector along the screwing axis (||u||=1) // o : point on the screwing axis - m_w=sqrtf(wx*wx+wy*wy+wz*wz); + m_w=SimdSqrt(wx*wx+wy*wy+wz*wz); //if (!w) { if (fabs(m_w)<SCREWEPSILON ) { assert(m_w == 0.f); m_w=0.; - m_s=sqrtf(dx*dx+dy*dy+dz*dz); + m_s=SimdSqrt(dx*dx+dy*dy+dz*dz); if (fabs(m_s)<SCREWEPSILON ) { assert(m_s == 0.); @@ -78,8 +78,8 @@ BU_Screwing::BU_Screwing(const SimdVector3& relLinVel,const SimdVector3& relAngV n1.normalize(); SimdVector3 n1orth=m_u.cross(n1); - float n2x=cosf(0.5f*m_w); - float n2y=sinf(0.5f*m_w); + float n2x=SimdCos(0.5f*m_w); + float n2y=SimdSin(0.5f*m_w); m_o=0.5f*t.dot(n1)*(n1+n2x/n2y*n1orth); } @@ -104,7 +104,7 @@ void BU_Screwing::LocalMatrix(SimdTransform &t) const { if ((m_u[0]>SCREWEPSILON)||(m_u[0]<-SCREWEPSILON)||(m_u[1]>SCREWEPSILON)||(m_u[1]<-SCREWEPSILON)) { // to avoid numerical problems - float n=sqrtf(m_u[0]*m_u[0]+m_u[1]*m_u[1]); + float n=SimdSqrt(m_u[0]*m_u[0]+m_u[1]*m_u[1]); float invn=1.0f/n; SimdMatrix3x3 mat; @@ -160,8 +160,8 @@ SimdTransform BU_Screwing::InBetweenTransform(const SimdTransform& tr,SimdScalar SimdPoint3 org = tr.getOrigin(); SimdPoint3 neworg ( - org.x()*cosf(m_w*t)-org.y()*sinf(m_w*t), - org.x()*sinf(m_w*t)+org.y()*cosf(m_w*t), + org.x()*SimdCos(m_w*t)-org.y()*SimdSin(m_w*t), + org.x()*SimdSin(m_w*t)+org.y()*SimdCos(m_w*t), org.z()+m_s*CalculateF(t)); SimdTransform newtr; @@ -190,7 +190,7 @@ SimdScalar BU_Screwing::CalculateF(SimdScalar t) const result = t; } else { - result = ( tanf((m_w*t)/2.f) / tanf(m_w/2.f)); + result = ( SimdTan((m_w*t)/2.f) / SimdTan(m_w/2.f)); } return result; } diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/BU_Screwing.h b/extern/bullet/Bullet/NarrowPhaseCollision/BU_Screwing.h index 09cf049d2f8..8b5a35208af 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/BU_Screwing.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/BU_Screwing.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, @@ -37,16 +37,16 @@ public: inline SimdPoint3 InBetweenPosition(const SimdPoint3& pt,SimdScalar t) const { return SimdPoint3( - pt.x()*cosf(m_w*t)-pt.y()*sinf(m_w*t), - pt.x()*sinf(m_w*t)+pt.y()*cosf(m_w*t), + pt.x()*SimdCos(m_w*t)-pt.y()*SimdSin(m_w*t), + pt.x()*SimdSin(m_w*t)+pt.y()*SimdCos(m_w*t), pt.z()+m_s*CalculateF(t)); } inline SimdVector3 InBetweenVector(const SimdVector3& vec,SimdScalar t) const { return SimdVector3( - vec.x()*cosf(m_w*t)-vec.y()*sinf(m_w*t), - vec.x()*sinf(m_w*t)+vec.y()*cosf(m_w*t), + vec.x()*SimdCos(m_w*t)-vec.y()*SimdSin(m_w*t), + vec.x()*SimdSin(m_w*t)+vec.y()*SimdCos(m_w*t), vec.z()); } diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/BU_StaticMotionState.h b/extern/bullet/Bullet/NarrowPhaseCollision/BU_StaticMotionState.h index 553fa6fea78..cbb799c5f78 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/BU_StaticMotionState.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/BU_StaticMotionState.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/BU_VertexPoly.cpp b/extern/bullet/Bullet/NarrowPhaseCollision/BU_VertexPoly.cpp index 8486df701e7..a67f4b34a3a 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/BU_VertexPoly.cpp +++ b/extern/bullet/Bullet/NarrowPhaseCollision/BU_VertexPoly.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, @@ -25,7 +25,7 @@ #define BU_Polynomial BU_IntervalArithmeticPolynomialSolver #endif -inline bool TestFuzzyZero(SimdScalar x) { return fabsf(x) < 0.0001f; } +inline bool TestFuzzyZero(SimdScalar x) { return SimdFabs(x) < 0.0001f; } BU_VertexPoly::BU_VertexPoly() @@ -119,7 +119,7 @@ bool BU_VertexPoly::GetTimeOfImpact( //ax^3+bx^2+cx+d=0 //degenerate coefficients mess things up :( - SimdScalar ietsje = (r*s)/tanf(w/2.f); + SimdScalar ietsje = (r*s)/SimdTan(w/2.f); if (ietsje*ietsje < 0.01f) ietsje = 0.f; @@ -137,7 +137,7 @@ bool BU_VertexPoly::GetTimeOfImpact( { SimdScalar tau = polynomialSolver.GetRoot(i); - SimdScalar t = 2.f*atanf(tau)/w; + SimdScalar t = 2.f*SimdAtan(tau)/w; //tau = tan (wt/2) so 2*atan (tau)/w if (swapAB) { diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/BU_VertexPoly.h b/extern/bullet/Bullet/NarrowPhaseCollision/BU_VertexPoly.h index 81c2017542f..56a86995f3d 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/BU_VertexPoly.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/BU_VertexPoly.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.cpp b/extern/bullet/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.cpp index 2369b02b1b9..4074a2f3fe0 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.cpp +++ b/extern/bullet/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.h b/extern/bullet/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.h index 0f9808f2986..b8b31377aa7 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/ConvexCast.h b/extern/bullet/Bullet/NarrowPhaseCollision/ConvexCast.h index 2e7fa0e8eea..8d3e79de276 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/ConvexCast.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/ConvexCast.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/ConvexPenetrationDepthSolver.h b/extern/bullet/Bullet/NarrowPhaseCollision/ConvexPenetrationDepthSolver.h index 4eef58e9775..8af37e08032 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/ConvexPenetrationDepthSolver.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/ConvexPenetrationDepthSolver.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/DiscreteCollisionDetectorInterface.h b/extern/bullet/Bullet/NarrowPhaseCollision/DiscreteCollisionDetectorInterface.h index c51de7388a3..393606f5d0e 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/DiscreteCollisionDetectorInterface.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/DiscreteCollisionDetectorInterface.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/GjkConvexCast.cpp b/extern/bullet/Bullet/NarrowPhaseCollision/GjkConvexCast.cpp index 10a4cb56dcf..45d7403586f 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/GjkConvexCast.cpp +++ b/extern/bullet/Bullet/NarrowPhaseCollision/GjkConvexCast.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/GjkConvexCast.h b/extern/bullet/Bullet/NarrowPhaseCollision/GjkConvexCast.h index f5c800f85c6..a1bcc615010 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/GjkConvexCast.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/GjkConvexCast.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp b/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp index f5db2661c01..07502e53d55 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp +++ b/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com +* Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, @@ -125,9 +125,9 @@ void GjkPairDetector::GetClosestPoints(const ClosestPointInput& input,Result& ou //valid normal if (lenSqr > SIMD_EPSILON) { - float rlen = 1.f / sqrtf(lenSqr ); + float rlen = 1.f / SimdSqrt(lenSqr ); normalInB *= rlen; //normalize - SimdScalar s = sqrtf(squaredDistance); + SimdScalar s = SimdSqrt(squaredDistance); ASSERT(s > SimdScalar(0.0)); pointOnA -= m_cachedSeparatingAxis * (marginA / s); pointOnB += m_cachedSeparatingAxis * (marginB / s); @@ -158,7 +158,7 @@ void GjkPairDetector::GetClosestPoints(const ClosestPointInput& input,Result& ou float lenSqr = normalInB.length2(); if (lenSqr > SIMD_EPSILON) { - normalInB /= sqrtf(lenSqr); + normalInB /= SimdSqrt(lenSqr); distance = -(pointOnA-pointOnB).length(); } else { diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.h b/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.h index 70ff3c6568b..f6311a9eba5 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/PersistentManifold.cpp b/extern/bullet/Bullet/NarrowPhaseCollision/PersistentManifold.cpp index d923d6f51f1..92b817adee8 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/PersistentManifold.cpp +++ b/extern/bullet/Bullet/NarrowPhaseCollision/PersistentManifold.cpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com +* Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/PersistentManifold.h b/extern/bullet/Bullet/NarrowPhaseCollision/PersistentManifold.h index 2d91a08602b..dc7f3a8fa4d 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/PersistentManifold.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/PersistentManifold.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com +* Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.cpp b/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.cpp index 62ca91f768c..2517aa22c23 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.cpp +++ b/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.h b/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.h index 92dac112a36..8fc97bb3b40 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/SimplexSolverInterface.h b/extern/bullet/Bullet/NarrowPhaseCollision/SimplexSolverInterface.h index 9fe58385904..05a5ae5895f 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/SimplexSolverInterface.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/SimplexSolverInterface.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/SubSimplexConvexCast.cpp b/extern/bullet/Bullet/NarrowPhaseCollision/SubSimplexConvexCast.cpp index 80fea519887..c665b7b0ced 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/SubSimplexConvexCast.cpp +++ b/extern/bullet/Bullet/NarrowPhaseCollision/SubSimplexConvexCast.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/SubSimplexConvexCast.h b/extern/bullet/Bullet/NarrowPhaseCollision/SubSimplexConvexCast.h index 38c958304bc..088f0b01fe8 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/SubSimplexConvexCast.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/SubSimplexConvexCast.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.cpp b/extern/bullet/Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.cpp index 3c529b62e14..0c7b63bfe93 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.cpp +++ b/extern/bullet/Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.h b/extern/bullet/Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.h index 3328b1061e5..7fd3478ba1e 100644 --- a/extern/bullet/Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.h +++ b/extern/bullet/Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp index d3f40077963..f7e41e61824 100644 --- a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp +++ b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.h b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.h index ad4c96c0ab4..366bdd02bb8 100644 --- a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.h +++ b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp index c29df9f3807..3f356c703d7 100644 --- a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp +++ b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.h b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.h index c136e459a32..8b16687f192 100644 --- a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.h +++ b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/CollisionDispatch/EmptyCollisionAlgorithm.cpp b/extern/bullet/BulletDynamics/CollisionDispatch/EmptyCollisionAlgorithm.cpp index 4fd6000c7aa..632dc911770 100644 --- a/extern/bullet/BulletDynamics/CollisionDispatch/EmptyCollisionAlgorithm.cpp +++ b/extern/bullet/BulletDynamics/CollisionDispatch/EmptyCollisionAlgorithm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/CollisionDispatch/EmptyCollisionAlgorithm.h b/extern/bullet/BulletDynamics/CollisionDispatch/EmptyCollisionAlgorithm.h index 85a64df5b40..371941193e4 100644 --- a/extern/bullet/BulletDynamics/CollisionDispatch/EmptyCollisionAlgorithm.h +++ b/extern/bullet/BulletDynamics/CollisionDispatch/EmptyCollisionAlgorithm.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/CollisionDispatch/ManifoldResult.cpp b/extern/bullet/BulletDynamics/CollisionDispatch/ManifoldResult.cpp index 2fd712221ac..a5b13b1eccd 100644 --- a/extern/bullet/BulletDynamics/CollisionDispatch/ManifoldResult.cpp +++ b/extern/bullet/BulletDynamics/CollisionDispatch/ManifoldResult.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/CollisionDispatch/ManifoldResult.h b/extern/bullet/BulletDynamics/CollisionDispatch/ManifoldResult.h index a06497e315c..8462469164e 100644 --- a/extern/bullet/BulletDynamics/CollisionDispatch/ManifoldResult.h +++ b/extern/bullet/BulletDynamics/CollisionDispatch/ManifoldResult.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/ConstraintSolver.h b/extern/bullet/BulletDynamics/ConstraintSolver/ConstraintSolver.h index 84015929586..b4fd8ae26b9 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/ConstraintSolver.h +++ b/extern/bullet/BulletDynamics/ConstraintSolver/ConstraintSolver.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp b/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp index 8345e23517f..01c2dbf031d 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp +++ b/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.h b/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.h index 1a1e4b3f150..77e49644905 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.h +++ b/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/ContactSolverInfo.h b/extern/bullet/BulletDynamics/ConstraintSolver/ContactSolverInfo.h index e262b1a599b..e7b7dfeb20c 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/ContactSolverInfo.h +++ b/extern/bullet/BulletDynamics/ConstraintSolver/ContactSolverInfo.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/JacobianEntry.h b/extern/bullet/BulletDynamics/ConstraintSolver/JacobianEntry.h index c1f3a521f2d..ebf58c34485 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/JacobianEntry.h +++ b/extern/bullet/BulletDynamics/ConstraintSolver/JacobianEntry.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp b/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp index b834eb9a417..aa0beab7786 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp +++ b/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.h b/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.h index 101f24867c5..f5a5a9b7052 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.h +++ b/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/Point2PointConstraint.cpp b/extern/bullet/BulletDynamics/ConstraintSolver/Point2PointConstraint.cpp index 0c46b8fc47d..9471c1faf7c 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/Point2PointConstraint.cpp +++ b/extern/bullet/BulletDynamics/ConstraintSolver/Point2PointConstraint.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/Point2PointConstraint.h b/extern/bullet/BulletDynamics/ConstraintSolver/Point2PointConstraint.h index 85e13cde21e..82b4dcc83db 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/Point2PointConstraint.h +++ b/extern/bullet/BulletDynamics/ConstraintSolver/Point2PointConstraint.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/SimpleConstraintSolver.cpp b/extern/bullet/BulletDynamics/ConstraintSolver/SimpleConstraintSolver.cpp index 43b5dc32281..d8dcbab4db2 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/SimpleConstraintSolver.cpp +++ b/extern/bullet/BulletDynamics/ConstraintSolver/SimpleConstraintSolver.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/SimpleConstraintSolver.h b/extern/bullet/BulletDynamics/ConstraintSolver/SimpleConstraintSolver.h index a85683b041a..36a29dff7df 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/SimpleConstraintSolver.h +++ b/extern/bullet/BulletDynamics/ConstraintSolver/SimpleConstraintSolver.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/Solve2LinearConstraint.cpp b/extern/bullet/BulletDynamics/ConstraintSolver/Solve2LinearConstraint.cpp index 28773d5faa8..4111de679d0 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/Solve2LinearConstraint.cpp +++ b/extern/bullet/BulletDynamics/ConstraintSolver/Solve2LinearConstraint.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/Solve2LinearConstraint.h b/extern/bullet/BulletDynamics/ConstraintSolver/Solve2LinearConstraint.h index 710f9589c18..a422b56ae71 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/Solve2LinearConstraint.h +++ b/extern/bullet/BulletDynamics/ConstraintSolver/Solve2LinearConstraint.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp b/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp index aecf137a904..ea9240c2bcf 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp +++ b/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp @@ -519,7 +519,7 @@ static void SOR_LCP (int m, int nb, dRealMutablePtr J, int *jb, RigidBody * cons // the constraints are ordered so that all lambda[] values needed have // already been computed. if (findex[index] >= 0) { - hi[index] = fabsf (hicopy[index] * lambda[findex[index]]); + hi[index] = SimdFabs (hicopy[index] * lambda[findex[index]]); lo[index] = -hi[index]; } diff --git a/extern/bullet/BulletDynamics/Dynamics/ContactJoint.cpp b/extern/bullet/BulletDynamics/Dynamics/ContactJoint.cpp index 07ad818888f..b60b4eefe34 100644 --- a/extern/bullet/BulletDynamics/Dynamics/ContactJoint.cpp +++ b/extern/bullet/BulletDynamics/Dynamics/ContactJoint.cpp @@ -34,13 +34,13 @@ void ContactJoint::GetInfo1(Info1 *info) #define M_SQRT12 SimdScalar(0.7071067811865475244008443621048490) -#define dRecipSqrt(x) ((float)(1.0f/sqrtf(float(x)))) /* reciprocal square root */ +#define dRecipSqrt(x) ((float)(1.0f/SimdSqrt(float(x)))) /* reciprocal square root */ void dPlaneSpace1 (const dVector3 n, dVector3 p, dVector3 q) { - if (fabsf(n[2]) > M_SQRT12) { + if (SimdFabs(n[2]) > M_SQRT12) { // choose p in y-z plane SimdScalar a = n[1]*n[1] + n[2]*n[2]; SimdScalar k = dRecipSqrt (a); diff --git a/extern/bullet/BulletDynamics/Dynamics/RigidBody.cpp b/extern/bullet/BulletDynamics/Dynamics/RigidBody.cpp index 8c82397988d..a6c0fda96f3 100644 --- a/extern/bullet/BulletDynamics/Dynamics/RigidBody.cpp +++ b/extern/bullet/BulletDynamics/Dynamics/RigidBody.cpp @@ -22,7 +22,6 @@ RigidBody::RigidBody( const MassProps& massProps,SimdScalar linearDamping,SimdSc m_angularVelocity(0.f,0.f,0.f), m_restitution(restitution), m_friction(friction) - { m_debugBodyId = uniqueId++; diff --git a/extern/bullet/BulletLicense.txt b/extern/bullet/BulletLicense.txt index 8405bef82e4..5f70c4fcb55 100644 --- a/extern/bullet/BulletLicense.txt +++ b/extern/bullet/BulletLicense.txt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, diff --git a/extern/bullet/LinearMath/AabbUtil2.h b/extern/bullet/LinearMath/AabbUtil2.h index 5b00f3bb25b..27172f93139 100644 --- a/extern/bullet/LinearMath/AabbUtil2.h +++ b/extern/bullet/LinearMath/AabbUtil2.h @@ -1,6 +1,6 @@ /* -Copyright (c) 2005 Gino van den Bergen / Erwin Coumans <www.erwincoumans.com> +Copyright (c) 2005 Gino van den Bergen / Erwin Coumans http://continuousphysics.com Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by diff --git a/extern/bullet/LinearMath/GEN_List.h b/extern/bullet/LinearMath/GEN_List.h index bbcf987b462..abd09d9e7cc 100644 --- a/extern/bullet/LinearMath/GEN_List.h +++ b/extern/bullet/LinearMath/GEN_List.h @@ -1,6 +1,6 @@ /* -Copyright (c) 2005 Gino van den Bergen / Erwin Coumans <www.erwincoumans.com> +Copyright (c) 2005 Gino van den Bergen / Erwin Coumans http://continuousphysics.com Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by diff --git a/extern/bullet/LinearMath/GEN_MinMax.h b/extern/bullet/LinearMath/GEN_MinMax.h index c3ab24390f7..24dd70d1294 100644 --- a/extern/bullet/LinearMath/GEN_MinMax.h +++ b/extern/bullet/LinearMath/GEN_MinMax.h @@ -1,6 +1,6 @@ /* -Copyright (c) 2005 Gino van den Bergen / Erwin Coumans <www.erwincoumans.com> +Copyright (c) 2005 Gino van den Bergen / Erwin Coumans http://continuousphysics.com Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by diff --git a/extern/bullet/LinearMath/GEN_random.h b/extern/bullet/LinearMath/GEN_random.h index 22c77d827a2..0be74f70227 100644 --- a/extern/bullet/LinearMath/GEN_random.h +++ b/extern/bullet/LinearMath/GEN_random.h @@ -1,6 +1,6 @@ /* -Copyright (c) 2005 Gino van den Bergen / Erwin Coumans <www.erwincoumans.com> +Copyright (c) 2005 Gino van den Bergen / Erwin Coumans http://continuousphysics.com Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by diff --git a/extern/bullet/LinearMath/IDebugDraw.h b/extern/bullet/LinearMath/IDebugDraw.h index 2f0b33a6129..be2e421a77e 100644 --- a/extern/bullet/LinearMath/IDebugDraw.h +++ b/extern/bullet/LinearMath/IDebugDraw.h @@ -1,5 +1,5 @@ /* -Copyright (c) 2005 Gino van den Bergen / Erwin Coumans <www.erwincoumans.com> +Copyright (c) 2005 Gino van den Bergen / Erwin Coumans http://continuousphysics.com Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by diff --git a/extern/bullet/LinearMath/SimdMatrix3x3.h b/extern/bullet/LinearMath/SimdMatrix3x3.h index 850e2f37dea..55670a4e6fa 100644 --- a/extern/bullet/LinearMath/SimdMatrix3x3.h +++ b/extern/bullet/LinearMath/SimdMatrix3x3.h @@ -1,6 +1,6 @@ /* -Copyright (c) 2005 Gino van den Bergen / Erwin Coumans <www.erwincoumans.com> +Copyright (c) 2005 Gino van den Bergen / Erwin Coumans http://continuousphysics.com Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by @@ -130,12 +130,12 @@ class SimdMatrix3x3 { void setEulerYPR(const SimdScalar& yaw, const SimdScalar& pitch, const SimdScalar& roll) { - SimdScalar cy(cosf(yaw)); - SimdScalar sy(sinf(yaw)); - SimdScalar cp(cosf(pitch)); - SimdScalar sp(sinf(pitch)); - SimdScalar cr(cosf(roll)); - SimdScalar sr(sinf(roll)); + SimdScalar cy(SimdCos(yaw)); + SimdScalar sy(SimdSin(yaw)); + SimdScalar cp(SimdCos(pitch)); + SimdScalar sp(SimdSin(pitch)); + SimdScalar cr(SimdCos(roll)); + SimdScalar sr(SimdSin(roll)); SimdScalar cc = cy * cr; SimdScalar cs = cy * sr; SimdScalar sc = sy * cr; @@ -155,12 +155,12 @@ class SimdMatrix3x3 { **/ void setEulerZYX(SimdScalar eulerX,SimdScalar eulerY,SimdScalar eulerZ) { - SimdScalar ci ( cosf(eulerX)); - SimdScalar cj ( cosf(eulerY)); - SimdScalar ch ( cosf(eulerZ)); - SimdScalar si ( sinf(eulerX)); - SimdScalar sj ( sinf(eulerY)); - SimdScalar sh ( sinf(eulerZ)); + SimdScalar ci ( SimdCos(eulerX)); + SimdScalar cj ( SimdCos(eulerY)); + SimdScalar ch ( SimdCos(eulerZ)); + SimdScalar si ( SimdSin(eulerX)); + SimdScalar sj ( SimdSin(eulerY)); + SimdScalar sh ( SimdSin(eulerZ)); SimdScalar cc = ci * ch; SimdScalar cs = ci * sh; SimdScalar sc = si * ch; @@ -200,7 +200,7 @@ class SimdMatrix3x3 { if (trace > SimdScalar(0.0)) { - SimdScalar s = sqrtf(trace + SimdScalar(1.0)); + SimdScalar s = SimdSqrt(trace + SimdScalar(1.0)); q[3] = s * SimdScalar(0.5); s = SimdScalar(0.5) / s; @@ -216,7 +216,7 @@ class SimdMatrix3x3 { int j = (i + 1) % 3; int k = (i + 2) % 3; - SimdScalar s = sqrtf(m_el[i][i] - m_el[j][j] - m_el[k][k] + SimdScalar(1.0)); + SimdScalar s = SimdSqrt(m_el[i][i] - m_el[j][j] - m_el[k][k] + SimdScalar(1.0)); q[i] = s * SimdScalar(0.5); s = SimdScalar(0.5) / s; @@ -230,23 +230,23 @@ class SimdMatrix3x3 { void getEuler(SimdScalar& yaw, SimdScalar& pitch, SimdScalar& roll) const { - pitch = SimdScalar(asinf(-m_el[2][0])); + pitch = SimdScalar(SimdAsin(-m_el[2][0])); if (pitch < SIMD_2_PI) { if (pitch > SIMD_2_PI) { - yaw = SimdScalar(atan2f(m_el[1][0], m_el[0][0])); - roll = SimdScalar(atan2f(m_el[2][1], m_el[2][2])); + yaw = SimdScalar(SimdAtan2(m_el[1][0], m_el[0][0])); + roll = SimdScalar(SimdAtan2(m_el[2][1], m_el[2][2])); } else { - yaw = SimdScalar(-atan2f(-m_el[0][1], m_el[0][2])); + yaw = SimdScalar(-SimdAtan2(-m_el[0][1], m_el[0][2])); roll = SimdScalar(0.0); } } else { - yaw = SimdScalar(atan2f(-m_el[0][1], m_el[0][2])); + yaw = SimdScalar(SimdAtan2(-m_el[0][1], m_el[0][2])); roll = SimdScalar(0.0); } } @@ -309,9 +309,9 @@ class SimdMatrix3x3 { SimdMatrix3x3::absolute() const { return SimdMatrix3x3( - fabsf(m_el[0][0]), fabsf(m_el[0][1]), fabsf(m_el[0][2]), - fabsf(m_el[1][0]), fabsf(m_el[1][1]), fabsf(m_el[1][2]), - fabsf(m_el[2][0]), fabsf(m_el[2][1]), fabsf(m_el[2][2])); + SimdFabs(m_el[0][0]), SimdFabs(m_el[0][1]), SimdFabs(m_el[0][2]), + SimdFabs(m_el[1][0]), SimdFabs(m_el[1][1]), SimdFabs(m_el[1][2]), + SimdFabs(m_el[2][0]), SimdFabs(m_el[2][1]), SimdFabs(m_el[2][2])); } SIMD_FORCE_INLINE SimdMatrix3x3 diff --git a/extern/bullet/LinearMath/SimdMinMax.h b/extern/bullet/LinearMath/SimdMinMax.h index 999cfb0c919..1ec8ebc3f2c 100644 --- a/extern/bullet/LinearMath/SimdMinMax.h +++ b/extern/bullet/LinearMath/SimdMinMax.h @@ -1,6 +1,6 @@ /* -Copyright (c) 2005 Gino van den Bergen / Erwin Coumans <www.erwincoumans.com> +Copyright (c) 2005 Gino van den Bergen / Erwin Coumans http://continuousphysics.com Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by diff --git a/extern/bullet/LinearMath/SimdPoint3.h b/extern/bullet/LinearMath/SimdPoint3.h index 711ac5c76cc..0e09b2e120d 100644 --- a/extern/bullet/LinearMath/SimdPoint3.h +++ b/extern/bullet/LinearMath/SimdPoint3.h @@ -1,6 +1,6 @@ /* -Copyright (c) 2005 Gino van den Bergen / Erwin Coumans <www.erwincoumans.com> +Copyright (c) 2005 Gino van den Bergen / Erwin Coumans http://continuousphysics.com Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by diff --git a/extern/bullet/LinearMath/SimdQuadWord.h b/extern/bullet/LinearMath/SimdQuadWord.h index 67bcf907693..492981fb303 100644 --- a/extern/bullet/LinearMath/SimdQuadWord.h +++ b/extern/bullet/LinearMath/SimdQuadWord.h @@ -1,6 +1,6 @@ /* -Copyright (c) 2005 Gino van den Bergen / Erwin Coumans <www.erwincoumans.com> +Copyright (c) 2005 Gino van den Bergen / Erwin Coumans http://continuousphysics.com Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by diff --git a/extern/bullet/LinearMath/SimdQuaternion.h b/extern/bullet/LinearMath/SimdQuaternion.h index 6a8513ae0d9..86da693bab8 100644 --- a/extern/bullet/LinearMath/SimdQuaternion.h +++ b/extern/bullet/LinearMath/SimdQuaternion.h @@ -1,6 +1,6 @@ /* -Copyright (c) 2005 Gino van den Bergen / Erwin Coumans <www.erwincoumans.com> +Copyright (c) 2005 Gino van den Bergen / Erwin Coumans http://continuousphysics.com Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by @@ -56,9 +56,9 @@ public: { SimdScalar d = axis.length(); assert(d != SimdScalar(0.0)); - SimdScalar s = sinf(angle * SimdScalar(0.5)) / d; + SimdScalar s = SimdSin(angle * SimdScalar(0.5)) / d; setValue(axis.x() * s, axis.y() * s, axis.z() * s, - cosf(angle * SimdScalar(0.5))); + SimdCos(angle * SimdScalar(0.5))); } void setEuler(const SimdScalar& yaw, const SimdScalar& pitch, const SimdScalar& roll) @@ -66,12 +66,12 @@ public: SimdScalar halfYaw = SimdScalar(yaw) * SimdScalar(0.5); SimdScalar halfPitch = SimdScalar(pitch) * SimdScalar(0.5); SimdScalar halfRoll = SimdScalar(roll) * SimdScalar(0.5); - SimdScalar cosYaw = cosf(halfYaw); - SimdScalar sinYaw = sinf(halfYaw); - SimdScalar cosPitch = cosf(halfPitch); - SimdScalar sinPitch = sinf(halfPitch); - SimdScalar cosRoll = cosf(halfRoll); - SimdScalar sinRoll = sinf(halfRoll); + SimdScalar cosYaw = SimdCos(halfYaw); + SimdScalar sinYaw = SimdSin(halfYaw); + SimdScalar cosPitch = SimdCos(halfPitch); + SimdScalar sinPitch = SimdSin(halfPitch); + SimdScalar cosRoll = SimdCos(halfRoll); + SimdScalar sinRoll = SimdSin(halfRoll); setValue(cosRoll * sinPitch * cosYaw + sinRoll * cosPitch * sinYaw, cosRoll * cosPitch * sinYaw - sinRoll * sinPitch * cosYaw, sinRoll * cosPitch * cosYaw - cosRoll * sinPitch * sinYaw, @@ -118,7 +118,7 @@ public: SimdScalar length() const { - return sqrtf(length2()); + return SimdSqrt(length2()); } SimdQuaternion& normalize() @@ -155,14 +155,14 @@ public: SimdScalar angle(const SimdQuaternion& q) const { - SimdScalar s = sqrtf(length2() * q.length2()); + SimdScalar s = SimdSqrt(length2() * q.length2()); assert(s != SimdScalar(0.0)); - return acosf(dot(q) / s); + return SimdAcos(dot(q) / s); } SimdScalar getAngle() const { - SimdScalar s = 2.f * acosf(m_unusedW); + SimdScalar s = 2.f * SimdAcos(m_unusedW); return s; } @@ -208,9 +208,9 @@ public: SimdScalar theta = angle(q); if (theta != SimdScalar(0.0)) { - SimdScalar d = SimdScalar(1.0) / sinf(theta); - SimdScalar s0 = sinf((SimdScalar(1.0) - t) * theta); - SimdScalar s1 = sinf(t * theta); + SimdScalar d = SimdScalar(1.0) / SimdSin(theta); + SimdScalar s0 = SimdSin((SimdScalar(1.0) - t) * theta); + SimdScalar s1 = SimdSin(t * theta); return SimdQuaternion((m_x * s0 + q.x() * s1) * d, (m_y * s0 + q.y() * s1) * d, (m_z * s0 + q.z() * s1) * d, diff --git a/extern/bullet/LinearMath/SimdScalar.h b/extern/bullet/LinearMath/SimdScalar.h index b1e1905666a..4ea359db1b6 100644 --- a/extern/bullet/LinearMath/SimdScalar.h +++ b/extern/bullet/LinearMath/SimdScalar.h @@ -1,6 +1,6 @@ /* -Copyright (c) 2005 Gino van den Bergen / Erwin Coumans <www.erwincoumans.com> +Copyright (c) 2005 Gino van den Bergen / Erwin Coumans http://continuousphysics.com Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by @@ -59,6 +59,8 @@ DEALINGS IN THE SOFTWARE. #endif + + #define ASSERT assert #endif @@ -67,6 +69,40 @@ DEALINGS IN THE SOFTWARE. typedef float SimdScalar; +#if defined (__sun) || defined (__sun__) || defined (__sparc) || defined (__APPLE__) +//use double float precision operation on those platforms for Blender + +SIMD_FORCE_INLINE SimdScalar SimdSqrt(SimdScalar x) { return sqrt(x); } +SIMD_FORCE_INLINE SimdScalar SimdFabs(SimdScalar x) { return fabs(x); } +SIMD_FORCE_INLINE SimdScalar SimdCos(SimdScalar x) { return cos(x); } +SIMD_FORCE_INLINE SimdScalar SimdSin(SimdScalar x) { return sin(x); } +SIMD_FORCE_INLINE SimdScalar SimdTan(SimdScalar x) { return tan(x); } +SIMD_FORCE_INLINE SimdScalar SimdAcos(SimdScalar x) { return acos(x); } +SIMD_FORCE_INLINE SimdScalar SimdAsin(SimdScalar x) { return asin(x); } +SIMD_FORCE_INLINE SimdScalar SimdAtan(SimdScalar x) { return atan(x); } +SIMD_FORCE_INLINE SimdScalar SimdAtan2(SimdScalar x, SimdScalar y) { return atan2(x, y); } +SIMD_FORCE_INLINE SimdScalar SimdExp(SimdScalar x) { return exp(x); } +SIMD_FORCE_INLINE SimdScalar SimdLog(SimdScalar x) { return log(x); } +SIMD_FORCE_INLINE SimdScalar SimdPow(SimdScalar x,SimdScalar y) { return pow(x,y); } + +#else + +SIMD_FORCE_INLINE SimdScalar SimdSqrt(SimdScalar x) { return sqrtf(x); } +SIMD_FORCE_INLINE SimdScalar SimdFabs(SimdScalar x) { return fabsf(x); } +SIMD_FORCE_INLINE SimdScalar SimdCos(SimdScalar x) { return cosf(x); } +SIMD_FORCE_INLINE SimdScalar SimdSin(SimdScalar x) { return sinf(x); } +SIMD_FORCE_INLINE SimdScalar SimdTan(SimdScalar x) { return tanf(x); } +SIMD_FORCE_INLINE SimdScalar SimdAcos(SimdScalar x) { return acosf(x); } +SIMD_FORCE_INLINE SimdScalar SimdAsin(SimdScalar x) { return asinf(x); } +SIMD_FORCE_INLINE SimdScalar SimdAtan(SimdScalar x) { return atanf(x); } +SIMD_FORCE_INLINE SimdScalar SimdAtan2(SimdScalar x, SimdScalar y) { return atan2f(x, y); } +SIMD_FORCE_INLINE SimdScalar SimdExp(SimdScalar x) { return expf(x); } +SIMD_FORCE_INLINE SimdScalar SimdLog(SimdScalar x) { return logf(x); } +SIMD_FORCE_INLINE SimdScalar SimdPow(SimdScalar x,SimdScalar y) { return powf(x,y); } + +#endif + + const SimdScalar SIMD_2_PI = 6.283185307179586232f; const SimdScalar SIMD_PI = SIMD_2_PI * SimdScalar(0.5f); const SimdScalar SIMD_HALF_PI = SIMD_2_PI * SimdScalar(0.25f); @@ -75,7 +111,7 @@ const SimdScalar SIMD_DEGS_PER_RAD = SimdScalar(360.0f) / SIMD_2_PI; const SimdScalar SIMD_EPSILON = FLT_EPSILON; const SimdScalar SIMD_INFINITY = FLT_MAX; -SIMD_FORCE_INLINE bool SimdFuzzyZero(SimdScalar x) { return fabsf(x) < SIMD_EPSILON; } +SIMD_FORCE_INLINE bool SimdFuzzyZero(SimdScalar x) { return SimdFabs(x) < SIMD_EPSILON; } SIMD_FORCE_INLINE bool SimdEqual(SimdScalar a, SimdScalar eps) { return (((a) <= eps) && !((a) < -eps)); @@ -83,19 +119,13 @@ SIMD_FORCE_INLINE bool SimdEqual(SimdScalar a, SimdScalar eps) { SIMD_FORCE_INLINE bool SimdGreaterEqual (SimdScalar a, SimdScalar eps) { return (!((a) <= eps)); } - -SIMD_FORCE_INLINE SimdScalar SimdCos(SimdScalar x) { return cosf(x); } -SIMD_FORCE_INLINE SimdScalar SimdSin(SimdScalar x) { return sinf(x); } -SIMD_FORCE_INLINE SimdScalar SimdTan(SimdScalar x) { return tanf(x); } SIMD_FORCE_INLINE int SimdSign(SimdScalar x) { return x < 0.0f ? -1 : x > 0.0f ? 1 : 0; } -SIMD_FORCE_INLINE SimdScalar SimdAcos(SimdScalar x) { return acosf(x); } -SIMD_FORCE_INLINE SimdScalar SimdAsin(SimdScalar x) { return asinf(x); } -SIMD_FORCE_INLINE SimdScalar SimdAtan(SimdScalar x) { return atanf(x); } -SIMD_FORCE_INLINE SimdScalar SimdAtan2(SimdScalar x, SimdScalar y) { return atan2f(x, y); } SIMD_FORCE_INLINE SimdScalar SimdRadians(SimdScalar x) { return x * SIMD_RADS_PER_DEG; } SIMD_FORCE_INLINE SimdScalar SimdDegrees(SimdScalar x) { return x * SIMD_DEGS_PER_RAD; } -#endif + + +#endif //SIMD___SCALAR_H diff --git a/extern/bullet/LinearMath/SimdTransform.h b/extern/bullet/LinearMath/SimdTransform.h index cbf9a95a41f..625703699b5 100644 --- a/extern/bullet/LinearMath/SimdTransform.h +++ b/extern/bullet/LinearMath/SimdTransform.h @@ -1,6 +1,6 @@ /* -Copyright (c) 2005 Gino van den Bergen / Erwin Coumans <www.erwincoumans.com> +Copyright (c) 2005 Gino van den Bergen / Erwin Coumans http://continuousphysics.com Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by diff --git a/extern/bullet/LinearMath/SimdTransformUtil.h b/extern/bullet/LinearMath/SimdTransformUtil.h index f3ee76de77b..179e2f51daa 100644 --- a/extern/bullet/LinearMath/SimdTransformUtil.h +++ b/extern/bullet/LinearMath/SimdTransformUtil.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Erwin Coumans http://www.erwincoumans.com + * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ * * Permission to use, copy, modify, distribute and sell this software * and its documentation for any purpose is hereby granted without fee, @@ -47,9 +47,9 @@ public: else { // sync(fAngle) = sin(c*fAngle)/t - axis = angvel*( sinf(0.5f*fAngle*timeStep)/fAngle ); + axis = angvel*( SimdSin(0.5f*fAngle*timeStep)/fAngle ); } - SimdQuaternion dorn (axis.x(),axis.y(),axis.z(),cosf( fAngle*timeStep*0.5f )); + SimdQuaternion dorn (axis.x(),axis.y(),axis.z(),SimdCos( fAngle*timeStep*0.5f )); SimdQuaternion orn0 = curTrans.getRotation(); SimdQuaternion predictedOrn = dorn * orn0; @@ -81,7 +81,7 @@ public: if (len < 0.001f) axis = SimdVector3(1.f,0.f,0.f); else - axis /= sqrtf(len); + axis /= SimdSqrt(len); angVel = axis * angle / timeStep; diff --git a/extern/bullet/LinearMath/SimdVector3.h b/extern/bullet/LinearMath/SimdVector3.h index b7077d828b9..3a9f40ac764 100644 --- a/extern/bullet/LinearMath/SimdVector3.h +++ b/extern/bullet/LinearMath/SimdVector3.h @@ -1,6 +1,6 @@ /* -Copyright (c) 2005 Gino van den Bergen / Erwin Coumans <www.erwincoumans.com> +Copyright (c) 2005 Gino van den Bergen / Erwin Coumans http://continuousphysics.com Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by @@ -92,7 +92,7 @@ public: SIMD_FORCE_INLINE SimdScalar length() const { - return sqrtf(length2()); + return SimdSqrt(length2()); } SIMD_FORCE_INLINE SimdScalar distance2(const SimdVector3& v) const; @@ -108,17 +108,17 @@ public: SIMD_FORCE_INLINE SimdScalar angle(const SimdVector3& v) const { - SimdScalar s = sqrtf(length2() * v.length2()); + SimdScalar s = SimdSqrt(length2() * v.length2()); assert(s != SimdScalar(0.0)); - return acosf(dot(v) / s); + return SimdAcos(dot(v) / s); } SIMD_FORCE_INLINE SimdVector3 absolute() const { return SimdVector3( - fabsf(m_x), - fabsf(m_y), - fabsf(m_z)); + SimdFabs(m_x), + SimdFabs(m_y), + SimdFabs(m_z)); } SIMD_FORCE_INLINE SimdVector3 cross(const SimdVector3& v) const @@ -310,10 +310,10 @@ public: SIMD_FORCE_INLINE SimdVector4 absolute4() const { return SimdVector4( - fabsf(m_x), - fabsf(m_y), - fabsf(m_z), - fabsf(m_unusedW)); + SimdFabs(m_x), + SimdFabs(m_y), + SimdFabs(m_z), + SimdFabs(m_unusedW)); } |