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/effect_show_explosion_area.cpp
+32 -32
View File
@@ -35,7 +35,7 @@ Database::EsmEffectShow EffectShowExplosionArea::getEffectShow(int idx)
Database::EsmEffectShow esmEffectShow;
if (!m_handlerPdmData->isSmoke(m_explosionArea.chargeStruct()))
if (!m_handlerPdmData->isSmoke(m_explosionArea.chargeStruct))
{
int indX = idx % m_areasWidth.numOfAreas;
int indY = idx / m_areasWidth.numOfAreas;
@@ -62,15 +62,15 @@ Database::EsmEffectShow EffectShowExplosionArea::getEffectShow(int idx)
esmEffectShow.id = 0;
esmEffectShow.name = QStringLiteral("EXP");
esmEffectShow.startTime = m_explosionArea.effectStart().is_set() ? m_explosionArea.effectStart().get() : 0;
esmEffectShow.duration = m_explosionArea.effectDuration();
esmEffectShow.startTime = m_explosionArea.effectStart.is_set() ? m_explosionArea.effectStart.get() : 0;
esmEffectShow.duration = m_explosionArea.effectDuration;
esmEffectShow.centerPosition = centerPosRotated.geographic();
esmEffectShow.idAreaEffectSimulation = m_explosionArea.id();
esmEffectShow.idAreaEffectSimulation = m_explosionArea.id;
esmEffectShow.esmParticipantId = -1;
esmEffectShow.nameAreaEfffectSimulation = QString::fromStdString(m_explosionArea.name());
esmEffectShow.nameAreaEfffectSimulation = QString::fromStdString(m_explosionArea.name);
esmEffectShow.numOfVolley = getNumberOfVolley();
esmEffectShow.shotsPerVolley = getShotsPerArea() / esmEffectShow.numOfVolley;
esmEffectShow.typeOfAmmunition = m_explosionArea.chargeStruct().chargeTypeId();
esmEffectShow.typeOfAmmunition = m_explosionArea.chargeStruct.chargeTypeId;
// can there be more then 48 shoots?
if (esmEffectShow.shotsPerVolley > 48)
@@ -80,10 +80,10 @@ Database::EsmEffectShow EffectShowExplosionArea::getEffectShow(int idx)
esmEffectShow.lowerLeftPosition = lowerLeftPosRotated.geographic();
esmEffectShow.areaWidth = m_areasWidth.side(indX);
esmEffectShow.areaDepth = m_areasDepth.side(indY);
esmEffectShow.areaRotation = m_explosionArea.area().rotation() + 90;
esmEffectShow.areaRotation = m_explosionArea.area.rotation + 90;
DEBUG_LOG(m_logger) << "\nWidth: " << m_explosionArea.area().width() << " Height: " << m_explosionArea.area().height()
DEBUG_LOG(m_logger) << "\nWidth: " << m_explosionArea.area.width << " Height: " << m_explosionArea.area.height
<< "\nRotated LL Pos: " << lowerLeftPosRotated.mgrs()
<< "\nRotated Center Pos: " << centerPosRotated.mgrs()
<< "\nOffset x,y: " << x_off << " , " << y_off
@@ -100,30 +100,30 @@ Database::EsmEffectShow EffectShowExplosionArea::getEffectShow(int idx)
// calculate center position
LtsCoordTrans::UtmCoordinate centerPos = lowerLeftPosRotated;
centerPos.x = centerPos.x + m_explosionArea.area().width() / 2.;
centerPos.y = centerPos.y + m_explosionArea.area().height() / 2.;
centerPos.x = centerPos.x + m_explosionArea.area.width / 2.;
centerPos.y = centerPos.y + m_explosionArea.area.height / 2.;
LtsCoordTrans::UtmCoordinate centerPosRotated = rotate(centerPos, m_lowerLeftPos, rotationRad());
esmEffectShow.id = 0;
esmEffectShow.name = QStringLiteral("EXP");
esmEffectShow.startTime = m_explosionArea.effectStart().is_set() ? m_explosionArea.effectStart().get() : 0;
esmEffectShow.duration = m_explosionArea.effectDuration();
esmEffectShow.startTime = m_explosionArea.effectStart.is_set() ? m_explosionArea.effectStart.get() : 0;
esmEffectShow.duration = m_explosionArea.effectDuration;
esmEffectShow.centerPosition = centerPosRotated.geographic();
esmEffectShow.idAreaEffectSimulation = m_explosionArea.id();
esmEffectShow.idAreaEffectSimulation = m_explosionArea.id;
esmEffectShow.esmParticipantId = -1;
esmEffectShow.nameAreaEfffectSimulation = QString::fromStdString(m_explosionArea.name());
esmEffectShow.typeOfAmmunition = m_explosionArea.chargeStruct().chargeTypeId();
esmEffectShow.nameAreaEfffectSimulation = QString::fromStdString(m_explosionArea.name);
esmEffectShow.typeOfAmmunition = m_explosionArea.chargeStruct.chargeTypeId;
esmEffectShow.numOfVolley = 1;
esmEffectShow.shotsPerVolley = 1;
esmEffectShow.lowerLeftPosition = lowerLeftPosRotated.geographic();
esmEffectShow.areaWidth = m_explosionArea.area().width();
esmEffectShow.areaDepth = m_explosionArea.area().height();
esmEffectShow.areaRotation = m_explosionArea.area().rotation() + 90;
esmEffectShow.areaWidth = m_explosionArea.area.width;
esmEffectShow.areaDepth = m_explosionArea.area.height;
esmEffectShow.areaRotation = m_explosionArea.area.rotation + 90;
DEBUG_LOG(m_logger) << "\nWidth: " << m_explosionArea.area().width() << " Height: " << m_explosionArea.area().height()
DEBUG_LOG(m_logger) << "\nWidth: " << m_explosionArea.area.width << " Height: " << m_explosionArea.area.height
<< "\nRotated LL Pos: " << lowerLeftPosRotated.mgrs()
<< "\nRotated Center Pos: " << centerPosRotated.mgrs()
<< "\nSide x,y: " << m_explosionArea.area().width() << " , " << m_explosionArea.area().height();
<< "\nSide x,y: " << m_explosionArea.area.width << " , " << m_explosionArea.area.height;
}
return esmEffectShow;
@@ -131,29 +131,29 @@ Database::EsmEffectShow EffectShowExplosionArea::getEffectShow(int idx)
//=============================================================================
void EffectShowExplosionArea::updateEffectShow(Database::EsmEffectShow &data)
{
data.nameAreaEfffectSimulation = QString::fromStdString(m_explosionArea.name());
data.startTime = m_explosionArea.effectStart().is_set() ? m_explosionArea.effectStart().get() : 0;
data.duration = m_explosionArea.effectDuration();
data.nameAreaEfffectSimulation = QString::fromStdString(m_explosionArea.name);
data.startTime = m_explosionArea.effectStart.is_set() ? m_explosionArea.effectStart.get() : 0;
data.duration = m_explosionArea.effectDuration;
if (data.shotsPerVolley > 48)
data.shotsPerVolley = 48;//(48 / data.numOfVolley);
if (data.shotsPerVolley <= 0)
data.shotsPerVolley = 1;
data.typeOfAmmunition = m_explosionArea.chargeStruct().chargeTypeId();
data.typeOfAmmunition = m_explosionArea.chargeStruct.chargeTypeId;
}
//-----------------------------------------------------------------------------
void EffectShowExplosionArea::calculateSquare()
{
// start position of the area
Core::GeoPosition2D geoPos = m_explosionArea.area().cornerBottomLeft();
m_lowerLeftPos = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon(), geoPos.lat());
Core::GeoPosition2D geoPos = m_explosionArea.area.cornerBottomLeft;
m_lowerLeftPos = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon, geoPos.lat);
// Calculate squares.
m_areasWidth = getAreasSideLength(m_explosionArea.area().width()); // Squares in x-direction
m_areasDepth = getAreasSideLength(m_explosionArea.area().height()); // Squares in y-direction
m_areasWidth = getAreasSideLength(m_explosionArea.area.width); // Squares in x-direction
m_areasDepth = getAreasSideLength(m_explosionArea.area.height); // Squares in y-direction
// Calculate number of squares
if (m_handlerPdmData->isSmoke(m_explosionArea.chargeStruct()))
if (m_handlerPdmData->isSmoke(m_explosionArea.chargeStruct))
m_numOfEffectShows = 1;
else
m_numOfEffectShows = m_areasWidth.numOfAreas * m_areasDepth.numOfAreas;
@@ -203,7 +203,7 @@ int EffectShowExplosionArea::getShotsPerArea() const
{
if (!m_numOfEffectShows)
return 0;
int v = m_explosionArea.cannonCount() * m_explosionArea.cannonRounds();
int v = m_explosionArea.cannonCount * m_explosionArea.cannonRounds;
return v / m_numOfEffectShows; //split even across all effect shows
}
@@ -211,7 +211,7 @@ int EffectShowExplosionArea::getShotsPerArea(int areas) const
{
if (areas == 0)
return 0;
int v = m_explosionArea.cannonCount() * m_explosionArea.cannonRounds();
int v = m_explosionArea.cannonCount * m_explosionArea.cannonRounds;
return v / areas;
}
@@ -237,7 +237,7 @@ int EffectShowExplosionArea::getNumberOfVolley(int v)
//-----------------------------------------------------------------------------
double EffectShowExplosionArea::rotationRad() const
{
return -m_explosionArea.area().rotation() * LtsCoordTrans::deg2rad();
return -m_explosionArea.area.rotation * LtsCoordTrans::deg2rad();
}
//-----------------------------------------------------------------------------