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

fix Mac OSX build (compound-compound still broken on OSX)

Browse Source 
remove operator= from b3Vector3 to make it POD/Plane Old Data
This commit is contained in:
Erwin Coumans
2013-08-20 12:45:05 -07:00
parent 677722bba3
commit d860e7f51a
5 changed files with 13 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Bullet3Common/b3Matrix3x3.h
View File

@@ -255,9 +255,9 @@ public:
V2 = V2 + b3v0100;
V3 = V3 + b3v0010;
m_el[0] = V1;
m_el[1] = V2;
m_el[2] = V3;
m_el[0] = b3MakeVector3(V1);
m_el[1] = b3MakeVector3(V2);
m_el[2] = b3MakeVector3(V3);
#else
b3Scalar xs = q.getX() * s, ys = q.getY() * s, zs = q.getZ() * s;
b3Scalar wx = q.getW() * xs, wy = q.getW() * ys, wz = q.getW() * zs;
@@ -312,9 +312,9 @@ public:
void setIdentity()
{
#if (defined(B3_USE_SSE_IN_API)&& defined (B3_USE_SSE)) || defined(B3_USE_NEON)
m_el[0] = b3v1000;
m_el[1] = b3v0100;
m_el[2] = b3v0010;
m_el[0] = b3MakeVector3(b3v1000);
m_el[1] = b3MakeVector3(b3v0100);
m_el[2] = b3MakeVector3(b3v0010);
#else
setValue(b3Scalar(1.0), b3Scalar(0.0), b3Scalar(0.0),
b3Scalar(0.0), b3Scalar(1.0), b3Scalar(0.0),
@@ -1164,7 +1164,7 @@ operator*(const b3Vector3& v, const b3Matrix3x3& m)
c0 = _mm_add_ps(c0, c1);
c2 = _mm_mul_ps(c2, _mm_and_ps(m[2].mVec128, b3vFFF0fMask) );
return b3Vector3(_mm_add_ps(c0, c2));
return b3MakeVector3(_mm_add_ps(c0, c2));
#elif defined(B3_USE_NEON)
const float32x4_t vv = v.mVec128;
const float32x2_t vlo = vget_low_f32(vv);
@@ -1182,7 +1182,7 @@ operator*(const b3Vector3& v, const b3Matrix3x3& m)
c0 = vaddq_f32(c0, c1);
c0 = vaddq_f32(c0, c2);
return b3Vector3(c0);
return b3MakeVector3(c0);
#else
return b3MakeVector3(m.tdotx(v), m.tdoty(v), m.tdotz(v));
#endif