BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed BlendTree crash when animation nodes are null

Browse Source
This commit is contained in:
viktorljung
2016-03-02 17:42:55 +01:00
parent d8a0e69ff0
commit e9bbb5ed2a
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Rendering/BlendTree.cpp
+18 -5
View File
@@ -142,9 +142,13 @@ BlendTree::Node* BlendTree::FillTreeByName(Node* parentNode, std::string name, E
} else if (node->Weight == 0.f) { } else if (node->Weight == 0.f) {
node->Child[1] = FillTreeByName(node, (std::string)childEntity["Blend"]["Pose2"], childEntity); node->Child[1] = FillTreeByName(node, (std::string)childEntity["Blend"]["Pose2"], childEntity);
}*/ }*/
if(node->Child[0] == nullptr && node->Child[1] == nullptr) {
return nullptr;
} else {
return node;
}
return node;
} else if (childEntity.HasComponent("BlendOverride")) { } else if (childEntity.HasComponent("BlendOverride")) {
Node* node = new Node(); Node* node = new Node();
node->Entity = childEntity; node->Entity = childEntity;
@@ -153,7 +157,12 @@ BlendTree::Node* BlendTree::FillTreeByName(Node* parentNode, std::string name, E
node->Type = NodeType::Override; node->Type = NodeType::Override;
node->Child[0] = FillTreeByName(node, (std::string)childEntity["BlendOverride"]["Master"], childEntity); node->Child[0] = FillTreeByName(node, (std::string)childEntity["BlendOverride"]["Master"], childEntity);
node->Child[1] = FillTreeByName(node, (std::string)childEntity["BlendOverride"]["Slave"], childEntity); node->Child[1] = FillTreeByName(node, (std::string)childEntity["BlendOverride"]["Slave"], childEntity);
return node;
if (node->Child[0] == nullptr && node->Child[1] == nullptr) {
return nullptr;
} else {
return node;
}
} else if (childEntity.HasComponent("BlendAdditive")) { } else if (childEntity.HasComponent("BlendAdditive")) {
Node* node = new Node(); Node* node = new Node();
node->Entity = childEntity; node->Entity = childEntity;
@@ -162,7 +171,12 @@ BlendTree::Node* BlendTree::FillTreeByName(Node* parentNode, std::string name, E
node->Type = NodeType::Additive; node->Type = NodeType::Additive;
node->Child[0] = FillTreeByName(node, (std::string)childEntity["BlendAdditive"]["Adder"], childEntity); node->Child[0] = FillTreeByName(node, (std::string)childEntity["BlendAdditive"]["Adder"], childEntity);
node->Child[1] = FillTreeByName(node, (std::string)childEntity["BlendAdditive"]["Receiver"], childEntity); node->Child[1] = FillTreeByName(node, (std::string)childEntity["BlendAdditive"]["Receiver"], childEntity);
return node;
if(node->Child[0] == nullptr && node->Child[1] == nullptr) {
return nullptr;
} else {
return node;
}
} }
@@ -252,7 +266,6 @@ void BlendTree::Blend(std::map<int, Skeleton::PoseData>& pose)
if(currentNode->Pose.size() == 0) { if(currentNode->Pose.size() == 0) {
if (currentNode->Child[0] != nullptr && currentNode->Child[1] != nullptr) { if (currentNode->Child[0] != nullptr && currentNode->Child[1] != nullptr) {
if (currentNode->Child[0]->Pose.size() != 0 && currentNode->Child[1]->Pose.size() != 0) { if (currentNode->Child[0]->Pose.size() != 0 && currentNode->Child[1]->Pose.size() != 0) {
switch (currentNode->Type) { switch (currentNode->Type) {
case BlendTree::NodeType::Additive: case BlendTree::NodeType::Additive:
currentNode->Pose = m_Skeleton->BlendPoseAdditive(currentNode->Child[0]->Pose, currentNode->Child[1]->Pose); currentNode->Pose = m_Skeleton->BlendPoseAdditive(currentNode->Child[0]->Pose, currentNode->Child[1]->Pose);