livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-12216; Make sure a model loaded from some DAE always has vertex normals.

master
Nicky 2014-10-14 00:40:09 +02:00
parent e7c90906f8
commit edc844a74b
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
indra/llprimitive/llmodel.cpp
View File

@ -943,7 +943,43 @@ void LLModel::addVolumeFacesFromDomMesh(domMesh* mesh)
return ; //abort
}
}
// <FS:ND> FIRE-12216
// If we're missing normals, do a quick and dirty calculation of them.
// Use the normals of each vertex' connected faces and sum them up.
// This is maybe not as good as LLModel::generateNormals, but generateNormals will optimize and change
// the model, which can be okay if the user triggers it knowingly.
for( face_list_t::iterator itr = mVolumeFaces.begin(); itr != mVolumeFaces.end(); ++itr )
{
LLVolumeFace &face = *itr;
if( face.mNormals || !face.mIndices || face.mNumIndices%3 )
continue;
face.mNormals = face.mPositions + face.mNumVertices;
for( S32 i = 0; i < face.mNumVertices; ++i )
face.mNormals[i].clear();
for( S32 i = 0; i < face.mNumIndices; i+=3 )
{
LLVector4a v0( face.mPositions[ face.mIndices[ i ] ] );
LLVector4a v1( face.mPositions[ face.mIndices[ i+1 ] ] );
LLVector4a v2( face.mPositions[ face.mIndices[ i+2 ] ] );
LLVector4a vNormal;
v2.sub( v1 );
v1.sub( v0 );
vNormal.setCross3( v1, v2 );
vNormal.normalize3();
face.mNormals[ face.mIndices[ i ] ].add( vNormal );
face.mNormals[ face.mIndices[ i+1 ] ].add( vNormal );
face.mNormals[ face.mIndices[ i+2 ] ].add( vNormal );
}
for( S32 i = 0; i < face.mNumVertices; ++i )
face.mNormals[i].normalize3();
}
// </FS:ND>
}
BOOL LLModel::createVolumeFacesFromDomMesh(domMesh* mesh)