v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update glTF2Exporter.cpp

pull/2191/head
haroonq 2018-10-29 14:52:41 -07:00 committed by GitHub
parent bfe1dc2914
commit 7b9f4a66de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
code/glTF2Exporter.cpp
View File

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