Skip to content
Snippets Groups Projects
Commit 1c11979e authored by Corvin-N's avatar Corvin-N
Browse files

Merge branch 'feature/human-library' into feature/human-tracker

parents f5badc14 2801d2d7
No related branches found
No related tags found
2 merge requests!38human tracker skeleton,!28Draft: Dev -> Main
...@@ -4,7 +4,8 @@ armarx_add_aron_library(human_aron ...@@ -4,7 +4,8 @@ armarx_add_aron_library(human_aron
armarx_add_library(human armarx_add_library(human
DEPENDENCIES_PUBLIC DEPENDENCIES_PUBLIC
armarx_navigation::core ArmarXCore
armarx_navigation::core
DEPENDENCIES_PRIVATE DEPENDENCIES_PRIVATE
SOURCES SOURCES
#types.cpp #types.cpp
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#pragma once #pragma once
#include <SimoxUtility/shapes.h> #include <ArmarXCore/core/time.h>
#include <armarx/navigation/core/basic_types.h> #include <armarx/navigation/core/basic_types.h>
...@@ -31,12 +31,14 @@ namespace armarx::navigation::human ...@@ -31,12 +31,14 @@ namespace armarx::navigation::human
{ {
core::Pose2D global_T_human; core::Pose2D global_T_human;
Eigen::Vector2f linearVelocity; Eigen::Vector2f linearVelocity;
DateTime detectionTime;
}; };
struct HumanGroup struct HumanGroup
{ {
std::vector<Eigen::Vector2f> vertices; std::vector<Eigen::Vector2f> vertices;
std::vector<Human> humans; std::vector<Human> humans;
DateTime detectionTime;
}; };
} // namespace armarx::navigation::human } // namespace armarx::navigation::human
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