Address PR comments.

Signed-off-by: John <[email protected]>

Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Mesh/AtomMeshBus.h → Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Mesh/MeshHandleStateBus.h

@@ -16,8 +16,8 @@ namespace AZ
 {
     namespace Render
     {
-        //! Bus for retrieving data about a given entity's Atom mesh.
-        class AtomMeshRequests
+        //! Bus for retrieving data about a given entity's mesh handle state.
+        class MeshHandleStateRequests
         : public AZ::EBusTraits
         {
         public:
@@ -25,14 +25,14 @@ namespace AZ
             static const EBusAddressPolicy AddressPolicy = EBusAddressPolicy::ById;
             using BusIdType = EntityId;
 
-            //! Returns the handle to the Atom mesh.
+            //! Returns the handle to the mesh.
             virtual const MeshFeatureProcessorInterface::MeshHandle* GetMeshHandle() const = 0;
         };
 
-        using AtomMeshRequestBus = EBus<AtomMeshRequests>;
+        using MeshHandleStateRequestBus = EBus<MeshHandleStateRequests>;
         
-        //! Bus for receiving notifications about a given entity's Atom mesh state.
-        class AtomMeshNotifications
+        //! Bus for receiving notifications about a given entity's mesh handle state.
+        class MeshHandleStateNotifications
         : public AZ::EBusTraits
         {
         public:
@@ -40,8 +40,8 @@ namespace AZ
             static const EBusAddressPolicy AddressPolicy = EBusAddressPolicy::ById;
             using BusIdType = EntityId;
 
-            //! Notification for when the Atom mesh handle has been acquired (and thus ready for use).
-            virtual void OnAcquireMesh(const MeshFeatureProcessorInterface::MeshHandle* meshHandle) = 0;
+            //! Notification for when the mesh handle has been set (and thus ready for use).
+            virtual void OnMeshHandleSet(const MeshFeatureProcessorInterface::MeshHandle* meshHandle) = 0;
 
             //! When connecting to this bus, if the handle is ready you will immediately get an OnMeshHandleAcquire notification.
             template<class Bus>
@@ -57,23 +57,23 @@ namespace AZ
                 {
                     AZ::EBusConnectionPolicy<Bus>::Connect(busPtr, context, handler, connectLock, id);
 
-                    // If this entity has no AtomMeshRequests handler treat this call as a no-op.
-                    if(!AtomMeshRequestBus::HasHandlers(id))
+                    // If this entity has no MeshHandleStateRequests handler treat this call as a no-op.
+                    if(!MeshHandleStateRequestBus::HasHandlers(id))
                     {
                         return;
                     }
 
-                    const MeshFeatureProcessorInterface::MeshHandle* meshHandle;
-                    AtomMeshRequestBus::EventResult(meshHandle, id, &AtomMeshRequestBus::Events::GetMeshHandle);
+                    const MeshFeatureProcessorInterface::MeshHandle* meshHandle = nullptr;
+                    MeshHandleStateRequestBus::EventResult(meshHandle, id, &MeshHandleStateRequestBus::Events::GetMeshHandle);
 
                     if (meshHandle && meshHandle->IsValid())
                     {
-                        handler->OnAcquireMesh(meshHandle);
+                        handler->OnMeshHandleSet(meshHandle);
                     }
                 }
             };
         };
 
-        using AtomMeshNotificationBus = EBus<AtomMeshNotifications>;
+        using MeshHandleStateNotificationBus = EBus<MeshHandleStateNotifications>;
     } // namespace Render
 } // namespace Render

Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.cpp

@@ -8,8 +8,8 @@
 
 #include <Mesh/MeshComponentController.h>
 
-#include <AtomLyIntegration/CommonFeatures/Mesh/AtomMeshBus.h>
 #include <AtomLyIntegration/CommonFeatures/Mesh/MeshComponentConstants.h>
+#include <AtomLyIntegration/CommonFeatures/Mesh/MeshHandleStateBus.h>
 
 #include <Atom/Feature/Mesh/MeshFeatureProcessor.h>
 
@@ -253,7 +253,7 @@ namespace AZ
 
             const auto entityContextId = FindOwningContextId(entityId);
             MeshComponentRequestBus::Handler::BusConnect(entityId);
-            AtomMeshRequestBus::Handler::BusConnect(entityId);
+            MeshHandleStateRequestBus::Handler::BusConnect(entityId);
             TransformNotificationBus::Handler::BusConnect(entityId);
             MaterialReceiverRequestBus::Handler::BusConnect(entityId);
             MaterialComponentNotificationBus::Handler::BusConnect(entityId);
@@ -276,7 +276,7 @@ namespace AZ
             MaterialReceiverRequestBus::Handler::BusDisconnect();
             TransformNotificationBus::Handler::BusDisconnect();
             MeshComponentRequestBus::Handler::BusDisconnect();
-            AtomMeshRequestBus::Handler::BusDisconnect();
+            MeshHandleStateRequestBus::Handler::BusDisconnect();
 
             m_nonUniformScaleChangedHandler.Disconnect();
 
@@ -407,7 +407,7 @@ namespace AZ
                 meshDescriptor.m_requiresCloneCallback = RequiresCloning;
                 meshDescriptor.m_isRayTracingEnabled = m_configuration.m_isRayTracingEnabled;
                 m_meshHandle = m_meshFeatureProcessor->AcquireMesh(meshDescriptor, materials);
-                AtomMeshNotificationBus::Event(entityId, &AtomMeshNotificationBus::Events::OnAcquireMesh, &m_meshHandle);
+                MeshHandleStateNotificationBus::Event(entityId, &MeshHandleStateNotificationBus::Events::OnMeshHandleSet, &m_meshHandle);
                 m_meshFeatureProcessor->ConnectModelChangeEventHandler(m_meshHandle, m_changeEventHandler);
 
                 const AZ::Transform& transform =

Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.h

@@ -25,7 +25,7 @@
 
 #include <AtomLyIntegration/CommonFeatures/Material/MaterialComponentBus.h>
 #include <AtomLyIntegration/CommonFeatures/Mesh/MeshComponentBus.h>
-#include <AtomLyIntegration/CommonFeatures/Mesh/AtomMeshBus.h>
+#include <AtomLyIntegration/CommonFeatures/Mesh/MeshHandleStateBus.h>
 
 namespace AZ
 {
@@ -60,7 +60,7 @@ namespace AZ
 
         class MeshComponentController final
             : private MeshComponentRequestBus::Handler
-            , private AtomMeshRequestBus::Handler
+            , private MeshHandleStateRequestBus::Handler
             , public AzFramework::BoundsRequestBus::Handler
             , public AzFramework::RenderGeometry::IntersectionRequestBus::Handler
             , private TransformNotificationBus::Handler
@@ -91,7 +91,7 @@ namespace AZ
         private:
             AZ_DISABLE_COPY(MeshComponentController);
 
-            // MeshComponentRequestBus::Handler overrides ...
+            // MeshComponentRequestBus overrides ...
             void SetModelAsset(Data::Asset<RPI::ModelAsset> modelAsset) override;
             Data::Asset<const RPI::ModelAsset> GetModelAsset() const override;
             void SetModelAssetId(Data::AssetId modelAssetId) override;
@@ -100,7 +100,7 @@ namespace AZ
             AZStd::string GetModelAssetPath() const override;
             AZ::Data::Instance<RPI::Model> GetModel() const override;
 
-            // AtomMeshRequestBus::Handler overrides ...
+            // AtomMeshRequestBus overrides ...
             const MeshFeatureProcessorInterface::MeshHandle* GetMeshHandle() const override;
 
             void SetSortKey(RHI::DrawItemSortKey sortKey) override;

Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_public_files.cmake

@@ -26,7 +26,7 @@ set(FILES
     Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentBus.h
     Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentConfig.h
     Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentConstants.h
-    Include/AtomLyIntegration/CommonFeatures/Mesh/AtomMeshBus.h
+    Include/AtomLyIntegration/CommonFeatures/Mesh/MeshHandleStateBus.h
     Include/AtomLyIntegration/CommonFeatures/Mesh/MeshComponentBus.h
     Include/AtomLyIntegration/CommonFeatures/Mesh/MeshComponentConstants.h
     Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxLayerBus.h

Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.cpp

@@ -623,7 +623,7 @@ namespace AZ::Render
         MaterialComponentNotificationBus::Handler::BusConnect(m_entityId);
         MeshComponentRequestBus::Handler::BusConnect(m_entityId);
         SkinnedMeshOverrideRequestBus::Handler::BusConnect(m_entityId);
-        AtomMeshRequestBus::Handler::BusConnect(m_entityId);
+        MeshHandleStateRequestBus::Handler::BusConnect(m_entityId);
 
         const Data::Instance<RPI::Model> model = m_meshFeatureProcessor->GetModel(*m_meshHandle);
         MeshComponentNotificationBus::Event(m_entityId, &MeshComponentNotificationBus::Events::OnModelReady, GetModelAsset(), model);
@@ -633,7 +633,7 @@ namespace AZ::Render
     {
         MeshComponentNotificationBus::Event(m_entityId, &MeshComponentNotificationBus::Events::OnModelPreDestroy);
 
-        AtomMeshRequestBus::Handler::BusDisconnect();
+        MeshHandleStateRequestBus::Handler::BusDisconnect();
         SkinnedMeshOverrideRequestBus::Handler::BusDisconnect(m_entityId);
         MeshComponentRequestBus::Handler::BusDisconnect();
         MaterialComponentNotificationBus::Handler::BusDisconnect();

Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.h

@@ -18,7 +18,7 @@
 #include <LmbrCentral/Animation/SkeletalHierarchyRequestBus.h>
 
 #include <AtomLyIntegration/CommonFeatures/Material/MaterialComponentBus.h>
-#include <AtomLyIntegration/CommonFeatures/Mesh/AtomMeshBus.h>
+#include <AtomLyIntegration/CommonFeatures/Mesh/MeshHandleStateBus.h>
 #include <AtomLyIntegration/CommonFeatures/Mesh/MeshComponentBus.h>
 #include <AtomLyIntegration/CommonFeatures/SkinnedMesh/SkinnedMeshOverrideBus.h>
 #include <Atom/Feature/SkinnedMesh/SkinnedMeshFeatureProcessorBus.h>
@@ -71,7 +71,7 @@ namespace AZ
             , private AZ::Render::SkinnedMeshOutputStreamNotificationBus::Handler
             , private LmbrCentral::SkeletalHierarchyRequestBus::Handler
             , private Data::AssetBus::MultiHandler
-            , private AtomMeshRequestBus::Handler
+            , private MeshHandleStateRequestBus::Handler
         {
         public:
             AZ_CLASS_ALLOCATOR_DECL;
@@ -182,7 +182,7 @@ namespace AZ
             void CreateRenderProxy(const MaterialAssignmentMap& materials);
 
         private:
-            // AtomMeshRequestBus::Handler overrides ...
+            // MeshHandleStateRequestBus overrides ...
             const MeshFeatureProcessorInterface::MeshHandle* GetMeshHandle() const override;
 
             void CreateSkinnedMeshInstance();

Gems/AtomLyIntegration/EditorModeFeedback/Code/Source/EditorModeFeedbackSystemComponent.cpp

@@ -167,7 +167,7 @@ namespace AZ
             {
                 return;
             }
- 
+
             if (!m_maskMaterial)
             {
                 m_maskMaterial = CreateMaskMaterial();

Gems/AtomLyIntegration/EditorModeFeedback/Code/Source/FocusedEntity/FocusedMeshEntity.cpp

@@ -17,6 +17,7 @@
 #include <Atom/RPI.Public/ViewportContext.h>
 #include <Atom/RPI.Public/ViewportContextBus.h>
 #include <AzCore/Component/TransformBus.h>
+#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
 
 namespace AZ
 {
@@ -31,14 +32,6 @@ namespace AZ
             return viewPtr;
         }
 
-        // Get the world transform for the specified entity
-        static AZ::Transform GetWorldTransformForEntity(EntityId entityId)
-        {
-            AZ::Transform worldTM;
-            AZ::TransformBus::EventResult(worldTM, entityId, &AZ::TransformBus::Events::GetWorldTM);
-            return worldTM;
-        }
-
         // Utility class for common drawable data
         class DrawableMetaData
         {
@@ -76,30 +69,30 @@ namespace AZ
             return m_featureProcessor;
         }
 
-        FocuseMeshdEntity::FocuseMeshdEntity(EntityId entityId, Data::Instance<RPI::Material> maskMaterial)
+        FocusedMeshEntity::FocusedMeshEntity(EntityId entityId, Data::Instance<RPI::Material> maskMaterial)
             : m_entityId(entityId)
             , m_maskMaterial(maskMaterial)
         {
-            AZ::Render::AtomMeshNotificationBus::Handler::BusConnect(m_entityId);
+            AZ::Render::MeshHandleStateNotificationBus::Handler::BusConnect(m_entityId);
         }
         
-        FocuseMeshdEntity::~FocuseMeshdEntity()
+        FocusedMeshEntity::~FocusedMeshEntity()
         {
-            AZ::Render::AtomMeshNotificationBus::Handler::BusDisconnect();
+            AZ::Render::MeshHandleStateNotificationBus::Handler::BusDisconnect();
         }
 
-        void FocuseMeshdEntity::ClearDrawData()
+        void FocusedMeshEntity::ClearDrawData()
         {
             m_modelLodIndex = RPI::ModelLodIndex::Null;
             m_meshDrawPackets.clear();
         }
         
-        bool FocuseMeshdEntity::CanDraw() const
+        bool FocusedMeshEntity::CanDraw() const
         {
             return !m_meshDrawPackets.empty();
         }
 
-        void FocuseMeshdEntity::Draw()
+        void FocusedMeshEntity::Draw()
         {
             if (!CanDraw())
             {
@@ -130,13 +123,13 @@ namespace AZ
             }
         }
          
-        RPI::ModelLodIndex FocuseMeshdEntity::GetModelLodIndex(const RPI::ViewPtr view, Data::Instance<RPI::Model> model) const
+        RPI::ModelLodIndex FocusedMeshEntity::GetModelLodIndex(const RPI::ViewPtr view, Data::Instance<RPI::Model> model) const
         {
-            const auto worldTM = GetWorldTransformForEntity(m_entityId);
+            const auto worldTM = AzToolsFramework::GetWorldTransform(m_entityId);
             return RPI::ModelLodUtils::SelectLod(view.get(), worldTM, *model);
         }
         
-        void FocuseMeshdEntity::OnAcquireMesh(const MeshFeatureProcessorInterface::MeshHandle* meshHandle)
+        void FocusedMeshEntity::OnMeshHandleSet(const MeshFeatureProcessorInterface::MeshHandle* meshHandle)
         {
             m_meshHandle = meshHandle;
             const DrawableMetaData drawabaleMetaData(m_entityId);
@@ -145,7 +138,7 @@ namespace AZ
             CreateOrUpdateMeshDrawPackets(drawabaleMetaData.GetFeatureProcessor(), modelLodIndex, model);
         }
         
-        void FocuseMeshdEntity::CreateOrUpdateMeshDrawPackets(
+        void FocusedMeshEntity::CreateOrUpdateMeshDrawPackets(
             const MeshFeatureProcessorInterface* featureProcessor, const RPI::ModelLodIndex modelLodIndex, Data::Instance<RPI::Model> model)
         {
             if (!m_meshHandle || !m_meshHandle->IsValid())
@@ -163,7 +156,7 @@ namespace AZ
             }
         }
 
-        void FocuseMeshdEntity::BuildMeshDrawPackets(
+        void FocusedMeshEntity::BuildMeshDrawPackets(
             const Data::Asset<RPI::ModelAsset> modelAsset, Data::Instance<RPI::ShaderResourceGroup> meshObjectSrg)
         {
             const Data::Asset<RPI::ModelLodAsset>& modelLodAsset = modelAsset->GetLodAssets()[m_modelLodIndex.m_index];
@@ -176,7 +169,7 @@ namespace AZ
             }
         }
 
-        Data::Instance<RPI::ShaderResourceGroup> FocuseMeshdEntity::CreateMaskShaderResourceGroup(
+        Data::Instance<RPI::ShaderResourceGroup> FocusedMeshEntity::CreateMaskShaderResourceGroup(
             const MeshFeatureProcessorInterface* featureProcessor) const
         {
             const auto& shaderAsset = m_maskMaterial->GetAsset()->GetMaterialTypeAsset()->GetShaderAssetForObjectSrg();

Gems/AtomLyIntegration/EditorModeFeedback/Code/Source/FocusedEntity/FocusedMeshEntity.h

@@ -11,7 +11,7 @@
 #include <Atom/RPI.Public/MeshDrawPacket.h>
 #include <Atom/RPI.Reflect/Model/ModelLodIndex.h>
 #include <AtomCore/Instance/Instance.h>
-#include <AtomLyIntegration/CommonFeatures/Mesh/AtomMeshBus.h>
+#include <AtomLyIntegration/CommonFeatures/Mesh/MeshHandleStateBus.h>
 #include <AzCore/std/containers/vector.h>
 
 namespace AZ
@@ -20,12 +20,12 @@ namespace AZ
     {
         //! Representation of a focused entity's Atom mesh (if any).
         //! @note It is not an error for an entity to not have any Atom mesh.
-        class FocuseMeshdEntity
-            : private AZ::Render::AtomMeshNotificationBus::Handler
+        class FocusedMeshEntity
+            : private AZ::Render::MeshHandleStateNotificationBus::Handler
         {
         public:
-            FocuseMeshdEntity(EntityId entityId, Data::Instance<RPI::Material> maskMaterial);
-            ~FocuseMeshdEntity();
+            FocusedMeshEntity(EntityId entityId, Data::Instance<RPI::Material> maskMaterial);
+            ~FocusedMeshEntity();
 
             //! Returns true if this entity can be drawn, otherwise false.
             bool CanDraw() const;
@@ -38,8 +38,8 @@ namespace AZ
             //! Retrieves the levol of detail index for this entity's Atom mesh.
             RPI::ModelLodIndex GetModelLodIndex(const RPI::ViewPtr view, Data::Instance<RPI::Model> model) const;
 
-            //AtomMeshNotificationBus overrides ...
-            void OnAcquireMesh(const MeshFeatureProcessorInterface::MeshHandle* meshHandle) override;
+            // MeshHandleStateNotificationBus overrides ...
+            void OnMeshHandleSet(const MeshFeatureProcessorInterface::MeshHandle* meshHandle) override;
 
             //! Builds the entity's drawable mesh data from scratch, overwriting any existing data.
             void CreateOrUpdateMeshDrawPackets(

Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp

@@ -437,7 +437,6 @@ namespace WhiteBox
                 }
 
                 // generate the mesh
-                // TODO: LYN-786
                 (*m_renderMesh)->BuildMesh(m_renderData, m_worldFromLocal);
             }
         }

Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAtomRenderMesh.cpp

@@ -27,12 +27,12 @@ namespace WhiteBox
     AtomRenderMesh::AtomRenderMesh(AZ::EntityId entityId)
         : m_entityId(entityId)
     {
-        AZ::Render::AtomMeshRequestBus::Handler::BusConnect(m_entityId);
+        AZ::Render::MeshHandleStateRequestBus::Handler::BusConnect(m_entityId);
     }
 
     AtomRenderMesh::~AtomRenderMesh()
     {
-        AZ::Render::AtomMeshRequestBus::Handler::BusDisconnect();
+        AZ::Render::MeshHandleStateRequestBus::Handler::BusDisconnect();
     }
 
     bool AtomRenderMesh::AreAttributesValid() const
@@ -189,7 +189,7 @@ namespace WhiteBox
 
         m_meshFeatureProcessor->ReleaseMesh(m_meshHandle);
         m_meshHandle = m_meshFeatureProcessor->AcquireMesh(AZ::Render::MeshHandleDescriptor{ m_modelAsset });
-        AZ::Render::AtomMeshNotificationBus::Event(m_entityId, &AZ::Render::AtomMeshNotificationBus::Events::OnAcquireMesh, &m_meshHandle);
+        AZ::Render::MeshHandleStateNotificationBus::Event(m_entityId, &AZ::Render::MeshHandleStateNotificationBus::Events::OnMeshHandleSet, &m_meshHandle);
 
         return true;
     }
@@ -203,7 +203,6 @@ namespace WhiteBox
     {
         if (!CreateLodAsset(meshData))
         {
-            // TODO: LYN-808
             return false;
         }
 
@@ -211,7 +210,6 @@ namespace WhiteBox
 
         if (!CreateModel())
         {
-            // TODO: LYN-808
             return false;
         }
 
@@ -239,7 +237,6 @@ namespace WhiteBox
         {
             if (!CreateMesh(meshData))
             {
-                // TODO: LYN-808
                 return;
             }
         }
@@ -247,7 +244,6 @@ namespace WhiteBox
         {
             if (!UpdateMeshBuffers(meshData))
             {
-                // TODO: LYN-808
                 return;
             }
         }
@@ -262,7 +258,6 @@ namespace WhiteBox
 
     void AtomRenderMesh::UpdateMaterial([[maybe_unused]] const WhiteBoxMaterial& material)
     {
-        // TODO: LYN-784
         // colors: vertex colors probs not used.
         // (use constant color for material -> material editor)
         //
@@ -294,13 +289,11 @@ namespace WhiteBox
 
     bool AtomRenderMesh::IsVisible() const
     {
-        // TODO: LYN-788
         return true;
     }
 
     void AtomRenderMesh::SetVisiblity([[maybe_unused]] bool visibility)
     {
-        // TODO: LYN-788
         // hide: m_meshFeatureProcessor->ReleaseMesh(m_meshHandle);
         // show: m_meshHandle = m_meshFeatureProcessor->AcquireMesh(m_modelAsset);
     }

Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAtomRenderMesh.h

@@ -14,7 +14,7 @@
 #include <Rendering/WhiteBoxRenderMeshInterface.h>
 
 #include <Atom/Feature/Mesh/MeshFeatureProcessorInterface.h>
-#include <AtomLyIntegration/CommonFeatures/Mesh/AtomMeshBus.h>
+#include <AtomLyIntegration/CommonFeatures/Mesh/MeshHandleStateBus.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Name/Name.h>
 
@@ -32,13 +32,13 @@ namespace WhiteBox
     //! A concrete implementation of RenderMeshInterface to support Atom rendering for the White Box Tool.
     class AtomRenderMesh
         : public RenderMeshInterface
-        , private AZ::Render::AtomMeshRequestBus::Handler
+        , private AZ::Render::MeshHandleStateRequestBus::Handler
 
     {
     public:
         AZ_RTTI(AtomRenderMesh, "{1F48D2F5-037C-400B-977C-7C0C9A34B84C}", RenderMeshInterface);
 
-        AtomRenderMesh(AZ::EntityId entityId);
+        explicit AtomRenderMesh(AZ::EntityId entityId);
         ~AtomRenderMesh();
 
         // RenderMeshInterface ...
@@ -67,7 +67,7 @@ namespace WhiteBox
             att->UpdateData(data);
         }
 
-        // AtomMeshRequestBus::Handler overrides ...
+        // AtomMeshRequestBus overrides ...
         const AZ::Render::MeshFeatureProcessorInterface::MeshHandle* GetMeshHandle() const override;
 
         bool CreateMeshBuffers(const WhiteBoxMeshAtomData& meshData);
@@ -99,7 +99,6 @@ namespace WhiteBox
             m_attributes;
 
         //! Default white box mesh material.
-        // TODO: LYN-784
         static constexpr AZStd::string_view TexturedMaterialPath = "materials/defaultpbr.azmaterial";
         static constexpr AZStd::string_view SolidMaterialPath = "materials/defaultpbr.azmaterial";
         static constexpr AZ::RPI::ModelMaterialSlot::StableId OneMaterialSlotId = 0;

Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxMeshAtomData.cpp

@@ -52,7 +52,6 @@ namespace WhiteBox
         }
 
         // calculate the basis vectors for the TBN matrices
-        // TODO: LYN-782
         AZTangentSpaceCalculation tangentSpaceCalculation;
         tangentSpaceCalculation.Calculate(positions, m_indices, uvs);
 

Gems/WhiteBox/Code/Source/Rendering/WhiteBoxNullRenderMesh.cpp

@@ -10,7 +10,6 @@
 
 namespace WhiteBox
 {
-    // TODO: LYN-786
     void WhiteBoxNullRenderMesh::BuildMesh(
         [[maybe_unused]] const WhiteBoxRenderData& renderData, [[maybe_unused]] const AZ::Transform& worldFromLocal)
     {

Gems/WhiteBox/Code/Source/Rendering/WhiteBoxNullRenderMesh.h

@@ -18,8 +18,7 @@ namespace WhiteBox
         AZ_RTTI(WhiteBoxNullRenderMesh, "{99230D4D-5592-4A41-8BAB-60C1B7C1785D}", RenderMeshInterface);
 
         // RenderMeshInterface ...
-        void BuildMesh(const WhiteBoxRenderData& renderData, const AZ::Transform& worldFromLocal)
-            override; // TODO: LYN-786
+        void BuildMesh(const WhiteBoxRenderData& renderData, const AZ::Transform& worldFromLocal) override;
         void UpdateTransform(const AZ::Transform& worldFromLocal) override;
         void UpdateMaterial(const WhiteBoxMaterial& material) override;
         bool IsVisible() const override;

Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderMeshInterface.h

@@ -31,7 +31,7 @@ namespace WhiteBox
 
         //! Take White Box render data and populate the render mesh from it.
         virtual void BuildMesh(
-            const WhiteBoxRenderData& renderData, const AZ::Transform& worldFromLocal) = 0; // TODO: LYN-786
+            const WhiteBoxRenderData& renderData, const AZ::Transform& worldFromLocal) = 0;
 
         //! Update the transform of the render mesh.
         virtual void UpdateTransform(const AZ::Transform& worldFromLocal) = 0;

Gems/WhiteBox/Code/Source/WhiteBoxComponent.cpp

@@ -41,7 +41,6 @@ namespace WhiteBox
         AZ::TransformBus::EventResult(worldFromLocal, entityId, &AZ::TransformBus::Events::GetWorldTM);
 
         // generate the mesh
-        // TODO: LYN-786
         m_renderMesh->BuildMesh(m_whiteBoxRenderData, worldFromLocal);
         m_renderMesh->SetVisiblity(m_whiteBoxRenderData.m_material.m_visible);