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

Rename EMotionFX class members to follow the m_ naming convention

Browse Source 
Signed-off-by: Chris Burel <burelc@amazon.com>
This commit is contained in:
Chris Burel
2021-08-09 14:09:45 -07:00
parent 9afbd07a88
commit 1837d05169
649 changed files with 20161 additions and 21889 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/MCore/Source/CommandSyntax.cpp
+26 -26
View File
@@ -68,21 +68,21 @@ namespace MCore
// check if this param is a required one or not
bool CommandSyntax::GetParamRequired(size_t index) const
{
return m_parameters[index].mRequired;
return m_parameters[index].m_required;
}
// get the parameter name
const char* CommandSyntax::GetParamName(size_t index) const
{
return m_parameters[index].mName.c_str();
return m_parameters[index].m_name.c_str();
}
// get the parameter description
const char* CommandSyntax::GetParamDescription(size_t index) const
{
return m_parameters[index].mDescription.c_str();
return m_parameters[index].m_description.c_str();
}
@@ -95,7 +95,7 @@ namespace MCore
const char* CommandSyntax::GetParamTypeString(const Parameter& parameter) const
{
// check the type
switch (parameter.mParamType)
switch (parameter.m_paramType)
{
case PARAMTYPE_STRING:
return "String";
@@ -129,7 +129,7 @@ namespace MCore
// get the parameter type
CommandSyntax::EParamType CommandSyntax::GetParamType(size_t index) const
{
return m_parameters[index].mParamType;
return m_parameters[index].m_paramType;
}
@@ -145,7 +145,7 @@ namespace MCore
{
const auto foundParameter = AZStd::find_if(begin(m_parameters), end(m_parameters), [parameter](const Parameter& p)
{
return AzFramework::StringFunc::Equal(p.mName, parameter, false /* no case */);
return AzFramework::StringFunc::Equal(p.m_name, parameter, false /* no case */);
});
return foundParameter != end(m_parameters) ? AZStd::distance(begin(m_parameters), foundParameter) : InvalidIndex;
}
@@ -154,7 +154,7 @@ namespace MCore
// get the default value for a given parameter
const AZStd::string& CommandSyntax::GetDefaultValue(size_t index) const
{
return m_parameters[index].mDefaultValue;
return m_parameters[index].m_defaultValue;
}
@@ -163,7 +163,7 @@ namespace MCore
const size_t index = FindParameterIndex(paramName);
if (index != InvalidIndex)
{
return m_parameters[index].mDefaultValue;
return m_parameters[index].m_defaultValue;
}
static const AZStd::string empty;
@@ -180,7 +180,7 @@ namespace MCore
return false;
}
outDefaultValue = m_parameters[index].mDefaultValue;
outDefaultValue = m_parameters[index].m_defaultValue;
return true;
}
@@ -203,28 +203,28 @@ namespace MCore
for (const Parameter& parameter : m_parameters)
{
// if the required parameter hasn't been specified
if (parameter.mRequired && commandLine.CheckIfHasParameter(parameter.mName) == false)
if (parameter.m_required && commandLine.CheckIfHasParameter(parameter.m_name) == false)
{
outResult += AZStd::string::format("Required parameter '%s' has not been specified.\n", parameter.mName.c_str());
outResult += AZStd::string::format("Required parameter '%s' has not been specified.\n", parameter.m_name.c_str());
}
else
{
// find the parameter index
const size_t paramIndex = commandLine.FindParameterIndex(parameter.mName.c_str());
const size_t paramIndex = commandLine.FindParameterIndex(parameter.m_name.c_str());
if (paramIndex != InvalidIndex)
{
const AZStd::string& value = commandLine.GetParameterValue(paramIndex);
const AZStd::string& paramName = parameter.mName;
const AZStd::string& paramName = parameter.m_name;
// if the parameter value has not been specified and it is not a boolean parameter
if ((value.empty()) && parameter.mParamType != PARAMTYPE_BOOLEAN && parameter.mParamType != PARAMTYPE_STRING)
if ((value.empty()) && parameter.m_paramType != PARAMTYPE_BOOLEAN && parameter.m_paramType != PARAMTYPE_STRING)
{
outResult += AZStd::string::format("Parameter '%s' has no value specified.\n", paramName.c_str());
}
else
{
// check if we specified a valid int
if (parameter.mParamType == PARAMTYPE_INT)
if (parameter.m_paramType == PARAMTYPE_INT)
{
if (!AzFramework::StringFunc::LooksLikeInt(value.c_str()))
{
@@ -233,7 +233,7 @@ namespace MCore
}
// check if the specified float is valid
if (parameter.mParamType == PARAMTYPE_FLOAT)
if (parameter.m_paramType == PARAMTYPE_FLOAT)
{
if (!AzFramework::StringFunc::LooksLikeFloat(value.c_str()))
{
@@ -242,7 +242,7 @@ namespace MCore
}
// check if this is a valid boolean
if (parameter.mParamType == PARAMTYPE_BOOLEAN)
if (parameter.m_paramType == PARAMTYPE_BOOLEAN)
{
if (!value.empty() && !AzFramework::StringFunc::LooksLikeBool(value.c_str()))
{
@@ -251,7 +251,7 @@ namespace MCore
}
// check if this is a valid boolean
if (parameter.mParamType == PARAMTYPE_CHAR)
if (parameter.m_paramType == PARAMTYPE_CHAR)
{
if (value.size() > 1)
{
@@ -260,7 +260,7 @@ namespace MCore
}
// check if the specified vector3 is valid
if (parameter.mParamType == PARAMTYPE_VECTOR3)
if (parameter.m_paramType == PARAMTYPE_VECTOR3)
{
if (!AzFramework::StringFunc::LooksLikeVector3(value.c_str()))
{
@@ -269,7 +269,7 @@ namespace MCore
}
// check if the specified vector3 is valid
if (parameter.mParamType == PARAMTYPE_VECTOR4)
if (parameter.m_paramType == PARAMTYPE_VECTOR4)
{
if (!AzFramework::StringFunc::LooksLikeVector4(value.c_str()))
{
@@ -302,8 +302,8 @@ namespace MCore
// find the longest command name
size_t offset = AZStd::minmax_element(begin(m_parameters), end(m_parameters), [](const Parameter& left, const Parameter& right)
{
return left.mName.size() < right.mName.size();
}).second->mName.size();
return left.m_name.size() < right.m_name.size();
}).second->m_name.size();
size_t offset2 = offset;
size_t offset3 = offset;
@@ -330,19 +330,19 @@ namespace MCore
for (const Parameter& parameter : m_parameters)
{
offset2 = offset3;
final = parameter.mName;
final = parameter.m_name;
offset2 += 5;
final.append(offset2 - final.size(), MCore::CharacterConstants::space);
final += GetParamTypeString(parameter);
offset2 += 15;
final.append(offset2 - final.size(), MCore::CharacterConstants::space);
final += parameter.mRequired ? "Yes" : "No";
final += parameter.m_required ? "Yes" : "No";
offset2 += 10;
final.append(offset2 - final.size(), MCore::CharacterConstants::space);
final += parameter.mDefaultValue;
final += parameter.m_defaultValue;
offset2 += 20;
final.append(offset2 - final.size(), MCore::CharacterConstants::space);
final += parameter.mDescription;
final += parameter.m_description;
MCore::LogInfo(final.c_str());
}