Skip to content
Snippets Groups Projects

build!: Integrate new MantleAPI with new units

Merged Andreas Rauschert requested to merge integrate_update_deps_to_latest into main
Files
9
@@ -26,7 +26,7 @@ using Jerk = units::jerk::meters_per_second_cubed_t;
using units::literals::operator""_s;
using units::literals::operator""_ms;
using units::literals::operator""_mps;
using units::literals::operator""_mps_cu;
using units::literals::operator""_mps_cb;
namespace detail
{
@@ -188,13 +188,13 @@ std::optional<mantle_api::Performance> GetVehiclePerformance(const mantle_api::I
{
const auto& entity_name{entity.GetName()};
if (properties->performance.max_acceleration_rate < 0.0_mps_cu)
if (properties->performance.max_acceleration_rate < 0.0_mps_cb)
{
OpenScenarioEngine::v1_3::Logger::Warning("SpeedAction: the \'maxAccelerationRate\' performance parameter of entity " + entity_name + " cannot be negative. Using positive value instead.");
properties->performance.max_acceleration_rate *= -1.0;
}
if (properties->performance.max_deceleration_rate < 0.0_mps_cu)
if (properties->performance.max_deceleration_rate < 0.0_mps_cb)
{
OpenScenarioEngine::v1_3::Logger::Warning("SpeedAction: the \'maxDecelerationRate\' performance parameter of entity " + entity_name + " cannot be negative. Using positive value instead.");
properties->performance.max_deceleration_rate *= -1.0;
Loading