diff --git a/include/Entities/Entity.hpp b/include/Entities/Entity.hpp index ff9f448..7f0d7d8 100644 --- a/include/Entities/Entity.hpp +++ b/include/Entities/Entity.hpp @@ -70,8 +70,7 @@ namespace Entities { - virtual void specificPhysicsCalculations(std::chrono::milliseconds::rep duration) = 0; - virtual void specificReloadCharacteristicts() = 0; + virtual void childWorker() = 0; protected: diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index ccb8d6f..f288302 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -153,7 +153,6 @@ namespace Entities }else { LOG_S(INFO)<< "Wait for MomentApp"; - std::this_thread::sleep_for(std::chrono::milliseconds(5000)); } @@ -195,17 +194,24 @@ namespace Entities void Entity::handleExternalComms(std::string msg) { - LOG_S(INFO)<Speed.isValid()) this->setSpeed(MoveOrder->Speed.getValue()); + if(MoveOrder->Course.isValid()) this->setCourse(MoveOrder->Course.getValue()); + if(MoveOrder->getPosition().isValid()) + { + LOG_S(INFO)<<"New Position received"; + this->setPosition(MoveOrder->getPosition()); + } + // CommandCommsServer_->sendMessage("Hello Client"); } - LOG_S(INFO)<CommandCommsServer_->countClients(); - CommandCommsServer_->sendMessage("Hello Client"); + + CommandCommsServer_->sendMessage(this->OwnShipTrack->buildMessage().serialize()); } @@ -218,7 +224,7 @@ namespace Entities while (!stopMainLoop) { handleMovement(); - + childWorker(); std::this_thread::sleep_for(std::chrono::milliseconds(500));