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

Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer

Browse Source 
Conflicts:
	src/Engine/Rendering/RawModelCustom.cpp
	tools/MayaExporter/MayaExporter/Skeleton.cpp
This commit is contained in:
Teejoon
2016-02-04 15:05:00 +01:00
parent 336b058c9f 84499665d0
commit c272857819
7 changed files with 251 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Rendering/RawModelCustom.h
+1 -1
View File
@@ -121,7 +121,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, Skeleton::Animation& animation);
void ReadAnimationKeyFrame(unsigned int &offset, char* fileData, unsigned int& fileByteSize, std::vector<Skeleton::Animation::Keyframe>& animation);
//void CreateSkeleton(std::vector<std::tuple<std::string, glm::mat4>> &boneInfo, std::map<std::string, int> &boneNameMapping, aiNode* node, int parentID);
};
include/Engine/Rendering/Skeleton.h
+9 -8
View File
@@ -53,20 +53,21 @@ public:
{
struct BoneProperty
{
int ID;
glm::vec3 Position;
glm::quat Rotation;
glm::vec3 Scale = glm::vec3(1);
};
int Index = 0;
double Time = 0.0;
std::map<int, Keyframe::BoneProperty> BoneProperties;
int Index = 0;
double Time = 0.0;
BoneProperty BoneProperties;
};
std::string Name;
double Duration;
std::vector<Keyframe> Keyframes;
std::string Name;
double Duration;
std::map<int, std::vector<Keyframe>> JointAnimations;
};
Skeleton() { }