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

Merge pull request #1674 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15902

Browse Source 
[ATOM-15902] Reflection probes occasionally fail to hot-reload
This commit is contained in:
dmcdiarmid-ly
2021-06-30 11:36:52 -07:00
committed by GitHub
parent 8d2154af26 09aba94da7
commit 89f4872469
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.cpp
+16 -18
View File
@@ -149,22 +149,11 @@ namespace AZ
// load cubemap
Data::Asset<RPI::StreamingImageAsset>& cubeMapAsset =
m_configuration.m_useBakedCubemap ? m_configuration.m_bakedCubeMapAsset : m_configuration.m_authoredCubeMapAsset;
Data::AssetBus::MultiHandler::BusConnect(cubeMapAsset.GetId());
const AZStd::string& relativePath =
m_configuration.m_useBakedCubemap ? m_configuration.m_bakedCubeMapRelativePath : m_configuration.m_authoredCubeMapAsset.GetHint();
if (cubeMapAsset.GetId().IsValid())
{
if (cubeMapAsset.IsReady())
{
Data::Instance<RPI::Image> image = RPI::StreamingImage::FindOrCreate(cubeMapAsset);
m_featureProcessor->SetProbeCubeMap(m_handle, image, relativePath);
}
else
{
cubeMapAsset.QueueLoad();
}
cubeMapAsset.QueueLoad();
Data::AssetBus::MultiHandler::BusConnect(cubeMapAsset.GetId());
}
}
@@ -201,6 +190,18 @@ namespace AZ
m_featureProcessor->SetProbeCubeMap(m_handle, image, relativePath);
}
void ReflectionProbeComponentController::OnAssetReloaded(Data::Asset<Data::AssetData> asset)
{
if (m_configuration.m_useBakedCubemap)
{
m_configuration.m_bakedCubeMapAsset = asset;
}
else
{
m_configuration.m_authoredCubeMapAsset = asset;
}
}
void ReflectionProbeComponentController::SetConfiguration(const ReflectionProbeComponentConfig& config)
{
m_configuration = config;
@@ -216,11 +217,8 @@ namespace AZ
Data::Asset<RPI::StreamingImageAsset>& cubeMapAsset =
m_configuration.m_useBakedCubemap ? m_configuration.m_bakedCubeMapAsset : m_configuration.m_authoredCubeMapAsset;
const AZStd::string& relativePath =
m_configuration.m_useBakedCubemap ? m_configuration.m_bakedCubeMapRelativePath : m_configuration.m_authoredCubeMapAsset.GetHint();
Data::Instance<RPI::Image> image = RPI::StreamingImage::FindOrCreate(cubeMapAsset);
m_featureProcessor->SetProbeCubeMap(m_handle, image, relativePath);
// this will invoke OnAssetReady()
Data::AssetBus::MultiHandler::BusConnect(cubeMapAsset.GetId());
}
void ReflectionProbeComponentController::OnTransformChanged([[maybe_unused]] const AZ::Transform& local, const AZ::Transform& world)
Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.h
+1
View File
@@ -114,6 +114,7 @@ namespace AZ
// Data::AssetBus overrides ...
void OnAssetReady(Data::Asset<Data::AssetData> asset) override;
void OnAssetReloaded(Data::Asset<Data::AssetData> asset) override;
// TransformNotificationBus overrides ...
void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;