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

navigation memory: property to disable transparent humans

parent 23bc5a42
No related branches found
No related tags found
1 merge request!28Draft: Dev -> Main
......@@ -475,7 +475,7 @@ namespace armarx::navigation::components::navigation_memory
visu.drawCostmaps(layers, p.visuCostmaps);
// Humans
visu.drawHumans(layers, p.visuHumans);
visu.drawHumans(layers, p.visuHumans, p.visuTransparent);
arviz.commit(layers);
......
......@@ -100,6 +100,8 @@ namespace armarx::navigation::components::navigation_memory
bool visuGraphEdges = true;
bool visuCostmaps = true;
bool visuHumans = true;
bool visuTransparent = false;
float visuFrequency = 10;
};
......
......@@ -177,7 +177,7 @@ namespace armarx::navigation::memory
}
void
visualize(const human::Humans& humans, viz::Layer& layer)
visualize(const human::Humans& humans, viz::Layer& layer, const bool visuTransparent)
{
const Eigen::Translation3f human_T_mmm(Eigen::Vector3f{0,0, 1000});
......@@ -199,7 +199,7 @@ namespace armarx::navigation::memory
mmm.file("RobotAPI", "RobotAPI/robots/MMM/mmm.xml");
mmm.pose(conv::to3D(human.pose) * human_T_mmm);
mmm.scale(1.7); // 1.7m
mmm.overrideColor(viz::Color::orange(255, 100));
mmm.overrideColor(viz::Color::orange(255, visuTransparent? 100: 255));
layer.add(mmm);
}
......@@ -248,7 +248,7 @@ namespace armarx::navigation::memory
}
void
Visu::drawHumans(std::vector<viz::Layer>& layers, bool enabled)
Visu::drawHumans(std::vector<viz::Layer>& layers, const bool enabled, const bool visuTransparent)
{
if (not enabled)
{
......@@ -283,7 +283,7 @@ namespace armarx::navigation::memory
for (const auto& [providerName, humans] : namedProviderHumans)
{
viz::Layer& layer = layers.emplace_back(arviz.layer("humans_" + providerName));
visualize(humans, layer);
visualize(humans, layer, visuTransparent);
}
}
......
......@@ -55,7 +55,7 @@ namespace armarx::navigation::memory
void drawLocations(std::vector<viz::Layer>& layers, bool enabled);
void drawGraphs(std::vector<viz::Layer>& layers, bool enabled);
void drawCostmaps(std::vector<viz::Layer>& layers, bool enabled);
void drawHumans(std::vector<viz::Layer>& layers, bool enabled);
void drawHumans(std::vector<viz::Layer>& layers, bool enabled, bool visuTransparent);
viz::ScopedClient arviz;
......
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