Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'glt2anim' of https://github.com/haroonq/assimp into glt2anim

Browse Source
This commit is contained in:
Haroon Qureshi
2018-10-29 14:46:43 -07:00
parent acad9a06e9 57d3d71b6e
commit bfe1dc2914
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/glTF2Exporter.cpp
View File

@@ -973,9 +973,14 @@ inline void ExtractTranslationSampler(Asset& asset, std::string& animId, Ref<Buf
return;
}
<<<<<<< HEAD
const vec3 kZeros = {0, 0, 0};
std::vector<float> times(numKeyframes);
std::vector<vec3> values(numKeyframes, kZeros);
=======
std::vector<float> times(numKeyframes);
std::vector<vec3> values(numKeyframes);
>>>>>>> 57d3d71b6ec68f41a10c1da2f01d096f1308e88c
for (unsigned int i = 0; i < numKeyframes; ++i) {
const aiVectorKey& key = nodeChannel->mPositionKeys[i];
// mTime is measured in ticks, but GLTF time is measured in seconds, so convert.
@@ -997,9 +1002,14 @@ inline void ExtractScaleSampler(Asset& asset, std::string& animId, Ref<Buffer>&
return;
}
<<<<<<< HEAD
const vec3 kZeros = {0, 0, 0};
std::vector<float> times(numKeyframes);
std::vector<vec3> values(numKeyframes, kZeros);
=======
std::vector<float> times(numKeyframes);
std::vector<vec3> values(numKeyframes);
>>>>>>> 57d3d71b6ec68f41a10c1da2f01d096f1308e88c
for (unsigned int i = 0; i < numKeyframes; ++i) {
const aiVectorKey& key = nodeChannel->mScalingKeys[i];
// mTime is measured in ticks, but GLTF time is measured in seconds, so convert.
@@ -1021,9 +1031,14 @@ inline void ExtractRotationSampler(Asset& asset, std::string& animId, Ref<Buffer
return;
}
<<<<<<< HEAD
const vec4 kZeros = {0, 0, 0, 0};
std::vector<float> times(numKeyframes);
std::vector<vec4> values(numKeyframes, kZeros);
=======
std::vector<float> times(numKeyframes);
std::vector<vec4> values(numKeyframes);
>>>>>>> 57d3d71b6ec68f41a10c1da2f01d096f1308e88c
for (unsigned int i = 0; i < numKeyframes; ++i) {
const aiQuatKey& key = nodeChannel->mRotationKeys[i];
// mTime is measured in ticks, but GLTF time is measured in seconds, so convert.