Skip to content
Snippets Groups Projects
Commit bf7ada8b authored by Fabian Reister's avatar Fabian Reister
Browse files

Merge remote-tracking branch 'origin/armem/dev' into...

Merge remote-tracking branch 'origin/armem/dev' into feature/armem-object-memory-articulated-objects
parents 1f282252 84842f18
No related branches found
No related tags found
2 merge requests!157armem/dev => master,!141Feature/armem object memory articulated objects
......@@ -74,6 +74,7 @@ namespace armarx::armem
{
ice.aronType = providerSegment.aronType()->getResult();
}
ARMARX_CHECK(!providerSegment.aronType() || ice.aronType);
toIce(ice.entities, providerSegment.entities());
}
void fromIce(const data::ProviderSegment& ice, wm::ProviderSegment& providerSegment)
......@@ -84,6 +85,7 @@ namespace armarx::armem
{
providerSegment.aronType() = aron::typenavigator::ObjectNavigator::DynamicCastAndCheck(aron::typenavigator::Navigator::FromAronType(ice.aronType));
}
ARMARX_CHECK(!providerSegment.aronType() || ice.aronType);
fromIce(ice.entities, providerSegment.entities());
}
......@@ -95,6 +97,7 @@ namespace armarx::armem
{
ice.aronType = coreSegment.aronType()->getResult();
}
ARMARX_CHECK(!coreSegment.aronType() || ice.aronType);
toIce(ice.providerSegments, coreSegment.providerSegments());
}
void fromIce(const data::CoreSegment& ice, wm::CoreSegment& coreSegment)
......@@ -105,6 +108,7 @@ namespace armarx::armem
{
coreSegment.aronType() = aron::typenavigator::ObjectNavigator::DynamicCastAndCheck(aron::typenavigator::Navigator::FromAronType(ice.aronType));
}
ARMARX_CHECK(!coreSegment.aronType() || ice.aronType);
fromIce(ice.providerSegments, coreSegment.providerSegments());
}
......
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