Skip to content

Fixed bug I introduced when fixing hierarchy UB #955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaremieromer merged 1 commit into from
Dec 14, 2025
Merged

Fixed bug I introduced when fixing hierarchy UB #955

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 23 additions & 16 deletions source/ncengine/ecs/NcEcsImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ void EcsModule::UpdateWorldSpaceMatrices()
{
Transform* transform;
std::span<Entity> children;
size_t childIndex = 0;
};

auto stack = std::vector<ParentInfo>{};
Expand All @@ -96,32 +97,38 @@ void EcsModule::UpdateWorldSpaceMatrices()
if (hierarchy.children.empty())
continue;

stack.emplace_back(&transform, hierarchy.children);
stack.emplace_back(&transform, hierarchy.children, 0);

while (!stack.empty())
{
if (stack.back().children.empty())
auto& current = stack.back();
auto& children = current.children;

if (current.childIndex >= children.size())
{
stack.pop_back();
continue;
}

if (!stack.back().children.front().IsStatic())
auto childEntity = children[current.childIndex];
current.childIndex++;

if (childEntity.IsStatic())
{
auto& child = world.Get<Transform>(stack.back().children.front());
dirty = dirty || child.IsDirty();
if (dirty)
child.UpdateWorldMatrix(stack.back().transform->TransformationMatrix());

auto& childHierarchy = world.Get<Hierarchy>(stack.back().children.front());
if (!childHierarchy.children.empty())
{
auto currentIndex = stack.size() - 1; // Save index before push
stack.emplace_back(&child, childHierarchy.children);
stack[currentIndex].children = stack[currentIndex].children.subspan(1); // Advance using index
}
continue;
}

stack.back().children = stack.back().children.subspan(1);
auto& childTransform = world.Get<Transform>(childEntity);
dirty = dirty || childTransform.IsDirty();

if (dirty)
childTransform.UpdateWorldMatrix(current.transform->TransformationMatrix());

auto& childHierarchy = world.Get<Hierarchy>(childEntity);
if (!childHierarchy.children.empty())
{
stack.emplace_back(&childTransform, childHierarchy.children, 0);
}
}
}
#else // debug update
Expand Down