Merge pull request #2 from tuatec/unweighted-bones

Add Unweighted Bones directly in Unreal
tuatec · Jul 18, 2022 · 13ddaa7 · 13ddaa7
2 parents 7b02b13 + 3c6080b
commit 13ddaa7
Show file tree

Hide file tree

Showing 13 changed files with 771 additions and 18 deletions.
diff --git a/Content/Data/DT_ConstraintBone.uasset b/Content/Data/DT_ConstraintBone.uasset
diff --git a/Content/Data/DT_IKBoneChains.uasset b/Content/Data/DT_IKBoneChains.uasset
diff --git a/Content/Data/DT_Sockets.uasset b/Content/Data/DT_Sockets.uasset
diff --git a/Content/Data/DT_UnweightedBones.uasset b/Content/Data/DT_UnweightedBones.uasset
diff --git a/Content/Data/DT_VirtualBones.uasset b/Content/Data/DT_VirtualBones.uasset
diff --git a/Content/EditorHooks/BP_IKRigFunctions.uasset b/Content/EditorHooks/BP_IKRigFunctions.uasset
diff --git a/Content/EditorHooks/BP_SkeletonBoneFunctions.uasset b/Content/EditorHooks/BP_SkeletonBoneFunctions.uasset
diff --git a/Content/HeldObjectEditor/BP_HeldObjectEditor.uasset b/Content/HeldObjectEditor/BP_HeldObjectEditor.uasset
diff --git a/Content/Structures/ST_TTUnweightedBones.uasset b/Content/Structures/ST_TTUnweightedBones.uasset
diff --git a/Source/TTToolbox/Private/IKRig_ConstraintBones.cpp b/Source/TTToolbox/Private/IKRig_ConstraintBones.cpp
@@ -29,15 +29,40 @@ void UIKRig_ConstraintBones::Initialize(const FIKRigSkeleton& IKRigSkeleton)
 {
 	m_constraintBones.Reserve(ConstraintBones.Num());
 
+	bool errorsOccurred = false;
+
 	//! @todo @ffs sort bone indices
-	for (auto& constraintBone : ConstraintBones)
+	for (auto& constraint : ConstraintBones)
 	{
-		m_constraintBones.Add(
-			{
-				IKRigSkeleton.GetBoneIndexFromName(constraintBone.ConstraintBone),
-				IKRigSkeleton.GetBoneIndexFromName(constraintBone.ModifiedBone)
+		int32 constraintBone = IKRigSkeleton.GetBoneIndexFromName(constraint.ConstraintBone);
+		int32 modifiedBone = IKRigSkeleton.GetBoneIndexFromName(constraint.ModifiedBone);
+
+		if (constraintBone == INDEX_NONE)
+		{
+			errorsOccurred = true;
+			UE_LOG(LogTemp, Error, TEXT("Failed get get bone index for constaint bone %s"), *constraint.ConstraintBone.ToString());
+			continue;
+		}
+
+		if (modifiedBone == INDEX_NONE)
+		{
+			errorsOccurred = true;
+			UE_LOG(LogTemp, Error, TEXT("Failed get get bone index for constaint bone %s"), *constraint.ModifiedBone.ToString());
+			continue;
+		}
+
+			m_constraintBones.Add(
+				{
+					constraintBone,
+					modifiedBone
 			});
 	}
+
+	if (errorsOccurred)
+	{
+		UE_LOG(LogTemp, Error, TEXT("Some constraint bones could not be set up, no constraining will be done. Please check the error messages above."));
+		m_constraintBones.Empty();
+	}
 }
 
 void UIKRig_ConstraintBones::Solve(FIKRigSkeleton& IKRigSkeleton, const FIKRigGoalContainer& Goals)