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

initial upgrade to GIMPACT 0.3, thanks to Francisco Leon for the update. GIMPACT demo/build system will be fixed today.

Browse Source
This commit is contained in:
ejcoumans
2007-09-30 00:05:52 +00:00
parent c98a678c9a
commit 78fe8b7249
22 changed files with 5240 additions and 1082 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Extras/GIMPACT/src/core/gim_contact.cpp
View File

@@ -48,10 +48,10 @@ void gim_contact_array::merge_contacts(
//fill key contacts
for (GUINT i = 0;i<contacts.size() ;i++ )
for (GUINT i = 0;i<contacts.size() ;i++ )
{
keycontacts[i].m_key = contacts[i].calc_key_contact();
keycontacts[i].m_value = i;
keycontacts[i].m_value = i;
}
//sort keys
@@ -121,10 +121,10 @@ void gim_contact_array::merge_contacts_unique(const gim_contact_array & contacts
GIM_CONTACT average_contact = contacts.back();
for (GUINT i=1;i<contacts.size() ;i++ )
for (GUINT i=1;i<contacts.size() ;i++ )
{
average_contact.m_point += contacts[i].m_point;
average_contact.m_normal += contacts[i].m_normal * contacts[i].m_depth;
average_contact.m_normal += contacts[i].m_normal * contacts[i].m_depth;
}
//divide