Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'bp/master'

Browse Source
This commit is contained in:
=
2015-02-12 09:14:39 -08:00
parent 27aa959059 b36936a4ab
commit c8e252ba36
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bullet.pc.cmake
View File

@@ -2,5 +2,5 @@ Name: bullet
Description: Bullet Continuous Collision Detection and Physics Library
Requires:
Version: @BULLET_VERSION@
Libs: -L@LIB_DESTINATION@ -lBulletSoftBody -lBulletDynamics -lBulletCollision -lLinearMath
Cflags: @BULLET_DOUBLE_DEF@ -I@INCLUDE_INSTALL_DIR@
Libs: -L@CMAKE_INSTALL_PREFIX@/@LIB_DESTINATION@ -lBulletSoftBody -lBulletDynamics -lBulletCollision -lLinearMath
Cflags: @BULLET_DOUBLE_DEF@ -I@CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@

8
src/Bullet3Common/b3Vector3.h
View File

@@ -467,10 +467,10 @@ public:
__m128 tmp3 = _mm_add_ps(r0,r1);
mVec128 = tmp3;
#elif defined(B3_USE_NEON)
mVec128 = vsubq_f32(v1.mVec128, v0.mVec128);
mVec128 = vmulq_n_f32(mVec128, rt);
mVec128 = vaddq_f32(mVec128, v0.mVec128);
#else
float32x4_t vl = vsubq_f32(v1.mVec128, v0.mVec128);
vl = vmulq_n_f32(vl, rt);
mVec128 = vaddq_f32(vl, v0.mVec128);
#else
b3Scalar s = b3Scalar(1.0) - rt;
m_floats[0] = s * v0.m_floats[0] + rt * v1.m_floats[0];
m_floats[1] = s * v0.m_floats[1] + rt * v1.m_floats[1];

8
src/LinearMath/btVector3.h
View File

@@ -501,10 +501,10 @@ public:
__m128 tmp3 = _mm_add_ps(r0,r1);
mVec128 = tmp3;
#elif defined(BT_USE_NEON)
mVec128 = vsubq_f32(v1.mVec128, v0.mVec128);
mVec128 = vmulq_n_f32(mVec128, rt);
mVec128 = vaddq_f32(mVec128, v0.mVec128);
#else
float32x4_t vl = vsubq_f32(v1.mVec128, v0.mVec128);
vl = vmulq_n_f32(vl, rt);
mVec128 = vaddq_f32(vl, v0.mVec128);
#else
btScalar s = btScalar(1.0) - rt;
m_floats[0] = s * v0.m_floats[0] + rt * v1.m_floats[0];
m_floats[1] = s * v0.m_floats[1] + rt * v1.m_floats[1];

4
test/Bullet2/Source/Tests/Test_v3interp.cpp
View File

@@ -62,7 +62,9 @@ int Test_v3interp(void)
v2.setW(w);
correct_res = v3interp_ref(correct_res, v1, v2, rt);
test_res.setInterpolate3(v1, v2, rt);
//test self-referencing vector, see issue https://github.com/bulletphysics/bullet3/pull/313
test_res = v1;
test_res.setInterpolate3(test_res, v2, rt);
if( fabs(correct_res.m_floats[0] - test_res.m_floats[0]) +
fabs(correct_res.m_floats[1] - test_res.m_floats[1]) +