TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 07:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

rename struct to reflect naming convention

Browse source
This commit is contained in:
marauder2k7 2026-05-16 16:28:02 +01:00
parent 75e366c0dd
commit e664a2e20c
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/materials/materialPropertiesManager.cpp
View file

@ -550,14 +550,14 @@ void MaterialPropertiesManager::setDefaultEffect(MaterialPropertiesData* data)
mDefault = data; mDefault = data;
} }
MaterialEffectResult resolveImpact( BaseMatInstance* mat, MaterialPropertiesResult resolveImpact( BaseMatInstance* mat,
const VectorF& incomingVelocity, const VectorF& incomingVelocity,
const VectorF& surfaceNormal, const VectorF& surfaceNormal,
F32 impactForce, F32 impactForce,
bool isMelee) bool isMelee)
{ {
MaterialEffectResult result; MaterialPropertiesResult result;
result.mat_effect = MaterialFXManager.resolve(mat); result.mat_effect = MaterialFXManager.resolve(mat);
if (!result.mat_effect) if (!result.mat_effect)

4
Engine/source/materials/materialPropertiesManager.h
View file

@ -192,7 +192,7 @@ public:
extern MaterialPropertiesManager MaterialFXManager; extern MaterialPropertiesManager MaterialFXManager;
struct MaterialEffectResult struct MaterialPropertiesResult
{ {
MaterialPropertiesData* mat_effect = NULL; MaterialPropertiesData* mat_effect = NULL;
bool didRicochet = false; bool didRicochet = false;
@ -203,7 +203,7 @@ struct MaterialEffectResult
F32 finalDamageMultiplier = 1.0f; F32 finalDamageMultiplier = 1.0f;
}; };
MaterialEffectResult resolveImpact(BaseMatInstance* mat, MaterialPropertiesResult resolveImpact(BaseMatInstance* mat,
const VectorF& incomingVelocity, const VectorF& incomingVelocity,
const VectorF& surfaceNormal, const VectorF& surfaceNormal,
F32 impactForce, F32 impactForce,