Changeset 473

Timestamp:

01/28/12 23:14:39 (4 months ago)

Author:

Carsten

Message:

Model Editor: Small fixes and improvements.

Location:

cafu/trunk

Files:

• CaWE/ModelEditor/ChildFrame.cpp (modified) (2 diffs)
• CaWE/ModelEditor/ElementsList.cpp (modified) (3 diffs)
• Libs/Models/Loader_md5.cpp (modified) (3 diffs)

cafu/trunk/CaWE/ModelEditor/ChildFrame.cpp

@@ -173 +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_ANIM_IMPORT, "Import animation 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);
@@ -389 +389 @@
 {
     wxFileDialog FileDialog(this,                           // The window parent.
-                            "Import animation sequence",    // Message.
+                            "Import animation sequences",   // Message.
                             "",                             // The default directory.
                             "*.md5anim",                    // The default file name.

cafu/trunk/CaWE/ModelEditor/ElementsList.cpp

@@ -193 +193 @@
     const ArrayT<unsigned int>& Sel=m_ModelDoc->GetSelection(m_TYPE);
 
+    m_IsRecursiveSelfNotify=true;
     Freeze();
     DeleteAllItems();
@@ -278 +279 @@
 
     Thaw();
+    m_IsRecursiveSelfNotify=false;
 }
 
@@ -305 +307 @@
     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==ANIM) Menu.Append(ID_MENU_ADD_NEW, "Import...");
 
     if (m_TYPE==MESH)

cafu/trunk/Libs/Models/Loader_md5.cpp

@@ -265 +265 @@
         CafuModelT::AnimT Anim;
 
-        Anim.Name="Anim";
+        Anim.Name=cf::String::StripExt(m_FileName);
         Anim.FPS =24.0f;
         Anim.Next=-1;
+
+        const size_t PathLength=cf::String::GetPath(Anim.Name).length() + 1;
+
+        if (PathLength < Anim.Name.length())
+            Anim.Name=std::string(Anim.Name, PathLength);
 
         bool GotHierarchy=false;
@@ -297 +302 @@
                 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 (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 joints in the model."); }
                 if (Anim.AnimJoints.Size()>0) { printf("Anim.AnimJoints.Size()==%lu\n", Anim.AnimJoints.Size()); throw ModelLoaderT::LoadErrorT("Anim.AnimJoints.Size() > 0"); }
 
@@ -397 +402 @@
 
         // 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 (Anim.AnimJoints.Size()!=Joints.Size()) throw ModelLoaderT::LoadErrorT("The number of joints in the md5anim file does not match number of joints 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.");