Merge pull request #1713 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15922

[ATOM-15922] ReflectionProbe does not refresh when changed to use an Authored cubemap
This commit is contained in:
dmcdiarmid-ly
2021-07-01 13:24:31 -07:00
committed by GitHub
@@ -214,11 +214,25 @@ namespace AZ
void ReflectionProbeComponentController::UpdateCubeMap()
{
// disconnect the asset bus since we might reconnect with a different asset
Data::AssetBus::MultiHandler::BusDisconnect();
Data::Asset<RPI::StreamingImageAsset>& cubeMapAsset =
m_configuration.m_useBakedCubemap ? m_configuration.m_bakedCubeMapAsset : m_configuration.m_authoredCubeMapAsset;
// this will invoke OnAssetReady()
Data::AssetBus::MultiHandler::BusConnect(cubeMapAsset.GetId());
if (cubeMapAsset.GetId().IsValid())
{
cubeMapAsset.QueueLoad();
// this will invoke OnAssetReady()
Data::AssetBus::MultiHandler::BusConnect(cubeMapAsset.GetId());
}
else
{
// clear the current cubemap
Data::Instance<RPI::Image> image = nullptr;
m_featureProcessor->SetProbeCubeMap(m_handle, image, {});
}
}
void ReflectionProbeComponentController::OnTransformChanged([[maybe_unused]] const AZ::Transform& local, const AZ::Transform& world)