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

Merge pull request #326 from erwincoumans/master

Browse Source 
_N -> n, _C -> c, _L ->l, some collision with a standard C++ header?
This commit is contained in:
erwincoumans
2015-02-20 13:53:54 -08:00
parent 2a0787907b 193e680790
commit 98ac437649
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/BulletCollision/Gimpact/gim_basic_geometry_operations.h
View File

@@ -404,12 +404,12 @@ SIMD_FORCE_INLINE void SEGMENT_COLLISION(
CLASS_POINT & vPointA, CLASS_POINT & vPointA,
CLASS_POINT & vPointB) CLASS_POINT & vPointB)
{ {
CLASS_POINT _AD,_BD,_N; CLASS_POINT _AD,_BD,n;
vec4f _M;//plane vec4f _M;//plane
VEC_DIFF(_AD,vA2,vA1); VEC_DIFF(_AD,vA2,vA1);
VEC_DIFF(_BD,vB2,vB1); VEC_DIFF(_BD,vB2,vB1);
VEC_CROSS(_N,_AD,_BD); VEC_CROSS(n,_AD,_BD);
GREAL _tp = VEC_DOT(_N,_N); GREAL _tp = VEC_DOT(n,n);
if(_tp<G_EPSILON)//ARE PARALELE if(_tp<G_EPSILON)//ARE PARALELE
{ {
//project B over A //project B over A
@@ -424,10 +424,10 @@ SIMD_FORCE_INLINE void SEGMENT_COLLISION(
_M[2] = VEC_DOT(vA1,_AD); _M[2] = VEC_DOT(vA1,_AD);
_M[3] = VEC_DOT(vA2,_AD); _M[3] = VEC_DOT(vA2,_AD);
//mid points //mid points
_N[0] = (_M[0]+_M[1])*0.5f; n[0] = (_M[0]+_M[1])*0.5f;
_N[1] = (_M[2]+_M[3])*0.5f; n[1] = (_M[2]+_M[3])*0.5f;
if(_N[0]<_N[1]) if(n[0]<n[1])
{ {
if(_M[1]<_M[2]) if(_M[1]<_M[2])
{ {
@@ -467,7 +467,7 @@ SIMD_FORCE_INLINE void SEGMENT_COLLISION(
} }
VEC_CROSS(_M,_N,_BD); VEC_CROSS(_M,n,_BD);
_M[3] = VEC_DOT(_M,vB1); _M[3] = VEC_DOT(_M,vB1);
LINE_PLANE_COLLISION(_M,_AD,vA1,vPointA,_tp,btScalar(0), btScalar(1)); LINE_PLANE_COLLISION(_M,_AD,vA1,vPointA,_tp,btScalar(0), btScalar(1));

12
src/BulletDynamics/MLCPSolvers/btDantzigLCP.cpp
View File

@@ -1200,9 +1200,9 @@ struct btLCP
int *const m_findex, *const m_p, *const m_C; int *const m_findex, *const m_p, *const m_C;
btLCP (int _n, int _nskip, int _nub, btScalar *_Adata, btScalar *_x, btScalar *_b, btScalar *_w, btLCP (int _n, int _nskip, int _nub, btScalar *_Adata, btScalar *_x, btScalar *_b, btScalar *_w,
btScalar *_lo, btScalar *_hi, btScalar *_L, btScalar *_d, btScalar *_lo, btScalar *_hi, btScalar *l, btScalar *_d,
btScalar *_Dell, btScalar *_ell, btScalar *_tmp, btScalar *_Dell, btScalar *_ell, btScalar *_tmp,
bool *_state, int *_findex, int *_p, int *_C, btScalar **Arows); bool *_state, int *_findex, int *p, int *c, btScalar **Arows);
int getNub() const { return m_nub; } int getNub() const { return m_nub; }
void transfer_i_to_C (int i); void transfer_i_to_C (int i);
void transfer_i_to_N (int i) { m_nN++; } // because we can assume C and N span 1:i-1 void transfer_i_to_N (int i) { m_nN++; } // because we can assume C and N span 1:i-1
@@ -1225,9 +1225,9 @@ struct btLCP
btLCP::btLCP (int _n, int _nskip, int _nub, btScalar *_Adata, btScalar *_x, btScalar *_b, btScalar *_w, btLCP::btLCP (int _n, int _nskip, int _nub, btScalar *_Adata, btScalar *_x, btScalar *_b, btScalar *_w,
btScalar *_lo, btScalar *_hi, btScalar *_L, btScalar *_d, btScalar *_lo, btScalar *_hi, btScalar *l, btScalar *_d,
btScalar *_Dell, btScalar *_ell, btScalar *_tmp, btScalar *_Dell, btScalar *_ell, btScalar *_tmp,
bool *_state, int *_findex, int *_p, int *_C, btScalar **Arows): bool *_state, int *_findex, int *p, int *c, btScalar **Arows):
m_n(_n), m_nskip(_nskip), m_nub(_nub), m_nC(0), m_nN(0), m_n(_n), m_nskip(_nskip), m_nub(_nub), m_nC(0), m_nN(0),
# ifdef BTROWPTRS # ifdef BTROWPTRS
m_A(Arows), m_A(Arows),
@@ -1235,8 +1235,8 @@ btLCP::btLCP (int _n, int _nskip, int _nub, btScalar *_Adata, btScalar *_x, btSc
m_A(_Adata), m_A(_Adata),
#endif #endif
m_x(_x), m_b(_b), m_w(_w), m_lo(_lo), m_hi(_hi), m_x(_x), m_b(_b), m_w(_w), m_lo(_lo), m_hi(_hi),
m_L(_L), m_d(_d), m_Dell(_Dell), m_ell(_ell), m_tmp(_tmp), m_L(l), m_d(_d), m_Dell(_Dell), m_ell(_ell), m_tmp(_tmp),
m_state(_state), m_findex(_findex), m_p(_p), m_C(_C) m_state(_state), m_findex(_findex), m_p(p), m_C(c)
{ {
{ {
btSetZero (m_x,m_n); btSetZero (m_x,m_n);