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

Build fix

pull/2050/head
Sebastian Matusik 2018-07-05 14:46:15 +01:00
parent 3e3a785750
commit 0cc9240886
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/glTF2Importer.cpp
View File

@ -460,7 +460,7 @@ void glTF2Importer::ImportMeshes(glTF2::Asset& r)
Mesh::Primitive::Target& target = targets[i]; Mesh::Primitive::Target& target = targets[i];
if (target.position.size() > 0) { if (target.position.size() > 0) {
aiVector3D *positionDiff == nullptr; aiVector3D *positionDiff = nullptr;
target.position[0]->ExtractData(positionDiff); target.position[0]->ExtractData(positionDiff);
for(int vertexId = 0; vertexId < aim->mNumVertices; vertexId++) { for(int vertexId = 0; vertexId < aim->mNumVertices; vertexId++) {
aiAnimMesh.mVertices[vertexId] += positionDiff[vertexId]; aiAnimMesh.mVertices[vertexId] += positionDiff[vertexId];
@ -468,7 +468,7 @@ void glTF2Importer::ImportMeshes(glTF2::Asset& r)
delete [] positionDiff; delete [] positionDiff;
} }
if (target.normal.size() > 0) { if (target.normal.size() > 0) {
aiVector3D *normalDiff == nullptr; aiVector3D *normalDiff = nullptr;
target.normal[0]->ExtractData(normalDiff); target.normal[0]->ExtractData(normalDiff);
for(int vertexId = 0; vertexId < aim->mNumVertices; vertexId++) { for(int vertexId = 0; vertexId < aim->mNumVertices; vertexId++) {
aiAnimMesh.mNormals[vertexId] += normalDiff[vertexId]; aiAnimMesh.mNormals[vertexId] += normalDiff[vertexId];
@ -484,7 +484,7 @@ void glTF2Importer::ImportMeshes(glTF2::Asset& r)
for (unsigned int vertexId = 0; vertexId < aim->mNumVertices; ++vertexId) { for (unsigned int vertexId = 0; vertexId < aim->mNumVertices; ++vertexId) {
tangent[vertexId].xyz += tangentDiff[vertexId]; tangent[vertexId].xyz += tangentDiff[vertexId];
aiAnimMesh.mTangents[vertexId] = tangent[vertexId]; aiAnimMesh.mTangents[vertexId] = tangent[vertexId].xyz;
aiAnimMesh.mBitangents[vertexId] = (aiAnimMesh.mNormals[vertexId] ^ tangent[vertexId].xyz) * tangent[vertexId].w; aiAnimMesh.mBitangents[vertexId] = (aiAnimMesh.mNormals[vertexId] ^ tangent[vertexId].xyz) * tangent[vertexId].w;
} }
delete [] tangent; delete [] tangent;