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

Fix weight blending in look modification postfx. (#1627)

Browse Source 
Signed-off-by: Robin <rbarrand@amazon.com>
This commit is contained in:
hershey5045
2021-06-28 19:49:35 -07:00
committed by GitHub
parent c45ec34f16
commit ccb784d7d5
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Feature/Common/Code/Source/PostProcess/LookModification/LookModificationSettings.cpp
+1 -12
View File
@@ -40,7 +40,6 @@ namespace AZ
void LookModificationSettings::ApplySettingsTo(LookModificationSettings* target, float alpha) const
{
AZ_UNUSED(alpha);
AZ_Assert(target != nullptr, "LookModificationSettings::ApplySettingsTo called with nullptr as argument.");
auto lutAssetId = GetColorGradingLut();
@@ -48,20 +47,10 @@ namespace AZ
{
Render::LutBlendItem lutBlend;
lutBlend.m_intensity = GetColorGradingLutIntensity();
lutBlend.m_overrideStrength = GetColorGradingLutOverride();
lutBlend.m_overrideStrength = GetColorGradingLutOverride() * alpha;
lutBlend.m_assetId = lutAssetId;
target->AddLutBlend(lutBlend);
}
// Auto-gen code to blend individual params based on their override value onto target settings
#define OVERRIDE_TARGET target
#define OVERRIDE_ALPHA alpha
#include <Atom/Feature/ParamMacros/StartOverrideBlend.inl>
#include <Atom/Feature/PostProcess/LookModification/LookModificationParams.inl>
#include <Atom/Feature/ParamMacros/EndParams.inl>
#undef OVERRIDE_TARGET
#undef OVERRIDE_ALPHA
}
void LookModificationSettings::Simulate(float deltaTime)