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

Fix format strings in EMotionFX to use the correct token for size_t

Browse Source 
Signed-off-by: Chris Burel <burelc@amazon.com>
This commit is contained in:
Chris Burel
2021-07-06 08:58:34 -07:00
parent 2cfee517a0
commit d57d263b5d
9 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorInstanceCommands.cpp
+1 -1
View File
@@ -492,7 +492,7 @@ namespace CommandSystem
commandString = AZStd::string::format("CreateActorInstance -actorID %i -actorInstanceID %i", mOldActorID, actorInstanceID);
commandGroup.AddCommandString(commandString.c_str());
commandString = AZStd::string::format("AdjustActorInstance -actorInstanceID %i -pos \"%s\" -rot \"%s\" -scale \"%s\" -lodLevel %d -isVisible \"%s\" -doRender \"%s\"",
commandString = AZStd::string::format("AdjustActorInstance -actorInstanceID %i -pos \"%s\" -rot \"%s\" -scale \"%s\" -lodLevel %zu -isVisible \"%s\" -doRender \"%s\"",
actorInstanceID,
AZStd::to_string(mOldPosition).c_str(),
AZStd::to_string(mOldRotation).c_str(),
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidget.cpp
+2 -2
View File
@@ -1475,10 +1475,10 @@ namespace EMStudio
if (animGraphNode->GetCanHaveChildren())
{
// child nodes
toolTipString += AZStd::string::format("<tr><td><b><nobr>Child Nodes:</nobr></b></td><td>%i</td></tr>", animGraphNode->GetNumChildNodes());
toolTipString += AZStd::string::format("<tr><td><b><nobr>Child Nodes:</nobr></b></td><td>%zu</td></tr>", animGraphNode->GetNumChildNodes());
// recursive child nodes
toolTipString += AZStd::string::format("<tr><td width=\"140\"><b><nobr>Recursive Child Nodes:</nobr></b></td><td>%i</td></tr>", animGraphNode->RecursiveCalcNumNodes());
toolTipString += AZStd::string::format("<tr><td width=\"140\"><b><nobr>Recursive Child Nodes:</nobr></b></td><td>%zu</td></tr>", animGraphNode->RecursiveCalcNumNodes());
}
// states
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsWindow.cpp
+1 -1
View File
@@ -268,7 +268,7 @@ namespace EMStudio
QTableWidgetItem* tableItemName = new QTableWidgetItem(mTempString.c_str());
mTempString = attachment->GetIsInfluencedByMultipleJoints() ? "Yes" : "No";
QTableWidgetItem* tableItemDeformable = new QTableWidgetItem(mTempString.c_str());
mTempString = AZStd::string::format("%i", attachmentInstance->GetNumNodes());
mTempString = AZStd::string::format("%zu", attachmentInstance->GetNumNodes());
QTableWidgetItem* tableItemNumNodes = new QTableWidgetItem(mTempString.c_str());
QTableWidgetItem* tableItemNodeName = new QTableWidgetItem("");
// set node name if exists
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetEditWindow.cpp
+1 -1
View File
@@ -149,7 +149,7 @@ namespace EMStudio
const float rangeMax = (float)mRangeMax->value();
AZStd::string result;
AZStd::string command = AZStd::string::format("AdjustMorphTarget -actorInstanceID %i -lodLevel %i -name \"%s\" -rangeMin %f -rangeMax %f", mActorInstance->GetID(), mActorInstance->GetLODLevel(), mMorphTarget->GetNameString().c_str(), rangeMin, rangeMax);
AZStd::string command = AZStd::string::format("AdjustMorphTarget -actorInstanceID %i -lodLevel %zu -name \"%s\" -rangeMin %f -rangeMax %f", mActorInstance->GetID(), mActorInstance->GetLODLevel(), mMorphTarget->GetNameString().c_str(), rangeMin, rangeMax);
if (EMStudio::GetCommandManager()->ExecuteCommand(command, result) == false)
{
AZ_Error("EMotionFX", false, result.c_str());
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetGroupWidget.cpp
+4 -4
View File
@@ -133,7 +133,7 @@ namespace EMStudio
{
EMotionFX::MorphTarget* morphTarget = mMorphTargets[i].mMorphTarget;
command = AZStd::string::format("AdjustMorphTarget -actorInstanceID %i -lodLevel %i -name \"%s\" -manualMode ", mActorInstance->GetID(), mActorInstance->GetLODLevel(), morphTarget->GetName());
command = AZStd::string::format("AdjustMorphTarget -actorInstanceID %i -lodLevel %zu -name \"%s\" -manualMode ", mActorInstance->GetID(), mActorInstance->GetLODLevel(), morphTarget->GetName());
command += AZStd::to_string(value == Qt::Checked);
commandGroup.AddCommandString(command);
}
@@ -159,7 +159,7 @@ namespace EMStudio
{
EMotionFX::MorphTarget* morphTarget = mMorphTargets[i].mMorphTarget;
command = AZStd::string::format("AdjustMorphTarget -actorInstanceID %i -lodLevel %i -name \"%s\" -weight %f", mActorInstance->GetID(), mActorInstance->GetLODLevel(), morphTarget->GetName(), morphTarget->CalcZeroInfluenceWeight());
command = AZStd::string::format("AdjustMorphTarget -actorInstanceID %i -lodLevel %zu -name \"%s\" -weight %f", mActorInstance->GetID(), mActorInstance->GetLODLevel(), morphTarget->GetName(), morphTarget->CalcZeroInfluenceWeight());
commandGroup.AddCommandString(command);
}
@@ -179,7 +179,7 @@ namespace EMStudio
EMotionFX::MorphTarget* morphTarget = mMorphTargets[morphTargetIndex].mMorphTarget;
AZStd::string result;
const AZStd::string command = AZStd::string::format("AdjustMorphTarget -actorInstanceID %i -lodLevel %i -name \"%s\" -weight %f -manualMode %s",
const AZStd::string command = AZStd::string::format("AdjustMorphTarget -actorInstanceID %i -lodLevel %zu -name \"%s\" -weight %f -manualMode %s",
mActorInstance->GetID(),
mActorInstance->GetLODLevel(),
morphTarget->GetName(),
@@ -219,7 +219,7 @@ namespace EMStudio
// execute command
AZStd::string result;
const AZStd::string command = AZStd::string::format("AdjustMorphTarget -actorInstanceID %i -lodLevel %i -name \"%s\" -weight %f", mActorInstance->GetID(), mActorInstance->GetLODLevel(), morphTarget->GetName(), floatSlider->value());
const AZStd::string command = AZStd::string::format("AdjustMorphTarget -actorInstanceID %i -lodLevel %zu -name \"%s\" -weight %f", mActorInstance->GetID(), mActorInstance->GetLODLevel(), morphTarget->GetName(), floatSlider->value());
if (EMStudio::GetCommandManager()->ExecuteCommand(command, result) == false)
{
AZ_Error("EMotionFX", false, result.c_str());
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/PhonemeSelectionWindow.cpp
+1 -1
View File
@@ -523,7 +523,7 @@ namespace EMStudio
// clear the selected phoneme sets
void PhonemeSelectionWindow::ClearSelectedPhonemeSets()
{
const AZStd::string command = AZStd::string::format("AdjustMorphTarget -actorID %i -lodLevel %i -name \"%s\" -phonemeAction \"clear\"", mActor->GetID(), mLODLevel, mMorphTarget->GetName());
const AZStd::string command = AZStd::string::format("AdjustMorphTarget -actorID %i -lodLevel %zu -name \"%s\" -phonemeAction \"clear\"", mActor->GetID(), mLODLevel, mMorphTarget->GetName());
AZStd::string result;
if (!EMStudio::GetCommandManager()->ExecuteCommand(command, result))
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetWindow.cpp
+1 -1
View File
@@ -409,7 +409,7 @@ namespace EMStudio
commandGroup.AddCommandString("Unselect -motionIndex SELECT_ALL");
command = AZStd::string::format("Select -motionIndex %d", EMotionFX::GetMotionManager().FindMotionIndexByID(motion->GetID()));
command = AZStd::string::format("Select -motionIndex %zu", EMotionFX::GetMotionManager().FindMotionIndexByID(motion->GetID()));
commandGroup.AddCommandString(command);
EMotionFX::PlayBackInfo* defaultPlayBackInfo = motion->GetDefaultPlayBackInfo();
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewPlugin.cpp
+1 -1
View File
@@ -1575,7 +1575,7 @@ namespace EMStudio
// adjust the motion event
AZStd::string outResult, command;
command = AZStd::string::format("AdjustMotionEvent -motionID %i -eventTrackName \"%s\" -eventNr %i -startTime %f -endTime %f", mMotion->GetID(), eventTrack->GetName(), motionEventNr, startTime, endTime);
command = AZStd::string::format("AdjustMotionEvent -motionID %i -eventTrackName \"%s\" -eventNr %zu -startTime %f -endTime %f", mMotion->GetID(), eventTrack->GetName(), motionEventNr, startTime, endTime);
if (EMStudio::GetCommandManager()->ExecuteCommand(command.c_str(), outResult) == false)
{
MCore::LogError(outResult.c_str());
Gems/EMotionFX/Code/Tests/Mocks/EventHandler.h
+1 -1
View File
@@ -58,7 +58,7 @@ namespace EMotionFX
MOCK_METHOD2(OnStartTransition, void(AnimGraphInstance* animGraphInstance, AnimGraphStateTransition* transition));
MOCK_METHOD2(OnEndTransition, void(AnimGraphInstance* animGraphInstance, AnimGraphStateTransition* transition));
MOCK_METHOD3(OnSetVisualManipulatorOffset, void(AnimGraphInstance* animGraphInstance, uint32 paramIndex, const AZ::Vector3& offset));
MOCK_METHOD3(OnSetVisualManipulatorOffset, void(AnimGraphInstance* animGraphInstance, size_t paramIndex, const AZ::Vector3& offset));
MOCK_METHOD4(OnInputPortsChanged, void(AnimGraphNode* node, const AZStd::vector<AZStd::string>& newInputPorts, const AZStd::string& memberName, const AZStd::vector<AZStd::string>& memberValue));
MOCK_METHOD4(OnOutputPortsChanged, void(AnimGraphNode* node, const AZStd::vector<AZStd::string>& newOutputPorts, const AZStd::string& memberName, const AZStd::vector<AZStd::string>& memberValue));
MOCK_METHOD3(OnRenamedNode, void(AnimGraph* animGraph, AnimGraphNode* node, const AZStd::string& oldName));