Merge pull request #481 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-17749

DiffuseProbeGrid Gem

Gem/Code/CMakeLists.txt

@@ -45,6 +45,7 @@ ly_add_target(
             Gem::Atom_Component_DebugCamera.Static
             Gem::AtomSampleViewer.Lib.Static
             Gem::Profiler.Static
+            Gem::DiffuseProbeGrid.Static
 )
 
 ly_add_target(

Gem/Code/Source/DiffuseGIExampleComponent.cpp

@@ -384,8 +384,8 @@ namespace AtomSampleViewer
         
         m_directionalLightPitch = AZ::DegToRad(-65.0f);
         m_directionalLightYaw = AZ::DegToRad(65.0f);
-        m_directionalLightColor = AZ::Color(0.92f, 0.78f, 0.35f, 1.0f);
-        m_directionalLightIntensity = 30.0f;
+        m_directionalLightColor = AZ::Color(1.0f, 0.9f, 0.6f, 1.0f);
+        m_directionalLightIntensity = 20.0f;
 
         m_pointLightPos = AZ::Vector3(9.2f, -3.7f, 1.0f);
         m_pointLightColor = AZ::Color(1.0f, 0.0f, 0.0f, 1.0f);

Gem/Code/Source/DiffuseGIExampleComponent.h

@@ -20,8 +20,8 @@
 #include <Atom/Feature/Mesh/MeshFeatureProcessorInterface.h>
 #include <Atom/Feature/CoreLights/PointLightFeatureProcessorInterface.h>
 #include <Atom/Feature/CoreLights/DirectionalLightFeatureProcessorInterface.h>
-#include <Atom/Feature/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessorInterface.h>
-#include <Atom/Feature/DiffuseGlobalIllumination/DiffuseGlobalIlluminationFeatureProcessorInterface.h>
+#include <DiffuseProbeGrid/DiffuseProbeGridFeatureProcessorInterface.h>
+#include <DiffuseProbeGrid/DiffuseGlobalIlluminationFeatureProcessorInterface.h>
 
 namespace AtomSampleViewer
 {
@@ -164,7 +164,7 @@ namespace AtomSampleViewer
         // diffuse IBL (Sponza only)
         bool m_useDiffuseIbl = true;
         AZ::Data::Asset<AZ::RPI::StreamingImageAsset> m_diffuseImageAsset;
-        float m_diffuseIblExposure = 2.0f;
+        float m_diffuseIblExposure = 1.0f;
 
         // shadow settings
         static const AZ::Render::ShadowmapSize s_shadowmapSizes[];

Gem/Code/enabled_gems.cmake

@@ -23,4 +23,5 @@ set(ENABLED_GEMS
     MaterialEditor
     UiBasics
     StreamerProfiler
+    DiffuseProbeGrid
 )