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

Merge pull request #313 from jackoalan/neon-setinterpolate3-fix

Browse Source 
Fixed self-referencial bug in btVector3's setInterpolate3 (NEON)
This commit is contained in:
erwincoumans
2015-02-10 18:10:26 -08:00
parent e3a77042cd 9e8e22bee5
commit 15d5659483
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Bullet3Common/b3Vector3.h
View File

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