ADD: added function for calculation the movement with gegraphiclib
This commit is contained in:
@@ -68,7 +68,7 @@ namespace Entities {
|
|||||||
virtual void specificPhysicsCalculations(std::chrono::milliseconds::rep duration) = 0;
|
virtual void specificPhysicsCalculations(std::chrono::milliseconds::rep duration) = 0;
|
||||||
virtual void specificReloadCharacteristicts() = 0;
|
virtual void specificReloadCharacteristicts() = 0;
|
||||||
|
|
||||||
Entities::Movement Movement_;
|
std::unique_ptr<Entities::Movement> Movement_;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
|||||||
@@ -36,6 +36,8 @@ namespace Entities
|
|||||||
|
|
||||||
void updatePosition(double dt);
|
void updatePosition(double dt);
|
||||||
|
|
||||||
|
void updatePositionSimple(double dt);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief returns the current Course representing the direction the front of the entity is pointing
|
* @brief returns the current Course representing the direction the front of the entity is pointing
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ namespace Entities
|
|||||||
auto end = std::chrono::steady_clock::now();
|
auto end = std::chrono::steady_clock::now();
|
||||||
std::chrono::milliseconds::rep duration = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
|
std::chrono::milliseconds::rep duration = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
|
||||||
|
|
||||||
Movement_.updatePosition(duration);
|
Movement_->updatePosition(duration);
|
||||||
|
|
||||||
|
|
||||||
specificPhysicsCalculations(duration);
|
specificPhysicsCalculations(duration);
|
||||||
|
|||||||
@@ -97,6 +97,14 @@ namespace Entities
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void Movement::updatePositionSimple(double dt)
|
||||||
|
{
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
Eigen::Vector3d Movement::getKinematicVector()
|
Eigen::Vector3d Movement::getKinematicVector()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
#include <Entities/Tracklist/Tracklist.hpp>
|
#include <Entities/Tracklist/Tracklist.hpp>
|
||||||
// #include <Entities/Tracklist/TracklistItem.hpp>
|
// #include <Entities/Tracklist/TracklistItem.hpp>
|
||||||
// #include <SimCore/SimCore.hpp>
|
// #include <SimCore/SimCore.hpp>
|
||||||
@@ -89,7 +88,8 @@ namespace TrackList
|
|||||||
std::lock_guard<std::mutex> lock(mutex_);
|
std::lock_guard<std::mutex> lock(mutex_);
|
||||||
|
|
||||||
auto item = std::make_shared<TracklistItem>( track, sensorData);
|
auto item = std::make_shared<TracklistItem>( track, sensorData);
|
||||||
TrackList_.emplace(track->getIdentifier().serialize(),item);
|
std::string id = track->getIdentifier().serialize();
|
||||||
|
TrackList_.emplace(id,item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user