Add editing custom tags of objects.

This also shows the internal tags.
enginmanap · Jan 13, 2025 · 40a6fa6 · 40a6fa6
1 parent d4fa493
commit 40a6fa6
Show file tree

Hide file tree

Showing 7 changed files with 118 additions and 2 deletions.
diff --git a/src/GameObjects/GameObject.h b/src/GameObjects/GameObject.h
@@ -7,6 +7,7 @@
 
 #include <string>
 #include <list>
+#include <Utils/HardCodedTags.h>
 
 #include "API/LimonAPI.h"
 #include "Editor/ImGuiRequest.h"
@@ -59,10 +60,28 @@ class GameObject {
         return false;
     }
 
+    /**
+     *
+     * @return all tags, including hardcoded ones
+     */
     const std::list<HashUtil::HashedString>& getTags() const {
         return tags;
     }
 
+    /**
+     * This method is here only for Editor. Don't use in game code, or refactor to remove rehashing of tags
+     * @return list of tags, filtered by HardCodedTags list.
+     */
+    std::list<HashUtil::HashedString> getTagsCustomOnly() const {
+        std::list<HashUtil::HashedString> filteredTags;
+        for (const auto& currentTag: tags) {
+            if (std::find(HardCodedTags::ALL_TAGS.begin(), HardCodedTags::ALL_TAGS.end(), currentTag.text) == HardCodedTags::ALL_TAGS.end()) {
+                filteredTags.emplace_back(currentTag.text);
+            }
+        }
+        return filteredTags;
+    }
+
     virtual void removeTag(const std::string& text) {
         HashUtil::HashedString tag(text);
         bool found = false;

diff --git a/src/GameObjects/Model.cpp b/src/GameObjects/Model.cpp
@@ -304,6 +304,20 @@ bool Model::fillObjects(tinyxml2::XMLDocument &document, tinyxml2::XMLElement *o
         }
     }
 
+    std::list<HashUtil::HashedString> customTags = getTagsCustomOnly();
+    if (!customTags.empty()) {
+        tinyxml2::XMLElement *customTagsNode = document.NewElement("CustomTags");
+        tinyxml2::XMLElement *customTagsCountNode = document.NewElement("Count");
+        customTagsCountNode->SetText(std::to_string(customTags.size()).c_str());
+        customTagsNode->InsertEndChild(customTagsCountNode);
+        objectElement->InsertEndChild(customTagsNode);
+        for (auto& customTag:customTags) {
+            tinyxml2::XMLElement *customTagNode = document.NewElement("CustomTag");
+            customTagNode->SetText(customTag.text.c_str());
+            customTagsNode->InsertEndChild(customTagNode);
+        }
+    }
+
     modelAsset->serializeCustomizations();
     return true;
 }
@@ -326,6 +340,25 @@ ImGuiResult Model::addImGuiEditorElements(const ImGuiRequest &request) {
     }
 
     ImGui::NewLine();
+    static char tempTagsBuffer[512] = {0};
+    std::string joinedTags = StringUtils::join(this->getTagsCustomOnly(), ",");
+    strncpy(tempTagsBuffer, joinedTags.c_str(), std::min(joinedTags.length(), sizeof(tempTagsBuffer) - 1));
+    tempTagsBuffer[std::min(joinedTags.length(), sizeof(tempTagsBuffer) - 1)] = 0;
+    std::vector<std::string> internalTags;
+    for (auto currentTag : this->getTags()) {
+        if (std::find(HardCodedTags::ALL_TAGS.begin(), HardCodedTags::ALL_TAGS.end(), currentTag.text) != HardCodedTags::ALL_TAGS.end()) {
+            internalTags.emplace_back(currentTag.text);
+        }
+    }
+    char internalTagsBuffer[512] = {0};
+    std::string internalTagsJoined = StringUtils::join(internalTags, ",");
+    strncpy(internalTagsBuffer, internalTagsJoined.c_str(), std::min(internalTagsJoined.length(), sizeof(internalTagsBuffer) - 1));
+    tempTagsBuffer[std::min(internalTagsJoined.length(), sizeof(internalTagsBuffer) - 1)] = 0;
+
+    ImGui::InputText("Automatic Tags##ForModelObject", internalTagsBuffer, sizeof(internalTagsBuffer), ImGuiInputTextFlags_ReadOnly);
+    ImGui::InputText("Custom Tags##ForModelObject",tempTagsBuffer, sizeof(tempTagsBuffer), ImGuiInputTextFlags_CharsNoBlank);
+    joinedTags = tempTagsBuffer;
+    this->setTagsCustomOnly(StringUtils::split(joinedTags, ","));
     if (isAnimated()) {
         if (ImGui::CollapsingHeader("Model animation properties")) {
             if (ImGui::BeginCombo("Animation Name", animationName.c_str())) {

diff --git a/src/GameObjects/Model.h b/src/GameObjects/Model.h
@@ -291,6 +291,21 @@ class Model : public PhysicalRenderable, public GameObject {
         GameObject::removeTag(text);
     }
 
+private:
+    /**
+     * This method is causing rehashing of all new tags. Don't use in game mode, only intended for Editor
+     * @param tagList custom tags to be set.
+     */
+    void setTagsCustomOnly(const std::vector<std::string> & tagList) {
+        std::list<HashUtil::HashedString> currentTags = this->getTagsCustomOnly();
+        for (auto current_tag: currentTags) {
+            this->removeTag(current_tag.text);
+        }
+        for (auto it = tagList.begin(); it != tagList.end(); ++it) {
+            this->addTag(*it);
+        }
+        this->dirtyForFrustum = true;
+    }
 
 };
 

diff --git a/src/Utils/HardCodedTag.cpp b/src/Utils/HardCodedTag.cpp
@@ -19,4 +19,23 @@ const std::string HardCodedTags::CAMERA_LIGHT_DIRECTIONAL   = "directional_camer
 const std::string HardCodedTags::CAMERA_LIGHT_POINT         = "point_camera";
 const std::string HardCodedTags::CAMERA_PLAYER              = "player_camera";
 
-const std::string HardCodedTags::PICKED_OBJECT              =   "picked_object";
+const std::string HardCodedTags::PICKED_OBJECT              =   "picked_object";
+
+const std::vector<std::string> HardCodedTags::ALL_TAGS              = {
+    HardCodedTags::OBJECT_MODEL_STATIC          ,
+    HardCodedTags::OBJECT_MODEL_PHYSICAL        ,
+
+    HardCodedTags::OBJECT_MODEL_BASIC           ,
+    HardCodedTags::OBJECT_MODEL_ANIMATED        ,
+    HardCodedTags::OBJECT_MODEL_TRANSPARENT     ,
+
+    HardCodedTags::OBJECT_PLAYER_BASIC          ,
+    HardCodedTags::OBJECT_PLAYER_ANIMATED       ,
+    HardCodedTags::OBJECT_PLAYER_TRANSPARENT    ,
+
+    HardCodedTags::CAMERA_LIGHT_DIRECTIONAL     ,
+    HardCodedTags::CAMERA_LIGHT_POINT           ,
+    HardCodedTags::CAMERA_PLAYER                ,
+
+    HardCodedTags::PICKED_OBJECT
+};
diff --git a/src/Utils/HardCodedTags.h b/src/Utils/HardCodedTags.h
@@ -30,6 +30,8 @@ class HardCodedTags {
     static const std::string CAMERA_PLAYER;
 
     static const std::string PICKED_OBJECT;
+
+    static const std::vector<std::string> ALL_TAGS;//all tags
 };
 
 #endif //LIMONENGINE_HARDCODEDTAGS_H
diff --git a/src/Utils/StringUtils.hpp b/src/Utils/StringUtils.hpp
@@ -9,6 +9,8 @@
 #include <string>
 #include <vector>
 #include <sstream>
+#include <list>
+#include "HashUtil.h"
 
 class StringUtils {
 public:
@@ -49,6 +51,20 @@ class StringUtils {
         }
         return joinedStream.str();
     }
+
+
+    std::string static join(const std::list<HashUtil::HashedString>& source, const std::string& delimiter)
+    {
+        std::ostringstream joinedStream;
+        if (source.empty()) {
+            return "";
+        }
+        for (auto it = source.begin(); it != std::prev(source.end()); ++it) {
+            joinedStream << it->text << delimiter;
+        }
+        joinedStream << source.back().text;
+        return joinedStream.str();
+    }
 };
 
 

diff --git a/src/WorldLoader.cpp b/src/WorldLoader.cpp
@@ -591,7 +591,7 @@ WorldLoader::loadObject( std::shared_ptr<AssetManager> assetManager, tinyxml2::X
     }
     //Now Load material changes
     std::vector<std::pair<std::string, std::shared_ptr<Material>>> custumizedMeshMaterialList;
-    tinyxml2::XMLElement* meshMaterialListNode =  objectNode->FirstChildElement("MeshMaterialList");
+    tinyxml2::XMLElement* meshMaterialListNode = objectNode->FirstChildElement("MeshMaterialList");
     if (meshMaterialListNode != nullptr) {
         tinyxml2::XMLElement *meshMaterialNode = meshMaterialListNode->FirstChildElement("MeshMaterial");
         while (meshMaterialNode != nullptr) {
@@ -614,6 +614,18 @@ WorldLoader::loadObject( std::shared_ptr<AssetManager> assetManager, tinyxml2::X
         loadedObjectInformation->model->loadOverriddenMeshMaterial(custumizedMeshMaterialList);
     }
 
+    tinyxml2::XMLElement* customTagsNode = objectNode->FirstChildElement("CustomTags");
+    if (customTagsNode != nullptr) {
+        tinyxml2::XMLElement *customTagNode = customTagsNode->FirstChildElement("CustomTag");
+        while (customTagNode != nullptr) {
+            if (customTagNode->GetText() != nullptr) {
+                loadedObjectInformation->model->addTag(customTagNode->GetText());
+            }
+            customTagNode = customTagNode->NextSiblingElement("CustomTag");
+        }
+    }
+
+
     loadedObjects.push_back(std::move(loadedObjectInformation));