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

Merge pull request #538 from cubeman99/master 

Added NaN check when outputting normals in PLY exporter, to avoid '-1.#IND'
pull/541/head
Alexander Gessler 2015-04-18 07:29:37 -07:00
parent 76dd9467b2 b38572d1bc
commit 27c6552ae8
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/PlyExporter.cpp
View File

@ -44,11 +44,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "PlyExporter.h" #include "PlyExporter.h"
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <cmath>
#include "Exceptional.h" #include "Exceptional.h"
#include "../include/assimp/scene.h" #include "../include/assimp/scene.h"
#include "../include/assimp/version.h" #include "../include/assimp/version.h"
#include "../include/assimp/IOSystem.hpp" #include "../include/assimp/IOSystem.hpp"
#include "../include/assimp/Exporter.hpp" #include "../include/assimp/Exporter.hpp"
#include "qnan.h"
using namespace Assimp; using namespace Assimp;
@ -213,6 +215,8 @@ PlyExporter::PlyExporter(const char* _filename, const aiScene* pScene, bool bina
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void PlyExporter::WriteMeshVerts(const aiMesh* m, unsigned int components) void PlyExporter::WriteMeshVerts(const aiMesh* m, unsigned int components)
{ {
static const float inf = std::numeric_limits<float>::infinity();
// If a component (for instance normal vectors) is present in at least one mesh in the scene, // If a component (for instance normal vectors) is present in at least one mesh in the scene,
// then default values are written for meshes that do not contain this component. // then default values are written for meshes that do not contain this component.
for (unsigned int i = 0; i < m->mNumVertices; ++i) { for (unsigned int i = 0; i < m->mNumVertices; ++i) {
@ -222,11 +226,11 @@ void PlyExporter::WriteMeshVerts(const aiMesh* m, unsigned int components)
m->mVertices[i].z m->mVertices[i].z
; ;
if(components & PLY_EXPORT_HAS_NORMALS) { if(components & PLY_EXPORT_HAS_NORMALS) {
if (m->HasNormals()) { if (m->HasNormals() && is_not_qnan(m->mNormals[i].x) && std::fabs(m->mNormals[i].x) != inf) {
mOutput << mOutput <<
" " << m->mNormals[i].x << " " << m->mNormals[i].x <<
" " << m->mNormals[i].y << " " << m->mNormals[i].y <<
" " << m->mNormals[i].z; " " << m->mNormals[i].z;
} }
else { else {
mOutput << " 0.0 0.0 0.0"; mOutput << " 0.0 0.0 0.0";