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

Merge pull request #963 from erwincoumans/master

Browse Source 
disable keyboard toggle in Linux/X11, revert num solver iterations to 50 (from 150)
This commit is contained in:
erwincoumans
2017-02-16 15:58:23 -08:00
committed by GitHub
parent 904a1b5f05 8f546acbe8
commit 835dea5c3f
6 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/ExampleBrowser/OpenGLExampleBrowser.cpp
View File

@@ -257,7 +257,6 @@ void MyKeyboardCallback(int key, int state)
} else
{
b3ChromeUtilsStopTimingsAndWriteJsonFile();
}
#endif //BT_NO_PROFILE

7
examples/OpenGLWindow/X11OpenGLWindow.cpp
View File

@@ -839,7 +839,7 @@ void X11OpenGLWindow::pumpMessage()
if (m_data->m_keyboardCallback)
{
#if 0
#if 1
unsigned short is_retriggered = 0;
///filter out keyboard repeat
//see http://stackoverflow.com/questions/2100654/ignore-auto-repeat-in-x11-applications
@@ -851,8 +851,8 @@ void X11OpenGLWindow::pumpMessage()
if (nev.type == KeyPress && nev.xkey.time == m_data->m_xev.xkey.time &&
nev.xkey.keycode == m_data->m_xev.xkey.keycode)
{
fprintf (stdout, "key #%ld was retriggered.\n",
(long) MyXLookupKeysym(&nev.xkey, 0));
//fprintf (stdout, "key #%ld was retriggered.\n",
// (long) MyXLookupKeysym(&nev.xkey, 0));
// delete retriggered KeyPress event
MyXNextEvent(m_data->m_dpy, & m_data->m_xev);
@@ -861,6 +861,7 @@ void X11OpenGLWindow::pumpMessage()
}
#endif
int state = 0;
if (!is_retriggered)
(*m_data->m_keyboardCallback)(keycode,state);
}

1
examples/RoboticsLearning/GripperGraspExample.cpp
View File

@@ -209,6 +209,7 @@ public:
if ((m_options & eONE_MOTOR_GRASP)!=0)
{
m_robotSim.setNumSolverIterations(150);
{
SliderParams slider("Vertical velocity",&sGripperVerticalVelocity);
slider.m_minVal=-2;

10
examples/RoboticsLearning/b3RobotSimAPI.cpp
View File

@@ -478,6 +478,16 @@ void b3RobotSimAPI::setGravity(const b3Vector3& gravityAcceleration)
}
void b3RobotSimAPI::setNumSolverIterations(int numIterations)
{
b3SharedMemoryCommandHandle command = b3InitPhysicsParamCommand(m_data->m_physicsClient);
b3SharedMemoryStatusHandle statusHandle;
b3PhysicsParamSetNumSolverIterations(command, numIterations);
statusHandle = b3SubmitClientCommandAndWaitStatus(m_data->m_physicsClient, command);
b3Assert(b3GetStatusType(statusHandle)==CMD_CLIENT_COMMAND_COMPLETED);
}
void b3RobotSimAPI::setNumSimulationSubSteps(int numSubSteps)
{
b3SharedMemoryCommandHandle command = b3InitPhysicsParamCommand(m_data->m_physicsClient);

1
examples/RoboticsLearning/b3RobotSimAPI.h
View File

@@ -157,6 +157,7 @@ public:
void setGravity(const b3Vector3& gravityAcceleration);
void setNumSimulationSubSteps(int numSubSteps);
void setNumSolverIterations(int numIterations);
bool calculateInverseKinematics(const struct b3RobotSimInverseKinematicArgs& args, struct b3RobotSimInverseKinematicsResults& results);

2
examples/SharedMemory/PhysicsServerCommandProcessor.cpp
View File

@@ -799,7 +799,7 @@ void PhysicsServerCommandProcessor::createEmptyDynamicsWorld()
m_data->m_dynamicsWorld->getSolverInfo().m_erp2 = 0.08;
m_data->m_dynamicsWorld->getSolverInfo().m_linearSlop = 0.00001;
m_data->m_dynamicsWorld->getSolverInfo().m_numIterations = 150;
m_data->m_dynamicsWorld->getSolverInfo().m_numIterations = 50;
m_data->m_dynamicsWorld->getSolverInfo().m_leastSquaresResidualThreshold = 1e-7;
// m_data->m_dynamicsWorld->getSolverInfo().m_minimumSolverBatchSize = 2;
//todo: islands/constraints are buggy in btMultiBodyDynamicsWorld! (performance + see slipping grasp)