Minor retargeting improvements

- using enum instead of "int" in instance class and viewer code
- highlighting retargeted bones in SHOW_ANIM mode with orange color, and bind-pose bones with grey one
- clicking at "retargeting" label in skeletal mesh viewer toggles between enabled/disabled state (bypassing "rotation only" mode)

Author: gildor2

MeshInstance/MeshInstance.h

@@ -9,6 +9,7 @@ class CAnimSet;
 class CAnimSequence;
 class CStaticMesh;
 
+enum class EAnimRetargetingMode;
 
 /*-----------------------------------------------------------------------------
 	Basic CMeshInstance class
@@ -142,7 +143,7 @@ class CSkelMeshInstance : public CMeshInstance
 	int			LodIndex;
 	int			MorphIndex;
 	int			UVIndex;
-	int			RetargetingModeOverride;			// EAnimRetargetingMode
+	EAnimRetargetingMode RetargetingModeOverride;
 
 	CSkelMeshInstance();
 	virtual ~CSkelMeshInstance();

MeshInstance/SkelMeshInstance.cpp

@@ -92,7 +92,7 @@ CSkelMeshInstance::CSkelMeshInstance()
 :	LodIndex(0)
 ,	MorphIndex(-1)
 ,	UVIndex(0)
-,	RetargetingModeOverride((int)EAnimRetargetingMode::AnimSet)
+,	RetargetingModeOverride(EAnimRetargetingMode::AnimSet)
 ,	LastLodIndex(-2)				// initialize with value which differs from LodNum and from all other values
 ,	LastMorphIndex(-1)
 ,	MaxAnimChannel(-1)
@@ -660,13 +660,17 @@ void CSkelMeshInstance::UpdateSkeleton()
 	{
 		const CBoneDebugInfo& BoneDebug = BoneDebugInfos[i];
 		if (!BoneDebug.BoneName) continue; // the bone is entirely skipped due to animation settings
-		const char* TextColor = S_YELLOW;
+		const char* TextColor = S_GREY;
 		if (BoneDebug.bIsAnimated)
 		{
-			TextColor = BoneDebug.bSkippedOnRetargetting ? S_RED : S_GREEN;
+			TextColor = S_GREEN;
+			if (BoneDebug.RetargetMode != EBoneRetargetingMode::Animation)
+			{
+				TextColor = BoneDebug.bSkippedOnRetargetting ? S_RED : S_ORANGE;
+			}
 		}
 		bool bClicked = DrawTextLeftH(NULL,
-			"%s%s" S_HYPERLINK("%d (%s)") " : P( %8.3f %8.3f %8.3f )  Q( %6.3f %6.3f %6.3f %6.3f )",
+			"%s%s" S_HYPERLINK("%d (%s)") " : T (%6.3f %6.3f %6.3f)  R (%5.2f %5.2f %5.2f %5.2f)",
 			HighlightBoneIndex == BoneDebug.MeshBoneIndex ? "> " : "  ", // indicator of the selected bone
 			TextColor, BoneDebug.MeshBoneIndex, BoneDebug.BoneName,
 			VECTOR_ARG(BoneDebug.AnimPosition), QUAT_ARG(BoneDebug.AnimRotation)

Unreal/Mesh/SkeletalMesh.h

@@ -291,7 +291,7 @@ class CAnimSequence
 enum class EAnimRetargetingMode
 {
 	// Use settings defined in each AnimSet (default)
-	AnimSet,
+	AnimSet = 0,
 	// Force AnimRotationOnly enabled on all AnimSets, but for this SkeletalMesh only
 	AnimRotationOnly,
 	// Always pick data from the animation, no retargeting

Viewers/ObjectViewer.h

@@ -22,6 +22,7 @@ class USkeleton;
 
 class UIMenuItem;
 
+enum class EAnimRetargetingMode;
 
 #define TEST_FILES		1		// comment line to disable some notifications
 
@@ -211,6 +212,8 @@ class CSkelMeshViewer : public CMeshViewer
 	bool			bIsUE4Mesh;
 	USkeleton*		Skeleton;
 	int				HighlightMeshIndex;
+
+	void SetRetargetingMode(EAnimRetargetingMode NewMode);
 };
 
 

Viewers/SkelMeshViewer.cpp

@@ -412,7 +412,14 @@ void CSkelMeshViewer::Draw2D()
 			OnOffStatus = S_RED "disabled";
 			break;
 		}
-		DrawTextBottomLeft(S_GREEN "Retargeting:" S_WHITE " %s", OnOffStatus);
+		if (DrawTextBottomLeftH(NULL, S_GREEN S_HYPERLINK("Retargeting:" S_WHITE " %s"), OnOffStatus))
+		{
+			// Allow retargeting toggle with a mouse click
+			if (MeshInst->RetargetingModeOverride == EAnimRetargetingMode::AnimSet)
+				SetRetargetingMode(EAnimRetargetingMode::NoRetargeting);
+			else
+				SetRetargetingMode(EAnimRetargetingMode::AnimSet);
+		}
 
 		const CAnimSequence* Seq = MeshInst->GetAnim(0);
 		if (Seq)
@@ -832,11 +839,9 @@ void CSkelMeshViewer::ProcessKey(unsigned key)
 
 	case 'r'|KEY_CTRL:
 		{
-			int mode = MeshInst->RetargetingModeOverride + 1;
-			if (mode >= (int)EAnimRetargetingMode::Count) mode = 0;
-			MeshInst->RetargetingModeOverride = mode;
-			for (CSkelMeshInstance* mesh : TaggedMeshes)
-				mesh->RetargetingModeOverride = mode;
+			EAnimRetargetingMode mode = EAnimRetargetingMode((int)MeshInst->RetargetingModeOverride + 1);
+			if (mode >= EAnimRetargetingMode::Count) mode = EAnimRetargetingMode::AnimSet;
+			SetRetargetingMode(mode);
 		}
 		break;
 
@@ -855,6 +860,13 @@ void CSkelMeshViewer::ProcessKey(unsigned key)
 	unguard;
 }
 
+void CSkelMeshViewer::SetRetargetingMode(EAnimRetargetingMode NewMode)
+{
+	CSkelMeshInstance *MeshInst = static_cast<CSkelMeshInstance*>(Inst);
+	MeshInst->RetargetingModeOverride = NewMode;
+	for (CSkelMeshInstance* mesh : TaggedMeshes)
+		mesh->RetargetingModeOverride = NewMode;
+}
 
 void CSkelMeshViewer::AttachAnimSet()
 {