Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12eaa29c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix the compiler error for the ternary operator, caused by Eigen rebase."

parents 198cf8e5 c9d79c61
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ vec3 Predictor::AngularVelocity(const quat& a, const quat& b, real delta_time) {
  const auto delta_q = b.inverse() * a;
  // Check that delta_q.w() == 1, Eigen doesn't respect this convention. If
  // delta_q.w() == -1, we'll get the opposite velocity.
  return 2.0 * (delta_q.w() < 0 ? -delta_q.vec() : delta_q.vec()) / delta_time;
  return 2.0 * (delta_q.w() < 0 ? static_cast<vec3>(-delta_q.vec()) : delta_q.vec()) / delta_time;
}

Velocity Predictor::PredictVelocity(int64_t time_ns) const {