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

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFeatureProcessor.cpp
+14 -15
View File
@@ -82,21 +82,18 @@ namespace AZ
// Find the relevant indices in the scene srg
m_sceneSrg = GetParentScene()->GetShaderResourceGroup();
m_skyboxEnableIndex = m_sceneSrg->FindShaderInputConstantIndex(Name("m_enable"));
m_physicalSkyBufferIndex = m_sceneSrg->FindShaderInputBufferIndex(Name("m_physicalSkyData"));
m_physicalSkyIndex = m_sceneSrg->FindShaderInputConstantIndex(Name("m_physicalSky"));
m_cubemapIndex = m_sceneSrg->FindShaderInputImageIndex(Name("m_skyboxCubemap"));
m_cubemapRotationMatrixIndex = m_sceneSrg->FindShaderInputConstantIndex(Name("m_cubemapRotationMatrix"));
m_cubemapExposureIndex = m_sceneSrg->FindShaderInputConstantIndex(Name("m_cubemapExposure"));
AZ_Error(FeatureProcessorName, m_skyboxEnableIndex.IsValid(), "Unable to find m_enable in scene shader resource group.");
AZ_Error(FeatureProcessorName, m_physicalSkyBufferIndex.IsValid(), "Unable to find m_physicalSkyData in scene shader resource group.");
AZ_Error(FeatureProcessorName, m_physicalSkyIndex.IsValid(), "Unable to find m_useCubemap in scene shader resource group.");
AZ_Error(FeatureProcessorName, m_cubemapIndex.IsValid(), "Unable to find m_skyboxCubemap in scene shader resource group.");
AZ_Error(FeatureProcessorName, m_cubemapRotationMatrixIndex.IsValid(), "Unable to find m_cubemapRotationMatrix in scene shader resource group.");
AZ_Error(FeatureProcessorName, m_cubemapExposureIndex.IsValid(), "Unable to find m_cubemapExposure in scene shader resource group.");
m_skyboxEnableIndex.Reset();
m_physicalSkyBufferIndex.Reset();
m_physicalSkyIndex.Reset();
m_cubemapIndex.Reset();
m_cubemapRotationMatrixIndex.Reset();
m_cubemapExposureIndex.Reset();
m_sceneSrg->SetBufferView(m_physicalSkyBufferIndex, m_buffer->GetBufferView());
if (m_buffer)
{
m_sceneSrg->SetBufferView(m_physicalSkyBufferIndex, m_buffer->GetBufferView());
}
}
void SkyBoxFeatureProcessor::Deactivate()
@@ -154,8 +151,10 @@ namespace AZ
AZ::Vector4 artistParams = AZ::Vector4(m_skyIntensity.GetIntensity(), m_sunIntensity.GetIntensity(), 0.0f, 0.0f);
artistParams.StoreToFloat4(m_physicalSkyData.m_physicalSkyAndSunIntensity.data());
m_buffer->UpdateData(&m_physicalSkyData, sizeof(PhysicalSkyData));
if (m_buffer)
{
m_buffer->UpdateData(&m_physicalSkyData, sizeof(PhysicalSkyData));
}
m_skyNeedUpdate = false;
m_sunNeedUpdate = false;
m_mapBuffer = false;