From f02dd84f4ee9b81801c78e97c1b3fc236f56de20 Mon Sep 17 00:00:00 2001 From: hwinkel Date: Wed, 7 Jun 2023 22:45:24 +0200 Subject: [PATCH] CHG: changed scope of some variables --- include/Entities/Entity.hpp | 9 ++++++--- src/Entities/Entity.cpp | 1 + src/Entities/Tracklist/Tracklist.cpp | 6 +----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/Entities/Entity.hpp b/include/Entities/Entity.hpp index 53bcbb2..5d787e5 100644 --- a/include/Entities/Entity.hpp +++ b/include/Entities/Entity.hpp @@ -70,11 +70,9 @@ namespace Entities { std::unique_ptr Movement_ = nullptr; - private: + protected: std::string EntityName_; - - SimCore::GroundTruthTrack ownTrack_; SimCore::Identifier ParentID_; SimCore::EntityKind EntityKind_; @@ -82,6 +80,11 @@ namespace Entities { std::uint32_t CommandPort_; std::string CommandIPAddress_; + private: + + + + std::vector threads; diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 9b6afce..1207c93 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -111,6 +111,7 @@ namespace Entities Movement_->updatePositionSimple(duration); } + // LOG_S(INFO)<<"Entity class working"; specificPhysicsCalculations(duration); diff --git a/src/Entities/Tracklist/Tracklist.cpp b/src/Entities/Tracklist/Tracklist.cpp index 78480a9..7b700d6 100644 --- a/src/Entities/Tracklist/Tracklist.cpp +++ b/src/Entities/Tracklist/Tracklist.cpp @@ -1,9 +1,5 @@ #include -// #include -// #include -// #include -// #include -// #include + #define TRACK_TIMEOUT 5 * 60 *1000