birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replacing virtual function with default parameter with overloaded function

Browse Source
This commit is contained in:
greerdv
2021-05-06 15:11:11 +01:00
parent 368bf69ae6
commit 578cd47a0a
5 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Decals/DecalFeatureProcessorInterface.h
+4 -2
View File
@@ -88,8 +88,10 @@ namespace AZ
//! Sets the transform of the decal
//! Equivalent to calling SetDecalPosition() + SetDecalOrientation() + SetDecalHalfSize()
virtual void SetDecalTransform(DecalHandle handle, const AZ::Transform& world,
const AZ::Vector3& nonUniformScale = AZ::Vector3::CreateOne()) = 0;
//! @{
virtual void SetDecalTransform(DecalHandle handle, const AZ::Transform& world) = 0;
virtual void SetDecalTransform(DecalHandle handle, const AZ::Transform& world, const AZ::Vector3& nonUniformScale) = 0;
//! @}
//! Sets the material information for this decal
virtual void SetDecalMaterial(DecalHandle handle, const AZ::Data::AssetId) = 0;
Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.cpp
+5
View File
@@ -262,6 +262,11 @@ namespace AZ
}
}
void DecalFeatureProcessor::SetDecalTransform(DecalHandle handle, const AZ::Transform& world)
{
SetDecalTransform(handle, world, AZ::Vector3::CreateOne());
}
void DecalFeatureProcessor::SetDecalTransform(DecalHandle handle, const AZ::Transform& world, const AZ::Vector3& nonUniformScale)
{
// ATOM-4330
Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.h
+4 -2
View File
@@ -73,8 +73,10 @@ namespace AZ
//! Sets the transform of the decal
//! Equivalent to calling SetDecalPosition() + SetDecalOrientation() + SetDecalHalfSize()
void SetDecalTransform(DecalHandle handle, const AZ::Transform& world,
const AZ::Vector3& nonUniformScale = AZ::Vector3::CreateOne()) override;
//! @{
void SetDecalTransform(DecalHandle handle, const AZ::Transform& world) override;
void SetDecalTransform(DecalHandle handle, const AZ::Transform& world, const AZ::Vector3& nonUniformScale) override;
//! @}
//! Sets the material information for this decal
void SetDecalMaterial(DecalHandle handle, const AZ::Data::AssetId) override;
Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp
+5
View File
@@ -269,6 +269,11 @@ namespace AZ
}
}
void DecalTextureArrayFeatureProcessor::SetDecalTransform(DecalHandle handle, const AZ::Transform& world)
{
SetDecalTransform(handle, world, AZ::Vector3::CreateOne());
}
void DecalTextureArrayFeatureProcessor::SetDecalTransform(DecalHandle handle, const AZ::Transform& world,
const AZ::Vector3& nonUniformScale)
{
Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.h
+4 -2
View File
@@ -82,8 +82,10 @@ namespace AZ
//! Sets the transform of the decal
//! Equivalent to calling SetDecalPosition() + SetDecalOrientation() + SetDecalHalfSize()
void SetDecalTransform(const DecalHandle handle, const AZ::Transform& world,
const AZ::Vector3& nonUniformScale = AZ::Vector3::CreateOne()) override;
//! @{
void SetDecalTransform(const DecalHandle handle, const AZ::Transform& world) override;
void SetDecalTransform(const DecalHandle handle, const AZ::Transform& world, const AZ::Vector3& nonUniformScale) override;
//! @}
//! Sets the material information for this decal
void SetDecalMaterial(const DecalHandle handle, const AZ::Data::AssetId id) override;