|
@@ -587,11 +587,11 @@ void OgreXmlSerializer::ReadAnimations(XmlNode &node, Skeleton *skeleton) {
|
|
const std::string currentChildName = currentChildNode.name();
|
|
const std::string currentChildName = currentChildNode.name();
|
|
if (currentChildName == nnTracks) {
|
|
if (currentChildName == nnTracks) {
|
|
ReadAnimationTracks(currentChildNode, anim);
|
|
ReadAnimationTracks(currentChildNode, anim);
|
|
- skeleton->animations.push_back(anim);
|
|
|
|
} else {
|
|
} else {
|
|
throw DeadlyImportError("No <tracks> found in <animation> ", anim->name);
|
|
throw DeadlyImportError("No <tracks> found in <animation> ", anim->name);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ skeleton->animations.push_back(anim);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -607,11 +607,11 @@ void OgreXmlSerializer::ReadAnimationTracks(XmlNode &node, Animation *dest) {
|
|
const std::string currentChildName = currentChildNode.name();
|
|
const std::string currentChildName = currentChildNode.name();
|
|
if (currentChildName == nnKeyFrames) {
|
|
if (currentChildName == nnKeyFrames) {
|
|
ReadAnimationKeyFrames(currentChildNode, dest, &track);
|
|
ReadAnimationKeyFrames(currentChildNode, dest, &track);
|
|
- dest->tracks.push_back(track);
|
|
|
|
} else {
|
|
} else {
|
|
throw DeadlyImportError("No <keyframes> found in <track> ", dest->name);
|
|
throw DeadlyImportError("No <keyframes> found in <track> ", dest->name);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ dest->tracks.push_back(track);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -631,7 +631,7 @@ void OgreXmlSerializer::ReadAnimationKeyFrames(XmlNode &node, Animation *anim, V
|
|
keyframe.position.z = ReadAttribute<float>(currentChildNode, anZ);
|
|
keyframe.position.z = ReadAttribute<float>(currentChildNode, anZ);
|
|
} else if (currentChildName == nnRotate) {
|
|
} else if (currentChildName == nnRotate) {
|
|
float angle = ReadAttribute<float>(currentChildNode, "angle");
|
|
float angle = ReadAttribute<float>(currentChildNode, "angle");
|
|
- for (XmlNode ¤tChildChildNode : currentNode.children()) {
|
|
|
|
|
|
+ for (XmlNode ¤tChildChildNode : currentChildNode.children()) {
|
|
const std::string currentChildChildName = currentChildChildNode.name();
|
|
const std::string currentChildChildName = currentChildChildNode.name();
|
|
if (currentChildChildName == nnAxis) {
|
|
if (currentChildChildName == nnAxis) {
|
|
aiVector3D axis;
|
|
aiVector3D axis;
|