xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Canvas and UI Component #222

Merged
maverickdgg merged 5 commits from SP3-20-UI-System into main 2022-11-18 12:29:40 +08:00
Conversation 0 Commits 5 Files Changed 8 +8 -4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d997cd4da6 - Show all commits

10
SHADE_Engine/src/UI/SHUISystem.cpp
View File

@ -31,7 +31,7 @@ namespace SHADE
auto& children = sceneGraph.GetChildren(canvas.GetEID()); auto& children = sceneGraph.GetChildren(canvas.GetEID());
for (auto& child : children) for (auto& child : children)
{ {
RecurssiveUIComponentCheck(child); RecurssiveUIComponentCheck(child, canvas);
} }
} }
@ -53,7 +53,7 @@ namespace SHADE
} }
void SHUISystem::AddUIComponentRoutine::RecurssiveUIComponentCheck(SHSceneNode* node) noexcept void SHUISystem::AddUIComponentRoutine::RecurssiveUIComponentCheck(SHSceneNode* node, SHCanvasComponent& canvas) noexcept
{ {
if (node == nullptr) if (node == nullptr)
return; return;
@ -62,11 +62,15 @@ namespace SHADE
if(SHComponentManager::HasComponent<SHUIComponent>(eid) == false) if(SHComponentManager::HasComponent<SHUIComponent>(eid) == false)
SHComponentManager::AddComponent<SHUIComponent>(eid); SHComponentManager::AddComponent<SHUIComponent>(eid);
else
{
SHComponentManager::GetComponent<SHUIComponent>(eid)->canvasID = canvas.GetEID();
}
auto& children = SHSceneManager::GetCurrentSceneGraph().GetChildren(eid); auto& children = SHSceneManager::GetCurrentSceneGraph().GetChildren(eid);
for (auto& child : children) for (auto& child : children)
{ {
RecurssiveUIComponentCheck(child); RecurssiveUIComponentCheck(child, canvas);
} }
} }

2
SHADE_Engine/src/UI/SHUISystem.h
View File

@ -25,7 +25,7 @@ namespace SHADE
private: private:
void RecurssiveUIComponentCheck(SHSceneNode* node) noexcept; void RecurssiveUIComponentCheck(SHSceneNode* node, SHCanvasComponent& canvas) noexcept;
}; };
friend class AddUIComponentRoutine; friend class AddUIComponentRoutine;