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

Renamed MaterialFunctor code to use propertyId instead of propertyName, because 'name' is us for the short name of a property and 'ID' is for the full name including groups.

Browse Source 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
monroegm-disable-blank-issue-2
santorac 4 years ago
parent 90e34e8649
commit a352807c87
2 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File

28
Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialFunctor.h
Unescape Escape View File

@ -91,11 +91,11 @@ namespace AZ
//! Get the property value. The type must be one of those in MaterialPropertyValue. //! Get the property value. The type must be one of those in MaterialPropertyValue.
//! Otherwise, a compile error will be reported. //! Otherwise, a compile error will be reported.
template<typename Type> template<typename Type>
const Type& GetMaterialPropertyValue(const Name& propertyName) const; const Type& GetMaterialPropertyValue(const Name& propertyId) const;
template<typename Type> template<typename Type>
const Type& GetMaterialPropertyValue(const MaterialPropertyIndex& index) const; const Type& GetMaterialPropertyValue(const MaterialPropertyIndex& index) const;
//! Get the property value. GetMaterialPropertyValue<T>() is equivalent to GetMaterialPropertyValue().GetValue<T>(). //! Get the property value. GetMaterialPropertyValue<T>() is equivalent to GetMaterialPropertyValue().GetValue<T>().
const MaterialPropertyValue& GetMaterialPropertyValue(const Name& propertyName) const; const MaterialPropertyValue& GetMaterialPropertyValue(const Name& propertyId) const;
const MaterialPropertyValue& GetMaterialPropertyValue(const MaterialPropertyIndex& index) const; const MaterialPropertyValue& GetMaterialPropertyValue(const MaterialPropertyIndex& index) const;
const MaterialPropertiesLayout* GetMaterialPropertiesLayout() const { return m_materialPropertiesLayout.get(); } const MaterialPropertiesLayout* GetMaterialPropertiesLayout() const { return m_materialPropertiesLayout.get(); }
@ -164,19 +164,19 @@ namespace AZ
{ {
friend class LuaMaterialFunctorEditorContext; friend class LuaMaterialFunctorEditorContext;
public: public:
const MaterialPropertyDynamicMetadata* GetMaterialPropertyMetadata(const Name& propertyName) const; const MaterialPropertyDynamicMetadata* GetMaterialPropertyMetadata(const Name& propertyId) const;
const MaterialPropertyDynamicMetadata* GetMaterialPropertyMetadata(const MaterialPropertyIndex& index) const; const MaterialPropertyDynamicMetadata* GetMaterialPropertyMetadata(const MaterialPropertyIndex& index) const;
const MaterialPropertyGroupDynamicMetadata* GetMaterialPropertyGroupMetadata(const Name& propertyName) const; const MaterialPropertyGroupDynamicMetadata* GetMaterialPropertyGroupMetadata(const Name& propertyId) const;
//! Get the property value. The type must be one of those in MaterialPropertyValue. //! Get the property value. The type must be one of those in MaterialPropertyValue.
//! Otherwise, a compile error will be reported. //! Otherwise, a compile error will be reported.
template<typename Type> template<typename Type>
const Type& GetMaterialPropertyValue(const Name& propertyName) const; const Type& GetMaterialPropertyValue(const Name& propertyId) const;
template<typename Type> template<typename Type>
const Type& GetMaterialPropertyValue(const MaterialPropertyIndex& index) const; const Type& GetMaterialPropertyValue(const MaterialPropertyIndex& index) const;
//! Get the property value. GetMaterialPropertyValue<T>() is equivalent to GetMaterialPropertyValue().GetValue<T>(). //! Get the property value. GetMaterialPropertyValue<T>() is equivalent to GetMaterialPropertyValue().GetValue<T>().
const MaterialPropertyValue& GetMaterialPropertyValue(const Name& propertyName) const; const MaterialPropertyValue& GetMaterialPropertyValue(const Name& propertyId) const;
const MaterialPropertyValue& GetMaterialPropertyValue(const MaterialPropertyIndex& index) const; const MaterialPropertyValue& GetMaterialPropertyValue(const MaterialPropertyIndex& index) const;
const MaterialPropertiesLayout* GetMaterialPropertiesLayout() const { return m_materialPropertiesLayout.get(); } const MaterialPropertiesLayout* GetMaterialPropertiesLayout() const { return m_materialPropertiesLayout.get(); }
@ -184,22 +184,22 @@ namespace AZ
MaterialPropertyPsoHandling GetMaterialPropertyPsoHandling() const { return MaterialPropertyPsoHandling::Allowed; } MaterialPropertyPsoHandling GetMaterialPropertyPsoHandling() const { return MaterialPropertyPsoHandling::Allowed; }
//! Set the visibility dynamic metadata of a material property. //! Set the visibility dynamic metadata of a material property.
bool SetMaterialPropertyVisibility(const Name& propertyName, MaterialPropertyVisibility visibility); bool SetMaterialPropertyVisibility(const Name& propertyId, MaterialPropertyVisibility visibility);
bool SetMaterialPropertyVisibility(const MaterialPropertyIndex& index, MaterialPropertyVisibility visibility); bool SetMaterialPropertyVisibility(const MaterialPropertyIndex& index, MaterialPropertyVisibility visibility);
bool SetMaterialPropertyDescription(const Name& propertyName, AZStd::string description); bool SetMaterialPropertyDescription(const Name& propertyId, AZStd::string description);
bool SetMaterialPropertyDescription(const MaterialPropertyIndex& index, AZStd::string description); bool SetMaterialPropertyDescription(const MaterialPropertyIndex& index, AZStd::string description);
bool SetMaterialPropertyMinValue(const Name& propertyName, const MaterialPropertyValue& min); bool SetMaterialPropertyMinValue(const Name& propertyId, const MaterialPropertyValue& min);
bool SetMaterialPropertyMinValue(const MaterialPropertyIndex& index, const MaterialPropertyValue& min); bool SetMaterialPropertyMinValue(const MaterialPropertyIndex& index, const MaterialPropertyValue& min);
bool SetMaterialPropertyMaxValue(const Name& propertyName, const MaterialPropertyValue& max); bool SetMaterialPropertyMaxValue(const Name& propertyId, const MaterialPropertyValue& max);
bool SetMaterialPropertyMaxValue(const MaterialPropertyIndex& index, const MaterialPropertyValue& max); bool SetMaterialPropertyMaxValue(const MaterialPropertyIndex& index, const MaterialPropertyValue& max);
bool SetMaterialPropertySoftMinValue(const Name& propertyName, const MaterialPropertyValue& min); bool SetMaterialPropertySoftMinValue(const Name& propertyId, const MaterialPropertyValue& min);
bool SetMaterialPropertySoftMinValue(const MaterialPropertyIndex& index, const MaterialPropertyValue& min); bool SetMaterialPropertySoftMinValue(const MaterialPropertyIndex& index, const MaterialPropertyValue& min);
bool SetMaterialPropertySoftMaxValue(const Name& propertyName, const MaterialPropertyValue& max); bool SetMaterialPropertySoftMaxValue(const Name& propertyId, const MaterialPropertyValue& max);
bool SetMaterialPropertySoftMaxValue(const MaterialPropertyIndex& index, const MaterialPropertyValue& max); bool SetMaterialPropertySoftMaxValue(const MaterialPropertyIndex& index, const MaterialPropertyValue& max);
bool SetMaterialPropertyGroupVisibility(const Name& propertyGroupName, MaterialPropertyGroupVisibility visibility); bool SetMaterialPropertyGroupVisibility(const Name& propertyGroupName, MaterialPropertyGroupVisibility visibility);
@ -218,8 +218,8 @@ namespace AZ
); );
private: private:
MaterialPropertyDynamicMetadata* QueryMaterialPropertyMetadata(const Name& propertyName) const; MaterialPropertyDynamicMetadata* QueryMaterialPropertyMetadata(const Name& propertyId) const;
MaterialPropertyGroupDynamicMetadata* QueryMaterialPropertyGroupMetadata(const Name& propertyGroupName) const; MaterialPropertyGroupDynamicMetadata* QueryMaterialPropertyGroupMetadata(const Name& propertyGroupId) const;
const AZStd::vector<MaterialPropertyValue>& m_materialPropertyValues; const AZStd::vector<MaterialPropertyValue>& m_materialPropertyValues;
RHI::ConstPtr<MaterialPropertiesLayout> m_materialPropertiesLayout; RHI::ConstPtr<MaterialPropertiesLayout> m_materialPropertiesLayout;

106
Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialFunctor.cpp
Unescape Escape View File

@ -155,9 +155,9 @@ namespace AZ
, m_materialPropertyDependencies(materialPropertyDependencies) , m_materialPropertyDependencies(materialPropertyDependencies)
{} {}
const MaterialPropertyDynamicMetadata* MaterialFunctor::EditorContext::GetMaterialPropertyMetadata(const Name& propertyName) const const MaterialPropertyDynamicMetadata* MaterialFunctor::EditorContext::GetMaterialPropertyMetadata(const Name& propertyId) const
{ {
return QueryMaterialPropertyMetadata(propertyName); return QueryMaterialPropertyMetadata(propertyId);
} }
const MaterialPropertyDynamicMetadata* MaterialFunctor::EditorContext::GetMaterialPropertyMetadata(const MaterialPropertyIndex& index) const const MaterialPropertyDynamicMetadata* MaterialFunctor::EditorContext::GetMaterialPropertyMetadata(const MaterialPropertyIndex& index) const
@ -166,9 +166,9 @@ namespace AZ
return GetMaterialPropertyMetadata(name); return GetMaterialPropertyMetadata(name);
} }
const MaterialPropertyGroupDynamicMetadata* MaterialFunctor::EditorContext::GetMaterialPropertyGroupMetadata(const Name& propertyName) const const MaterialPropertyGroupDynamicMetadata* MaterialFunctor::EditorContext::GetMaterialPropertyGroupMetadata(const Name& propertyId) const
{ {
return QueryMaterialPropertyGroupMetadata(propertyName); return QueryMaterialPropertyGroupMetadata(propertyId);
} }
bool MaterialFunctor::EditorContext::SetMaterialPropertyGroupVisibility(const Name& propertyGroupName, MaterialPropertyGroupVisibility visibility) bool MaterialFunctor::EditorContext::SetMaterialPropertyGroupVisibility(const Name& propertyGroupName, MaterialPropertyGroupVisibility visibility)
@ -188,9 +188,9 @@ namespace AZ
return true; return true;
} }
bool MaterialFunctor::EditorContext::SetMaterialPropertyVisibility(const Name& propertyName, MaterialPropertyVisibility visibility) bool MaterialFunctor::EditorContext::SetMaterialPropertyVisibility(const Name& propertyId, MaterialPropertyVisibility visibility)
{ {
MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyName); MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyId);
if (!metadata) if (!metadata)
{ {
return false; return false;
@ -199,7 +199,7 @@ namespace AZ
if (metadata->m_visibility != visibility) if (metadata->m_visibility != visibility)
{ {
metadata->m_visibility = visibility; metadata->m_visibility = visibility;
m_updatedPropertiesOut.insert(propertyName); m_updatedPropertiesOut.insert(propertyId);
} }
return true; return true;
@ -211,9 +211,9 @@ namespace AZ
return SetMaterialPropertyVisibility(name, visibility); return SetMaterialPropertyVisibility(name, visibility);
} }
bool MaterialFunctor::EditorContext::SetMaterialPropertyDescription(const Name& propertyName, AZStd::string description) bool MaterialFunctor::EditorContext::SetMaterialPropertyDescription(const Name& propertyId, AZStd::string description)
{ {
MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyName); MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyId);
if (!metadata) if (!metadata)
{ {
return false; return false;
@ -222,7 +222,7 @@ namespace AZ
if (metadata->m_description != description) if (metadata->m_description != description)
{ {
metadata->m_description = description; metadata->m_description = description;
m_updatedPropertiesOut.insert(propertyName); m_updatedPropertiesOut.insert(propertyId);
} }
return true; return true;
@ -234,9 +234,9 @@ namespace AZ
return SetMaterialPropertyDescription(name, description); return SetMaterialPropertyDescription(name, description);
} }
bool MaterialFunctor::EditorContext::SetMaterialPropertyMinValue(const Name& propertyName, const MaterialPropertyValue& min) bool MaterialFunctor::EditorContext::SetMaterialPropertyMinValue(const Name& propertyId, const MaterialPropertyValue& min)
{ {
MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyName); MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyId);
if (!metadata) if (!metadata)
{ {
return false; return false;
@ -245,7 +245,7 @@ namespace AZ
if(metadata->m_propertyRange.m_min != min) if(metadata->m_propertyRange.m_min != min)
{ {
metadata->m_propertyRange.m_min = min; metadata->m_propertyRange.m_min = min;
m_updatedPropertiesOut.insert(propertyName); m_updatedPropertiesOut.insert(propertyId);
} }
return true; return true;
@ -257,9 +257,9 @@ namespace AZ
return SetMaterialPropertyMinValue(name, min); return SetMaterialPropertyMinValue(name, min);
} }
bool MaterialFunctor::EditorContext::SetMaterialPropertyMaxValue(const Name& propertyName, const MaterialPropertyValue& max) bool MaterialFunctor::EditorContext::SetMaterialPropertyMaxValue(const Name& propertyId, const MaterialPropertyValue& max)
{ {
MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyName); MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyId);
if (!metadata) if (!metadata)
{ {
return false; return false;
@ -268,7 +268,7 @@ namespace AZ
if (metadata->m_propertyRange.m_max != max) if (metadata->m_propertyRange.m_max != max)
{ {
metadata->m_propertyRange.m_max = max; metadata->m_propertyRange.m_max = max;
m_updatedPropertiesOut.insert(propertyName); m_updatedPropertiesOut.insert(propertyId);
} }
return true; return true;
@ -280,9 +280,9 @@ namespace AZ
return SetMaterialPropertyMaxValue(name, max); return SetMaterialPropertyMaxValue(name, max);
} }
bool MaterialFunctor::EditorContext::SetMaterialPropertySoftMinValue(const Name& propertyName, const MaterialPropertyValue& min) bool MaterialFunctor::EditorContext::SetMaterialPropertySoftMinValue(const Name& propertyId, const MaterialPropertyValue& min)
{ {
MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyName); MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyId);
if (!metadata) if (!metadata)
{ {
return false; return false;
@ -291,7 +291,7 @@ namespace AZ
if (metadata->m_propertyRange.m_softMin != min) if (metadata->m_propertyRange.m_softMin != min)
{ {
metadata->m_propertyRange.m_softMin = min; metadata->m_propertyRange.m_softMin = min;
m_updatedPropertiesOut.insert(propertyName); m_updatedPropertiesOut.insert(propertyId);
} }
return true; return true;
@ -303,9 +303,9 @@ namespace AZ
return SetMaterialPropertySoftMinValue(name, min); return SetMaterialPropertySoftMinValue(name, min);
} }
bool MaterialFunctor::EditorContext::SetMaterialPropertySoftMaxValue(const Name& propertyName, const MaterialPropertyValue& max) bool MaterialFunctor::EditorContext::SetMaterialPropertySoftMaxValue(const Name& propertyId, const MaterialPropertyValue& max)
{ {
MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyName); MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyId);
if (!metadata) if (!metadata)
{ {
return false; return false;
@ -314,7 +314,7 @@ namespace AZ
if (metadata->m_propertyRange.m_softMax != max) if (metadata->m_propertyRange.m_softMax != max)
{ {
metadata->m_propertyRange.m_softMax = max; metadata->m_propertyRange.m_softMax = max;
m_updatedPropertiesOut.insert(propertyName); m_updatedPropertiesOut.insert(propertyId);
} }
return true; return true;
@ -326,24 +326,24 @@ namespace AZ
return SetMaterialPropertySoftMaxValue(name, max); return SetMaterialPropertySoftMaxValue(name, max);
} }
MaterialPropertyDynamicMetadata* MaterialFunctor::EditorContext::QueryMaterialPropertyMetadata(const Name& propertyName) const MaterialPropertyDynamicMetadata* MaterialFunctor::EditorContext::QueryMaterialPropertyMetadata(const Name& propertyId) const
{ {
auto it = m_propertyMetadata.find(propertyName); auto it = m_propertyMetadata.find(propertyId);
if (it == m_propertyMetadata.end()) if (it == m_propertyMetadata.end())
{ {
AZ_Error("MaterialFunctor", false, "Couldn't find metadata for material property: %s.", propertyName.GetCStr()); AZ_Error("MaterialFunctor", false, "Couldn't find metadata for material property: %s.", propertyId.GetCStr());
return nullptr; return nullptr;
} }
return &it->second; return &it->second;
} }
MaterialPropertyGroupDynamicMetadata* MaterialFunctor::EditorContext::QueryMaterialPropertyGroupMetadata(const Name& propertyGroupName) const MaterialPropertyGroupDynamicMetadata* MaterialFunctor::EditorContext::QueryMaterialPropertyGroupMetadata(const Name& propertyGroupId) const
{ {
auto it = m_propertyGroupMetadata.find(propertyGroupName); auto it = m_propertyGroupMetadata.find(propertyGroupId);
if (it == m_propertyGroupMetadata.end()) if (it == m_propertyGroupMetadata.end())
{ {
AZ_Error("MaterialFunctor", false, "Couldn't find metadata for material property group: %s.", propertyGroupName.GetCStr()); AZ_Error("MaterialFunctor", false, "Couldn't find metadata for material property group: %s.", propertyGroupId.GetCStr());
return nullptr; return nullptr;
} }
@ -357,20 +357,20 @@ namespace AZ
} }
// explicit template instantiation // explicit template instantiation
template const bool& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<bool> (const Name& propertyName) const; template const bool& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<bool> (const Name& propertyId) const;
template const int32_t& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<int32_t> (const Name& propertyName) const; template const int32_t& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<int32_t> (const Name& propertyId) const;
template const uint32_t& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<uint32_t> (const Name& propertyName) const; template const uint32_t& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<uint32_t> (const Name& propertyId) const;
template const float& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<float> (const Name& propertyName) const; template const float& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<float> (const Name& propertyId) const;
template const Vector2& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Vector2> (const Name& propertyName) const; template const Vector2& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Vector2> (const Name& propertyId) const;
template const Vector3& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Vector3> (const Name& propertyName) const; template const Vector3& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Vector3> (const Name& propertyId) const;
template const Vector4& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Vector4> (const Name& propertyName) const; template const Vector4& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Vector4> (const Name& propertyId) const;
template const Color& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Color> (const Name& propertyName) const; template const Color& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Color> (const Name& propertyId) const;
template const Data::Instance<Image>& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Data::Instance<Image>>(const Name& propertyName) const; template const Data::Instance<Image>& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Data::Instance<Image>>(const Name& propertyId) const;
template<typename Type> template<typename Type>
const Type& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue(const Name& propertyName) const const Type& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue(const Name& propertyId) const
{ {
return GetMaterialPropertyValue(propertyName).GetValue<Type>(); return GetMaterialPropertyValue(propertyId).GetValue<Type>();
} }
// explicit template instantiation // explicit template instantiation
@ -391,19 +391,19 @@ namespace AZ
} }
// explicit template instantiation // explicit template instantiation
template const bool& MaterialFunctor::EditorContext::GetMaterialPropertyValue<bool> (const Name& propertyName) const; template const bool& MaterialFunctor::EditorContext::GetMaterialPropertyValue<bool> (const Name& propertyId) const;
template const int32_t& MaterialFunctor::EditorContext::GetMaterialPropertyValue<int32_t> (const Name& propertyName) const; template const int32_t& MaterialFunctor::EditorContext::GetMaterialPropertyValue<int32_t> (const Name& propertyId) const;
template const uint32_t& MaterialFunctor::EditorContext::GetMaterialPropertyValue<uint32_t> (const Name& propertyName) const; template const uint32_t& MaterialFunctor::EditorContext::GetMaterialPropertyValue<uint32_t> (const Name& propertyId) const;
template const float& MaterialFunctor::EditorContext::GetMaterialPropertyValue<float> (const Name& propertyName) const; template const float& MaterialFunctor::EditorContext::GetMaterialPropertyValue<float> (const Name& propertyId) const;
template const Vector2& MaterialFunctor::EditorContext::GetMaterialPropertyValue<Vector2> (const Name& propertyName) const; template const Vector2& MaterialFunctor::EditorContext::GetMaterialPropertyValue<Vector2> (const Name& propertyId) const;
template const Vector3& MaterialFunctor::EditorContext::GetMaterialPropertyValue<Vector3> (const Name& propertyName) const; template const Vector3& MaterialFunctor::EditorContext::GetMaterialPropertyValue<Vector3> (const Name& propertyId) const;
template const Vector4& MaterialFunctor::EditorContext::GetMaterialPropertyValue<Vector4> (const Name& propertyName) const; template const Vector4& MaterialFunctor::EditorContext::GetMaterialPropertyValue<Vector4> (const Name& propertyId) const;
template const Color& MaterialFunctor::EditorContext::GetMaterialPropertyValue<Color> (const Name& propertyName) const; template const Color& MaterialFunctor::EditorContext::GetMaterialPropertyValue<Color> (const Name& propertyId) const;
template<typename Type> template<typename Type>
const Type& MaterialFunctor::EditorContext::GetMaterialPropertyValue(const Name& propertyName) const const Type& MaterialFunctor::EditorContext::GetMaterialPropertyValue(const Name& propertyId) const
{ {
return GetMaterialPropertyValue(propertyName).GetValue<Type>(); return GetMaterialPropertyValue(propertyId).GetValue<Type>();
} }
// explicit template instantiation // explicit template instantiation
@ -436,9 +436,9 @@ namespace AZ
return m_materialPropertyValues[index.GetIndex()]; return m_materialPropertyValues[index.GetIndex()];
} }
const MaterialPropertyValue& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue(const Name& propertyName) const const MaterialPropertyValue& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue(const Name& propertyId) const
{ {
MaterialPropertyIndex index = m_materialPropertiesLayout->FindPropertyIndex(propertyName); MaterialPropertyIndex index = m_materialPropertiesLayout->FindPropertyIndex(propertyId);
return GetMaterialPropertyValue(index); return GetMaterialPropertyValue(index);
} }
@ -449,9 +449,9 @@ namespace AZ
return m_materialPropertyValues[index.GetIndex()]; return m_materialPropertyValues[index.GetIndex()];
} }
const MaterialPropertyValue& MaterialFunctor::EditorContext::GetMaterialPropertyValue(const Name& propertyName) const const MaterialPropertyValue& MaterialFunctor::EditorContext::GetMaterialPropertyValue(const Name& propertyId) const
{ {
MaterialPropertyIndex index = m_materialPropertiesLayout->FindPropertyIndex(propertyName); MaterialPropertyIndex index = m_materialPropertiesLayout->FindPropertyIndex(propertyId);
return GetMaterialPropertyValue(index); return GetMaterialPropertyValue(index);
} }

Write Preview
Loading…
Cancel
Save