Components refactoring

engine/includes/components/animator.h

@@ -68,9 +68,6 @@ class ENGINE_EXPORT Animator : public NativeBehaviour {
     void start() override;
     void update() override;
 
-    void loadUserData(const VariantMap &data) override;
-    VariantMap saveUserData() const override;
-
     void setClips(AnimationClip *start, AnimationClip *end, float duration = 0.0f, float time = 0.0f);
 
     static void stateMachineUpdated(int state, void *ptr);

engine/includes/components/armature.h

@@ -24,15 +24,12 @@ class ENGINE_EXPORT Armature : public NativeBehaviour {
 
     Texture *texture() const;
 
-private:
     void update() override;
 
-    void loadUserData(const VariantMap &data) override;
-    VariantMap saveUserData() const override;
-
+private:
     void drawGizmosSelected() override;
 
-    void cleanDirty(Actor *actor);
+    void cleanDirty();
 
     static void bindPoseUpdated(int state, void *ptr);
 

engine/includes/components/skinnedmeshrender.h

@@ -36,9 +36,6 @@ class ENGINE_EXPORT SkinnedMeshRender : public MeshRender {
 
     AABBox localBound() const override;
 
-    void loadUserData(const VariantMap &data) override;
-    VariantMap saveUserData() const override;
-
     void setMaterial(Material *material) override;
 
     void onReferenceDestroyed() override;

engine/src/components/animator.cpp

@@ -11,8 +11,6 @@
 
 #include "log.h"
 
-#define CLIP "Clip"
-
 static std::hash<std::string> hash_str;
 
 /*!
@@ -336,36 +334,6 @@ int Animator::duration() const {
 /*!
     \internal
 */
-void Animator::loadUserData(const VariantMap &data) {
-    PROFILE_FUNCTION();
-
-    auto it = data.find(CLIP);
-    if(it != data.end()) {
-        std::string guid = (*it).second.toString();
-        AnimationStateMachine *stateMachine = Engine::loadResource<AnimationStateMachine>(guid);
-        setStateMachine(stateMachine);
-    }
-
-    Component::loadUserData(data);
-}
-/*!
-    \internal
-*/
-VariantMap Animator::saveUserData() const {
-    PROFILE_FUNCTION();
-
-    VariantMap result = Component::saveUserData();
-
-    std::string ref = Engine::reference(m_stateMachine);
-    if(!ref.empty()) {
-        result[CLIP] = ref;
-    }
-
-    return result;
-}
-/*!
-    \internal
-*/
 void Animator::setClips(AnimationClip *start, AnimationClip *end, float duration, float time) {
     PROFILE_FUNCTION();
 

engine/src/components/armature.cpp

@@ -62,28 +62,31 @@ Armature::~Armature() {
 */
 void Armature::update() {
     if(m_bindDirty) {
-        cleanDirty(actor());
+        cleanDirty();
     }
 
     Texture::Surface &surface = m_cache->surface(0);
     ByteArray &array = surface.front();
     uint8_t *data = array.data();
 
-    Matrix4 localInv(transform()->worldTransform().inverse());
+    Transform *t = transform();
+    if(t) {
+        Matrix4 localInv(t->worldTransform().inverse());
 
-    for(uint32_t i = 0; i < m_bones.size(); i++) {
-        if(i < m_invertTransform.size() && m_bones[i]) {
-            Matrix4 t(localInv * m_bones[i]->worldTransform() * m_invertTransform[i]);
+        for(uint32_t i = 0; i < m_bones.size(); i++) {
+            if(i < m_invertTransform.size() && m_bones[i]) {
+                Matrix4 t(localInv * m_bones[i]->worldTransform() * m_invertTransform[i]);
 
-            // Compress data
-            t[3]  = t[12];
-            t[7]  = t[13];
-            t[11] = t[14];
+                // Compress data
+                t[3]  = t[12];
+                t[7]  = t[13];
+                t[11] = t[14];
 
-            memcpy(&data[i * M4X3_SIZE], t.mat, M4X3_SIZE);
+                memcpy(&data[i * M4X3_SIZE], t.mat, M4X3_SIZE);
+            }
         }
+        m_cache->setDirty();
     }
-    m_cache->setDirty();
 }
 /*!
     Returns a bind pose of the bone structure.
@@ -118,28 +121,6 @@ Texture *Armature::texture() const {
 /*!
     \internal
 */
-void Armature::loadUserData(const VariantMap &data) {
-    Component::loadUserData(data);
-
-    auto it = data.find(gPose);
-    if(it != data.end()) {
-        setBindPose(Engine::loadResource<Pose>((*it).second.toString()));
-    }
-}
-/*!
-    \internal
-*/
-VariantMap Armature::saveUserData() const {
-    VariantMap result = Component::saveUserData();
-
-    std::string ref = Engine::reference(bindPose());
-    if(!ref.empty()) {
-        result[gPose] = ref;
-    }
-
-    return result;
-}
-
 void Armature::drawGizmosSelected() {
     static Mesh *bone = nullptr;
     if(bone == nullptr) {
@@ -155,10 +136,12 @@ void Armature::drawGizmosSelected() {
         }
     }
 }
-
-void Armature::cleanDirty(Actor *actor) {
+/*!
+    \internal
+*/
+void Armature::cleanDirty() {
     if(m_bindPose) {
-        std::list<Actor *> bones = actor->findChildren<Actor *>();
+        std::list<Actor *> bones = actor()->findChildren<Actor *>();
 
         uint32_t count = m_bindPose->boneCount();
         m_bones.reserve(count);
@@ -182,7 +165,9 @@ void Armature::cleanDirty(Actor *actor) {
 
     m_bindDirty = false;
 }
-
+/*!
+    \internal
+*/
 void Armature::bindPoseUpdated(int state, void *ptr) {
     switch(state) {
     case Resource::Ready: {

engine/src/components/component.cpp

@@ -86,7 +86,11 @@ void Component::setStarted(bool started) {
     Returns a transform attached to this Actor.
 */
 Transform *Component::transform() const {
-    return actor()->transform();
+    Actor *act = actor();
+    if(act) {
+        return act->transform();
+    }
+    return nullptr;
 }
 /*!
     Returns a component with \a type attached to the same Actor.

engine/src/components/skinnedmeshrender.cpp

@@ -4,15 +4,9 @@
 #include "components/transform.h"
 #include "components/armature.h"
 
-#include "resources/mesh.h"
 #include "resources/material.h"
 
-#include "systems/resourcesystem.h"
-
-#include "commandbuffer.h"
-
 namespace  {
-    const char *gArmature("Armature");
     const char *gMatrices("skinMatrices");
 }
 
@@ -98,6 +92,8 @@ void SkinnedMeshRender::setArmature(Armature *armature) {
                     it->setTexture(gMatrices, m_armature->texture());
                 }
             }
+
+            m_armature->update();
         }
     }
 }
@@ -119,31 +115,6 @@ void SkinnedMeshRender::setMaterialsList(const std::list<Material *> &materials)
 /*!
     \internal
 */
-void SkinnedMeshRender::loadUserData(const VariantMap &data) {
-    MeshRender::loadUserData(data);
-
-    auto it = data.find(gArmature);
-    if(it != data.end()) {
-        uint32_t uuid = uint32_t((*it).second.toInt());
-        Object *object = Engine::findObject(uuid, Engine::findRoot(this));
-        setArmature(dynamic_cast<Armature *>(object));
-    }
-}
-/*!
-    \internal
-*/
-VariantMap SkinnedMeshRender::saveUserData() const {
-    VariantMap result(MeshRender::saveUserData());
-
-    if(m_armature) {
-        result[gArmature] = int(m_armature->uuid());
-    }
-
-    return result;
-}
-/*!
-    \internal
-*/
 void SkinnedMeshRender::onReferenceDestroyed() {
     MeshRender::onReferenceDestroyed();
 

engine/src/components/spriterender.cpp

@@ -6,7 +6,6 @@
 #include "resources/mesh.h"
 #include "resources/sprite.h"
 
-#include "commandbuffer.h"
 #include "pipelinecontext.h"
 
 #include <math.h>

engine/src/components/tilemaprender.cpp

@@ -6,11 +6,7 @@
 #include "resources/tilemap.h"
 #include "resources/tileset.h"
 #include "resources/sprite.h"
-
-#include "commandbuffer.h"
-#include "pipelinecontext.h"
-
-#include "mesh.h"
+#include "resources/mesh.h"
 
 namespace {
     const char *gTileMap = "TileMap";