Skip to content

Commit 8ecd226

Browse files
committed
Add various API relative pose functions and use them in SimulatorCore
Signed-off-by: Mateusz Palczuk <[email protected]> Bring back distance condition evaluation in syntax (taken from commit "e6ffb819399842b6b3f71a7de816f36fcc01cfe0") Signed-off-by: Mateusz Palczuk <[email protected]> Move entity check to SimulatorCore scope and use in this class Signed-off-by: Mateusz Palczuk <[email protected]> Bring back distance condition evaluation fully + lateral lane changes in syntax (taken from commit "e6ffb819399842b6b3f71a7de816f36fcc01cfe0") Bring back `evaluateLateralRelativeLanes` to `SimulatorCore::CoordinateSystemConversion` Signed-off-by: Mateusz Palczuk <[email protected]> Remove `SimulatorCore::DistanceConditionEvaluation` class Signed-off-by: Mateusz Palczuk <[email protected]> Bring back return type deduction Signed-off-by: Mateusz Palczuk <[email protected]> Remove route clear in `applyAcquirePositionAction` - make implementation mirror the master Signed-off-by: Mateusz Palczuk <[email protected]> Bring back perfect forwarding for API constructor Signed-off-by: Mateusz Palczuk <[email protected]> Move `API::boundingBoxRelativePose` to be groupped with similar functions Signed-off-by: Mateusz Palczuk <[email protected]> Remove lanelet distance function from API Signed-off-by: Mateusz Palczuk <[email protected]> Remove lanelet distance functions Signed-off-by: Mateusz Palczuk <[email protected]>
1 parent 5a2dae1 commit 8ecd226

File tree

13 files changed

+672
-439
lines changed

13 files changed

+672
-439
lines changed

openscenario/openscenario_interpreter/include/openscenario_interpreter/simulator_core.hpp

Lines changed: 99 additions & 201 deletions
Large diffs are not rendered by default.

openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/distance_condition.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ inline namespace syntax
6060
<xsd:attribute name="routingAlgorithm" type="RoutingAlgorithm"/>
6161
</xsd:complexType>
6262
*/
63-
struct DistanceCondition : private Scope, private SimulatorCore::DistanceConditionEvaluation
63+
struct DistanceCondition : private Scope, private SimulatorCore::CoordinateSystemConversion
6464
{
6565
/*
6666
Definition of the coordinate system to be used for calculations. If not

openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/reach_position_condition.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ inline namespace syntax
3838
* </xsd:complexType>
3939
*
4040
* -------------------------------------------------------------------------- */
41-
struct ReachPositionCondition : private SimulatorCore::DistanceConditionEvaluation
41+
struct ReachPositionCondition : private SimulatorCore::CoordinateSystemConversion
4242
{
4343
const Double tolerance;
4444

openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/relative_clearance_condition.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ inline namespace syntax
4141
</xsd:complexType>
4242
*/
4343
struct RelativeClearanceCondition : private Scope,
44-
private SimulatorCore::DistanceConditionEvaluation,
44+
private SimulatorCore::CoordinateSystemConversion,
4545
private SimulatorCore::ConditionEvaluation
4646
{
4747
/*

openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/relative_distance_condition.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ inline namespace syntax
4848
<xsd:attribute name="routingAlgorithm" type="RoutingAlgorithm"/>
4949
</xsd:complexType>
5050
*/
51-
struct RelativeDistanceCondition : private Scope, private SimulatorCore::DistanceConditionEvaluation
51+
struct RelativeDistanceCondition : private Scope, private SimulatorCore::CoordinateSystemConversion
5252
{
5353
/*
5454
Definition of the coordinate system to be used for calculations. If not

0 commit comments

Comments
 (0)