diff --git a/include/Entities/Entity.hpp b/include/Entities/Entity.hpp index b0ca153..53bcbb2 100644 --- a/include/Entities/Entity.hpp +++ b/include/Entities/Entity.hpp @@ -68,7 +68,7 @@ namespace Entities { virtual void specificPhysicsCalculations(std::chrono::milliseconds::rep duration) = 0; virtual void specificReloadCharacteristicts() = 0; - std::unique_ptr Movement_; + std::unique_ptr Movement_ = nullptr; private: diff --git a/libs/SimCore b/libs/SimCore index eda12f0..f83fabd 160000 --- a/libs/SimCore +++ b/libs/SimCore @@ -1 +1 @@ -Subproject commit eda12f0985c9a56e64b4c3811c3cbffcb50a9ca4 +Subproject commit f83fabd343e690a62a794f3cb6db5cf46f72068b diff --git a/libs/json b/libs/json index 546370c..a0c1318 160000 --- a/libs/json +++ b/libs/json @@ -1 +1 @@ -Subproject commit 546370c9e778d99e7176641123e5cc1d0b62acab +Subproject commit a0c1318830519eac027a31edec1a99ce1ae5670e diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 8746fd7..2e1ee92 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -104,7 +104,13 @@ namespace Entities auto end = std::chrono::steady_clock::now(); std::chrono::milliseconds::rep duration = std::chrono::duration_cast(end - start).count(); - Movement_->updatePosition(duration); + + if(Movement_ != nullptr) + { + // Movement_->updatePosition(duration); + Movement_->updatePositionSimple(duration); + + } specificPhysicsCalculations(duration); diff --git a/src/Entities/Movement.cpp b/src/Entities/Movement.cpp index aa6c27e..688d4d2 100644 --- a/src/Entities/Movement.cpp +++ b/src/Entities/Movement.cpp @@ -100,8 +100,30 @@ namespace Entities void Movement::updatePositionSimple(double dt) { + double lat = ownPosition_.getGeodesicPos()(SimCore::LATITUDE); // in degree + double lon = ownPosition_.getGeodesicPos()(SimCore::LONGITUDE); // in degree + double alt = ownPosition_.getGeodesicPos()(SimCore::HEIGHT); // in meters + double vx = this->speed_ * cos(this->getPitch()); + double vy = this->speed_ * sin(this->getPitch()); + + LOG_S(INFO)<<"VX: " << vx << " VY: " <course_,movedDistance,lat2,lon2); + + LOG_S(INFO)<< "lat: "<