Update LoadSkeletonJob to use direct sync

Change-Id: I5622f9784628b7217f6e37c700ac314b7264f439
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

2 files changed, 5 insertions, 26 deletions

diff --git a/src/render/geometry/skeleton.cpp b/src/render/geometry/skeleton.cpp
index 14892922a..2fb74d1c1 100644
--- a/src/render/geometry/skeleton.cpp
+++ b/src/render/geometry/skeleton.cpp
@@ -119,9 +119,9 @@ void Skeleton::syncFromFrontEnd(const QNode *frontEnd, bool firstTime)
         }
         m_createJoints = loaderNode->isCreateJointsEnabled();
 
-        if ((loaderNode->rootJoint() && loaderNode->rootJoint()->id() != m_rootJointId) ||
-            (!loaderNode->rootJoint() && !m_rootJointId.isNull())) {
-            m_rootJointId = loaderNode->rootJoint() ? loaderNode->rootJoint()->id() : Qt3DCore::QNodeId{};
+        auto newJointId = Qt3DCore::qIdForNode(loaderNode->rootJoint());
+        if (newJointId != m_rootJointId) {
+            m_rootJointId = newJointId;
 
             // If using a QSkeletonLoader to create frontend QJoints, when those joints are
             // set on the skeleton, we end up here. In order to allow the subsequent call
@@ -156,25 +156,6 @@ void Skeleton::setStatus(QSkeletonLoader::Status status)
     }
 }
 
-void Skeleton::notifyJointCount()
-{
-    Qt3DCore::QPropertyUpdatedChangePtr e = Qt3DCore::QPropertyUpdatedChangePtr::create(peerId());
-    e->setDeliveryFlags(Qt3DCore::QSceneChange::DeliverToAll);
-    e->setPropertyName("jointCount");
-    e->setValue(jointCount());
-    notifyObservers(e);
-}
-
-void Skeleton::notifyJointNamesAndPoses()
-{
-    auto e = QPropertyUpdatedChangePtr::create(peerId());
-    JointNamesAndLocalPoses payload{m_skeletonData.jointNames, m_skeletonData.localPoses};
-    e->setDeliveryFlags(Qt3DCore::QSceneChange::BackendNodes);
-    e->setPropertyName("jointNamesAndLocalPoses");
-    e->setValue(QVariant::fromValue(payload));
-    notifyObservers(e);
-}
-
 void Skeleton::loadSkeleton()
 {
     qCDebug(Jobs) << Q_FUNC_INFO << m_source;
@@ -204,8 +185,6 @@ void Skeleton::loadSkeleton()
         else
             setStatus(QSkeletonLoader::Ready);
     }
-    notifyJointCount();
-    notifyJointNamesAndPoses();
 
     qCDebug(Jobs) << "Loaded skeleton data:" << *this;
 }
diff --git a/src/render/geometry/skeleton_p.h b/src/render/geometry/skeleton_p.h
index d1c6befe9..6bddbb93b 100644
--- a/src/render/geometry/skeleton_p.h
+++ b/src/render/geometry/skeleton_p.h
@@ -94,9 +94,9 @@ public:
     QString name() const { return m_name; }
 
     int jointCount() const { return m_skeletonData.joints.size(); }
-    void notifyJointCount();
-    void notifyJointNamesAndPoses();
     QVector<JointInfo> joints() const { return m_skeletonData.joints; }
+    QVector<QString> jointNames() const { return m_skeletonData.jointNames; }
+    QVector<Qt3DCore::Sqt> localPoses() const { return m_skeletonData.localPoses; }
 
     Qt3DCore::QNodeId rootJointId() const { return m_rootJointId; }