lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrates EffectShow and AssetManagement to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across esc and asm services.
This commit is contained in:
berrux-dev committed 2026-09-21 02:46:24 +02:00
1 parent a09979afdd
commit bdb2461737
39 files changed
+818 -818
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.cpp
+49 -49
View File
@@ -76,77 +76,77 @@ bool ObjectAesData::dataChanged(const Database::EsmAesData &data) const
DEBUG_LOG(m_logger) << "Data Volley: " << data.volley << " old: " << m_data.volley;
return (m_data.chargeTypeId != data.chargeTypeId)
|| (m_data.effectStart != data.effectStart)
|| (m_data.effectStateId == AreaEffectSimulation::AesEffectState::EsFired)
|| (m_data.effectStateId == static_cast<int>(AreaEffectSimulation::AesEffectState::EsFired))
|| (m_data.effectDuration != data.effectDuration);
}
//=============================================================================
bool ObjectAesData::statusPaused(const Database::EsmAesData &data) const
{
return (m_data.effectStateId != AreaEffectSimulation::AesEffectState_def::EsPaused) &&
(data.effectStateId == AreaEffectSimulation::AesEffectState_def::EsPaused);
return (m_data.effectStateId != static_cast<int>(AreaEffectSimulation::AesEffectState::EsPaused)) &&
(data.effectStateId == static_cast<int>(AreaEffectSimulation::AesEffectState::EsPaused));
}
//=============================================================================
bool ObjectAesData::statusContinued(const Database::EsmAesData &data) const
{
return (data.effectStateId == AreaEffectSimulation::AesEffectState_def::EsActivated) &&
return (data.effectStateId == static_cast<int>(AreaEffectSimulation::AesEffectState::EsActivated)) &&
(m_data.effectStart != data.effectStart); // false, if the scheduled start time reached
}
bool ObjectAesData::statusExpired(const Database::EsmAesData &data) const
{
return (data.effectStateId == AreaEffectSimulation::AesEffectState_def::EsExpired);
return (data.effectStateId == static_cast<int>(AreaEffectSimulation::AesEffectState::EsExpired));
}
//=============================================================================
Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::ExplosionArea &data)
{
Database::EsmAesData res;
res.idAes = data.id();
res.nameAes = QString::fromStdString(data.name());
res.effectStateId = data.effectStateId().underlying();
res.position = QPointF(data.area().cornerBottomLeft().lon(), data.area().cornerBottomLeft().lat());
res.rotationAngle = data.area().rotation();
res.depth = data.area().height();
res.width = data.area().width();
res.effectStart = data.effectStart().is_set() ? data.effectStart().get() : 0;
res.effectDuration = data.effectDuration();
res.chargeTypeId = data.chargeStruct().chargeTypeId();
res.volley = data.cannonCount() * data.cannonRounds();
res.idAes = data.id;
res.nameAes = QString::fromStdString(data.name);
res.effectStateId = data.effectStateId;
res.position = QPointF(data.area.cornerBottomLeft.lon, data.area.cornerBottomLeft.lat);
res.rotationAngle = data.area.rotation;
res.depth = data.area.height;
res.width = data.area.width;
res.effectStart = data.effectStart.is_set() ? data.effectStart.get() : 0;
res.effectDuration = data.effectDuration;
res.chargeTypeId = data.chargeStruct.chargeTypeId;
res.volley = data.cannonCount * data.cannonRounds;
return res;
}
Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::ExplosionCluster &data)
{
Database::EsmAesData res;
res.idAes = data.id();
res.nameAes = QString::fromStdString(data.name());
res.effectStateId = data.effectStateId().underlying();
res.position = QPointF(data.area().cornerBottomLeft().lon(), data.area().cornerBottomLeft().lat());
res.rotationAngle = data.area().rotation();
res.depth = data.area().height();
res.width = data.area().width();
res.effectStart = data.effectStart().is_set() ? data.effectStart().get() : 0;
res.effectDuration = data.effectDuration();
res.chargeTypeId = data.chargeStruct().chargeTypeId();
res.volley = data.impactCount(); //cannonCount() * data.cannonRounds();
res.idAes = data.id;
res.nameAes = QString::fromStdString(data.name);
res.effectStateId = data.effectStateId;
res.position = QPointF(data.area.cornerBottomLeft.lon, data.area.cornerBottomLeft.lat);
res.rotationAngle = data.area.rotation;
res.depth = data.area.height;
res.width = data.area.width;
res.effectStart = data.effectStart.is_set() ? data.effectStart.get() : 0;
res.effectDuration = data.effectDuration;
res.chargeTypeId = data.chargeStruct.chargeTypeId;
res.volley = data.impactCount; //cannonCount() * data.cannonRounds();
return res;
}
Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::EffectCluster &data)
{
Database::EsmAesData res;
res.idAes = data.id();
res.nameAes = QString::fromStdString(data.name());
res.effectStateId = data.effectStateId().underlying();
res.position = QPointF(data.area().cornerBottomLeft().lon(), data.area().cornerBottomLeft().lat());
res.rotationAngle = data.area().rotation();
res.depth = data.area().height();
res.width = data.area().width();
res.effectStart = data.effectStart().is_set() ? data.effectStart().get() : 0;
res.effectDuration = data.effectDuration();
res.chargeTypeId = data.chargeStruct().chargeTypeId();
res.idAes = data.id;
res.nameAes = QString::fromStdString(data.name);
res.effectStateId = data.effectStateId;
res.position = QPointF(data.area.cornerBottomLeft.lon, data.area.cornerBottomLeft.lat);
res.rotationAngle = data.area.rotation;
res.depth = data.area.height;
res.width = data.area.width;
res.effectStart = data.effectStart.is_set() ? data.effectStart.get() : 0;
res.effectDuration = data.effectDuration;
res.chargeTypeId = data.chargeStruct.chargeTypeId;
res.volley = 0;
for (const auto &effector : data.effectors())
for (const auto &effector : data.effectors)
{
res.volley += effector.chargeAmount();
res.volley += effector.chargeAmount;
}
return res;
@@ -157,19 +157,19 @@ Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::Min
{
Database::EsmAesData res;
const AreaEffectSimulation::MineSegment &segment = EffectShowManagement::EffectShowMineArea::getEffectShowSegment(data);
LtsCoordTrans::UtmCoordinate startPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic({segment.positionStart().lon(), segment.positionStart().lat()});
LtsCoordTrans::UtmCoordinate endPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic({segment.positionEnd().lon(), segment.positionEnd().lat()}, startPositionUtm.zone);
LtsCoordTrans::UtmCoordinate startPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic({segment.positionStart.lon, segment.positionStart.lat});
LtsCoordTrans::UtmCoordinate endPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic({segment.positionEnd.lon, segment.positionEnd.lat}, startPositionUtm.zone);
const QLineF line({startPositionUtm.x, startPositionUtm.y}, {endPositionUtm.x, endPositionUtm.y});
res.width = line.length();
res.idAes = data.id();
res.nameAes = QString::fromStdString(data.name());
res.effectStateId = data.effectStateId().underlying();
res.position = QPointF(segment.positionStart().lon(), segment.positionStart().lat());
res.depth = data.width();
res.effectStart = data.effectStart().is_set() ? data.effectStart().get() : 0;
res.effectDuration = data.effectDuration();
res.chargeTypeId = data.chargeStruct().chargeTypeId();
res.idAes = data.id;
res.nameAes = QString::fromStdString(data.name);
res.effectStateId = data.effectStateId;
res.position = QPointF(segment.positionStart.lon, segment.positionStart.lat);
res.depth = data.width;
res.effectStart = data.effectStart.is_set() ? data.effectStart.get() : 0;
res.effectDuration = data.effectDuration;
res.chargeTypeId = data.chargeStruct.chargeTypeId;
res.volley = 18;
return res;
}