Remove custom step_fn for StepControl::Advance.
PiperOrigin-RevId: 936609234 Change-Id: I606cf4d71d856cbd260900d63b22c719974c977d
This commit is contained in:
committed by
Copybara-Service
parent
027cfd1201
commit
5cef2472d5
@@ -92,8 +92,7 @@ StepControl::PauseState StepControl::GetPauseState() const {
|
||||
return pause_state_;
|
||||
}
|
||||
|
||||
StepControl::Status StepControl::Advance(mjModel* m, mjData* d,
|
||||
StepFn step_fn) {
|
||||
StepControl::Status StepControl::Advance(mjModel* m, mjData* d) {
|
||||
if (!m) {
|
||||
return Status::kOk;
|
||||
}
|
||||
@@ -187,11 +186,7 @@ StepControl::Status StepControl::Advance(mjModel* m, mjData* d,
|
||||
if (pre_step_) {
|
||||
pre_step_(m, d);
|
||||
}
|
||||
if (step_fn) {
|
||||
step_fn(m, d);
|
||||
} else {
|
||||
mj_step(m, d);
|
||||
}
|
||||
mj_step(m, d);
|
||||
if (post_step_) {
|
||||
post_step_(m, d);
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ class StepControl {
|
||||
mjWARN_BADQACC, mjWARN_BADQVEL, mjWARN_BADQPOS};
|
||||
|
||||
// Steps physics forward, respecting speed settings and refresh budget.
|
||||
Status Advance(mjModel* m, mjData* d, StepFn step_fn = nullptr);
|
||||
Status Advance(mjModel* m, mjData* d);
|
||||
|
||||
// Ensures the next call to Advance() will synchronize time and step once.
|
||||
void ForceSync();
|
||||
|
||||
Reference in New Issue
Block a user