ue-mcp 1.2.3 → 1.3.0

package/plugin/ue_mcp_bridge/Source/UE_MCP_Bridge/Private/Handlers/AnimationHandlers.cpp

@@ -33,6 +33,9 @@
 #include "Factories/BlendSpaceFactoryNew.h"
 #include "UObject/UObjectGlobals.h"
 #include "UObject/Package.h"
+// FArrayProperty / FScriptArrayHelper: the #880 readback of the montage's
+// private BranchingPointMarkers cache goes through its UPROPERTY.
+#include "UObject/UnrealType.h"
 #include "Misc/PackageName.h"
 #include "UObject/SavePackage.h"
 #include "Dom/JsonObject.h"
@@ -131,6 +134,7 @@ void FAnimationHandlers::RegisterHandlers(FMCPHandlerRegistry& Registry)
 	// IK Rig (#93)
 	Registry.RegisterHandler(TEXT("create_ik_rig"), &CreateIKRig);
 	Registry.RegisterHandler(TEXT("read_ik_rig"), &ReadIKRig);
+	Registry.RegisterHandler(TEXT("configure_ik_rig"), &ConfigureIKRig);
 	// #701/#703: IK authoring tail + batch retarget.
 	Registry.RegisterHandler(TEXT("set_ik_rig_mesh"), &SetIKRigMesh);
 	Registry.RegisterHandler(TEXT("set_ik_retargeter_rig"), &SetIKRetargeterRig);
@@ -142,6 +146,11 @@ void FAnimationHandlers::RegisterHandlers(FMCPHandlerRegistry& Registry)
 	Registry.RegisterHandler(TEXT("list_control_rig_variables"), &ListControlRigVariables);
 	Registry.RegisterHandler(TEXT("read_control_rig_graph"), &ReadControlRigGraph);
 	Registry.RegisterHandler(TEXT("read_control_rig_hierarchy"), &ReadControlRigHierarchy);
+	Registry.RegisterHandler(TEXT("begin_control_rig_edit"), &BeginControlRigEdit);
+	Registry.RegisterHandler(TEXT("read_control_rig_edit"), &ReadControlRigEdit);
+	Registry.RegisterHandler(TEXT("apply_control_rig_edits"), &ApplyControlRigEdits);
+	Registry.RegisterHandler(TEXT("bake_control_rig_edit"), &BakeControlRigEdit);
+	Registry.RegisterHandler(TEXT("analyze_animation"), &AnalyzeAnimation);
 
 	// v0.7.11 - depth
 	Registry.RegisterHandler(TEXT("set_root_motion_settings"), &SetRootMotionSettings);
@@ -153,6 +162,7 @@ void FAnimationHandlers::RegisterHandlers(FMCPHandlerRegistry& Registry)
 	// v0.7.11 - issue fixes
 	Registry.RegisterHandler(TEXT("create_ik_retargeter"), &CreateIKRetargeter);
 	Registry.RegisterHandler(TEXT("read_ik_retargeter"), &ReadIKRetargeter);
+	Registry.RegisterHandler(TEXT("configure_ik_retargeter"), &ConfigureIKRetargeter);
 	Registry.RegisterHandler(TEXT("set_anim_blueprint_skeleton"), &SetAnimBlueprintSkeleton);
 	Registry.RegisterHandler(TEXT("read_bone_track"), &ReadBoneTrack);
 
@@ -190,6 +200,11 @@ void FAnimationHandlers::RegisterHandlers(FMCPHandlerRegistry& Registry)
 	Registry.RegisterHandler(TEXT("list_bones"), &ListBones);
 	Registry.RegisterHandler(TEXT("rebind_leader_pose"), &RebindLeaderPose);
 	Registry.RegisterHandler(TEXT("preview_animation"), &PreviewAnimation);
+
+	// #922/#923/#926 - evaluated pose reads (live component, and asset sampling)
+	Registry.RegisterHandler(TEXT("get_live_bone_transforms"), &GetLiveBoneTransforms);
+	Registry.RegisterHandler(TEXT("sample_pose"), &SamplePose);
+	Registry.RegisterHandler(TEXT("measure_natural_speed"), &MeasureNaturalSpeed);
 }
 
 TSharedPtr<FJsonValue> FAnimationHandlers::ListAnimAssets(const TSharedPtr<FJsonObject>& Params)
@@ -1122,11 +1137,52 @@ TSharedPtr<FJsonValue> FAnimationHandlers::AddAnimNotify(const TSharedPtr<FJsonO
 		}
 	}
 
+	// #880: a notify only becomes a branching point when its event says so.
+	// FAnimNotifyEvent::MontageTickType defaults to Queued, and
+	// UAnimMontage::RefreshBranchingPointMarkers only records the events whose
+	// tick type is BranchingPoint - so a PlayMontageNotify added with the
+	// default left BranchingPointMarkers empty and
+	// UAnimNotify_PlayMontageNotify::BranchingPointNotify, the only thing that
+	// broadcasts OnPlayMontageNotifyBegin, was never reached. #528 set the name
+	// the delegate carries; this sets the tick type that gets it called.
+	//
+	// Montage notifies whose class is one of the PlayMontageNotify pair default
+	// to BranchingPoint because that is the only tick type at which they do
+	// anything. Everything else keeps the engine's Queued default, which is the
+	// cheaper tick. `branchingPoint` overrides either way.
+	const bool bIsMontage = AnimAsset->IsA<UAnimMontage>();
+	bool bWantBranchingPoint = false;
+	if (bIsMontage && NewNotify)
+	{
+		for (const UClass* NotifyClass = NewNotify->GetClass(); NotifyClass; NotifyClass = NotifyClass->GetSuperClass())
+		{
+			const FString ClassName = NotifyClass->GetName();
+			if (ClassName == TEXT("AnimNotify_PlayMontageNotify") ||
+				ClassName == TEXT("AnimNotify_PlayMontageNotifyWindow"))
+			{
+				bWantBranchingPoint = true;
+				break;
+			}
+		}
+	}
+	bool bExplicitBranchingPoint = false;
+	if (Params->TryGetBoolField(TEXT("branchingPoint"), bExplicitBranchingPoint))
+	{
+		bWantBranchingPoint = bExplicitBranchingPoint;
+	}
+	if (bWantBranchingPoint)
+	{
+		NewEvent.MontageTickType = EMontageNotifyTickType::BranchingPoint;
+	}
+
 	AnimAsset->SortNotifies();
 
-	// #528: PostEditChange + save rebuilds the montage's branching-point markers
-	// from the notifies (RefreshBranchingPointMarkers itself is private), so the
-	// notify fires as a branching point with the name just written.
+	// RefreshBranchingPointMarkers itself is private; RefreshCacheData is the
+	// public entry that calls it, and it also rebuilds the notify tracks and
+	// sync markers the editor caches. PostEditChange alone dispatches a
+	// property-changed event with no property attached, which is not the path
+	// that rebuilds the cache.
+	AnimAsset->RefreshCacheData();
 	AnimAsset->PostEditChange();
 	AnimAsset->MarkPackageDirty();
 
@@ -1142,6 +1198,26 @@ TSharedPtr<FJsonValue> FAnimationHandlers::AddAnimNotify(const TSharedPtr<FJsonO
 	{
 		Result->SetStringField(TEXT("notifyClass"), NewNotify->GetClass()->GetName());
 	}
+	if (bIsMontage)
+	{
+		// #880 read back what the refresh produced rather than asserting it
+		// happened. BranchingPointMarkers is private, so this goes through the
+		// UPROPERTY, which is what the runtime reads too.
+		Result->SetBoolField(TEXT("branchingPoint"), bWantBranchingPoint);
+		int32 MarkerCount = INDEX_NONE;
+		if (const FArrayProperty* MarkersProperty =
+			CastField<FArrayProperty>(AnimAsset->GetClass()->FindPropertyByName(TEXT("BranchingPointMarkers"))))
+		{
+			FScriptArrayHelper Helper(MarkersProperty, MarkersProperty->ContainerPtrToValuePtr<void>(AnimAsset));
+			MarkerCount = Helper.Num();
+		}
+		Result->SetNumberField(TEXT("branchingPointMarkerCount"), MarkerCount);
+		if (bWantBranchingPoint && MarkerCount == 0)
+		{
+			Result->SetStringField(TEXT("branchingPointWarning"),
+				TEXT("The notify was added as a branching point but the montage's BranchingPointMarkers cache is empty, so OnPlayMontageNotifyBegin will not broadcast until the montage is reloaded."));
+		}
+	}
 	// #471: paired remove handler now exists.
 	TSharedPtr<FJsonObject> Payload = MakeShared<FJsonObject>();
 	Payload->SetStringField(TEXT("assetPath"), AssetPath);

package/plugin/ue_mcp_bridge/Source/UE_MCP_Bridge/Private/Handlers/AnimationHandlers.h

@@ -96,6 +96,8 @@ private:
 	// IK Rig (#93)
 	static TSharedPtr<FJsonValue> CreateIKRig(const TSharedPtr<FJsonObject>& Params);
 	static TSharedPtr<FJsonValue> ReadIKRig(const TSharedPtr<FJsonObject>& Params);
+	// UE 5.8 full-body IK definition authoring over an existing IK Rig.
+	static TSharedPtr<FJsonValue> ConfigureIKRig(const TSharedPtr<FJsonObject>& Params);
 
 	// Control Rig (#11)
 	static TSharedPtr<FJsonValue> ListControlRigVariables(const TSharedPtr<FJsonObject>& Params);
@@ -104,6 +106,14 @@ private:
 	// #619 per-element Control Rig hierarchy metadata (name, type, index, parent)
 	static TSharedPtr<FJsonValue> ReadControlRigHierarchy(const TSharedPtr<FJsonObject>& Params);
 
+	// UE 5.8 Control Rig editing in Sequencer. Source AnimSequences are read-only;
+	// edits live in a LevelSequence until explicitly baked to a new AnimSequence.
+	static TSharedPtr<FJsonValue> BeginControlRigEdit(const TSharedPtr<FJsonObject>& Params);
+	static TSharedPtr<FJsonValue> ReadControlRigEdit(const TSharedPtr<FJsonObject>& Params);
+	static TSharedPtr<FJsonValue> ApplyControlRigEdits(const TSharedPtr<FJsonObject>& Params);
+	static TSharedPtr<FJsonValue> BakeControlRigEdit(const TSharedPtr<FJsonObject>& Params);
+	static TSharedPtr<FJsonValue> AnalyzeAnimation(const TSharedPtr<FJsonObject>& Params);
+
 	// v0.7.11 - depth
 	static TSharedPtr<FJsonValue> SetRootMotionSettings(const TSharedPtr<FJsonObject>& Params);
 	static TSharedPtr<FJsonValue> AddVirtualBone(const TSharedPtr<FJsonObject>& Params);
@@ -114,6 +124,8 @@ private:
 	// v0.7.11 - issue fixes
 	static TSharedPtr<FJsonValue> CreateIKRetargeter(const TSharedPtr<FJsonObject>& Params);
 	static TSharedPtr<FJsonValue> ReadIKRetargeter(const TSharedPtr<FJsonObject>& Params);
+	// UE 5.8 retarget op, chain-map, preview-mesh and retarget-pose authoring.
+	static TSharedPtr<FJsonValue> ConfigureIKRetargeter(const TSharedPtr<FJsonObject>& Params);
 	// #701/#703: IK rig/retargeter authoring tail + batch retarget bake.
 	static TSharedPtr<FJsonValue> SetIKRigMesh(const TSharedPtr<FJsonObject>& Params);
 	static TSharedPtr<FJsonValue> SetIKRetargeterRig(const TSharedPtr<FJsonObject>& Params);
@@ -164,4 +176,17 @@ private:
 	static TSharedPtr<FJsonValue> ListBones(const TSharedPtr<FJsonObject>& Params);
 	static TSharedPtr<FJsonValue> RebindLeaderPose(const TSharedPtr<FJsonObject>& Params);
 	static TSharedPtr<FJsonValue> PreviewAnimation(const TSharedPtr<FJsonObject>& Params);
+
+	// #922/#926 - the evaluated pose off a live SkeletalMeshComponent, for a set
+	// of bones at once. Lives in AnimationHandlers_SkeletalLive.cpp.
+	static TSharedPtr<FJsonValue> GetLiveBoneTransforms(const TSharedPtr<FJsonObject>& Params);
+
+	// #923/#926/#922 - evaluated pose reads off an asset. Live in
+	// AnimationHandlers_Pose.cpp.
+	// Evaluate an AnimSequence (or a BlendSpace at a blend position) at given
+	// frames or times and return composed transforms.
+	static TSharedPtr<FJsonValue> SamplePose(const TSharedPtr<FJsonObject>& Params);
+	// Planted-foot speed of a clip, which every retarget changes by the target
+	// skeleton's leg-length ratio and so has to be re-measured per clip.
+	static TSharedPtr<FJsonValue> MeasureNaturalSpeed(const TSharedPtr<FJsonObject>& Params);
 };

package/plugin/ue_mcp_bridge/Source/UE_MCP_Bridge/Private/Handlers/AnimationHandlers_ControlRig.cpp

@@ -37,7 +37,7 @@ namespace
 		}
 	}
 
-	TSharedPtr<FJsonObject> PinToJson(URigVMPin* Pin, bool bIncludeDefaults, int32 Depth)
+	TSharedPtr<FJsonObject> ControlRigPinToJson(URigVMPin* Pin, bool bIncludeDefaults, int32 Depth)
 	{
 		TSharedPtr<FJsonObject> Obj = MakeShared<FJsonObject>();
 		Obj->SetStringField(TEXT("name"), Pin->GetName());
@@ -64,7 +64,7 @@ namespace
 			TArray<TSharedPtr<FJsonValue>> SubArray;
 			for (URigVMPin* Sub : SubPins)
 			{
-				if (Sub) SubArray.Add(MakeShared<FJsonValueObject>(PinToJson(Sub, bIncludeDefaults, Depth + 1)));
+				if (Sub) SubArray.Add(MakeShared<FJsonValueObject>(ControlRigPinToJson(Sub, bIncludeDefaults, Depth + 1)));
 			}
 			Obj->SetArrayField(TEXT("subPins"), SubArray);
 		}
@@ -156,7 +156,7 @@ TSharedPtr<FJsonValue> FAnimationHandlers::ReadControlRigGraph(const TSharedPtr<
 				TArray<TSharedPtr<FJsonValue>> PinsArray;
 				for (URigVMPin* Pin : Node->GetPins())
 				{
-					if (Pin) PinsArray.Add(MakeShared<FJsonValueObject>(PinToJson(Pin, bIncludeDefaults, 0)));
+					if (Pin) PinsArray.Add(MakeShared<FJsonValueObject>(ControlRigPinToJson(Pin, bIncludeDefaults, 0)));
 				}
 				NodeObj->SetArrayField(TEXT("pins"), PinsArray);
 			}