feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Only play animations related to selected particle system

Browse Source 
When particle mode is enabled in 3D view, only the animations related
to the selected particle system are played instead of all animations
in the scene. Timeline animations are never played, as those are
controlled with timeline controls.

Animation is considered related to selected particle system if the
animation target is either descendant or ancestor of the selected
system, or the system itself.

Fixes: QDS-10678
Change-Id: Iaaaec14f86d61c7aba2347b16bc757fc188601a0
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2023-09-19 17:14:51 +03:00
parent 105bc1b253
commit 08272b4003
1 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
View File

@@ -533,9 +533,66 @@ void Qt5InformationNodeInstanceServer::handleParticleSystemSelected(QQuick3DPart
}
});
const auto anim = animations();
for (auto a : anim)
a->restart();
if (m_targetParticleSystem) {
auto checkAncestor = [](QObject *checkObj, QObject *ancestor) -> bool {
QObject *parent = checkObj->parent();
while (parent) {
if (parent == ancestor)
return true;
parent = parent->parent();
}
return false;
};
auto isAnimContainer = [](QObject *o) -> bool {
return ServerNodeInstance::isSubclassOf(o, "QQuickParallelAnimation")
|| ServerNodeInstance::isSubclassOf(o, "QQuickSequentialAnimation");
};
const QVector<QQuickAbstractAnimation *> anims = animations();
QSet<QQuickAbstractAnimation *> containers;
for (auto a : anims) {
// Stop all animations by default. We only want to run animations related to currently
// active particle system and nothing else.
a->stop();
// Timeline animations are controlled by timeline controls, so exclude those
if (ServerNodeInstance::isSubclassOf(a, "QQuickTimelineAnimation"))
continue;
if (ServerNodeInstance::isSubclassOf(a, "QQuickPropertyAnimation")
|| ServerNodeInstance::isSubclassOf(a, "QQuickPropertyAction")) {
QObject *target = a->property("target").value<QObject *>();
if (target != m_targetParticleSystem
&& !checkAncestor(target, m_targetParticleSystem)
&& !checkAncestor(m_targetParticleSystem, target)) {
continue;
}
} else {
continue;
}
QObject *animParent = a->parent();
bool isContained = isAnimContainer(animParent);
if (isContained) {
// We only want to start the toplevel container animations
while (isContained) {
if (isAnimContainer(animParent->parent())) {
animParent = animParent->parent();
isContained = true;
} else {
containers.insert(qobject_cast<QQuickAbstractAnimation *>(animParent));
isContained = false;
}
}
} else {
a->restart();
}
}
// Activate necessary container animations
for (auto container : std::as_const(containers))
container->restart();
}
}
static QString baseProperty(const QString &property)