Engine: Animation controller graph entry state issues #1262

Thunder.qbs

@@ -101,7 +101,6 @@ Project {
         "worldeditor/worldeditor.qbs",
         "builder/builder.qbs",
         "build/install.qbs",
-        "build/qbsinstall.qbs",
         "tests/tests.qbs"
     ]
 }

modules/editor/grapheditor/editor/graph/statenode.cpp

@@ -5,32 +5,41 @@
 #include <recttransform.h>
 #include <layout.h>
 
+void StateNode::updateName() {
+    if(m_nodeWidget) {
+        NodeWidget *nodeWidget = static_cast<NodeWidget *>(m_nodeWidget);
+        nodeWidget->updateName();
+    }
+}
+
 Widget *StateNode::widget() {
     if(m_nodeWidget == nullptr) {
         Actor *nodeActor = Engine::composeActor<NodeWidget>(name());
         if(nodeActor) {
             NodeWidget *nodeWidget = nodeActor->getComponent<NodeWidget>();
 
-            RectTransform *rect = nodeWidget->rectTransform();
-            rect->setVerticalPolicy(RectTransform::Fixed);
-            rect->setHorizontalPolicy(RectTransform::Fixed);
+            if(nodeWidget) {
+                RectTransform *rect = nodeWidget->rectTransform();
+                rect->setVerticalPolicy(RectTransform::Fixed);
+                rect->setHorizontalPolicy(RectTransform::Fixed);
 
-            Frame *title = nodeWidget->title();
-            Vector4 corners(title->corners());
-            corners.z = corners.w = corners.x;
-            title->setCorners(corners);
+                Frame *title = nodeWidget->title();
+                Vector4 corners(title->corners());
+                corners.z = corners.w = corners.x;
+                title->setCorners(corners);
 
-            RectTransform *titleRect = title->rectTransform();
-            titleRect->setMargin(Vector4(5.0f));
-            titleRect->setAnchors(Vector2(0.0f), Vector2(1.0f));
+                RectTransform *titleRect = title->rectTransform();
+                titleRect->setMargin(Vector4(5.0f));
+                titleRect->setAnchors(Vector2(0.0f), Vector2(1.0f));
 
-            Layout *layout = rect->layout();
-            layout->invalidate();
-            layout->update();
+                Layout *layout = rect->layout();
+                layout->invalidate();
+                layout->update();
 
-            nodeWidget->setGraphNode(this);
+                nodeWidget->setGraphNode(this);
 
-            m_nodeWidget = nodeWidget;
+                m_nodeWidget = nodeWidget;
+            }
         }
     }
 

modules/editor/grapheditor/editor/graph/statenode.h

@@ -6,7 +6,9 @@
 class NODEGRAPH_EXPORT StateNode : public GraphNode {
     A_OBJECT(StateNode, GraphNode, Graph)
 
-private:
+protected:
+    void updateName();
+
     Widget *widget() override;
 
 };

modules/editor/motiontools/converter/animationcontrollergraph.cpp

@@ -222,44 +222,42 @@ Variant AnimationControllerGraph::data() const {
     }
     machine.push_back(variables);
     // Pack transitions
+    TString entry;
     VariantList transitions;
     for(auto it : m_links) {
         StateLink *link = dynamic_cast<StateLink *>(it);
         if(link) {
-            VariantList transition;
-            transition.push_back(link->sender->name());
-            transition.push_back(link->receiver->name());
-            transition.push_back(link->duration());
-
-            Variant condition(link->property(gCondition));
-            if(condition.isValid()) {
-                VariantList conditions;
-                for(auto &it : condition.toList()) {
-                    VariantMap map(it.toMap());
-
-                    VariantList data;
-                    data.push_back(map[gName]);
-                    data.push_back(map[gType]);
-                    data.push_back(map[gValue]);
-                    conditions.push_back(data);
-                }
-                if(!conditions.empty()) {
-                    transition.push_back(conditions);
+            if(link->sender != m_entryState) {
+                VariantList transition;
+                transition.push_back(link->sender->name());
+                transition.push_back(link->receiver->name());
+                transition.push_back(link->property(gDuration).toFloat());
+
+                Variant condition(link->property(gCondition));
+                if(condition.isValid()) {
+                    VariantList conditions;
+                    for(auto &it : condition.toList()) {
+                        VariantMap map(it.toMap());
+
+                        VariantList data;
+                        data.push_back(map[gName]);
+                        data.push_back(map[gType]);
+                        data.push_back(map[gValue]);
+                        conditions.push_back(data);
+                    }
+                    if(!conditions.empty()) {
+                        transition.push_back(conditions);
+                    }
                 }
-            }
 
-            transitions.push_back(transition);
+                transitions.push_back(transition);
+            } else {
+                entry = it->receiver->name();
+            }
         }
     }
     machine.push_back(transitions);
     // Set initial state
-    TString entry;
-    for(const auto it : m_links) {
-        if(it->sender == m_entryState) {
-            entry = it->receiver->name();
-            break;
-        }
-    }
     machine.push_back(entry);
 
     result[gMachine] = machine;

modules/editor/motiontools/converter/basestate.h

@@ -11,7 +11,7 @@ class BaseState : public StateNode {
     A_OBJECT(BaseState, StateNode, Motion)
 
     A_PROPERTIES(
-        A_PROPERTY(TString, Name, BaseState::name, BaseState::setName),
+        A_PROPERTY(TString, Name, BaseState::name, BaseState::setBaseName),
         A_PROPERTYEX(AnimationClip *, Clip, BaseState::clip, BaseState::setClip, "editor=Asset"),
         A_PROPERTY(bool, Loop, BaseState::loop, BaseState::setLoop)
     )
@@ -33,6 +33,12 @@ class BaseState : public StateNode {
         m_loop = loop;
     }
 
+    void setBaseName(const TString &name) {
+        setName(name);
+
+        updateName();
+    }
+
 protected:
     Vector2 defaultSize() const override {
         return Vector2(170.0f, 40.0f);

modules/editor/motiontools/converter/statelink.h

@@ -21,22 +21,12 @@ namespace {
 class StateLink : public GraphLink {
     A_OBJECT(StateLink, GraphLink, Graph)
 
-    A_PROPERTIES(
-        A_PROPERTY(float, duration, StateLink::duration, StateLink::setDuration)
-    )
-
-public:
-    float duration() const {
-        return m_duration;
-    }
-
-    void setDuration(float duration) {
-        m_duration = duration;
-    }
-
 private:
     void toXml(pugi::xml_node &element) override {
-        element.append_attribute(gDuration) = m_duration;
+        Variant duration = property(gDuration);
+        if(duration.isValid()) {
+            element.append_attribute(gDuration) = duration.toFloat();
+        }
 
         AnimationControllerGraph *graph = static_cast<AnimationControllerGraph *>(sender->graph());
         if(graph) {
@@ -56,7 +46,10 @@ class StateLink : public GraphLink {
     }
 
     void fromXml(const pugi::xml_node &element) override {
-        m_duration = element.attribute(gDuration).as_float();
+        pugi::xml_attribute duration = element.attribute(gDuration);
+        if(duration) {
+            m_duration = duration.as_float();
+        }
 
         VariantList conditions;
 
@@ -85,14 +78,17 @@ class StateLink : public GraphLink {
             sub = sub.next_sibling();
         }
 
-        setProperty(gCondition, conditions);
+        if(!conditions.empty()) {
+            setProperty(gCondition, conditions);
+        }
     }
 
     void setEndpoints(GraphNode *sender, NodePort *oport, GraphNode *receiver, NodePort *iport) override {
         GraphLink::setEndpoints(sender, oport, receiver, iport);
 
         EntryState *entry = dynamic_cast<EntryState *>(sender);
         if(entry == nullptr) {
+            setProperty(gDuration, 0.0f);
             setProperty(gCondition, VariantList());
             setDynamicPropertyInfo(gCondition, "editor=Condition");
         }