Skip to content
Snippets Groups Projects

RT controller and simplification

Merged Fabian Reister requested to merge chore/rt-controller-and-simplification into master
1 file
+ 4
2
Compare changes
  • Side-by-side
  • Inline
#include "SceneProvider.h"
#include <VirtualRobot/SceneObjectSet.h>
#include "ArmarXCore/core/exceptions/local/ExpressionException.h"
#include <armarx/navigation/algorithms/CostmapBuilder.h>
#include <armarx/navigation/util/util.h>
@@ -25,7 +26,8 @@ namespace armarx::navigation::server::scene_provider
scn.timestamp = timestamp;
scn.robot = srv.virtualRobotReader->getRobot(
config.robotName, timestamp, VirtualRobot::RobotIO::RobotDescription::eStructure);
config.robotName, timestamp, VirtualRobot::RobotIO::RobotDescription::eCollisionModel);
ARMARX_CHECK_NOT_NULL(scn.robot);
scn.staticScene = getStaticScene(timestamp);
scn.dynamicScene = getDynamicScene(timestamp);
@@ -43,7 +45,7 @@ namespace armarx::navigation::server::scene_provider
srv.virtualRobotReader->synchronizeRobot(*scn.robot, timestamp);
scn.dynamicScene = getDynamicScene(timestamp);
scn.graph = getSceneGraph(timestamp);
// scn.graph = getSceneGraph(timestamp);
return true; // TODO(fabian.reister): return false if sync fails
}
Loading