From 74bdf2b0696a428ec85c9d6e4e1338360587c9ae Mon Sep 17 00:00:00 2001
From: Doug McDiarmid <dmcdiar@amazon.com>
Date: Wed, 26 May 2021 20:25:48 -0700
Subject: [PATCH] Minor changes: Updated comments and removed an include file.

---
 .../DiffuseProbeGridFeatureProcessorInterface.h                | 1 +
 .../Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGrid.h     | 1 +
 .../DiffuseProbeGrid/DiffuseProbeGridFeatureProcessor.cpp      | 3 ++-
 .../DiffuseProbeGrid/DiffuseProbeGridComponentController.cpp   | 2 +-
 .../DiffuseProbeGrid/EditorDiffuseProbeGridComponent.cpp       | 1 -
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessorInterface.h
index cf46383a64..73ce175d99 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessorInterface.h
@@ -109,6 +109,7 @@ namespace AZ
                 const AZStd::string& relocationTextureRelativePath,
                 const AZStd::string& classificationTextureRelativePath) = 0;
 
+            // check for and retrieve a new baked texture asset (does not apply to hot-reloaded assets, only initial bakes)
             virtual bool CheckTextureAssetNotification(
                 const AZStd::string& relativePath,
                 Data::Asset<RPI::StreamingImageAsset>& outTextureAsset,
diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGrid.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGrid.h
index 325cbcb616..ff6ad719cf 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGrid.h
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGrid.h
@@ -27,6 +27,7 @@ namespace AZ
 
         struct DiffuseProbeGridRenderData
         {
+            // [GFX TODO][ATOM-15650] Change DiffuseProbeGrid Classification texture to R8_UINT
             static const RHI::Format RayTraceImageFormat = RHI::Format::R32G32B32A32_FLOAT;
             static const RHI::Format IrradianceImageFormat = RHI::Format::R16G16B16A16_UNORM;
             static const RHI::Format DistanceImageFormat = RHI::Format::R32G32_FLOAT;
diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessor.cpp
index 11d7dc0385..060d51d1d0 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessor.cpp
@@ -352,7 +352,8 @@ namespace AZ
                 azrtti_typeid<AZ::RPI::StreamingImageAsset>(),
                 false);
 
-            // we only track notifications for new texture assets, existing assets are automatically reloaded by the RPI
+            // We only track notifications for new texture assets, meaning assets that are created the first time a DiffuseProbeGrid is baked.
+            // On subsequent bakes the existing assets are automatically reloaded by the RPI since they are already known by the asset system.
             if (!assetId.IsValid())
             {
                 m_notifyTextureAssets.push_back({ assetPath, assetId });
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/DiffuseProbeGridComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/DiffuseProbeGridComponentController.cpp
index 1ec09995fd..5fb835de15 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/DiffuseProbeGridComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/DiffuseProbeGridComponentController.cpp
@@ -128,7 +128,7 @@ namespace AZ
                     m_configuration.m_bakedRelocationTextureRelativePath,
                     m_configuration.m_bakedClassificationTextureRelativePath))
             {
-                // clear the baked texture paths and assets
+                // clear the baked texture paths and assets, since they belong to the original entity (not the clone)
                 m_configuration.m_bakedIrradianceTextureRelativePath.clear();
                 m_configuration.m_bakedDistanceTextureRelativePath.clear();
                 m_configuration.m_bakedRelocationTextureRelativePath.clear();
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/EditorDiffuseProbeGridComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/EditorDiffuseProbeGridComponent.cpp
index 162740fe1e..1e5b959803 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/EditorDiffuseProbeGridComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/EditorDiffuseProbeGridComponent.cpp
@@ -23,7 +23,6 @@
 AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
 #include <QApplication>
 #include <QMessageBox>
-#include <QProgressDialog>
 AZ_POP_DISABLE_WARNING
 
 namespace AZ