Ticket #2324: actoreditorpatch.patch

source/tools/atlas/AtlasObject/AtlasObjectXML.cpp

@@ -182 +182 @@
         size_t last = obj->value.find_last_not_of(whitespace);
         obj->value = obj->value.substr(first, 1+last-first);
     }
-
+    
+    obj->name = fromXmlChar(node->name);
+    
     return obj;
 }
 

source/tools/atlas/AtlasObject/AtlasObjectImpl.h

@@ -18 +18 @@
 #include "AtlasObject.h"
 
 #include <string>
+#include <vector>
 
 #ifdef _MSC_VER
  // Avoid complaints about unreachable code; the optimiser is realising
@@ -58 +59 @@
             // time with dozens of friends)
 
     std::wstring value;
+    std::wstring name;
 
     typedef std::multimap<const std::string, const AtNode::Ptr> child_maptype;
     typedef std::pair<const std::string, const AtNode::Ptr> child_pairtype;

source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp

@@ -99 +99 @@
     m_Material = new wxComboBox(materialsPanel, wxID_ANY, _T(""), wxDefaultPosition, wxDefaultSize, materials);
     materialsSizer->Add(m_Material, wxSizerFlags().Border(wxALL, 2));
 
+    Show(true);
+
 }
 
 void ActorEditor::ThawData(AtObj& in)
@@ -261 +263 @@
                 var.add("texture", varit["texture"]);
 
                 AtObj anims;
-                for (AtIter animit = varit["animations"]["animation"]; animit.defined(); ++animit)
+                for (AtIter stateit = varit["animations"]; stateit.defined(); ++stateit)
                 {
-                    AtObj anim;
-                    anim.add("@name", animit["name"]);
-                    anim.add("@file", animit["file"]);
-                    anim.add("@speed", animit["speed"]);
-
-                    anims.add("animation", anim);
+                    AtObj state;
+                    for (AtIter animit = varit["animations"]["animation"]; animit.defined(); ++animit)
+                    {
+                        AtObj anim;
+                        anim.add("@statename", stateit["name"]);
+                        anim.add("@name", animit["name"]);
+                        anim.add("@file", animit["file"]);
+                        anim.add("@frequency", animit["frequency"]);
+                        anim.add("@speed", animit["speed"]);
+                        
+                        anims.add("animation", anim);
+                    }
                 }
                 var.add("animations", anims);
 
@@ -291 +299 @@
         actor.set("@version", L"1");
         in.set("actor", actor);
     }
-    else if (version == 1)
+    else if (version >= 1)
     {
         // current format
     }
@@ -326 +334 @@
     // Export the group/variant/etc data
     AtObj actor (m_ActorEditorListCtrl->ExportData());
 
-    actor.set("@version", L"1");
+    actor.set("@version", L"2");
 
     if (m_CastShadows->IsChecked())
         actor.set("castshadow", L"");

source/tools/atlas/AtlasUI/ActorEditor/AnimListEditor.cpp

@@ -15 +15 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "precompiled.h"
-
 #include "AnimListEditor.h"
 
 #include "EditableListCtrl/FieldEditCtrl.h"
 #include "AtlasObject/AtlasObject.h"
+#include "AtlasObject/AtlasObjectImpl.h"
 
 //////////////////////////////////////////////////////////////////////////
 
@@ -62 +61 @@
 : DraggableListCtrl(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
                     wxLC_REPORT | wxLC_HRULES | wxLC_VRULES | wxLC_SINGLE_SEL)
 {
+    AddColumnType(_("State name"), 100, "@statename",  new FieldEditCtrl_Text());
     AddColumnType(_("Anim name"), 100, "@name",  new FieldEditCtrl_List("animations"));
     AddColumnType(_("File"),      200, "@file",  new FieldEditCtrl_File(_T("art/animation/"), _("Animation files (*.psa, *.dae)|*.psa;*.dae|All files (*.*)|*.*")));
+    AddColumnType(_("Frequency"),     100,  "@frequency", new FieldEditCtrl_Text());
     AddColumnType(_("Speed"),     50,  "@speed", new FieldEditCtrl_Text());
     AddColumnType(_("Load"),      40,  "@load",  new FieldEditCtrl_Text());
     AddColumnType(_("Event"),     40,  "@event", new FieldEditCtrl_Text());
@@ -71 +72 @@
 
 void AnimListEditorListCtrl::DoImport(AtObj& in)
 {
-    for (AtIter prop = in["animation"]; prop.defined(); ++prop)
-        AddRow(prop);
-
+    for (std::multimap<const std::string, const AtNode::Ptr>::const_iterator it = in.p->children.begin(); it != in.p->children.end(); it++)
+    {
+        for (std::multimap<const std::string, const AtNode::Ptr>::const_iterator it2 = it->second->children.begin(); it2 != it->second->children.end(); it2++)
+        {
+            AtObj newObj;
+            newObj.add("@statename",it->second->name.c_str());
+            newObj.add("@name",*(it2->second->getChild("@name")));
+            newObj.add("@file",*(it2->second->getChild("@file")));
+            newObj.add("@frequency",*(it2->second->getChild("@frequency")));
+            newObj.add("@speed",*(it2->second->getChild("@speed")));
+            newObj.add("@load",*(it2->second->getChild("@load")));
+            newObj.add("@event",*(it2->second->getChild("@event")));
+            AddRow(newObj);
+        }
+    }
     UpdateDisplay();
 }
 
@@ -81 +94 @@
 {
     AtObj out;
     for (size_t i = 0; i < m_ListData.size(); ++i)
-        out.add("animation", m_ListData[i]);
+    {
+        std::wstring statename = m_ListData[i].p->children.find("@statename")->second->value;
+        std::string str( statename.begin(), statename.end() );
+
+        const AtNode* nnode = new AtNode();
+        AtNode::Ptr newNode(nnode);
+
+        AtNode::child_pairtype obj = AtNode::child_pairtype(str, newNode);
+        AtNode::child_maptype(out.p->children).insert(obj); // <- segfaults here.
+        //out.add("animation", m_ListData[i]);
+        (*(out[str.c_str()])).p->addChild("animation", m_ListData[i].p);
+//      (*(out.p->getChild(str.c_str()).add("animation", m_ListData[i]);
+    }
     return out;
 }