Support for "name" attribute on entities

src/Engine/Core/EntityFileParser.cpp

@@ -3,7 +3,7 @@
 EntityFileParser::EntityFileParser(const EntityFile* entityFile) 
     : m_EntityFile(entityFile)
 {
-    m_Handler.SetStartEntityCallback(std::bind(&EntityFileParser::onStartEntity, this, std::placeholders::_1, std::placeholders::_2));
+    m_Handler.SetStartEntityCallback(std::bind(&EntityFileParser::onStartEntity, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
     m_Handler.SetStartComponentCallback(std::bind(&EntityFileParser::onStartComponent, this, std::placeholders::_1, std::placeholders::_2));
     m_Handler.SetStartFieldCallback(std::bind(&EntityFileParser::onStartComponentField, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
     m_Handler.SetStartFieldDataCallback(std::bind(&EntityFileParser::onFieldData, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
@@ -16,22 +16,25 @@ void EntityFileParser::MergeEntities(World* world)
     m_EntityFile->Parse(&m_Handler);
 }
 
-void EntityFileParser::onStartEntity(EntityID entity, EntityID parent)
+void EntityFileParser::onStartEntity(EntityID entity, EntityID parent, const std::string& name)
 {
     EntityID realParent = m_EntityIDMapper.at(parent);
     EntityID realEntity = m_World->CreateEntity(realParent);
+    if (!name.empty()) {
+        m_World->SetName(realEntity, name);
+    }
     m_EntityIDMapper[entity] = realEntity;
     LOG_DEBUG("Created entity #%i (%i) with parent %i (%i)", entity, realEntity, parent, realParent);
 }
 
-void EntityFileParser::onStartComponent(EntityID entity, std::string component)
+void EntityFileParser::onStartComponent(EntityID entity, const std::string& component)
 {
     EntityID realEntity = m_EntityIDMapper.at(entity);
     m_World->AttachComponent(realEntity, component);
     LOG_DEBUG("Attached component of type \"%s\" to entity #%i (%i)", component.c_str(), entity, realEntity);
 }
 
-void EntityFileParser::onStartComponentField(EntityID entity, std::string componentType, std::string fieldName, std::map<std::string, std::string> attributes)
+void EntityFileParser::onStartComponentField(EntityID entity, const std::string& componentType, const std::string& fieldName, const std::map<std::string, std::string>& attributes)
 {
     EntityID realEntity = m_EntityIDMapper.at(entity);
     ComponentWrapper component = m_World->GetComponent(realEntity, componentType);
@@ -47,7 +50,7 @@ void EntityFileParser::onStartComponentField(EntityID entity, std::string compon
     EntityFile::WriteAttributeData(data, field, attributes);
 }
 
-void EntityFileParser::onFieldData(EntityID entity, std::string componentType, std::string fieldName, const char* fieldData)
+void EntityFileParser::onFieldData(EntityID entity, const std::string& componentType, const std::string& fieldName, const char* fieldData)
 {
     EntityID realEntity = m_EntityIDMapper.at(entity);
     ComponentWrapper component = m_World->GetComponent(realEntity, componentType);

src/Engine/Core/EntityFileWriter.cpp

@@ -15,6 +15,10 @@ void EntityFileWriter::WriteEntity(World* world, EntityID entity)
     root->setAttribute(X("xmlns:xsi"), X("http://www.w3.org/2001/XMLSchema-instance"));
     root->setAttribute(X("xsi:noNamespaceSchemaLocation"), X("../Types/Entity.xsd"));
     root->setAttribute(X("xmlns:c"), X("components"));
+    const std::string& name = world->GetName(entity);
+    if (!name.empty()) {
+        root->setAttribute(X("name"), X(name));
+    }
     
     DOMElement* componentsElement = doc->createElement(X("Components"));
     root->appendChild(componentsElement);
@@ -47,6 +51,10 @@ void EntityFileWriter::appendEntityChildren(xercesc::DOMElement* parentElement,
         EntityID childEntity = it->second;
 
         DOMElement* entityElement = doc->createElement(X("Entity"));
+        const std::string& name = world->GetName(childEntity);
+        if (!name.empty()) {
+            entityElement->setAttribute(X("name"), X(name));
+        }
         parentElement->appendChild(entityElement);
 
         DOMElement* componentsElement = doc->createElement(X("Components"));

src/Engine/Core/World.cpp

@@ -49,6 +49,9 @@ void World::DeleteEntity(EntityID entity)
             break;
         }
     }
+
+    // Erase potential name
+    m_EntityNames.erase(entity);
 }
 
 void World::RegisterComponent(ComponentInfo& ci)
@@ -121,6 +124,25 @@ void World::SetParent(EntityID entity, EntityID parent)
     m_EntityChildren.insert(std::make_pair(parent, entity));
 }
 
+void World::SetName(EntityID entity, const std::string& name)
+{
+    m_EntityNames[entity] = name;
+}
+
+std::string World::GetName(EntityID entity) const
+{
+    if (entity == EntityID_Invalid) {
+        return "EntityID_Invalid";
+    }
+
+    auto it = m_EntityNames.find(entity);
+    if (it != m_EntityNames.end()) {
+        return it->second;
+    } else {
+        return std::string();
+    }
+}
+
 EntityID World::generateEntityID()
 {
     // TODO: Make EntityID generation smarter

src/Engine/Editor/EditorSystem.cpp

@@ -279,7 +279,6 @@ bool EditorSystem::OnFileDropped(const Events::FileDropped& e)
     return true;
 }
 
-
 void EditorSystem::createWidget()
 {
     if (m_Widget == EntityID_Invalid) {
@@ -600,7 +599,14 @@ bool EditorSystem::createEntityNode(World* world, EntityID entity)
     }
 
     ImGui::SetNextTreeNodeOpened(true, ImGuiSetCond_Once);
-    if (ImGui::TreeNode((std::string("#") + std::to_string(entity)).c_str())) {
+    std::string nodeTitle;
+    const std::string& entityName = world->GetName(entity);
+    if (!entityName.empty()) {
+        nodeTitle = entityName;
+    } else {
+        nodeTitle = std::string("#") + std::to_string(entity);
+    }
+    if (ImGui::TreeNode(nodeTitle.c_str())) {
         if (m_UIDraggingEntity != EntityID_Invalid && ImGui::IsItemHoveredRect() && ImGui::IsMouseReleased(0)) {
             LOG_DEBUG("Changed parent of %i to %i", m_UIDraggingEntity, entity);
             changeParent(m_UIDraggingEntity, entity);