Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct out-of-order transform instances (#2025)

Browse Source 
The current code only updates the order in the transaction commit if there's a single out-of-order node in the scene graph, but if multiple are out of order (or one swap doesn't fully fix the ordering), then we end up with out of order scenes, and incorrect world transforms.

Additionally, when nodes are reparented outside of a transaction, the order is not updated.
This commit is contained in:
tpsiaki
2020-01-13 13:22:49 -08:00
committed by Mathias Agopian
parent 4673545f45
commit 2c591d2dca
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
filament/src/components/TransformManager.cpp
View File

@@ -65,6 +65,18 @@ void FTransformManager::setParent(Instance i, Instance parent) noexcept {
removeNode(i);
insertNode(i, parent);
updateNodeTransform(i);
// Ensure that instances are still in order
if (!mLocalTransformTransactionOpen && i < parent) {
Instance end = manager.end();
while (i != end) {
Instance iParent = Instance(manager[i].parent);
if (UTILS_UNLIKELY(iParent > i)) {
swapNode(i, iParent);
} else {
++i;
}
}
}
}
}
}
@@ -176,7 +188,7 @@ void FTransformManager::commitLocalTransformTransaction() noexcept {
mat4f const* const UTILS_RESTRICT world = manager.raw_array<WORLD>();
for (Instance i = manager.begin(), e = manager.end(); i != e; ++i) {
// Ensure that children are always sorted after their parent.
if (UTILS_UNLIKELY(Instance(manager[i].parent) > i)) {
while (UTILS_UNLIKELY(Instance(manager[i].parent) > i)) {
swapNode(i, manager[i].parent);
}
Instance parent = manager[i].parent;