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

Enable fog in physical sky component to blend with deferred fog (#1320)

Browse Source
This commit is contained in:
hershey5045
2021-06-18 13:39:11 -07:00
committed by GitHub
parent 1ad6264d0d
commit c127a044d4
17 changed files with 335 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentController.cpp
+53 -5
View File
@@ -12,8 +12,6 @@
#include <SkyBox/PhysicalSkyComponentController.h>
#include <AzCore/RTTI/BehaviorContext.h>
#include <Atom/RPI.Public/Scene.h>
namespace AZ
@@ -34,6 +32,9 @@ namespace AZ
if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
{
behaviorContext->EBus<PhysicalSkyRequestBus>("PhysicalSkyRequestBus")
->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
->Attribute(AZ::Script::Attributes::Category, "render")
->Attribute(AZ::Script::Attributes::Module, "render")
->Event("SetTurbidity", &PhysicalSkyRequestBus::Events::SetTurbidity)
->Event("GetTurbidity", &PhysicalSkyRequestBus::Events::GetTurbidity)
->Event("SetSunRadiusFactor", &PhysicalSkyRequestBus::Events::SetSunRadiusFactor)
@@ -76,7 +77,7 @@ namespace AZ
m_featureProcessorInterface = RPI::Scene::GetFeatureProcessorForEntity<SkyBoxFeatureProcessorInterface>(entityId);
// only activate if there is no other skybox activate
if (!m_featureProcessorInterface->IsEnable())
if (!m_featureProcessorInterface->IsEnabled())
{
m_featureProcessorInterface->SetSkyboxMode(SkyBoxMode::PhysicalSky);
m_featureProcessorInterface->Enable(true);
@@ -95,8 +96,10 @@ namespace AZ
const AZ::Transform& transform = m_transformInterface ? m_transformInterface->GetWorldTM() : Transform::Identity();
m_featureProcessorInterface->SetSunPosition(GetSunTransform(transform));
m_featureProcessorInterface->SetFogSettings(m_configuration.m_skyBoxFogSettings);
PhysicalSkyRequestBus::Handler::BusConnect(m_entityId);
SkyBoxFogRequestBus::Handler::BusConnect(m_entityId);
TransformNotificationBus::Handler::BusConnect(m_entityId);
m_isActive = true;
@@ -113,8 +116,9 @@ namespace AZ
// Run deactivate if this skybox is activate
if (m_isActive)
{
PhysicalSkyRequestBus::Handler::BusDisconnect(m_entityId);
TransformNotificationBus::Handler::BusDisconnect(m_entityId);
PhysicalSkyRequestBus::Handler::BusDisconnect();
SkyBoxFogRequestBus::Handler::BusDisconnect();
TransformNotificationBus::Handler::BusDisconnect();
m_featureProcessorInterface->Enable(false);
m_featureProcessorInterface = nullptr;
@@ -229,5 +233,49 @@ namespace AZ
return SunPosition(atan2(sunPosition.GetZ(), sunPosition.GetX()), asin(sunPosition.GetY()));
}
void PhysicalSkyComponentController::SetEnabled(bool enable)
{
m_configuration.m_skyBoxFogSettings.m_enable = enable;
m_featureProcessorInterface->SetFogEnabled(enable);
}
bool PhysicalSkyComponentController::IsEnabled() const
{
return m_configuration.m_skyBoxFogSettings.m_enable;
}
void PhysicalSkyComponentController::SetColor(const AZ::Color& color)
{
m_configuration.m_skyBoxFogSettings.m_color = color;
m_featureProcessorInterface->SetFogColor(color);
}
const AZ::Color& PhysicalSkyComponentController::GetColor() const
{
return m_configuration.m_skyBoxFogSettings.m_color;
}
void PhysicalSkyComponentController::SetTopHeight(float topHeight)
{
m_configuration.m_skyBoxFogSettings.m_topHeight = topHeight;
m_featureProcessorInterface->SetFogTopHeight(topHeight);
}
float PhysicalSkyComponentController::GetTopHeight() const
{
return m_configuration.m_skyBoxFogSettings.m_topHeight;
}
void PhysicalSkyComponentController::SetBottomHeight(float bottomHeight)
{
m_configuration.m_skyBoxFogSettings.m_bottomHeight = bottomHeight;
m_featureProcessorInterface->SetFogBottomHeight(bottomHeight);
}
float PhysicalSkyComponentController::GetBottomHeight() const
{
return m_configuration.m_skyBoxFogSettings.m_bottomHeight;
}
}
}