Преглед изворни кода

Adding namespace in front of MeshHandleDescriptor to fix the non-unity build (#133)

Tommy Walton пре 4 година
родитељ
комит
31c0fdc161

+ 1 - 1
Gem/Code/Source/MaterialHotReloadTestComponent.cpp

@@ -319,7 +319,7 @@ namespace AtomSampleViewer
             m_material = Material::Create(m_materialAsset);
 
             Transform meshTransform = Transform::CreateFromQuaternion(Quaternion::CreateFromAxisAngle(Vector3::CreateAxisX(), -AZ::Constants::HalfPi));
-            m_meshHandle = m_meshFeatureProcessor->AcquireMesh(MeshHandleDescriptor{ m_modelAsset }, m_material);
+            m_meshHandle = m_meshFeatureProcessor->AcquireMesh(AZ::Render::MeshHandleDescriptor{ m_modelAsset }, m_material);
             m_meshFeatureProcessor->SetTransform(m_meshHandle, meshTransform);
 
             Data::Instance<RPI::Model> model = GetMeshFeatureProcessor()->GetModel(m_meshHandle);

+ 2 - 2
Gem/Code/Source/MeshExampleComponent.cpp

@@ -362,7 +362,7 @@ namespace AtomSampleViewer
 
             m_modelAsset.Create(m_modelBrowser.GetSelectedAssetId());
             GetMeshFeatureProcessor()->ReleaseMesh(m_meshHandle);
-            m_meshHandle = GetMeshFeatureProcessor()->AcquireMesh(MeshHandleDescriptor{ m_modelAsset }, m_materialOverrideInstance);
+            m_meshHandle = GetMeshFeatureProcessor()->AcquireMesh(AZ::Render::MeshHandleDescriptor{ m_modelAsset }, m_materialOverrideInstance);
             GetMeshFeatureProcessor()->SetTransform(m_meshHandle, AZ::Transform::CreateIdentity());
             GetMeshFeatureProcessor()->ConnectModelChangeEventHandler(m_meshHandle, m_changedHandler);
             GetMeshFeatureProcessor()->SetLodOverride(m_meshHandle, m_lodOverride);
@@ -375,7 +375,7 @@ namespace AtomSampleViewer
     
     void MeshExampleComponent::CreateGroundPlane()
     {
-        m_groundPlandMeshHandle = GetMeshFeatureProcessor()->AcquireMesh(MeshHandleDescriptor{ m_groundPlaneModelAsset }, m_groundPlaneMaterial);
+        m_groundPlandMeshHandle = GetMeshFeatureProcessor()->AcquireMesh(AZ::Render::MeshHandleDescriptor{ m_groundPlaneModelAsset }, m_groundPlaneMaterial);
     }
 
     void MeshExampleComponent::UpdateGroundPlane()