From e664a2e20cf3ee46ee83420ccb5c83b6cdaec65c Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Sat, 16 May 2026 16:28:02 +0100 Subject: [PATCH] rename struct to reflect naming convention --- Engine/source/materials/materialPropertiesManager.cpp | 4 ++-- Engine/source/materials/materialPropertiesManager.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Engine/source/materials/materialPropertiesManager.cpp b/Engine/source/materials/materialPropertiesManager.cpp index 7aab50e62..3718d9a69 100644 --- a/Engine/source/materials/materialPropertiesManager.cpp +++ b/Engine/source/materials/materialPropertiesManager.cpp @@ -550,14 +550,14 @@ void MaterialPropertiesManager::setDefaultEffect(MaterialPropertiesData* data) mDefault = data; } -MaterialEffectResult resolveImpact( BaseMatInstance* mat, +MaterialPropertiesResult resolveImpact( BaseMatInstance* mat, const VectorF& incomingVelocity, const VectorF& surfaceNormal, F32 impactForce, bool isMelee) { - MaterialEffectResult result; + MaterialPropertiesResult result; result.mat_effect = MaterialFXManager.resolve(mat); if (!result.mat_effect) diff --git a/Engine/source/materials/materialPropertiesManager.h b/Engine/source/materials/materialPropertiesManager.h index 32585f0f2..e5c2b25a6 100644 --- a/Engine/source/materials/materialPropertiesManager.h +++ b/Engine/source/materials/materialPropertiesManager.h @@ -192,7 +192,7 @@ public: extern MaterialPropertiesManager MaterialFXManager; -struct MaterialEffectResult +struct MaterialPropertiesResult { MaterialPropertiesData* mat_effect = NULL; bool didRicochet = false; @@ -203,7 +203,7 @@ struct MaterialEffectResult F32 finalDamageMultiplier = 1.0f; }; -MaterialEffectResult resolveImpact(BaseMatInstance* mat, +MaterialPropertiesResult resolveImpact(BaseMatInstance* mat, const VectorF& incomingVelocity, const VectorF& surfaceNormal, F32 impactForce,