- // TODO: better integration method
- glm::dvec3 acc(steering.Acceleration(*this));
- situation.Move(vel * dt);
- vel += acc * dt;
+ {
+ Situation::State state(situation.GetState());
+ Situation::Derivative a(Step(Situation::Derivative(), 0.0));
+ Situation::Derivative b(Step(a, dt * 0.5));
+ Situation::Derivative c(Step(b, dt * 0.5));
+ Situation::Derivative d(Step(c, dt));
+ Situation::Derivative f(
+ (1.0 / 6.0) * (a.vel + 2.0 * (b.vel + c.vel) + d.vel),
+ (1.0 / 6.0) * (a.acc + 2.0 * (b.acc + c.acc) + d.acc)
+ );
+ state.pos += f.vel * dt;
+ state.vel += f.acc * dt;
+ situation.SetState(state);
+ }