Basic parent/child relation working with entities

docs/tasks/core.todo

@@ -34,6 +34,10 @@ Core:
     ✔ Read the window size and position on shutdown and write these to the state file @done (2/8/2022, 4:39:37 PM)
     
 Graphics:
+    ☐ Implement parent transform for all draw methods
+        ☐ Ellipse
+        ☐ Lines
+        ☐ Text
 
     Re-write the renderer:
         ✔ Implement BeginScene and EndScene - these are called from the World OnRender @done(22-09-07 14:47)

src/renderer/renderer2D.cpp

@@ -131,7 +131,7 @@ namespace lunarium
         float parent_idx = -1.0f;
         if (parent_transform != glm::mat4(1.0f))
         {
-            if (mQuadData.Parents.size() > 15)
+            if (mQuadData.Parents.size() >= mQuadData.ParentSlots)
                 Flush(FlushMode::Quads);
 
             mQuadData.Parents.push_back(parent_transform);

src/renderer/renderer2D.h

@@ -115,6 +115,7 @@ namespace lunarium
             const int MaxVertices = MaxQuads * 4;
             const int MaxIndices = MaxQuads * 6;
             const int TextureSlots = 32;
+            const int ParentSlots = 32;
             std::vector<Texture*> LoadedTextures;
             Texture* WhiteTexture;
 

src/renderer/shaders/quad.vert

@@ -16,7 +16,7 @@ layout (location = 2) flat out int f_tex_index;
 layout (location = 3) flat out int f_tex_is_grey;
 
 uniform mat4 projview;
-uniform mat4 parents[16];
+uniform mat4 parents[32];
 
 void main()
 {

src/run_modes/editor/panels/properties_view.cpp

@@ -151,6 +151,18 @@ namespace lunarium { namespace editor
     
     void PropertiesView::ShowEntity()
     {
+        ImGui::Text("UUID: %ull", (u64)mpSelectedEntity->GetUUID());
+        char buffer[256] = { 0 };
+        strcpy(buffer, mpSelectedEntity->GetName().c_str());
+        ImGui::Text("Name:");
+        ImGui::SameLine();
+        if (ImGui::InputText("##Entity Name", buffer, 256))
+        {
+            mpSelectedEntity->SetName(buffer);
+        }
+
+        ImGui::Separator();
+
         ImGuiExt::TextCentered("Components");
         float spacing_y = 12.0f;
         ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0.0f, spacing_y));

src/run_modes/editor/panels/world_tree.cpp

@@ -16,145 +16,154 @@
 #include <editor/editor.h>
 #include <utils/logger.h>
 
-namespace lunarium
+namespace lunarium { namespace editor
 {
-    namespace editor
+    WorldTree::WorldTree(Editor *editor)
+        : Panel("World Tree", PanelDockZone::DDZ_LEFT, true, ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoScrollbar),
+            mpEditor(editor),
+            // TODO: Temp world created here
+            mpWorld(nullptr),
+            mpSelectedEntity(nullptr), mNewChild(false), mParentEnt(nullptr)
     {
-        WorldTree::WorldTree(Editor *editor)
-            : Panel("World Tree", PanelDockZone::DDZ_LEFT, true, ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoScrollbar),
-              mpEditor(editor),
-              // TODO: Temp world created here
-              mpWorld(nullptr),
-              mpSelectedEntity(nullptr)
-        {
-            AddPopup(PopUp::NEW_ENTITY, "New Entity", [](Panel *p)
+        AddPopup(PopUp::NEW_ENTITY, "New Entity", [](Panel *p)
+            {
+                WorldTree* pWT = (WorldTree*)p;
+                if (!pWT->mpWorld)
                 {
-                    WorldTree* pWT = (WorldTree*)p;
-                    if (!pWT->mpWorld)
-                    {
-                        return false;
-                    }
+                    return false;
+                }
 
-                    char name_buf[64] = "NewEntity";
-                    ImGui::TextUnformatted("Entity Name: ");
-                    ImGui::SameLine();
-                    if (ImGui::InputText("##Entity Name", name_buf, 64, ImGuiInputTextFlags_AutoSelectAll | ImGuiInputTextFlags_EnterReturnsTrue))
-                    {
-                        LUUID id = pWT->mpWorld->CreateEntity();
-                        pWT->mpWorld->GetEntity(id)->AddComponent<TagComponent>();
-                        TagComponent& tc = pWT->mpWorld->GetEntity(id)->GetComponent<TagComponent>();
-                        tc.Info = name_buf;
-                        return false;
-                    }
+                char name_buf[64] = "NewEntity";
+                ImGui::TextUnformatted("Entity Name: ");
+                ImGui::SameLine();
+                if (ImGui::InputText("##Entity Name", name_buf, 64, ImGuiInputTextFlags_AutoSelectAll | ImGuiInputTextFlags_EnterReturnsTrue))
+                {
+                    LUUID id = pWT->mpWorld->CreateEntity();
+                    pWT->mpWorld->GetEntity(id)->SetName(name_buf);
 
-                    if (Core::Input().IsKeyDown(KeyCode::ESCAPE, true))
+                    if (pWT->mNewChild)
                     {
-                        return false;
+                        pWT->mParentEnt->AddChild(id);
                     }
 
-                    return true;
-            }).LogIfFailed(Editor::LogCat);
-        }
+                    pWT->mNewChild = false;
+                    pWT->mParentEnt = nullptr;
+                    return false;
+                }
 
-        void WorldTree::SetWorld(lunarium::World *pWorld)
-        {
-            mpWorld = pWorld;
-            mpSelectedEntity = nullptr;
-        }
+                if (Core::Input().IsKeyDown(KeyCode::ESCAPE, true))
+                {
+                    pWT->mNewChild = false;
+                    return false;
+                } 
+
+                return true;
+        }).LogIfFailed(Editor::LogCat);
+    }
+
+    void WorldTree::SetWorld(lunarium::World *pWorld)
+    {
+        mpWorld = pWorld;
+        mpSelectedEntity = nullptr;
+    }
 
-        lunarium::World *WorldTree::GetWorld()
+    lunarium::World *WorldTree::GetWorld()
+    {
+        return mpWorld;
+    }
+
+    void WorldTree::DoFrame()
+    {
+        Entity *pSelection = nullptr;
+        if (!mpWorld)
         {
-            return mpWorld;
+            
+            ImGui::Text("No World Loaded");
+            return;
         }
 
-        void WorldTree::DoFrame()
+        ImGui::SetNextItemOpen(true);
+
+        if (ImGui::TreeNode("World Root"))
         {
-            Entity *pSelection = nullptr;
-            if (!mpWorld)
+            // List all world entities
+            // This will fail if we end up implementing child entities
+            // In that case this needs to become recursive
+            int idx = 0;
+            for (auto iter = mpWorld->EntitiesBegin(); !mpWorld->EntitiesIsEnd(iter); iter++, idx++)
             {
-                
-                ImGui::Text("No World Loaded");
-                return;
+                if (!(*iter)->HasComponent<ParentEntityComponent>())
+                {
+                    ShowEntity((*iter));
+                }
             }
 
-            ImGui::SetNextItemOpen(true);
+            ImGui::TreePop();
+        }
 
-            if (ImGui::TreeNode("World Root"))
-            {
-                // List all world entities
-                // This will fail if we end up implementing child entities
-                // In that case this needs to become recursive
-                int idx = 0;
-                for (auto iter = mpWorld->EntitiesBegin(); !mpWorld->EntitiesIsEnd(iter); iter++, idx++)
-                {
-                    std::string name = "Entity";
-                    name += std::to_string(idx);
-                    if ((*iter)->HasComponent<TagComponent>())
-                    {
-                        name = (*iter)->GetComponent<TagComponent>().Info;
-                    }
+        if (ImGui::IsMouseClicked(ImGuiMouseButton_Left) && ImGui::IsWindowHovered())
+        {
+            mpSelectedEntity = nullptr;
+            mpEditor->OnEntitySelect(nullptr);
+        }
 
-                    if ((*iter)->HasChildren())
-                    {
-                        // TODO: Recurse through children
-                        if (ImGui::TreeNode(name.c_str()))
-                        {
-                            ImGui::TreePop();
-                        }
-                    }
-                    else
-                    {
-                        bool is_selected = false;
-                        if ((*iter) == mpSelectedEntity)
-                        {
-                            is_selected = true;
-                        }
-                        if (ImGui::Selectable(name.c_str(), &is_selected))
-                        {
-                            mpSelectedEntity = (*iter);
-                            if (is_selected)
-                            {
-                                mpEditor->OnEntitySelect(mpSelectedEntity);
-                            }
-                            else
-                            {
-                                mpEditor->OnEntitySelect(nullptr);
-                                mpSelectedEntity = nullptr;
-                            }
-                        }
-                    }
-                }
+        DoContextMenu();
+    }
 
-                ImGui::TreePop();
-            }
     
-            if (ImGui::IsMouseClicked(ImGuiMouseButton_Left) && ImGui::IsWindowHovered())
+    void WorldTree::ShowEntity(Entity* pEnt)
+    {
+        bool was_clicked = false;
+        bool was_right_clicked = false;
+        if (ImGui::TreeNode(pEnt->GetName().c_str()))
+        {
+            was_clicked = ImGui::IsItemClicked(ImGuiMouseButton_Left);
+            was_right_clicked = ImGui::IsItemClicked(ImGuiMouseButton_Right);
+            
+            const std::vector<LUUID>& children = pEnt->GetChildren();
+            for (auto iter = children.begin(); iter != children.end(); iter++)
             {
-                mpSelectedEntity = nullptr;
-                mpEditor->OnEntitySelect(nullptr);
+                Entity* pe = mpWorld->GetEntity((*iter));
+                ShowEntity(pe);
             }
 
-            DoContextMenu();
+            ImGui::TreePop();
+        }
+        else
+        {
+            was_clicked = ImGui::IsItemClicked(ImGuiMouseButton_Left);
+            was_right_clicked = ImGui::IsItemClicked(ImGuiMouseButton_Right);
+        }
+
+        if (was_clicked)
+        {      
+            mpSelectedEntity = pEnt;
+            mpEditor->OnEntitySelect(pEnt);
         }
+        if (was_right_clicked)
+        {
+            mNewChild = true;
+            mParentEnt = pEnt;
+        }
+    }
 
-        void WorldTree::DoContextMenu()
+    void WorldTree::DoContextMenu()
+    {
+        if (ImGui::BeginPopupContextWindow(0, ImGuiPopupFlags_MouseButtonRight))
         {
-            if (ImGui::BeginPopupContextWindow(0, ImGuiPopupFlags_MouseButtonRight))
+            if (ImGui::Button("Create New Entity"))
             {
-                if (ImGui::Button("Create New Entity"))
+                if (!mpWorld)
                 {
-                    if (!mpWorld)
-                    {
-                        Logger::Warn(Editor::LogCat, "Can not create new entity - World pointer is null");
-                    }
-                    else
-                    {
-                        OpenPopup(PopUp::NEW_ENTITY).LogIfFailed(Editor::LogCat);
-                    }
+                    Logger::Warn(Editor::LogCat, "Can not create new entity - World pointer is null");
+                }
+                else
+                {
+                    OpenPopup(PopUp::NEW_ENTITY).LogIfFailed(Editor::LogCat);
                 }
-                ImGui::EndPopup();
             }
+            ImGui::EndPopup();
         }
-
     }
-}
+
+}}

src/run_modes/editor/panels/world_tree.h

@@ -35,6 +35,9 @@ namespace editor
         Editor* mpEditor;
         Entity* mpSelectedEntity;
 
+        // Helpers
+        void ShowEntity(Entity* pEnt);
+
         // Context menus
         void DoContextMenu();
 
@@ -47,6 +50,9 @@ namespace editor
         {
             NEW_ENTITY,
         };
+
+        bool mNewChild;
+        Entity* mParentEnt;
     };
 }
 }

src/world/components.h

@@ -81,6 +81,18 @@ namespace lunarium
         BlockOutComponent() = default;
         BlockOutComponent(const BlockOutComponent&) = default;
     };
+
+    /////////////////////////////////////////////////////////////////////
+    //				UTILITY COMPONENTS
+    /////////////////////////////////////////////////////////////////////
+    // These components are for internal use only. They do not show up in the editor.
+    struct ParentEntityComponent
+    {
+        LUUID parent;
+        
+        ParentEntityComponent() = default;
+        ParentEntityComponent(const ParentEntityComponent&) = default;
+    };
 }
 
 #endif  // LUNARIUM_COMPONENTS_H_

src/world/entity.cpp

@@ -14,7 +14,7 @@
 namespace lunarium
 {
     Entity::Entity(World& w)
-        : mHandle(entt::null), mWorld(w)
+        : mHandle(entt::null), mWorld(w), mParent(0), mParentSet(false)
     {
         mUUID = UUID::GetNewID();
         Init();
@@ -42,6 +42,16 @@ namespace lunarium
         return mUUID;
     }
 
+    std::string Entity::GetName() const
+    {
+        return mName;
+    }
+
+    void Entity::SetName(std::string name)
+    {
+        mName = name;
+    }
+
     
     bool Entity::HasChildren() const
     {
@@ -49,9 +59,52 @@ namespace lunarium
     }
 
     
-    void Entity::AddChild(Entity* pChild)
+    void Entity::AddChild(LUUID child)
+    {
+        Entity* e = mWorld.GetEntity(child);
+        e->AddComponent<ParentEntityComponent>(mUUID);
+        mChildren.push_back(child);
+    }
+
+    
+    void Entity::RemoveChild(LUUID child)
+    {
+        Entity* e = mWorld.GetEntity(child);
+        e->ClearParent();
+        for (auto iter = mChildren.begin(); iter != mChildren.end(); iter++)
+        {
+            if ((*iter) == child)
+            {
+                mChildren.erase(iter);
+                break;
+            }
+        }
+    }
+
+    
+    const std::vector<LUUID>& Entity::GetChildren() const
     {
-        mChildren.push_back(pChild);
+        return mChildren;
+    }
+
+    bool Entity::HasParent() const
+    {
+        return mParentSet;
+    }
+
+    LUUID Entity::GetParent() const
+    {
+        return mParent;
+    }
+
+    void Entity::SetParent(LUUID parent)
+    {
+        mParent = parent;
+    }
+    
+    void Entity::ClearParent()
+    {
+        mParentSet = false;
     }
 
 
@@ -63,6 +116,7 @@ namespace lunarium
         #if !BUILD_NO_EDITOR // Only does this when this is an editor build
 
         node["UUID"] = mUUID;
+        node["name"] = mName;
 
         auto& components = node["components"];
         if (HasComponent<TagComponent>())
@@ -151,6 +205,15 @@ namespace lunarium
             components.emplace_back(blockout);
         }
 
+        if (HasComponent<ParentEntityComponent>())
+        {
+            nlohmann::ordered_json parent;
+            ParentEntityComponent& comp = GetComponent<ParentEntityComponent>();
+            parent["type_name"] = "ParentEntityComponent";
+            parent["UUID"] = (u64)comp.parent;
+            components.emplace_back(parent);
+        }
+
         // TODO: ADD CODE TO SERIALIZE ANY NEW COMPONENTS
 
 
@@ -160,7 +223,7 @@ namespace lunarium
         for (int i = 0; i < mChildren.size(); i++)
         {
             nlohmann::ordered_json child;
-            mChildren[i]->Serialize(child).LogIfFailed(LogCategory::GAME_SYSTEM);
+            child["UUID"] = mChildren[i];
             children.emplace_back(child);
         }
 
@@ -173,6 +236,7 @@ namespace lunarium
         #if !BUILD_NO_EDITOR // Only does this when this is an editor build
 
         mUUID = node["UUID"].get<u64>();
+        mName = node["name"].get<std::string>();
 
         // TODO: Load components
         auto& components = node["components"];
@@ -255,6 +319,12 @@ namespace lunarium
                 AddComponent<BlockOutComponent>(Color, Size);
             }
 
+            if ("ParentEntityComponent" == comp_type_name)
+            {
+                LUUID parent = comp["UUID"].get<u64>();
+                AddComponent<ParentEntityComponent>(parent);
+            }
+
             // TODO: ADD CODE TO DESERIALIZE ANY NEW COMPONENTS
         }
 
@@ -266,8 +336,7 @@ namespace lunarium
         {
             auto& child = *iter;
 
-            Entity* ne = new Entity(mWorld);
-            ne->Deserialize(child).LogIfFailed(LogCategory::GAME_SYSTEM);
+            LUUID ne = child["UUID"].get<u64>();
             mChildren.push_back(ne);
         }
 

src/world/entity.h

@@ -65,9 +65,18 @@ namespace lunarium // TODO: : public JSONSerializable
 		}
 
         LUUID GetUUID() const;
+        std::string GetName() const;
+        void SetName(std::string name);
 
         bool HasChildren() const;
-        void AddChild(Entity* pChild);
+        void AddChild(LUUID child);
+        void RemoveChild(LUUID child);
+        const std::vector<LUUID>& GetChildren() const;
+
+        bool HasParent() const;
+        LUUID GetParent() const;
+        void SetParent(LUUID parent);
+        void ClearParent();
 
         // Serializing
         [[nodiscard]] virtual OpRes Serialize(nlohmann::ordered_json& node);
@@ -77,9 +86,12 @@ namespace lunarium // TODO: : public JSONSerializable
 
     private:
         LUUID mUUID;
+        LUUID mParent;
+        bool mParentSet;
+        std::string mName;
         entt::entity mHandle;
         World& mWorld; // The world the entity is contained within
-        std::vector<Entity*> mChildren;
+        std::vector<LUUID> mChildren;
 
     private:
         void Init();

src/world/world.cpp

@@ -65,6 +65,8 @@ namespace lunarium
         //     case RunMode::EDITOR: RenderEditor(pGraphics); break;
         // }
 
+        // TODO: Modify to handle parent/child rendering
+
 
         // Draw the Renderables that also have a transform
         // Code from:
@@ -180,6 +182,7 @@ namespace lunarium
 
             new_ent->Deserialize(ent).LogIfFailed(LogCategory::GAME_SYSTEM);
             mEntities.push_back(new_ent);
+            mEntitiesByUUID[new_ent->GetUUID()] = new_ent;
         }
 
         #endif

test_data/engine_state.json

@@ -2,7 +2,7 @@
     "State": 
     {
        "DataDirectory": "data/",
-       "Mode": "test",
+       "Mode": "editor",
 
        "Display": 
        {