Changeset 472 for cafu/trunk

Timestamp:

01/27/12 15:01:08 (4 months ago)

Author:

Carsten

Message:

Model Editor: Add ability to import animation sequences into existing model files.

This feature is, at the moment, implemented for md5anim files only.

References #80.

Location:

cafu/trunk

Files:

• CaWE/ModelEditor/ChildFrame.cpp (modified) (5 diffs)
• CaWE/ModelEditor/ChildFrame.hpp (modified) (2 diffs)
• CaWE/ModelEditor/Commands/Add.cpp (modified) (7 diffs)
• CaWE/ModelEditor/Commands/Add.hpp (modified) (2 diffs)
• CaWE/ModelEditor/ElementsList.cpp (modified) (4 diffs)
• Libs/Models/Loader.cpp (modified) (1 diff)
• Libs/Models/Loader.hpp (modified) (1 diff)
• Libs/Models/Loader_md5.cpp (modified) (2 diffs)
• Libs/Models/Loader_md5.hpp (modified) (1 diff)
• Libs/Models/Model_cmdl.cpp (modified) (1 diff)
• Libs/Models/Model_cmdl.hpp (modified) (2 diffs)

cafu/trunk/CaWE/ModelEditor/ChildFrame.cpp

@@ -41 +41 @@
 
 #include "MaterialSystem/Material.hpp"
+#include "Models/Loader_md5.hpp"
 #include "Models/Model_cmdl.hpp"
 
@@ -172 +173 @@
     ModelMenu->Append(ID_MENU_MODEL_SKIN_ADD, "Add skin", "Adds a new skin to the model");
     ModelMenu->Append(ID_MENU_MODEL_GUIFIXTURE_ADD, "Add GUI fixture", "Adds a new GUI fixture to the model");
+    ModelMenu->Append(ID_MENU_MODEL_ANIM_IMPORT, "Import anim sequences", "Imports additional animation sequences into the model");
     ModelMenu->Append(ID_MENU_MODEL_CHANNEL_ADD, "Add channel", "Adds a new animation channel to the model");
     ModelMenu->Append(-1, "Run benchmark", "Move the camera along a predefined path and determine the time taken")->Enable(false);
@@ -314 +316 @@
  // AnimToolbar->AddTool(ID_MENU_MODEL_SKIN_ADD,       "Add skin",        wxArtProvider::GetBitmap("window-new", wxART_TOOLBAR), "Add skin");
     AnimToolbar->AddTool(ID_MENU_MODEL_GUIFIXTURE_ADD, "Add GUI fixture", wxArtProvider::GetBitmap("window-new", wxART_TOOLBAR), "Add GUI fixture");
+ // AnimToolbar->AddTool(ID_MENU_MODEL_ANIM_IMPORT,    "Import anim",     wxArtProvider::GetBitmap("window-new", wxART_TOOLBAR), "Import anim");
  // AnimToolbar->AddTool(ID_MENU_MODEL_CHANNEL_ADD,    "Add channel",     wxArtProvider::GetBitmap("window-new", wxART_TOOLBAR), "Add channel");
     AnimToolbar->Realize();
@@ -380 +383 @@
 
     return SubmitCommand(new CommandAddT(m_ModelDoc, GuiFixtures));
+}
+
+
+bool ModelEditor::ChildFrameT::SubmitImportAnims()
+{
+    wxFileDialog FileDialog(this,                           // The window parent.
+                            "Import animation sequence",    // Message.
+                            "",                             // The default directory.
+                            "*.md5anim",                    // The default file name.
+                            "All files (*.*)|*.*"           // The wildcard.
+                            "|md5anim files|*.md5anim",
+                            wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_MULTIPLE);
+
+    if (FileDialog.ShowModal()!=wxID_OK)
+        return false;
+
+    wxArrayString     Paths;
+    ArrayT<CommandT*> SubCommands;
+    wxString          Errors;
+
+    FileDialog.GetPaths(Paths);
+
+    for (size_t PathNr=0; PathNr<Paths.GetCount(); PathNr++)
+    {
+        try
+        {
+            ImporterMd5AnimT          Importer(Paths[PathNr].ToStdString());
+            ArrayT<CafuModelT::AnimT> Anims=Importer.Import(m_ModelDoc->GetModel()->GetJoints(), m_ModelDoc->GetModel()->GetMeshes());
+
+            SubCommands.PushBack(new CommandAddT(m_ModelDoc, Anims));
+        }
+        catch (const ModelLoaderT::LoadErrorT& LE)
+        {
+            Errors += "\n" + Paths[PathNr] + "\n" + LE.what() + "\n";
+        }
+    }
+
+    if (Errors!="")
+    {
+        wxMessageBox(Errors, "Couldn't import animation sequences");
+    }
+
+    if (SubCommands.Size()==1)
+    {
+        return SubmitCommand(SubCommands[0]);
+    }
+    else if (SubCommands.Size()>1)
+    {
+        return SubmitCommand(new CommandMacroT(SubCommands, "Import anim sequences"));
+    }
+
+    return false;
 }
 
@@ -922 +977 @@
         }
 
+        case ID_MENU_MODEL_ANIM_IMPORT:
+        {
+            SubmitImportAnims();
+            break;
+        }
+
         case ID_MENU_MODEL_CHANNEL_ADD:
         {

cafu/trunk/CaWE/ModelEditor/ChildFrame.hpp

@@ -72 +72 @@
         /// Creates a new GUI fixture, calls SubmitCommand() accordingly and returns its result.
         bool SubmitNewGuiFixture();
+
+        /// Imports animation sequences from a user selected file, calls SubmitCommand() accordingly and returns its result.
+        bool SubmitImportAnims();
 
         /// Creates a new animation channel, calls SubmitCommand() accordingly and returns its result.
@@ -171 +174 @@
             ID_MENU_MODEL_SKIN_ADD,
             ID_MENU_MODEL_GUIFIXTURE_ADD,
+            ID_MENU_MODEL_ANIM_IMPORT,
             ID_MENU_MODEL_CHANNEL_ADD,
             ID_MENU_MODEL_LOAD_SUBMODEL,

cafu/trunk/CaWE/ModelEditor/Commands/Add.cpp

@@ -47 +47 @@
 
 
+CommandAddT::CommandAddT(ModelDocumentT* ModelDoc, const ArrayT<CafuModelT::AnimT>& Anims)
+    : m_ModelDoc(ModelDoc),
+      m_Type(ANIM),
+      m_Anims(Anims)
+{
+}
+
+
 CommandAddT::CommandAddT(ModelDocumentT* ModelDoc, const CafuModelT::ChannelT& Channel)
     : m_ModelDoc(ModelDoc),
@@ -90 +98 @@
             break;
 
+        case ANIM:
+            for (unsigned long AnimNr=0; AnimNr<m_Anims.Size(); AnimNr++)
+            {
+                Indices.PushBack(m_ModelDoc->GetModel()->m_Anims.Size());
+                m_ModelDoc->GetModel()->m_Anims.PushBack(m_Anims[AnimNr]);
+            }
+            break;
+
         case CHAN:
             for (unsigned long ChannelNr=0; ChannelNr<m_Channels.Size(); ChannelNr++)
@@ -96 +112 @@
                 m_ModelDoc->GetModel()->m_Channels.PushBack(m_Channels[ChannelNr]);
             }
-            break;
-
-        default:
             break;
     }
@@ -146 +159 @@
             break;
 
+        case ANIM:
+            for (unsigned long AnimNr=0; AnimNr<m_Anims.Size(); AnimNr++)
+            {
+                m_ModelDoc->GetModel()->m_Anims.DeleteBack();
+                Indices.InsertAt(0, m_ModelDoc->GetModel()->m_Anims.Size());
+            }
+            break;
+
         case CHAN:
             for (unsigned long ChannelNr=0; ChannelNr<m_Channels.Size(); ChannelNr++)
@@ -152 +173 @@
                 Indices.InsertAt(0, m_ModelDoc->GetModel()->m_Channels.Size());
             }
-            break;
-
-        default:
             break;
     }
@@ -175 +193 @@
         case JOINT: break;
         case MESH:  break;
-        case ANIM:  break;
 
         case SKIN:
@@ -191 +208 @@
         }
 
+        case ANIM:
+        {
+            Name=(m_Anims.Size()==1) ? wxString("Add anim sequence") : wxString::Format("Add %lu anim sequences", m_Anims.Size());
+            break;
+        }
+
         case CHAN:
         {

cafu/trunk/CaWE/ModelEditor/Commands/Add.hpp

@@ -40 +40 @@
         CommandAddT(ModelDocumentT* ModelDoc, const CafuModelT::SkinT& Skin);
         CommandAddT(ModelDocumentT* ModelDoc, const ArrayT<CafuModelT::GuiFixtureT>& GuiFixtures);
+        CommandAddT(ModelDocumentT* ModelDoc, const ArrayT<CafuModelT::AnimT>& Anims);
         CommandAddT(ModelDocumentT* ModelDoc, const CafuModelT::ChannelT& Channel);
 
@@ -52 +53 @@
         ModelDocumentT*                 m_ModelDoc;
         const ModelElementTypeT         m_Type;
-     // ArrayT<CafuModelT::JointT>      m_Joints;       ///< The added joints (if m_Type==JOINT).
-     // ArrayT<CafuModelT::MeshT>       m_Meshes;       ///< The added meshes (if m_Type==MESH).
+     // ArrayT<CafuModelT::JointT>      m_Joints;       ///< The added joints       (if m_Type==JOINT).
+     // ArrayT<CafuModelT::MeshT>       m_Meshes;       ///< The added meshes       (if m_Type==MESH).
      // ArrayT<MatSys::MeshT>           m_DrawMs;       ///< The draw meshes related to m_Meshes.
-        ArrayT<CafuModelT::SkinT>       m_Skins;        ///< The added skins (if m_Type==SKIN).
+        ArrayT<CafuModelT::SkinT>       m_Skins;        ///< The added skins        (if m_Type==SKIN).
         ArrayT<CafuModelT::GuiFixtureT> m_GuiFixtures;  ///< The added GUI fixtures (if m_Type==GFIX).
-     // ArrayT<CafuModelT::AnimT>       m_Anims;        ///< The added anims (if m_Type==ANIM).
-        ArrayT<CafuModelT::ChannelT>    m_Channels;     ///< The added channels (if m_Type==CHAN).
+        ArrayT<CafuModelT::AnimT>       m_Anims;        ///< The added anims        (if m_Type==ANIM).
+        ArrayT<CafuModelT::ChannelT>    m_Channels;     ///< The added channels     (if m_Type==CHAN).
     };
 }

cafu/trunk/CaWE/ModelEditor/ElementsList.cpp

@@ -305 +305 @@
     Menu.Append(ID_MENU_RENAME, "Rename\tF2");
     if (m_TYPE==GFIX || m_TYPE==SKIN || m_TYPE==CHAN) Menu.Append(ID_MENU_ADD_NEW, "Add/create new");
+    if (m_TYPE==ANIM) Menu.Append(ID_MENU_ADD_NEW, "Import more...");
 
     if (m_TYPE==MESH)
@@ -336 +337 @@
                 case SKIN: m_MainFrame->SubmitNewSkin();       break;
                 case GFIX: m_MainFrame->SubmitNewGuiFixture(); break;
+                case ANIM: m_MainFrame->SubmitImportAnims();   break;
                 case CHAN: m_MainFrame->SubmitNewChannel();    break;
                 default: break;
@@ -493 +495 @@
                 case SKIN: m_MainFrame->SubmitNewSkin();       break;
                 case GFIX: m_MainFrame->SubmitNewGuiFixture(); break;
+                case ANIM: m_MainFrame->SubmitImportAnims();   break;
                 case CHAN: m_MainFrame->SubmitNewChannel();    break;
                 default: break;
@@ -518 +521 @@
         case ID_BUTTON_ADD:
         {
-            UE.Enable(m_TYPE==SKIN || m_TYPE==GFIX || m_TYPE==CHAN);
+            UE.Enable(m_TYPE==SKIN || m_TYPE==GFIX || m_TYPE==ANIM || m_TYPE==CHAN);
             break;
         }

cafu/trunk/Libs/Models/Loader.cpp

@@ -159 +159 @@
     return Mat;
 }
+
+
+AnimImporterT::AnimImporterT(const std::string& FileName)
+    : m_FileName(FileName)
+{
+}

cafu/trunk/Libs/Models/Loader.hpp

@@ -129 +129 @@
 };
 
+
+/// The base class for importing additional animations into an existing CafuModelT.
+class AnimImporterT
+{
+    public:
+
+    /// The constructor.
+    AnimImporterT(const std::string& FileName);
+
+    /// Returns the name of the file the animations are imported from.
+    virtual const std::string& GetFileName() const { return m_FileName; }
+
+    /// Imports and returns the animation sequences from the file, optionally referring to the joints and meshes of the related model.
+    /// It is up to the caller to actually add the imported sequences to the related model instance.
+    virtual ArrayT<CafuModelT::AnimT> Import(const ArrayT<CafuModelT::JointT>& Joints, const ArrayT<CafuModelT::MeshT>& Meshes)=0;
+
+
+    protected:
+
+    const std::string m_FileName;
+};
+
 #endif

cafu/trunk/Libs/Models/Loader_md5.cpp

@@ -229 +229 @@
     for (unsigned long FileNr=1; FileNr<ComponentFiles.Size(); FileNr++)
     {
-        TextParserT TP(ComponentFiles[FileNr].c_str());
-
         try
         {
-            CafuModelT::AnimT Anim;
-
-            Anim.Name="Anim";
-            Anim.FPS =24.0f;
-            Anim.Next=-1;
-
-            while (!TP.IsAtEOF())
-            {
-                const std::string Token=TP.GetNextToken();
-
-                     if (Token=="MD5Version" ) { if (TP.GetNextToken()!="10") throw LoadErrorT("MD5Version is not 10."); }
-                else if (Token=="commandline") TP.GetNextToken();       // Ignore the command line.
-                else if (Token=="frameRate"  ) Anim.FPS=TP.GetNextTokenAsFloat();
-                else if (Token=="numFrames"  )
-                {
-                    // Be stricter with numFrames than with some num* variables in the md5mesh file.
-                    // This is required because for example there must be as many bounding boxes as frames.
-                    if (Anim.Frames.Size()>0) throw LoadErrorT("Anim.Frames.Size() > 0");
-
-                    Anim.Frames.PushBackEmpty(TP.GetNextTokenAsInt());
-                }
-                else if (Token=="numJoints")
-                {
-                    // The numJoints here MUST match the numJoints in the md5mesh file!
-                    const unsigned long numJoints=TP.GetNextTokenAsInt();
-
-                    if (numJoints!=Joints.Size()) { printf("%lu joints in md5anim file, %lu joints in md5mesh.\n", numJoints, Joints.Size()); throw LoadErrorT("Number of joints in the md5anim file does not match number of bones in the md5mesh."); }
-                    if (Anim.AnimJoints.Size()>0) { printf("Anim.AnimJoints.Size()==%lu\n", Anim.AnimJoints.Size()); throw LoadErrorT("Anim.AnimJoints.Size() > 0"); }
-
-                    Anim.AnimJoints.PushBackEmpty(numJoints);
-                }
-                else if (Token=="numAnimatedComponents")
-                {
-                    const unsigned long numAnimatedComponents=TP.GetNextTokenAsInt();
-
-                    // This is the number of components that is animated in the frames (and thus so many values are stored with each frame).
-                    // Therefore, the number of frames must have been specified already, so we can allocate all the memory here.
-                    if (Anim.Frames.Size()==0) throw LoadErrorT("Anim.Frames.Size() == 0");
-
-                    for (unsigned long FrameNr=0; FrameNr<Anim.Frames.Size(); FrameNr++)
-                        Anim.Frames[FrameNr].AnimData.PushBackEmpty(numAnimatedComponents);
-                }
-                else if (Token=="hierarchy")
-                {
-                    TP.AssertAndSkipToken("{");
-
-                    for (unsigned long JointNr=0; JointNr<Anim.AnimJoints.Size(); JointNr++)
-                    {
-                        // Make sure that the name and parent are identical with the joint from the md5mesh file.
-                        if (Joints[JointNr].Name  !=TP.GetNextToken()) throw LoadErrorT("Mismatching joint name.");
-                        if (Joints[JointNr].Parent!=TP.GetNextTokenAsInt()) throw LoadErrorT("Mismatching joint parent.");
-
-                        Anim.AnimJoints[JointNr].Flags       =TP.GetNextTokenAsInt();
-                        Anim.AnimJoints[JointNr].FirstDataIdx=TP.GetNextTokenAsInt();
-                    }
-
-                    TP.AssertAndSkipToken("}");
-                }
-                else if (Token=="bounds")
-                {
-                    TP.AssertAndSkipToken("{");
-
-                    for (unsigned long FrameNr=0; FrameNr<Anim.Frames.Size(); FrameNr++)
-                    {
-                        TP.AssertAndSkipToken("(");
-                        Anim.Frames[FrameNr].BB.Min.x=TP.GetNextTokenAsFloat();
-                        Anim.Frames[FrameNr].BB.Min.y=TP.GetNextTokenAsFloat();
-                        Anim.Frames[FrameNr].BB.Min.z=TP.GetNextTokenAsFloat();
-                        TP.AssertAndSkipToken(")");
-                        TP.AssertAndSkipToken("(");
-                        Anim.Frames[FrameNr].BB.Max.x=TP.GetNextTokenAsFloat();
-                        Anim.Frames[FrameNr].BB.Max.y=TP.GetNextTokenAsFloat();
-                        Anim.Frames[FrameNr].BB.Max.z=TP.GetNextTokenAsFloat();
-                        TP.AssertAndSkipToken(")");
-                    }
-
-                    TP.AssertAndSkipToken("}");
-                }
-                else if (Token=="baseframe")
-                {
-                    TP.AssertAndSkipToken("{");
-
-                    for (unsigned long JointNr=0; JointNr<Anim.AnimJoints.Size(); JointNr++)
-                    {
-                        TP.AssertAndSkipToken("(");
-                        Anim.AnimJoints[JointNr].DefaultPos.x=TP.GetNextTokenAsFloat();
-                        Anim.AnimJoints[JointNr].DefaultPos.y=TP.GetNextTokenAsFloat();
-                        Anim.AnimJoints[JointNr].DefaultPos.z=TP.GetNextTokenAsFloat();
-                        TP.AssertAndSkipToken(")");
-                        TP.AssertAndSkipToken("(");
-                        Anim.AnimJoints[JointNr].DefaultQtr.x=TP.GetNextTokenAsFloat();
-                        Anim.AnimJoints[JointNr].DefaultQtr.y=TP.GetNextTokenAsFloat();
-                        Anim.AnimJoints[JointNr].DefaultQtr.z=TP.GetNextTokenAsFloat();
-                        TP.AssertAndSkipToken(")");
-                        Anim.AnimJoints[JointNr].DefaultScale=Vector3fT(1.0f, 1.0f, 1.0f);
-                    }
-
-                    TP.AssertAndSkipToken("}");
-                }
-                else if (Token=="frame")
-                {
-                    const unsigned long FrameNr=TP.GetNextTokenAsInt();
-
-                    TP.AssertAndSkipToken("{");
-
-                    for (unsigned long ComponentNr=0; ComponentNr<Anim.Frames[FrameNr].AnimData.Size(); ComponentNr++)
-                        Anim.Frames[FrameNr].AnimData[ComponentNr]=TP.GetNextTokenAsFloat();
-
-                    TP.AssertAndSkipToken("}");
-                }
-                else
-                {
-                    // Unknown token!
-                    // If the next token is a block start, skip the block.
-                    // Otherwise it was something else that we just throw away.
-                    printf("Unknown token \"%s\", skipping...\n", Token.c_str());
-                    if (TP.GetNextToken()=="{") TP.SkipBlock("{", "}", true);
-                }
-            }
-
-            Anims.PushBack(Anim);
-        }
-        catch (const TextParserT::ParseError&)
-        {
-            // Loading this animation sequence failed, but as the base mesh (the md5mesh file)
-            // loaded properly, that is not reason enough to abort loading the entire model.
-            CafuModelT::AnimT InvalidAnim;
-
-            InvalidAnim.FPS=-1.0f;          // Use a negative FPS to flags this animation as invalid.
-            Anims.PushBack(InvalidAnim);    // Note that InvalidAnim.Frames.Size()==0, too.
-
-            printf("WARNING: Loading animation sequence file %s failed just before input byte %lu!\n", ComponentFiles[FileNr].c_str(), TP.GetReadPosByte());
+            ImporterMd5AnimT Importer(ComponentFiles[FileNr]);
+
+            Anims.PushBack(Importer.Import(Joints, Meshes));
         }
         catch (const LoadErrorT& LE)
@@ -372 +241 @@
             CafuModelT::AnimT InvalidAnim;
 
-            InvalidAnim.FPS=-1.0f;          // Use a negative FPS to flags this animation as invalid.
+            InvalidAnim.FPS=-1.0f;          // Use a negative FPS to flag this animation as invalid.
             Anims.PushBack(InvalidAnim);    // Note that InvalidAnim.Frames.Size()==0, too.
 
-            printf("WARNING: Loading animation sequence file %s failed just before input byte %lu:\n", ComponentFiles[FileNr].c_str(), TP.GetReadPosByte());
-            printf("%s", LE.what());
+            printf("WARNING: Loading animation sequence file %s failed:\n", ComponentFiles[FileNr].c_str());
+            printf("%s\n", LE.what());
         }
     }
 }
+
+
+ImporterMd5AnimT::ImporterMd5AnimT(const std::string& FileName)
+    : AnimImporterT(FileName)
+{
+}
+
+
+ArrayT<CafuModelT::AnimT> ImporterMd5AnimT::Import(const ArrayT<CafuModelT::JointT>& Joints, const ArrayT<CafuModelT::MeshT>& Meshes)
+{
+    TextParserT TP(m_FileName.c_str());
+
+    try
+    {
+        CafuModelT::AnimT Anim;
+
+        Anim.Name="Anim";
+        Anim.FPS =24.0f;
+        Anim.Next=-1;
+
+        bool GotHierarchy=false;
+        bool GotBounds   =false;
+        bool GotBaseframe=false;
+        ArrayT<bool> GotFrames;
+
+        while (!TP.IsAtEOF())
+        {
+            const std::string Token=TP.GetNextToken();
+
+                 if (Token=="MD5Version" ) { if (TP.GetNextToken()!="10") throw ModelLoaderT::LoadErrorT("MD5Version is not 10."); }
+            else if (Token=="commandline") TP.GetNextToken();       // Ignore the command line.
+            else if (Token=="frameRate"  ) Anim.FPS=TP.GetNextTokenAsFloat();
+            else if (Token=="numFrames"  )
+            {
+                // Be stricter with numFrames than with some num* variables in the md5mesh file.
+                // This is required because for example there must be as many bounding boxes as frames.
+                if (Anim.Frames.Size()>0) throw ModelLoaderT::LoadErrorT("Anim.Frames.Size() > 0");
+
+                Anim.Frames.PushBackEmpty(TP.GetNextTokenAsInt());
+
+                for (unsigned long FrameNr=0; FrameNr<Anim.Frames.Size(); FrameNr++)
+                    GotFrames.PushBack(false);
+            }
+            else if (Token=="numJoints")
+            {
+                // The numJoints here MUST match the numJoints in the md5mesh file!
+                const unsigned long numJoints=TP.GetNextTokenAsInt();
+
+                if (numJoints!=Joints.Size()) { printf("%lu joints in md5anim file, %lu joints in the model.\n", numJoints, Joints.Size()); throw ModelLoaderT::LoadErrorT("The number of joints in the md5anim file does not match number of bones in the model."); }
+                if (Anim.AnimJoints.Size()>0) { printf("Anim.AnimJoints.Size()==%lu\n", Anim.AnimJoints.Size()); throw ModelLoaderT::LoadErrorT("Anim.AnimJoints.Size() > 0"); }
+
+                Anim.AnimJoints.PushBackEmpty(numJoints);
+            }
+            else if (Token=="numAnimatedComponents")
+            {
+                const unsigned long numAnimatedComponents=TP.GetNextTokenAsInt();
+
+                // This is the number of components that is animated in the frames (and thus so many values are stored with each frame).
+                // Therefore, the number of frames must have been specified already, so we can allocate all the memory here.
+                if (Anim.Frames.Size()==0) throw ModelLoaderT::LoadErrorT("Anim.Frames.Size() == 0");
+
+                for (unsigned long FrameNr=0; FrameNr<Anim.Frames.Size(); FrameNr++)
+                    Anim.Frames[FrameNr].AnimData.PushBackEmpty(numAnimatedComponents);
+            }
+            else if (Token=="hierarchy")
+            {
+                TP.AssertAndSkipToken("{");
+
+                for (unsigned long JointNr=0; JointNr<Anim.AnimJoints.Size(); JointNr++)
+                {
+                    // Make sure that the name and parent are identical with the joint from the md5mesh file.
+                    if (Joints[JointNr].Name  !=TP.GetNextToken()) throw ModelLoaderT::LoadErrorT("Mismatching joint name.");
+                    if (Joints[JointNr].Parent!=TP.GetNextTokenAsInt()) throw ModelLoaderT::LoadErrorT("Mismatching joint parent.");
+
+                    Anim.AnimJoints[JointNr].Flags       =TP.GetNextTokenAsInt();
+                    Anim.AnimJoints[JointNr].FirstDataIdx=TP.GetNextTokenAsInt();
+                }
+
+                TP.AssertAndSkipToken("}");
+                GotHierarchy=true;
+            }
+            else if (Token=="bounds")
+            {
+                TP.AssertAndSkipToken("{");
+
+                for (unsigned long FrameNr=0; FrameNr<Anim.Frames.Size(); FrameNr++)
+                {
+                    TP.AssertAndSkipToken("(");
+                    Anim.Frames[FrameNr].BB.Min.x=TP.GetNextTokenAsFloat();
+                    Anim.Frames[FrameNr].BB.Min.y=TP.GetNextTokenAsFloat();
+                    Anim.Frames[FrameNr].BB.Min.z=TP.GetNextTokenAsFloat();
+                    TP.AssertAndSkipToken(")");
+                    TP.AssertAndSkipToken("(");
+                    Anim.Frames[FrameNr].BB.Max.x=TP.GetNextTokenAsFloat();
+                    Anim.Frames[FrameNr].BB.Max.y=TP.GetNextTokenAsFloat();
+                    Anim.Frames[FrameNr].BB.Max.z=TP.GetNextTokenAsFloat();
+                    TP.AssertAndSkipToken(")");
+                }
+
+                TP.AssertAndSkipToken("}");
+                GotBounds=true;
+            }
+            else if (Token=="baseframe")
+            {
+                TP.AssertAndSkipToken("{");
+
+                for (unsigned long JointNr=0; JointNr<Anim.AnimJoints.Size(); JointNr++)
+                {
+                    TP.AssertAndSkipToken("(");
+                    Anim.AnimJoints[JointNr].DefaultPos.x=TP.GetNextTokenAsFloat();
+                    Anim.AnimJoints[JointNr].DefaultPos.y=TP.GetNextTokenAsFloat();
+                    Anim.AnimJoints[JointNr].DefaultPos.z=TP.GetNextTokenAsFloat();
+                    TP.AssertAndSkipToken(")");
+                    TP.AssertAndSkipToken("(");
+                    Anim.AnimJoints[JointNr].DefaultQtr.x=TP.GetNextTokenAsFloat();
+                    Anim.AnimJoints[JointNr].DefaultQtr.y=TP.GetNextTokenAsFloat();
+                    Anim.AnimJoints[JointNr].DefaultQtr.z=TP.GetNextTokenAsFloat();
+                    TP.AssertAndSkipToken(")");
+                    Anim.AnimJoints[JointNr].DefaultScale=Vector3fT(1.0f, 1.0f, 1.0f);
+                }
+
+                TP.AssertAndSkipToken("}");
+                GotBaseframe=true;
+            }
+            else if (Token=="frame")
+            {
+                const unsigned long FrameNr=TP.GetNextTokenAsInt();
+
+                TP.AssertAndSkipToken("{");
+
+                for (unsigned long ComponentNr=0; ComponentNr<Anim.Frames[FrameNr].AnimData.Size(); ComponentNr++)
+                    Anim.Frames[FrameNr].AnimData[ComponentNr]=TP.GetNextTokenAsFloat();
+
+                TP.AssertAndSkipToken("}");
+                GotFrames[FrameNr]=true;
+            }
+            else
+            {
+                // Unknown token!
+                // If the next token is a block start, skip the block.
+                // Otherwise it was something else that we just throw away.
+                printf("Unknown token \"%s\", skipping...\n", Token.c_str());
+                if (TP.GetNextToken()=="{") TP.SkipBlock("{", "}", true);
+            }
+        }
+
+
+        // Make sure that the imported animation sequence is valid.
+        if (Anim.AnimJoints.Size()!=Joints.Size()) throw ModelLoaderT::LoadErrorT("The number of joints in the md5anim file does not match number of bones in the model.");
+        if (!GotHierarchy) throw ModelLoaderT::LoadErrorT("There seems to be no joints hierarchy defined in this file.");
+        if (!GotBounds) throw ModelLoaderT::LoadErrorT("There seem to be no bounds in this file.");
+        if (!GotBaseframe) throw ModelLoaderT::LoadErrorT("There seems to be no baseframe data in this file.");
+        if (Anim.Frames.Size()==0) throw ModelLoaderT::LoadErrorT("The animation sequence in this file has no frames.");
+
+        for (unsigned long FrameNr=0; FrameNr<Anim.Frames.Size(); FrameNr++)
+            if (!GotFrames[FrameNr])
+                throw ModelLoaderT::LoadErrorT("Some frames in the sequence are not defined.");
+
+
+        // The animation seems ok, return it.
+        ArrayT<CafuModelT::AnimT> Anims;
+        Anims.PushBack(Anim);
+        return Anims;
+    }
+    catch (const TextParserT::ParseError&)
+    {
+        printf("WARNING: Loading animation sequence file %s failed just before input byte %lu!\n", m_FileName.c_str(), TP.GetReadPosByte());
+
+        throw ModelLoaderT::LoadErrorT("Could not parse the file.");
+    }
+}

cafu/trunk/Libs/Models/Loader_md5.hpp

@@ -46 +46 @@
 };
 
+
+/// This class imports animations from Doom3 .md5anim files for addition to an existing CafuModelT.
+class ImporterMd5AnimT : public AnimImporterT
+{
+    public:
+
+    ImporterMd5AnimT(const std::string& FileName);
+
+    ArrayT<CafuModelT::AnimT> Import(const ArrayT<CafuModelT::JointT>& Joints, const ArrayT<CafuModelT::MeshT>& Meshes);
+};
+
 #endif

cafu/trunk/Libs/Models/Model_cmdl.cpp

@@ -354 +354 @@
     for (unsigned long MeshNr=0; MeshNr<m_Meshes.Size(); MeshNr++)
         MatSys::Renderer->FreeMaterial(m_Meshes[MeshNr].RenderMaterial);
+}
+
+
+void CafuModelT::Import(AnimImporterT& Importer)
+{
+    m_Anims.PushBack(Importer.Import(m_Joints, m_Meshes));
 }
 

cafu/trunk/Libs/Models/Model_cmdl.hpp

@@ -37 +37 @@
 
 
+class AnimImporterT;
 class MaterialT;
 class ModelLoaderT;
@@ -253 +254 @@
     ~CafuModelT();
 
+    /// Imports animations into this model using the given AnimImporterT.
+    /// At this time, this method is actually unused, because in the Model Editor,
+    /// the related command is a friend and thus accesses the m_Anims member directly.
+    void Import(AnimImporterT& Importer);
+
     /// Saves the model into the given stream.
     void Save(std::ostream& OutStream) const;