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

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.cpp
+30 -30
View File
@@ -30,16 +30,16 @@ ProjectDataManagement::VulnerabilityState DamageModel::vulnerabilityStateFromDam
switch(status)
{
case rpr2::DamageStatusEnum32::NoDamage:
vs = ProjectDataManagement::VulnerabilityState::CombatReady;
vs = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
break;
case rpr2::DamageStatusEnum32::SlightDamage:
vs = ProjectDataManagement::VulnerabilityState::LightDamage;
vs = ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage;
break;
case rpr2::DamageStatusEnum32::ModerateDamage:
vs = ProjectDataManagement::VulnerabilityState::HeavyDamage;
vs = ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage;
break;
case rpr2::DamageStatusEnum32::Destroyed:
vs = ProjectDataManagement::VulnerabilityState::CatastrophicKill;
vs = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill;
break;
}
@@ -61,33 +61,33 @@ rpr2::DamageStatusEnum32::ET DamageModel::damageState(qint64 simTimeMSec) const
return rpr2::DamageStatusEnum32::NoDamage;
switch (m_vulnerabilityStates.at(idx).vulnerabilityState.underlying())
switch (m_vulnerabilityStates.at(idx).vulnerabilityState)
{
case ProjectDataManagement::VulnerabilityState::CombatReady:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
return rpr2::DamageStatusEnum32::NoDamage;
case ProjectDataManagement::VulnerabilityState::LightDamage:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage:
return rpr2::DamageStatusEnum32::SlightDamage;
case ProjectDataManagement::VulnerabilityState::MediumDamage:
case ProjectDataManagement::VulnerabilityState::HeavyDamage:
case ProjectDataManagement::VulnerabilityState::MobilityKill:
case ProjectDataManagement::VulnerabilityState::VisibleMobilityKill:
case ProjectDataManagement::VulnerabilityState::WeaponSystemDamage:
case ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage:
return rpr2::DamageStatusEnum32::ModerateDamage;
case ProjectDataManagement::VulnerabilityState::CatastrophicKill:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill:
return rpr2::DamageStatusEnum32::Destroyed;
case ProjectDataManagement::VulnerabilityState::TemporarySeverance:
case ProjectDataManagement::VulnerabilityState::NearMiss:
case ProjectDataManagement::VulnerabilityState::HitWithNoEffect:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect:
return rpr2::DamageStatusEnum32::NoDamage;
case ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged:
case ProjectDataManagement::VulnerabilityState::Reserved:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_Reserved:
return rpr2::DamageStatusEnum32::NoDamage;
case ProjectDataManagement::VulnerabilityState::NContamination:
case ProjectDataManagement::VulnerabilityState::BContamination:
case ProjectDataManagement::VulnerabilityState::CContamination:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NContamination:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_BContamination:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CContamination:
return rpr2::DamageStatusEnum32::SlightDamage;
case ProjectDataManagement::VulnerabilityState::NotReady:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady:
return rpr2::DamageStatusEnum32::NoDamage;
}
return rpr2::DamageStatusEnum32::NoDamage;
@@ -98,9 +98,9 @@ bool DamageModel::immobilized(qint64 simTimeMSec) const
int idx = indexForTime(simTimeMSec);
if (idx < 0)
return false;
if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::MobilityKill ||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VisibleMobilityKill ||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill ||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill ||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
return true;
return false;
}
@@ -110,9 +110,9 @@ bool DamageModel::firePowerDisabled(qint64 simTimeMSec) const
int idx = indexForTime(simTimeMSec);
if (idx < 0)
return false;
if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::WeaponSystemDamage ||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage ||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage ||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage ||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
return true;
return false;
}
@@ -149,7 +149,7 @@ ProjectDataManagement::VulnerabilityState DamageModel::vulnerabilityState(qint64
{
int idx = indexForTime(simTimeMSec);
if (idx < 0)
return ProjectDataManagement::VulnerabilityState::CombatReady;
return ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
return m_vulnerabilityStates.at(idx).vulnerabilityState;
}