Set nativeccd as default.
PiperOrigin-RevId: 731343200 Change-Id: I315779017b676f3d118e0d38ee53a515272f50b8
This commit is contained in:
committed by
Copybara-Service
parent
4f691eeae4
commit
ed16f2daf2
@@ -61,7 +61,8 @@ const char* mjDISABLESTRING[mjNDISABLE] = {
|
||||
"Sensor",
|
||||
"Midphase",
|
||||
"Eulerdamp",
|
||||
"AutoReset"
|
||||
"AutoReset",
|
||||
"NativeCCD"
|
||||
};
|
||||
|
||||
|
||||
@@ -72,8 +73,7 @@ const char* mjENABLESTRING[mjNENABLE] = {
|
||||
"Fwdinv",
|
||||
"InvDiscrete",
|
||||
"MultiCCD",
|
||||
"Island",
|
||||
"NativeCCD"
|
||||
"Island"
|
||||
};
|
||||
|
||||
|
||||
@@ -1425,7 +1425,7 @@ mjtNum mj_geomDistance(const mjModel* m, const mjData* d, int geom1, int geom2,
|
||||
}
|
||||
|
||||
// use nativecdd if flag is enabled
|
||||
if (mjENABLED(mjENBL_NATIVECCD)) {
|
||||
if (!mjDISABLED(mjDSBL_NATIVECCD)) {
|
||||
if (func == mjc_Convex || func == mjc_BoxBox) {
|
||||
return mj_geomDistanceCCD(m, d, g1, g2, distmax, fromto);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user