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

remove warning, remove Jamfile from CMakeLists.txt, check for two static objects in solver.

Browse Source
This commit is contained in:
erwin.coumans
2010-02-20 21:12:50 +00:00
parent ceeb9392d9
commit 155254d448
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Extras/glui/CMakeLists.txt
View File

@@ -54,7 +54,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/glui
ADD_LIBRARY(GLUI
arcball.h glui_checkbox.cpp glui_internal.h glui_panel.cpp glui_spinner.cpp glui_treepanel.cpp
GL glui.cpp glui_column.cpp glui_internal_control.h glui_radio.cpp glui_statictext.cpp glui_window.cpp
Jamfile glui_add_controls.cpp glui_commandline.cpp glui_list.cpp glui_rollout.cpp glui_string.cpp quaternion.cpp
glui_add_controls.cpp glui_commandline.cpp glui_list.cpp glui_rollout.cpp glui_string.cpp quaternion.cpp
algebra3.cpp glui_bitmap_img_data.cpp glui_control.cpp glui_listbox.cpp glui_rotation.cpp glui_textbox.cpp quaternion.h
algebra3.h glui_bitmaps.cpp glui_edittext.cpp glui_mouse_iaction.cpp glui_scrollbar.cpp glui_translation.cpp
arcball.cpp glui_button.cpp glui_filebrowser.cpp glui_node.cpp glui_separator.cpp glui_tree.cpp

8
src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
View File

@@ -646,10 +646,8 @@ void btSequentialImpulseConstraintSolver::convertContact(btPersistentManifold* m
btRigidBody* solverBodyA = btRigidBody::upcast(colObj0);
btRigidBody* solverBodyB = btRigidBody::upcast(colObj1);
//??????????????????
// TODO : check InverseMass instead
///avoid collision response between two static objects
if (!solverBodyA && !solverBodyB)
if ((!solverBodyA || !solverBodyA->getInvMass()) && (!solverBodyB || !solverBodyB->getInvMass()))
return;
for (int j=0;j<manifold->getNumContacts();j++)
@@ -675,8 +673,8 @@ void btSequentialImpulseConstraintSolver::convertContact(btPersistentManifold* m
setupContactConstraint(solverConstraint, colObj0, colObj1, cp, infoGlobal, vel, rel_vel, relaxation, rel_pos1, rel_pos2);
const btVector3& pos1 = cp.getPositionWorldOnA();
const btVector3& pos2 = cp.getPositionWorldOnB();
// const btVector3& pos1 = cp.getPositionWorldOnA();
// const btVector3& pos2 = cp.getPositionWorldOnB();
/////setup the friction constraints