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

Changed the way we're exporting animations.

Browse Source
This commit is contained in:
antc13
2016-02-02 14:47:22 +01:00
parent 210e11e659
commit e8186a7062
4 changed files with 267 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Rendering/RawModelCustom.h
+1 -1
View File
@@ -89,7 +89,7 @@ private:
void ReadAnimationJoint(unsigned int &offset, char* fileData, unsigned int& fileByteSize);
void ReadAnimationClips(unsigned int &offset, char* fileData, unsigned int& fileByteSize, unsigned int numberOfClips);
void ReadAnimationClipSingle(unsigned int &offset, char* fileData, unsigned int& fileByteSize, unsigned int clipIndex);
void ReadAnimationKeyFrame(unsigned int &offset, char* fileData, unsigned int& fileByteSize, unsigned int numberOfJoints, Skeleton::Animation& animation);
void ReadAnimationKeyFrame(unsigned int &offset, char* fileData, unsigned int& fileByteSize, Skeleton::Animation& animation);
//void CreateSkeleton(std::vector<std::tuple<std::string, glm::mat4>> &boneInfo, std::map<std::string, int> &boneNameMapping, aiNode* node, int parentID);
};
src/Engine/Rendering/RawModelCustom.cpp
+8 -8
View File
@@ -327,22 +327,16 @@ void RawModelCustom::ReadAnimationClipSingle(unsigned int &offset, char* fileDat
unsigned int nrOfKeyframes = *(unsigned int*)(fileData + offset);
offset += sizeof(unsigned int);
if (offset + sizeof(unsigned int) > fileByteSize) {
throw Resource::FailedLoadingException("Reading AnimationClip NrOfJoints failed");
}
unsigned int nrOfJoints = *(unsigned int*)(fileData + offset);
offset += sizeof(unsigned int);
newAnimation.Keyframes.reserve(nrOfKeyframes);
for (unsigned int i = 0; i < nrOfKeyframes; i++) {
ReadAnimationKeyFrame(offset, fileData, fileByteSize, nrOfJoints, newAnimation);
ReadAnimationKeyFrame(offset, fileData, fileByteSize, newAnimation);
}
m_Skeleton->Animations[newAnimation.Name] = newAnimation;
#else
#endif
}
void RawModelCustom::ReadAnimationKeyFrame(unsigned int &offset, char* fileData, unsigned int& fileByteSize, unsigned int nrOfJoints, Skeleton::Animation& animation)
void RawModelCustom::ReadAnimationKeyFrame(unsigned int &offset, char* fileData, unsigned int& fileByteSize, Skeleton::Animation& animation)
{
Skeleton::Animation::Keyframe newKeyFrame;
@@ -358,6 +352,12 @@ void RawModelCustom::ReadAnimationKeyFrame(unsigned int &offset, char* fileData,
newKeyFrame.Time = *(float*)(fileData + offset);
offset += sizeof(float);
if (offset + sizeof(unsigned int) > fileByteSize) {
throw Resource::FailedLoadingException("Reading AnimationKeyFrame NrOfJoints failed");
}
unsigned int nrOfJoints = *(unsigned int*)(fileData + offset);
offset += sizeof(unsigned int);
if (offset + sizeof(Skeleton::Animation::Keyframe::BoneProperty) * nrOfJoints> fileByteSize) {
throw Resource::FailedLoadingException("Reading AnimationKeyFrame joints failed");
}
tools/MayaExporter/MayaExporter/Skeleton.cpp
+122 -74
View File
@@ -77,69 +77,69 @@ Animation Skeleton::GetAnimData(std::string animationName, int startFrame, int e
std::map<std::string, std::array<std::array<double, 4>, 4>> joinCheckMap;
std::map<std::string, bool> exportJoint;
MItDag jointIt(MItDag::TraversalType::kDepthFirst, MFn::kJoint);
for (unsigned int i = startFrame; i <= endFrame; i++)
{
MAnimControl::setCurrentTime(MTime(i, MTime::kNTSCField));
while (!jointIt.isDone())
{
m_Hierarchy.push_back(jointIt.item());
//MItDag jointIt(MItDag::TraversalType::kDepthFirst, MFn::kJoint);
//for (unsigned int i = startFrame; i <= endFrame; i++)
//{
// MAnimControl::setCurrentTime(MTime(i, MTime::kNTSCField));
// while (!jointIt.isDone())
// {
// m_Hierarchy.push_back(jointIt.item());
MFnTransform MayaJoint(jointIt.item());
MMatrix transformationMatrix = MayaJoint.transformationMatrix();
// MFnTransform MayaJoint(jointIt.item());
// MMatrix transformationMatrix = MayaJoint.transformationMatrix();
if (i == startFrame)
{
double doubleMat[4][4];
transformationMatrix.get(doubleMat);
// if (i == startFrame)
// {
// double doubleMat[4][4];
// transformationMatrix.get(doubleMat);
joinCheckMap[MayaJoint.name().asChar()][0][0] = doubleMat[0][0];
joinCheckMap[MayaJoint.name().asChar()][0][1] = doubleMat[0][1];
joinCheckMap[MayaJoint.name().asChar()][0][2] = doubleMat[0][2];
joinCheckMap[MayaJoint.name().asChar()][0][3] = doubleMat[0][3];
joinCheckMap[MayaJoint.name().asChar()][1][0] = doubleMat[1][0];
joinCheckMap[MayaJoint.name().asChar()][1][1] = doubleMat[1][1];
joinCheckMap[MayaJoint.name().asChar()][1][2] = doubleMat[1][2];
joinCheckMap[MayaJoint.name().asChar()][1][3] = doubleMat[1][3];
joinCheckMap[MayaJoint.name().asChar()][2][0] = doubleMat[2][0];
joinCheckMap[MayaJoint.name().asChar()][2][1] = doubleMat[2][1];
joinCheckMap[MayaJoint.name().asChar()][2][2] = doubleMat[2][2];
joinCheckMap[MayaJoint.name().asChar()][2][3] = doubleMat[2][3];
joinCheckMap[MayaJoint.name().asChar()][3][0] = doubleMat[3][0];
joinCheckMap[MayaJoint.name().asChar()][3][1] = doubleMat[3][1];
joinCheckMap[MayaJoint.name().asChar()][3][2] = doubleMat[3][2];
joinCheckMap[MayaJoint.name().asChar()][3][3] = doubleMat[3][3];
// joinCheckMap[MayaJoint.name().asChar()][0][0] = doubleMat[0][0];
// joinCheckMap[MayaJoint.name().asChar()][0][1] = doubleMat[0][1];
// joinCheckMap[MayaJoint.name().asChar()][0][2] = doubleMat[0][2];
// joinCheckMap[MayaJoint.name().asChar()][0][3] = doubleMat[0][3];
// joinCheckMap[MayaJoint.name().asChar()][1][0] = doubleMat[1][0];
// joinCheckMap[MayaJoint.name().asChar()][1][1] = doubleMat[1][1];
// joinCheckMap[MayaJoint.name().asChar()][1][2] = doubleMat[1][2];
// joinCheckMap[MayaJoint.name().asChar()][1][3] = doubleMat[1][3];
// joinCheckMap[MayaJoint.name().asChar()][2][0] = doubleMat[2][0];
// joinCheckMap[MayaJoint.name().asChar()][2][1] = doubleMat[2][1];
// joinCheckMap[MayaJoint.name().asChar()][2][2] = doubleMat[2][2];
// joinCheckMap[MayaJoint.name().asChar()][2][3] = doubleMat[2][3];
// joinCheckMap[MayaJoint.name().asChar()][3][0] = doubleMat[3][0];
// joinCheckMap[MayaJoint.name().asChar()][3][1] = doubleMat[3][1];
// joinCheckMap[MayaJoint.name().asChar()][3][2] = doubleMat[3][2];
// joinCheckMap[MayaJoint.name().asChar()][3][3] = doubleMat[3][3];
exportJoint[MayaJoint.name().asChar()] = false;
}
else if(!exportJoint[MayaJoint.name().asChar()])//!exportJoint[MayaJoint.name().asChar()])
{
double doubleMat[4][4];
// exportJoint[MayaJoint.name().asChar()] = false;
// }
// else if(!exportJoint[MayaJoint.name().asChar()])//!exportJoint[MayaJoint.name().asChar()])
// {
// double doubleMat[4][4];
doubleMat[0][0] = joinCheckMap[MayaJoint.name().asChar()][0][0];
doubleMat[0][1] = joinCheckMap[MayaJoint.name().asChar()][0][1];
doubleMat[0][2] = joinCheckMap[MayaJoint.name().asChar()][0][2];
doubleMat[0][3] = joinCheckMap[MayaJoint.name().asChar()][0][3];
doubleMat[1][0] = joinCheckMap[MayaJoint.name().asChar()][1][0];
doubleMat[1][1] = joinCheckMap[MayaJoint.name().asChar()][1][1];
doubleMat[1][2] = joinCheckMap[MayaJoint.name().asChar()][1][2];
doubleMat[1][3] = joinCheckMap[MayaJoint.name().asChar()][1][3];
doubleMat[2][0] = joinCheckMap[MayaJoint.name().asChar()][2][0];
doubleMat[2][1] = joinCheckMap[MayaJoint.name().asChar()][2][1];
doubleMat[2][2] = joinCheckMap[MayaJoint.name().asChar()][2][2];
doubleMat[2][3] = joinCheckMap[MayaJoint.name().asChar()][2][3];
doubleMat[3][0] = joinCheckMap[MayaJoint.name().asChar()][3][0];
doubleMat[3][1] = joinCheckMap[MayaJoint.name().asChar()][3][1];
doubleMat[3][2] = joinCheckMap[MayaJoint.name().asChar()][3][2];
doubleMat[3][3] = joinCheckMap[MayaJoint.name().asChar()][3][3];
// doubleMat[0][0] = joinCheckMap[MayaJoint.name().asChar()][0][0];
// doubleMat[0][1] = joinCheckMap[MayaJoint.name().asChar()][0][1];
// doubleMat[0][2] = joinCheckMap[MayaJoint.name().asChar()][0][2];
// doubleMat[0][3] = joinCheckMap[MayaJoint.name().asChar()][0][3];
// doubleMat[1][0] = joinCheckMap[MayaJoint.name().asChar()][1][0];
// doubleMat[1][1] = joinCheckMap[MayaJoint.name().asChar()][1][1];
// doubleMat[1][2] = joinCheckMap[MayaJoint.name().asChar()][1][2];
// doubleMat[1][3] = joinCheckMap[MayaJoint.name().asChar()][1][3];
// doubleMat[2][0] = joinCheckMap[MayaJoint.name().asChar()][2][0];
// doubleMat[2][1] = joinCheckMap[MayaJoint.name().asChar()][2][1];
// doubleMat[2][2] = joinCheckMap[MayaJoint.name().asChar()][2][2];
// doubleMat[2][3] = joinCheckMap[MayaJoint.name().asChar()][2][3];
// doubleMat[3][0] = joinCheckMap[MayaJoint.name().asChar()][3][0];
// doubleMat[3][1] = joinCheckMap[MayaJoint.name().asChar()][3][1];
// doubleMat[3][2] = joinCheckMap[MayaJoint.name().asChar()][3][2];
// doubleMat[3][3] = joinCheckMap[MayaJoint.name().asChar()][3][3];
MMatrix tmp(doubleMat);
if (!tmp.isEquivalent(transformationMatrix)) {
MGlobal::displayInfo(MString() + MayaJoint.name() + " is exported");
exportJoint[MayaJoint.name().asChar()] = true;
animatedJoints.push_back(MayaJoint.object());
}
}
// MMatrix tmp(doubleMat);
// if (!tmp.isEquivalent(transformationMatrix)) {
// MGlobal::displayInfo(MString() + MayaJoint.name() + " is exported");
// exportJoint[MayaJoint.name().asChar()] = true;
// animatedJoints.push_back(MayaJoint.object());
// }
// }
/*for (int i = 0; i < 9; i++)
{
@@ -186,7 +186,7 @@ Animation Skeleton::GetAnimData(std::string animationName, int startFrame, int e
/*MGlobal::displayInfo(MString() + "start keyfram index: " + startKeyFrameIndex + ". End keyfram index: " + endKeyFrameIndex + ".");*/
if (startFrame <= jointAnim.time(endKeyFrameIndex).value() && jointAnim.time(endKeyFrameIndex).value() <= endFrame || endKeyFrameIndex - startKeyFrameIndex > 0) {
/*if (startFrame <= jointAnim.time(endKeyFrameIndex).value() && jointAnim.time(endKeyFrameIndex).value() <= endFrame || endKeyFrameIndex - startKeyFrameIndex > 0) {
animatedJoints.push_back(jointIt.item());
i = 9;
break;
@@ -206,13 +206,13 @@ Animation Skeleton::GetAnimData(std::string animationName, int startFrame, int e
}
}
}
}*/
}
} // end of int i loop
jointIt.next();
} // end of int i loop*/
/* jointIt.next();
}
jointIt.reset();
}
}*/
int currentFrame = startFrame;
@@ -224,18 +224,62 @@ Animation Skeleton::GetAnimData(std::string animationName, int startFrame, int e
MAnimControl::setCurrentTime(MTime(currentFrame, MTime::kNTSCField));
MTime time = MAnimControl::currentTime();
for (auto aJoint : animatedJoints){
MFnTransform thisJoint(aJoint);
MItDag jointIt(MItDag::TraversalType::kDepthFirst, MFn::kJoint);
unsigned int jointID = 0;
while (!jointIt.isDone()) {
MFnTransform thisJoint(jointIt.currentItem());
MMatrix transformationMatrix = thisJoint.transformationMatrix();
double doubleMat[4][4];
if (currentFrame != startFrame){
Animation::Keyframe::JointProperty joint;
auto it = std::find(m_Hierarchy.begin(), m_Hierarchy.end(), thisJoint.object());
if (it != m_Hierarchy.end()) {
joint.ID = it - m_Hierarchy.begin();
doubleMat[0][0] = joinCheckMap[thisJoint.name().asChar()][0][0];
doubleMat[0][1] = joinCheckMap[thisJoint.name().asChar()][0][1];
doubleMat[0][2] = joinCheckMap[thisJoint.name().asChar()][0][2];
doubleMat[0][3] = joinCheckMap[thisJoint.name().asChar()][0][3];
doubleMat[1][0] = joinCheckMap[thisJoint.name().asChar()][1][0];
doubleMat[1][1] = joinCheckMap[thisJoint.name().asChar()][1][1];
doubleMat[1][2] = joinCheckMap[thisJoint.name().asChar()][1][2];
doubleMat[1][3] = joinCheckMap[thisJoint.name().asChar()][1][3];
doubleMat[2][0] = joinCheckMap[thisJoint.name().asChar()][2][0];
doubleMat[2][1] = joinCheckMap[thisJoint.name().asChar()][2][1];
doubleMat[2][2] = joinCheckMap[thisJoint.name().asChar()][2][2];
doubleMat[2][3] = joinCheckMap[thisJoint.name().asChar()][2][3];
doubleMat[3][0] = joinCheckMap[thisJoint.name().asChar()][3][0];
doubleMat[3][1] = joinCheckMap[thisJoint.name().asChar()][3][1];
doubleMat[3][2] = joinCheckMap[thisJoint.name().asChar()][3][2];
doubleMat[3][3] = joinCheckMap[thisJoint.name().asChar()][3][3];
MMatrix LastJointMatrix(doubleMat);
//Is same as last KeyFrame
if (LastJointMatrix.isEquivalent(transformationMatrix)) {
jointID++;
jointIt.next();
continue;
}
else {
MGlobal::displayError(MString() + "Could not find joint ID for: " + thisJoint.name());
}
transformationMatrix.get(doubleMat);
joinCheckMap[thisJoint.name().asChar()][0][0] = doubleMat[0][0];
joinCheckMap[thisJoint.name().asChar()][0][1] = doubleMat[0][1];
joinCheckMap[thisJoint.name().asChar()][0][2] = doubleMat[0][2];
joinCheckMap[thisJoint.name().asChar()][0][3] = doubleMat[0][3];
joinCheckMap[thisJoint.name().asChar()][1][0] = doubleMat[1][0];
joinCheckMap[thisJoint.name().asChar()][1][1] = doubleMat[1][1];
joinCheckMap[thisJoint.name().asChar()][1][2] = doubleMat[1][2];
joinCheckMap[thisJoint.name().asChar()][1][3] = doubleMat[1][3];
joinCheckMap[thisJoint.name().asChar()][2][0] = doubleMat[2][0];
joinCheckMap[thisJoint.name().asChar()][2][1] = doubleMat[2][1];
joinCheckMap[thisJoint.name().asChar()][2][2] = doubleMat[2][2];
joinCheckMap[thisJoint.name().asChar()][2][3] = doubleMat[2][3];
joinCheckMap[thisJoint.name().asChar()][3][0] = doubleMat[3][0];
joinCheckMap[thisJoint.name().asChar()][3][1] = doubleMat[3][1];
joinCheckMap[thisJoint.name().asChar()][3][2] = doubleMat[3][2];
joinCheckMap[thisJoint.name().asChar()][3][3] = doubleMat[3][3];
MTransformationMatrix Matrix = thisJoint.transformation();
MPlug BindPose = thisJoint.findPlug("bindPose");
MDataHandle DataHandle;
@@ -264,6 +308,9 @@ Animation Skeleton::GetAnimData(std::string animationName, int startFrame, int e
rotation = rotation * jo;
rotation.get(tmp);
Animation::Keyframe::JointProperty joint;
joint.ID = jointID;
joint.Rotation[0] = tmp[0];
joint.Rotation[1] = tmp[1];
joint.Rotation[2] = tmp[2];
@@ -278,13 +325,16 @@ Animation Skeleton::GetAnimData(std::string animationName, int startFrame, int e
joint.Scale[2] = tmp[2];
thisKeyFrame.JointProperties.push_back(joint);
jointID++;
jointIt.next();
}
thisKeyFrame.NumberOfJoints = thisKeyFrame.JointProperties.size();
returnData.Keyframes.push_back(thisKeyFrame);
currentFrame++;
}
returnData.NumKeyFrames = returnData.Keyframes.size();
returnData.NumberOfJoints = animatedJoints.size();
return returnData;
}
@@ -310,13 +360,11 @@ std::vector<BindPoseSkeletonNode> Skeleton::GetBindPoses()
}
SkeletonStorage.Name = std::string(MayaJoint.name().asChar());
NewJoint.ParentID = -1; // This joint is root
}
else {
} else {
auto it = std::find(m_Hierarchy.begin(), m_Hierarchy.end(), MayaJoint.parent(0));
if (it != m_Hierarchy.end()) {
NewJoint.ParentID = it - m_Hierarchy.begin();
}
else {
} else {
MGlobal::displayError(MString() + "Could not find joint parent for: " + MayaJoint.name());
}
}
tools/MayaExporter/MayaExporter/Skeleton.h
+3 -3
View File
@@ -22,6 +22,7 @@ public:
int Index = 0;
float Time = 0;
int NumberOfJoints;
std::vector<JointProperty> JointProperties;
};
@@ -29,7 +30,6 @@ public:
int nameLength = 0;
float Duration = 0;
int NumKeyFrames = 0;
int NumberOfJoints = 0;
std::vector<Keyframe> Keyframes;
virtual void WriteBinary(std::ostream& out)
@@ -38,11 +38,11 @@ public:
out.write(Name.c_str(), Name.size() + 1);
out.write((char*)&Duration, sizeof(float));
out.write((char*)&NumKeyFrames, sizeof(int));
out.write((char*)&NumberOfJoints, sizeof(int));
//Här under loopas alla key frames igenom
for (auto aKeyframe : Keyframes) {
out.write((char*)&aKeyframe.Index, sizeof(int));
out.write((char*)&aKeyframe.Time, sizeof(float));
out.write((char*)&aKeyframe.NumberOfJoints, sizeof(int));
for (auto aJoint : aKeyframe.JointProperties) {
out.write((char*)&aJoint.ID, sizeof(int));
out.write((char*)aJoint.Position, sizeof(float) * 3);
@@ -57,10 +57,10 @@ public:
out << "Animation Name: " << Name << endl;
out << "Duration: " << Duration << endl;
out << "Number of KeyFrames: " << NumKeyFrames << endl;
out << "Number of Joints: " << NumberOfJoints << endl;
for (auto aKeyframe : Keyframes) {
out << "Frame: " << aKeyframe.Index << endl;
out << "Time: " << aKeyframe.Time << endl;
out << "Number of Joints: " << aKeyframe.NumberOfJoints << endl;
for (auto aJoint : aKeyframe.JointProperties) {
out << "Joint ID: " << aJoint.ID << endl;
out << aJoint.Position[0] << " " << aJoint.Position[1] << " " << aJoint.Position[2] << endl;