Skip to content
Snippets Groups Projects
Commit ea6006b2 authored by Ziqi Zhou's avatar Ziqi Zhou
Browse files

feat: remove redundent part

parent 09694403
No related branches found
No related tags found
1 merge request!236Feat: support traveled distance condition
Pipeline #67966 passed
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "Storyboard/ByEntityCondition/TraveledDistanceCondition_impl.h" #include "Storyboard/ByEntityCondition/TraveledDistanceCondition_impl.h"
#include "Utils/EntityUtils.h"
#include "Utils/Logger.h" #include "Utils/Logger.h"
namespace OpenScenarioEngine::v1_3 namespace OpenScenarioEngine::v1_3
...@@ -18,21 +19,14 @@ namespace OpenScenarioEngine::v1_3 ...@@ -18,21 +19,14 @@ namespace OpenScenarioEngine::v1_3
bool TraveledDistanceCondition::IsSatisfied() bool TraveledDistanceCondition::IsSatisfied()
{ {
const auto& entity = mantle.environment->GetEntityRepository().Get(values.triggeringEntity); const auto& entity = EntityUtils::GetEntityByName(mantle.environment, values.triggeringEntity);
if (!entity)
{
Logger::Warning("TraveledDistanceCondition: TraveledDistanceCondition cannot be satisfied (entity undefined).");
return false;
}
auto current_position = entity->get().GetPosition(); auto current_position = entity.GetPosition();
if (!is_initialized) if (!is_initialized)
{ {
last_position = current_position; last_position = current_position;
traveled_distance = 0.0;
is_initialized = true; is_initialized = true;
return traveled_distance >= values.value;
} }
const auto distance_delta = (current_position - last_position).Length().value(); const auto distance_delta = (current_position - last_position).Length().value();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment