From 0333e1a1c62f1bb54dea6101a070023ea1ef8f74 Mon Sep 17 00:00:00 2001
From: Mathias Kahl <mathias.kahl@googlemail.com>
Date: Sat, 27 Aug 2011 15:04:45 +0200
Subject: [PATCH] Fixed bug in animation importer

---
 .../ColladaXna Standard Sample/AnimatedModel.cs           | 6 ++++++
 .../ColladaXna Standard Sample/Game1.cs                   | 8 ++++----
 .../ColladaXna Standard SampleContent.contentproj         | 6 ++----
 ColladaXnaBase/Import/AnimationImporter.cs                | 4 ++--
 ColladaXnaBase/Import/SceneImporter.cs                    | 4 ++--
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ColladaXna Standard Sample/ColladaXna Standard Sample/AnimatedModel.cs b/ColladaXna Standard Sample/ColladaXna Standard Sample/AnimatedModel.cs
index 2c3cbfe..c9680fe 100644
--- a/ColladaXna Standard Sample/ColladaXna Standard Sample/AnimatedModel.cs	
+++ b/ColladaXna Standard Sample/ColladaXna Standard Sample/AnimatedModel.cs	
@@ -70,6 +70,12 @@ public void Play(String clipName = "Take 001")
             player.StartClip(clip);
         }
 
+        public void PlayFirstClip()
+        {
+            AnimationClip clip = skinningData.AnimationClips.Values.First();
+            player.StartClip(clip);
+        }
+
         /// <summary>
         /// Advances the animation by given time and updates the model
         /// skin accordingly.
diff --git a/ColladaXna Standard Sample/ColladaXna Standard Sample/Game1.cs b/ColladaXna Standard Sample/ColladaXna Standard Sample/Game1.cs
index b4cd488..2baa367 100644
--- a/ColladaXna Standard Sample/ColladaXna Standard Sample/Game1.cs	
+++ b/ColladaXna Standard Sample/ColladaXna Standard Sample/Game1.cs	
@@ -28,8 +28,8 @@ public class Game1 : Microsoft.Xna.Framework.Game
         Matrix view;
         Matrix projection;
 
-        Vector3 pos = Vector3.Zero;
-        Vector3 rot = Vector3.Zero;
+        Vector3 pos;
+        Vector3 rot;
         bool showHints = true;
 
         List<Model> models = new List<Model>();
@@ -75,7 +75,7 @@ protected override void Initialize()
             view = Matrix.CreateLookAt(new Vector3(0, 0, -10), Vector3.Zero, Vector3.Up);
 
             pos = new Vector3(0, -40, 100);
-            rot = new Vector3(-MathHelper.PiOver2, 0, 0);
+            rot = new Vector3(-MathHelper.PiOver2, 0, MathHelper.Pi - MathHelper.PiOver4);
 
             base.Initialize();
         }
@@ -112,7 +112,7 @@ protected override void LoadContent()
                     }
 
                     // Start default animation clip
-                    animatedModels[model].Play();
+                    animatedModels[model].PlayFirstClip();
                 }
                 else
                 {
diff --git a/ColladaXna Standard Sample/ColladaXna Standard SampleContent/ColladaXna Standard SampleContent.contentproj b/ColladaXna Standard Sample/ColladaXna Standard SampleContent/ColladaXna Standard SampleContent.contentproj
index 4403dc4..2e1c5ab 100644
--- a/ColladaXna Standard Sample/ColladaXna Standard SampleContent/ColladaXna Standard SampleContent.contentproj	
+++ b/ColladaXna Standard Sample/ColladaXna Standard SampleContent/ColladaXna Standard SampleContent.contentproj	
@@ -55,7 +55,7 @@
       <Importer>ColladaStdModelImporter</Importer>
       <Processor>ModelProcessor</Processor>
       <SubType>Designer</SubType>
-      <ProcessorParameters_RotationZ>-45</ProcessorParameters_RotationZ>
+      <ProcessorParameters_RotationZ>-180</ProcessorParameters_RotationZ>
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -86,8 +86,7 @@
       <Name>Igor</Name>
       <Importer>ColladaStdModelImporter</Importer>
       <Processor>ModelProcessor</Processor>
-      <ProcessorParameters_Scale>20</ProcessorParameters_Scale>
-      <ProcessorParameters_RotationZ>180</ProcessorParameters_RotationZ>
+      <ProcessorParameters_Scale>30</ProcessorParameters_Scale>
     </Compile>
     <Compile Include="Igor\IgorTex.tga">
       <Name>IgorTex</Name>
@@ -101,7 +100,6 @@
       <Importer>ColladaStdModelImporter</Importer>
       <Processor>ModelProcessor</Processor>
       <ProcessorParameters_Scale>30</ProcessorParameters_Scale>
-      <ProcessorParameters_RotationZ>135</ProcessorParameters_RotationZ>
     </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
diff --git a/ColladaXnaBase/Import/AnimationImporter.cs b/ColladaXnaBase/Import/AnimationImporter.cs
index 3869d6f..c89a4f8 100644
--- a/ColladaXnaBase/Import/AnimationImporter.cs
+++ b/ColladaXnaBase/Import/AnimationImporter.cs
@@ -344,9 +344,9 @@ static JointAnimation ImportAnimation(XmlNode xmlAnimation, Dictionary<string,Jo
             string target)
         {            
             // Input and Output sources
-            Source input = Source.FromInput(xmlSampler.SelectSingleNode("//input[@semantic='INPUT']"),
+            Source input = Source.FromInput(xmlSampler.SelectSingleNode("input[@semantic='INPUT']"),
                                             xmlAnimation);
-            Source output = Source.FromInput(xmlSampler.SelectSingleNode("//input[@semantic='OUTPUT']"),
+            Source output = Source.FromInput(xmlSampler.SelectSingleNode("input[@semantic='OUTPUT']"),
                                              xmlAnimation);
 
             // Target (matrix, translation.*, rotation.*, scale.*)
diff --git a/ColladaXnaBase/Import/SceneImporter.cs b/ColladaXnaBase/Import/SceneImporter.cs
index e9e381a..37cb39d 100644
--- a/ColladaXnaBase/Import/SceneImporter.cs
+++ b/ColladaXnaBase/Import/SceneImporter.cs
@@ -110,11 +110,11 @@ string GetMeshLibKey(XmlNode xmlNode, string id)
         }
 
         Matrix CreateAbsoluteTransformFromSkeleton(XmlNode xmlControllerInstance)
-        {
+        {            
             XmlNode skeleton = xmlControllerInstance.SelectSingleNode("skeleton");
             string nodeId = skeleton != null
                 ? skeleton.InnerText.Trim().Substring(1)
-                : _model.RootJoint.GlobalID;
+                : _model.RootJoint.GlobalID;                        
 
             XmlNode xmlRoot = xmlControllerInstance.OwnerDocument.DocumentElement;
             XmlNode xmlNode = xmlRoot.SelectSingleNode("id('" + nodeId + "')");