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

Migrates AreaEffectSimulation to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across aes service and plugin.
This commit is contained in:
berrux-dev committed 2026-09-21 02:45:07 +02:00
1 parent e8d07af320
commit 472f537313
102 files changed
+3307 -3313
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/RecordReplay/aes_record_replay_plugin_custom.cpp
+18 -18
View File
@@ -59,7 +59,7 @@ bool RecordReplayPluginCustom::setReplayStartTime(NSqlQuery &q, qint64 startTime
{
for (const auto &valie : copyTW.values(key))
{
if (valie.trajectoryStartTime() < startTime - 210*1000)
if (valie.trajectoryStartTime < startTime - 210*1000)
{
m_trajectoryTimeAwareMap.remove(key, valie);
}
@@ -264,7 +264,7 @@ bool RecordReplayPluginCustom::setReplayStartTime(NSqlQuery &q, qint64 startTime
{
for (const auto &valie : copyTI.values(key))
{
if (valie.sampleTime() < startTime - 210*1000)
if (valie.sampleTime < startTime - 210*1000)
m_triggeredImpactsMap.remove(key, valie);
}
}
@@ -295,7 +295,7 @@ bool RecordReplayPluginCustom::setReplayStartTime(NSqlQuery &q, qint64 startTime
{
for (const auto &valie : copy.values(key))
{
if( m_explosionClusterKeys.find(valie.aesItemId()) != m_explosionClusterKeys.end())
if( m_explosionClusterKeys.find(valie.aesItemId) != m_explosionClusterKeys.end())
{
m_effectsMap.remove(key, valie);
continue;
@@ -316,34 +316,34 @@ bool RecordReplayPluginCustom::setReplayStartTime(NSqlQuery &q, qint64 startTime
{
for (const auto &value : copy.values(key))
{
if (value.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsCreated
|| value.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsFired
|| value.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsReceived
|| value.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsPrepared
|| value.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated
if (value.effectStateId == AreaEffectSimulation::AesEffectState::EsCreated
|| value.effectStateId == AreaEffectSimulation::AesEffectState::EsFired
|| value.effectStateId == AreaEffectSimulation::AesEffectState::EsReceived
|| value.effectStateId == AreaEffectSimulation::AesEffectState::EsPrepared
|| value.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated
)
continue;
// check regarding _Explosion_Cluster
{
static QVector<AesType_def::type> relavantAesTypeIds = {AesType_def::AtExplosionClusterGunToTargetLine, AesType_def::AtExplosionClusterSingleTrajectory};
if (relavantAesTypeIds.contains(value.aesTypeId().underlying()))
static QVector<AesType> relavantAesTypeIds = {AesType::AtExplosionClusterGunToTargetLine, AesType::AtExplosionClusterSingleTrajectory};
if (relavantAesTypeIds.contains(value.aesTypeId))
{
if (m_explosionClusterKeys.find(value.aesItemId()) != m_explosionClusterKeys.end() ) //contains not available until cpp 20
if (m_explosionClusterKeys.find(value.aesItemId) != m_explosionClusterKeys.end() ) //contains not available until cpp 20
continue;
}
}
// E01562-E343 EffectCluster: GunToTargetLines fehlen im Replay&Snapshot
{
static QVector<AesType_def::type> relavantAesTypeIds = {AesType_def::AtEffectClusterGunToTargetLine, AesType_def::AtEffectClusterGunToTargetLine};
if (relavantAesTypeIds.contains(value.aesTypeId().underlying()))
static QVector<AesType> relavantAesTypeIds = {AesType::AtEffectClusterGunToTargetLine, AesType::AtEffectClusterGunToTargetLine};
if (relavantAesTypeIds.contains(value.aesTypeId))
{
if (m_effectClusterKeys.find(value.aesItemId()) != m_effectClusterKeys.end() ) //contains not available until cpp 20
if (m_effectClusterKeys.find(value.aesItemId) != m_effectClusterKeys.end() ) //contains not available until cpp 20
continue;
}
}
if (value.effectStateId() == AesEffectState_def::EsRemoved || value.effectStart() < startTime - 210*1000)
if (value.effectStateId == AesEffectState::EsRemoved || value.effectStart < startTime - 210*1000)
{
m_aesItemViewMap.remove(key, value);
}
@@ -369,16 +369,16 @@ void RecordReplayPluginCustom::removeOld(QMultiMap<long long, T> &map, qint64 de
for (const auto &inner : map.values(item))
{
// Remove delted ones
if (inner.isDeleted())
if (inner.isDeleted)
{
map.remove(item, inner);
continue;
}
// keep planned
if (!inner.effectStart().is_set())
if (!inner.effectStart.is_set())
continue;
// Remove to old ones
if (inner.effectStart().get()+inner.effectDuration() < desiredTime - 210*1000 )
if (inner.effectStart.get()+inner.effectDuration < desiredTime - 210*1000 )
map.remove(item, inner);
}
}
qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/RecordReplay/aes_record_replay_plugin_custom.h
+1 -1
View File
@@ -9,7 +9,7 @@
#include <AreaEffectSimulation/aes_record_replay_plugin.h>
#include <AreaEffectSimulation/aes_dts.h>
// fixup include path on 42.3 -> missing interface
#include <../../Common/PluginInterfaces/record_replay_plugin.h>
#include <Common/PluginInterfaces/record_replay_plugin.h>
namespace AreaEffectSimulation