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

Merge remote-tracking branch 'bp/master'

Browse Source
This commit is contained in:
Erwin Coumans
2018-06-26 08:57:44 -07:00
parent 2c881d0b74 1b69e22df6
commit 21b089b0d7
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/SharedMemory/PhysicsServerCommandProcessor.cpp
View File

@@ -5197,7 +5197,6 @@ bool PhysicsServerCommandProcessor::processSendDesiredStateCommand(const struct
} }
b3PluginArguments args; b3PluginArguments args;
args.m_ints[0] = eSetPDControl;
args.m_ints[1] = bodyUniqueId; args.m_ints[1] = bodyUniqueId;
//find the joint motors and apply the desired velocity and maximum force/torque //find the joint motors and apply the desired velocity and maximum force/torque
{ {
@@ -5250,6 +5249,11 @@ bool PhysicsServerCommandProcessor::processSendDesiredStateCommand(const struct
args.m_ints[2] = link; args.m_ints[2] = link;
args.m_numInts = 3; args.m_numInts = 3;
args.m_numFloats = 5; args.m_numFloats = 5;
args.m_ints[0] = eSetPDControl;
if (args.m_floats[4] < B3_EPSILON) {
args.m_ints[0] = eRemovePDControl;
}
m_data->m_pluginManager.executePluginCommand(m_data->m_pdControlPlugin, &args); m_data->m_pluginManager.executePluginCommand(m_data->m_pdControlPlugin, &args);
} }
} }

1
examples/SharedMemory/plugins/pdControlPlugin/pdControlPlugin.cpp
View File

@@ -107,7 +107,6 @@ B3_SHARED_API int executePluginCommand_pdControlPlugin(struct b3PluginContext* c
if (arguments->m_numInts != 3) if (arguments->m_numInts != 3)
return -1; return -1;
switch (arguments->m_ints[0]) switch (arguments->m_ints[0])
{ {
case eSetPDControl: case eSetPDControl: