henry/EntityLibrary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CHG: changed to fit to the new base message

Browse Source
This commit is contained in:
Henry Winkel
2023-08-11 11:04:49 +02:00
parent 1f96b32aff
commit 2bc36527a3
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Entities/Entity.cpp
View File

@@ -45,7 +45,7 @@ namespace Entities
{
PodController_ = std::make_unique<kubecontrol::PodController>("docs/config");
OwnShipTrack = std::make_shared<SimCore::SimTrack>(OwnID, OwnType, EntityKind);
OwnShipTrack = std::make_shared<SimCore::SimTrack>(OwnID, EnttityName, EntityKind);
OwnShipTrack->setPosition(SimCore::Position());
MovemtServer_ = std::make_shared<DirectCommunication::DirectCommunicationServer>(__MOVEMENT_SERVER_PORT__);
@@ -70,7 +70,7 @@ namespace Entities
OwnShipTrack->setPosition(pos);
LOG_S(INFO)<< "POS: LAT: "<< OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LATITUDE) << " LON: " << OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LONGITUDE);
Orders::MoveOrder moveorder(OwnShipTrack->getIdentifier(),WHISPER::SourceType::ENTITY);
Orders::MoveOrder moveorder(OwnShipTrack->getIdentifier());
moveorder.setPosition(pos);
if(MovementWorkerStarted == true)
{
@@ -81,7 +81,7 @@ namespace Entities
void Entity::setSpeed(double val)
{
OwnShipTrack->Speed.setValue(val);
Orders::MoveOrder moveorder(OwnShipTrack->getIdentifier(),WHISPER::SourceType::ENTITY);
Orders::MoveOrder moveorder(OwnShipTrack->getIdentifier());
moveorder.Speed.setValue(val);
if(MovementWorkerStarted == true)
{
@@ -92,7 +92,7 @@ namespace Entities
void Entity::setCourse(double val)
{
OwnShipTrack->Course.setValue(val);
Orders::MoveOrder moveorder(OwnShipTrack->getIdentifier(),WHISPER::SourceType::ENTITY);
Orders::MoveOrder moveorder(OwnShipTrack->getIdentifier());
moveorder.Course.setValue(val);
if(MovementWorkerStarted == true)
{
@@ -144,7 +144,8 @@ namespace Entities
{
if (online_ == true) {
LOG_S(INFO)<<"__ONLINE__";
auto MovementPod = kubecontrol::KubePod("movmentpod-"+EntityName_,xg::newGuid().str(),"movementimage:latest");
MovementPodUUID_ = xg::newGuid().str();
auto MovementPod = kubecontrol::KubePod(MovementPodUUID_,MovementPodUUID_,"movementimage:latest");
MovementPod.setEnvironmentVar("SERVER_IP", SimCore::UtilFunctions::getOwnIP());
LOG_S(INFO)<< MovementPod.createYAML();
PodController_->startPod(MovementPod);
@@ -182,13 +183,13 @@ namespace Entities
if (newTrack != nullptr)
{
OwnShipTrack->setPosition(newTrack->getPosition());
// LOG_S(INFO)<< "new POS: LAT: "<< OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LATITUDE) << " LON: " << OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LONGITUDE);
LOG_S(INFO)<< "new POS: LAT: "<< OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LATITUDE) << " LON: " << OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LONGITUDE);
}
}
if (MovemtServer_->countClients() == 0)
{
MovementWorkerStarted = false;
MovementWorkerStarted = false;
}
}

12
src/Orders/MoveOrder.cpp
View File

@@ -10,8 +10,8 @@
namespace Orders
{
MoveOrder::MoveOrder(const SimCore::Identifier OwnID, WHISPER::SourceType srcType):
Order(OwnID,srcType,Orders::MOVE_ORDER)
MoveOrder::MoveOrder(const SimCore::Identifier OwnID):
Order(OwnID,Orders::MOVE_ORDER)
{
Speed = SimCore::Data<double>();
Course = SimCore::Data<double>();
@@ -20,8 +20,8 @@ namespace Orders
}
MoveOrder::MoveOrder(const SimCore::Identifier OwnID,WHISPER::SourceType srcType,SimCore::Position pos,double speed,double course , int startTime ):
Order(OwnID, srcType,Orders::MOVE_ORDER)
MoveOrder::MoveOrder(const SimCore::Identifier OwnID,SimCore::Position pos,double speed,double course , int startTime ):
Order(OwnID, Orders::MOVE_ORDER)
{
Speed = SimCore::Data<double>();
Course = SimCore::Data<double>();
@@ -50,7 +50,7 @@ namespace Orders
WHISPER::Message MoveOrder::buildMessage()
{
WHISPER::Message msg = WHISPER::Message(getOwnID().getUUID(), WHISPER::MsgTopics::COMMANDS , WHISPER::MsgType::COMMAND , srcType);
WHISPER::Message msg = WHISPER::Message(getOwnID().getUUID(), WHISPER::MsgTopics::COMMANDS , WHISPER::MsgType::COMMAND);
messages::entity::order::MoveOrder MoveOrder = messages::entity::order::MoveOrder();
@@ -117,7 +117,7 @@ namespace Orders
SimCore::Identifier OrderID(order.orderid());
auto MoveOrderObj = std::make_unique<MoveOrder>(OrderID,(WHISPER::SourceType)msg.sourceType_);
auto MoveOrderObj = std::make_unique<MoveOrder>(OrderID);
if (moveOrder.has_geocentricposition()) MoveOrderObj->setPosition(SimCore::Position(moveOrder.geocentricposition().x(),moveOrder.geocentricposition().y(),moveOrder.geocentricposition().z()));

3
src/Orders/Order.cpp
View File

@@ -5,10 +5,9 @@
namespace Orders
{
Order::Order(const SimCore::Identifier OwnID,const WHISPER::SourceType srcType, const Orders::OrderType OrderType_):
Order::Order(const SimCore::Identifier OwnID,const Orders::OrderType OrderType_):
orderID_(SimCore::Identifier()),
OwnID_(OwnID),
srcType(srcType),
OrderType_(OrderType_)
{