Reponse to code review feedback. The main change is making GetPropertyValues return by const ref.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
monroegm-disable-blank-issue-2
santorac 4 years ago
parent 3a426344dd
commit ddab03d678

@ -75,7 +75,7 @@ namespace AZ
void SetPropertyValue(const Name& propertyId, const MaterialPropertyValue& value); void SetPropertyValue(const Name& propertyId, const MaterialPropertyValue& value);
const MaterialPropertyValue& GetPropertyValue(const Name& propertyId) const; const MaterialPropertyValue& GetPropertyValue(const Name& propertyId) const;
PropertyValueMap GetPropertyValues() const; const PropertyValueMap& GetPropertyValues() const;
bool HasPropertyValue(const Name& propertyId) const; bool HasPropertyValue(const Name& propertyId) const;
void RemovePropertyValue(const Name& propertyId); void RemovePropertyValue(const Name& propertyId);

@ -100,7 +100,7 @@ namespace AZ
m_propertyValues.erase(propertyId); m_propertyValues.erase(propertyId);
} }
MaterialSourceData::PropertyValueMap MaterialSourceData::GetPropertyValues() const const MaterialSourceData::PropertyValueMap& MaterialSourceData::GetPropertyValues() const
{ {
return m_propertyValues; return m_propertyValues;
} }
@ -112,9 +112,9 @@ namespace AZ
void MaterialSourceData::ConvertToNewDataFormat() void MaterialSourceData::ConvertToNewDataFormat()
{ {
for (auto& [groupName, propertyList] : m_propertiesOld) for (const auto& [groupName, propertyList] : m_propertiesOld)
{ {
for (auto& [propertyName, propertyValue] : propertyList) for (const auto& [propertyName, propertyValue] : propertyList)
{ {
SetPropertyValue(MaterialPropertyId{groupName, propertyName}, propertyValue); SetPropertyValue(MaterialPropertyId{groupName, propertyName}, propertyValue);
} }

@ -357,7 +357,7 @@ namespace UnitTest
return fixupType(a.GetTypeId()) == fixupType(targetTypeId) && fixupType(b.GetTypeId()) == fixupType(targetTypeId); return fixupType(a.GetTypeId()) == fixupType(targetTypeId) && fixupType(b.GetTypeId()) == fixupType(targetTypeId);
} }
void CheckEqual(MaterialSourceData& a, MaterialSourceData& b) void CheckEqual(const MaterialSourceData& a, const MaterialSourceData& b)
{ {
EXPECT_STREQ(a.m_materialType.c_str(), b.m_materialType.c_str()); EXPECT_STREQ(a.m_materialType.c_str(), b.m_materialType.c_str());
EXPECT_STREQ(a.m_description.c_str(), b.m_description.c_str()); EXPECT_STREQ(a.m_description.c_str(), b.m_description.c_str());
@ -1091,15 +1091,15 @@ namespace UnitTest
MaterialSourceData sourceDataLevel3 = MaterialUtils::LoadMaterialSourceData("@exefolder@/Temp/m3.material").TakeValue(); MaterialSourceData sourceDataLevel3 = MaterialUtils::LoadMaterialSourceData("@exefolder@/Temp/m3.material").TakeValue();
auto materialAssetLevel1 = sourceDataLevel1.CreateMaterialAssetFromSourceData(Uuid::CreateRandom()); auto materialAssetLevel1 = sourceDataLevel1.CreateMaterialAssetFromSourceData(Uuid::CreateRandom());
EXPECT_TRUE(materialAssetLevel1.IsSuccess()); ASSERT_TRUE(materialAssetLevel1.IsSuccess());
EXPECT_TRUE(materialAssetLevel1.GetValue()->WasPreFinalized()); EXPECT_TRUE(materialAssetLevel1.GetValue()->WasPreFinalized());
auto materialAssetLevel2 = sourceDataLevel2.CreateMaterialAssetFromSourceData(Uuid::CreateRandom()); auto materialAssetLevel2 = sourceDataLevel2.CreateMaterialAssetFromSourceData(Uuid::CreateRandom());
EXPECT_TRUE(materialAssetLevel2.IsSuccess()); ASSERT_TRUE(materialAssetLevel2.IsSuccess());
EXPECT_TRUE(materialAssetLevel2.GetValue()->WasPreFinalized()); EXPECT_TRUE(materialAssetLevel2.GetValue()->WasPreFinalized());
auto materialAssetLevel3 = sourceDataLevel3.CreateMaterialAssetFromSourceData(Uuid::CreateRandom()); auto materialAssetLevel3 = sourceDataLevel3.CreateMaterialAssetFromSourceData(Uuid::CreateRandom());
EXPECT_TRUE(materialAssetLevel3.IsSuccess()); ASSERT_TRUE(materialAssetLevel3.IsSuccess());
EXPECT_TRUE(materialAssetLevel3.GetValue()->WasPreFinalized()); EXPECT_TRUE(materialAssetLevel3.GetValue()->WasPreFinalized());
auto layout = materialAssetLevel1.GetValue()->GetMaterialPropertiesLayout(); auto layout = materialAssetLevel1.GetValue()->GetMaterialPropertiesLayout();

@ -677,7 +677,7 @@ namespace MaterialEditor
if (!loadResult) if (!loadResult)
{ {
AZ_Error("MaterialDocument", false, "Material source data could not be loaded: '%s'.", m_absolutePath.c_str()); AZ_Error("MaterialDocument", false, "Material source data could not be loaded: '%s'.", m_absolutePath.c_str());
return OpenFailed(); return false;
} }
m_materialSourceData = loadResult.TakeValue(); m_materialSourceData = loadResult.TakeValue();

Loading…
Cancel
Save