YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More standard pointers.

Browse Source
This commit is contained in:
Dominic Masters
2023-11-12 19:52:41 -06:00
parent ae800eb59c
commit 9131947511
17 changed files with 48 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dawn/scene/components/ui/UIComponent.cpp
View File

@ -22,7 +22,7 @@ UIComponent::UIComponent(SceneItem *item) :
}
std::shared_ptr<UIComponentDimensional> UIComponent::getParentDimensional() {
auto parent = item->getParent().lock();
auto parent = item->getParent();
if(parent == nullptr) return nullptr;
auto dimensional = parent->getComponent<UIComponentDimensional>();
assertNotNull(dimensional, "UIComponent::getParentDimensional: Parent must have a UIComponentDimensional");
@ -240,11 +240,11 @@ void UIComponent::calculateDimensions(
std::shared_ptr<UICanvas> UIComponent::getCanvas() {
// TODO: Cache this on first hit.
auto parent = item->getParent().lock();
auto parent = item->getParent();
while(parent) {
auto canvas = parent->getComponent<UICanvas>();
if(canvas != nullptr) return canvas;
parent = parent->getParent().lock();
parent = parent->getParent();
}
assertUnreachable("UIComponent::getCanvas: No canvas found");
return nullptr;