mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-02 18:24:31 +00:00
rename struct to reflect naming convention
This commit is contained in:
parent
75e366c0dd
commit
e664a2e20c
2 changed files with 4 additions and 4 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue