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

ASSERT -> btAssert

Browse Source 
Added btStackAlloc to Bullet (right now only used by btGjkEpa)
removed default constructors of btCollisionWorld/btDiscreteDynamicsWorld, to reduce link-time dependencies
This commit is contained in:
ejcoumans
2006-11-29 01:52:09 +00:00
parent 43ab3c67c4
commit 6738ed329d
41 changed files with 206 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Extras/GIMPACT/src/gim_trimesh_capsule_collision.cpp
View File

@@ -151,7 +151,7 @@ void gim_closest_point_triangle_segment(GIM_TRIANGLE_DATA * triangle, vec3f s1,v
VEC_COPY(closest_points[1],sdiff);//normal
}
}
if(out_edge>2) return ;// ???? ASSERT this please
if(out_edge>2) return ;// ???? btAssert this please
if(GIM_IS_ZERO(dis))
{
@@ -191,7 +191,7 @@ int gim_triangle_capsule_collision(GIM_TRIANGLE_DATA * triangle, GIM_CAPSULE_DAT
}
vec3f vec;
while(old_contact_size<contacts->m_size)
while(old_contact_size<contacts->m_size)
{
//Scale the normal for pointing to triangle
VEC_SCALE(pcontact->m_normal,-1.0f,pcontact->m_normal);
@@ -202,7 +202,7 @@ int gim_triangle_capsule_collision(GIM_TRIANGLE_DATA * triangle, GIM_CAPSULE_DAT
pcontact->m_depth = capsule->m_radius - pcontact->m_depth;
pcontact++;
old_contact_size++;
old_contact_size++;
}
return 1;