Skip to content
Snippets Groups Projects
Commit b03d45a2 authored by Timo Weberruß's avatar Timo Weberruß
Browse files

Move everything to library (away from component)

parent a8a0189f
No related branches found
No related tags found
2 merge requests!109Social layers,!55Draft: Implement human grouping
Showing with 18 additions and 21 deletions
......@@ -10,19 +10,10 @@ armarx_add_component(dynamic_scene_provider
Component.cpp
ArVizDrawer.cpp
HumanTracker.cpp
HumanGrouper.cpp
EuclideanDistance.cpp
OrientationDistance.cpp
CombinedDistance.cpp
HEADERS
Component.h
ArVizDrawer.h
HumanTracker.h
HumanGrouper.h
DistanceFunction.h
EuclideanDistance.h
OrientationDistance.h
CombinedDistance.h
DEPENDENCIES
# ArmarXCore
ArmarXCore
......
......@@ -17,9 +17,18 @@ armarx_add_library(teb_human
types.cpp
aron_conversions.cpp
ProxemicZoneCreator.cpp
HumanGrouper.cpp
EuclideanDistance.cpp
OrientationDistance.cpp
CombinedDistance.cpp
HEADERS
types.h
aron_conversions.h
shapes.h
ProxemicZoneCreator.h
HumanGrouper.h
DistanceFunction.h
EuclideanDistance.h
OrientationDistance.h
CombinedDistance.h
)
#include "CombinedDistance.h"
namespace armarx::navigation::components::dynamic_scene_provider
namespace armarx::navigation::human
{
CombinedDistance::CombinedDistance(double maxOrientationInfluence)
{
......
......@@ -5,7 +5,7 @@
#include "OrientationDistance.h"
namespace armarx::navigation::components::dynamic_scene_provider
namespace armarx::navigation::human
{
class CombinedDistance : public DistanceFunction
{
......
......@@ -3,10 +3,8 @@
#include <armarx/navigation/human/types.h>
namespace armarx::navigation::components::dynamic_scene_provider
namespace armarx::navigation::human
{
using Human = armarx::navigation::human::Human;
class DistanceFunction
{
public:
......
#include "EuclideanDistance.h"
namespace armarx::navigation::components::dynamic_scene_provider
namespace armarx::navigation::human
{
double EuclideanDistance::computeDistance(Human &h1, Human &h2)
{
......
......@@ -3,7 +3,7 @@
#include "DistanceFunction.h"
namespace armarx::navigation::components::dynamic_scene_provider
namespace armarx::navigation::human
{
class EuclideanDistance : public DistanceFunction
{
......
#include "CombinedDistance.h"
#include "HumanGrouper.h"
namespace armarx::navigation::components::dynamic_scene_provider
namespace armarx::navigation::human
{
HumanGrouper::HumanGrouper(GroupingSettings settings) : settings(settings)
{
......
......@@ -25,7 +25,7 @@
#include "armarx/navigation/core/basic_types.h"
#include "armarx/navigation/human/types.h"
namespace armarx::navigation::components::dynamic_scene_provider
namespace armarx::navigation::human
{
/**
* @brief Identifies social interaction groups in a collection of detected humans.
......@@ -78,7 +78,6 @@ namespace armarx::navigation::components::dynamic_scene_provider
private:
void generateShapes(std::vector<human::HumanGroup> &groups);
std::vector<Human> currentHumans;
DistanceFunction *distanceFunction;
GroupingSettings settings;
......
#include "OrientationDistance.h"
namespace armarx::navigation::components::dynamic_scene_provider
namespace armarx::navigation::human
{
OrientationDistance::OrientationDistance(double max, double min)
{
......
......@@ -3,7 +3,7 @@
#include "DistanceFunction.h"
namespace armarx::navigation::components::dynamic_scene_provider
namespace armarx::navigation::human
{
class OrientationDistance : public DistanceFunction
{
......
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