Reverted change to EmbeddedAnimationProcessor linear keyframe reducti…

…on constraints Signed-off-by: Martin Evans <martindevans@gmail.com>
TomGillen · Oct 3, 2014 · 2249006 · 2249006
1 parent 810fa99
commit 2249006
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Myre/Myre.Graphics.Pipeline/Animations/EmbeddedAnimationProcessor.cs b/Myre/Myre.Graphics.Pipeline/Animations/EmbeddedAnimationProcessor.cs
@@ -157,8 +157,8 @@ private static IEnumerable<KeyValuePair<string, AnimationContent>> FindAnimation
         /// <param name="keyframes"></param>
         private static void LinearKeyframeReduction(LinkedList<KeyframeContent> keyframes)
         {
-            const float EPSILON_LENGTH   = 0.001f;      //1mm
-            const float EPSILON_COS_ANGLE = 0.999847f;  //1 degree
+            const float EPSILON_LENGTH   = 0.0000001f;
+            const float EPSILON_COS_ANGLE = 0.9999999f;
             const float EPSILON_SCALE    = 0.0000001f;
 
             if (keyframes.First == null || keyframes.First.Next == null || keyframes.First.Next.Next == null)

diff --git a/Testing/GraphicsTests/GraphicsTests/Tests/AnimatedDude.cs b/Testing/GraphicsTests/GraphicsTests/Tests/AnimatedDude.cs
@@ -25,13 +25,13 @@ class AnimatedDude
 
         private readonly string[] _sequence = new string[]
         {
-            //"walk-forward-0", "walk-forward-0", "walk-forward-0"
+            "walk-forward-0", "walk-forward-0", "walk-forward-0"
             //"idle01", "idle02", "jump", "roll-backward-0", "roll-forward-0",
             //"roll-left-0",
             //"roll-right-0",
             //"run-forward-0", "run-forward-1", "run-forward-2",
             //"run-forward_jump-0", "sitting", "strafe-left-0", "strafe-right-0", "swim-forward-0", "walk-backward-0", "walk-forward-0", "walk-forward-1", "walk-forward-2"
-            "t-pose"
+            //"t-pose"
 
         };
 
@@ -43,7 +43,7 @@ public AnimatedDude(IKernel kernel, ContentManager content, GraphicsDevice devic
             var model = content.Load<ModelData>(@"models/zoe");
             var dude = kernel.Get<EntityDescription>();
             dude.AddProperty(new TypedName<ModelData>("model"), model);
-            dude.AddProperty(new TypedName<Matrix>("transform"), Matrix.CreateScale(50f) * Matrix.CreateTranslation(0, 0, -50));
+            dude.AddProperty(new TypedName<Matrix>("transform"), Matrix.CreateScale(50f) * Matrix.CreateTranslation(0, 0, -150));
             dude.AddProperty(new TypedName<bool>("is_static"), false);
             dude.AddBehaviour<ModelInstance>();
             dude.AddBehaviour<Animated>();