Fixed eye rotation.

huika · Apr 28, 2015 · aa61a2a · aa61a2a
1 parent c47eb6d
commit aa61a2a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/UMAProject/Assets/UMA/Content/UMA/Humanoid/DNA/HumanFemaleDNAConverterBehaviour.cs b/UMAProject/Assets/UMA/Content/UMA/Humanoid/DNA/HumanFemaleDNAConverterBehaviour.cs
@@ -93,11 +93,11 @@ public static void UpdateUMAFemaleDNABones(UMAData umaData, UMASkeleton skeleton
 		//Mathf.Clamp(1 + (umaDna.eyeSize - 0.5f) * 0.3f , 0.7f, 1.4f),
 		//Mathf.Clamp(1 + (umaDna.eyeSize - 0.5f) * 0.3f , 0.7f, 1.4f),
 		//Mathf.Clamp(1 + (umaDna.eyeSize - 0.5f) * 0.3f , 0.7f, 1.4f));     
-		
-		skeleton.SetRotation(leftEyeHash,
-		                     Quaternion.Euler(new Vector3((umaDna.eyeRotation - 0.5f) * 20, -90, -180)));
-		skeleton.SetRotation(rightEyeHash,
-		                     Quaternion.Euler(new Vector3(-(umaDna.eyeRotation - 0.5f) * 20, -90, -180)));
+
+		skeleton.SetRotation(leftEyeAdjustHash,
+		                     Quaternion.Euler(new Vector3((umaDna.eyeRotation - 0.5f) * 20, 0, 0)));
+		skeleton.SetRotation(rightEyeAdjustHash,
+		                     Quaternion.Euler(new Vector3(-(umaDna.eyeRotation - 0.5f) * 20, 0, 0)));
 
 		//umaData.boneList["LeftEye"].boneTransform.localEulerAngles = new Vector3((umaDna.eyeRotation - 0.5f) * 20, -90, -180);
 		//umaData.boneList["RightEye"].boneTransform.localEulerAngles = new Vector3(-(umaDna.eyeRotation - 0.5f) * 20, -90, -180);

diff --git a/UMAProject/Assets/UMA/Content/UMA/Humanoid/DNA/HumanMaleDNAConverterBehaviour.cs b/UMAProject/Assets/UMA/Content/UMA/Humanoid/DNA/HumanMaleDNAConverterBehaviour.cs
@@ -97,10 +97,10 @@ public static void UpdateUMAMaleDNABones(UMAData umaData, UMASkeleton skeleton)
 		//Mathf.Clamp(1 + (umaDna.eyeSize - 0.5f) * 0.3f , 0.7f, 1.4f),
 		//Mathf.Clamp(1 + (umaDna.eyeSize - 0.5f) * 0.3f , 0.7f, 1.4f));     
 
-		skeleton.SetRotation(leftEyeHash,
-		                     Quaternion.Euler(new Vector3((umaDna.eyeRotation - 0.5f) * 20, -90, -180)));
-		skeleton.SetRotation(rightEyeHash,
-		                     Quaternion.Euler(new Vector3(-(umaDna.eyeRotation - 0.5f) * 20, -90, -180)));
+		skeleton.SetRotation(leftEyeAdjustHash,
+		                     Quaternion.Euler(new Vector3((umaDna.eyeRotation - 0.5f) * 20, 0, 0)));
+		skeleton.SetRotation(rightEyeAdjustHash,
+		                     Quaternion.Euler(new Vector3(-(umaDna.eyeRotation - 0.5f) * 20, 0, 0)));
 
 		//umaData.boneList["LeftEye"].boneTransform.localEulerAngles = new Vector3((umaDna.eyeRotation - 0.5f) * 20, -90, -180);
 		//umaData.boneList["RightEye"].boneTransform.localEulerAngles = new Vector3(-(umaDna.eyeRotation - 0.5f) * 20, -90, -180);

diff --git a/UMAProject/Assets/UMA/Content/UMA/Humanoid/DNA/HumanoidDNAConverterBehaviour.cs b/UMAProject/Assets/UMA/Content/UMA/Humanoid/DNA/HumanoidDNAConverterBehaviour.cs
@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using System.Collections;
 
 namespace UMA
@@ -18,6 +18,8 @@ public class HumanoidDNAConverterBehaviour : DnaConverterBehaviour
 		static protected int rightOuterBreastHash;
 		static protected int leftEyeHash;
 		static protected int rightEyeHash;
+		static protected int leftEyeAdjustHash;
+		static protected int rightEyeAdjustHash;
 		static protected int spine1AdjustHash;
 		static protected int spineAdjustHash;
 		static protected int lowerBackBellyHash;
@@ -96,6 +98,8 @@ public override void Prepare()
 			rightOuterBreastHash = UMAUtils.StringToHash("RightOuterBreast");
 			leftEyeHash = UMAUtils.StringToHash("LeftEye");
 			rightEyeHash = UMAUtils.StringToHash("RightEye");
+			leftEyeAdjustHash = UMAUtils.StringToHash("LeftEyeAdjust");
+			rightEyeAdjustHash = UMAUtils.StringToHash("RightEyeAdjust");
 			spine1AdjustHash = UMAUtils.StringToHash("Spine1Adjust");
 			spineAdjustHash = UMAUtils.StringToHash("SpineAdjust");
 			lowerBackBellyHash = UMAUtils.StringToHash("LowerBackBelly");
@@ -166,4 +170,4 @@ public override void Prepare()
 			builtHashes = true;
 		}
 	}
-}
+}