Merge pull request #24 from umasteeringgroup/fix-uma26/GetTPoseCorrectedRotation

Jaimi · web-flow · commit 05fa596bd6b1 · 2017-08-08T22:13:51.000-05:00
Proper fix for GetTPoseCorrectedRotation
diff --git a/UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/UMAGeneratorBase.cs b/UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/UMAGeneratorBase.cs
@@ -331,7 +331,7 @@ private static void SkeletonModifier(UMAData umaData, ref SkeletonBone[] bones,
 				{
 					skeletonbone.position = boneGO.transform.localPosition;
 					skeletonbone.scale = boneGO.transform.localScale;
-					skeletonbone.rotation = umaData.skeleton.GetTPoseCorrectedRotation(boneHash, boneGO.transform.localRotation);
+					skeletonbone.rotation = umaData.skeleton.GetTPoseCorrectedRotation(boneHash, skeletonbone.rotation);
 					newBones.Add(skeletonbone);
 				}
 			}
diff --git a/UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/UMASkeleton.cs b/UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/UMASkeleton.cs
@@ -660,7 +660,7 @@ public virtual void EnsureBoneHierarchy()
 
 		public virtual Quaternion GetTPoseCorrectedRotation(int nameHash, Quaternion tPoseRotation)
 		{
-			return tPoseRotation;
+			return boneHashData[nameHash].boneTransform.localRotation;
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ private static void SkeletonModifier(UMAData umaData, ref SkeletonBone[] bones,`
`331`	`331`	`{`
`332`	`332`	`skeletonbone.position = boneGO.transform.localPosition;`
`333`	`333`	`skeletonbone.scale = boneGO.transform.localScale;`
`334`		`- skeletonbone.rotation = umaData.skeleton.GetTPoseCorrectedRotation(boneHash, boneGO.transform.localRotation);`
	`334`	`+ skeletonbone.rotation = umaData.skeleton.GetTPoseCorrectedRotation(boneHash, skeletonbone.rotation);`
`335`	`335`	`newBones.Add(skeletonbone);`
`336`	`336`	`}`
`337`	`337`	`}`
Original file line number	Diff line number	Diff line change
`@@ -660,7 +660,7 @@ public virtual void EnsureBoneHierarchy()`
`660`	`660`
`661`	`661`	`public virtual Quaternion GetTPoseCorrectedRotation(int nameHash, Quaternion tPoseRotation)`
`662`	`662`	`{`
`663`		`- return tPoseRotation;`
	`663`	`+ return boneHashData[nameHash].boneTransform.localRotation;`
`664`	`664`	`}`
`665`	`665`	`}`
`666`	`666`	`}`