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

Merge branch 'master' into master

pull/1938/head
LoicFr 2018-05-02 17:11:54 +02:00 committed by GitHub
parent ed86023016 6ef9e8848d
commit 99139e9c9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
code/PlyExporter.cpp
View File

@ -194,16 +194,16 @@ PlyExporter::PlyExporter(const char* _filename, const aiScene* pScene, bool bina
for (unsigned int n = PLY_EXPORT_HAS_COLORS, c = 0; (components & n) && c != AI_MAX_NUMBER_OF_COLOR_SETS; n <<= 1, ++c) { for (unsigned int n = PLY_EXPORT_HAS_COLORS, c = 0; (components & n) && c != AI_MAX_NUMBER_OF_COLOR_SETS; n <<= 1, ++c) {
if (!c) { if (!c) {
mOutput << "property " << typeName << " r" << endl; mOutput << "property " << "uchar" << " red" << endl;
mOutput << "property " << typeName << " g" << endl; mOutput << "property " << "uchar" << " green" << endl;
mOutput << "property " << typeName << " b" << endl; mOutput << "property " << "uchar" << " blue" << endl;
mOutput << "property " << typeName << " a" << endl; mOutput << "property " << "uchar" << " alpha" << endl;
} }
else { else {
mOutput << "property " << typeName << " r" << c << endl; mOutput << "property " << "uchar" << " red" << c << endl;
mOutput << "property " << typeName << " g" << c << endl; mOutput << "property " << "uchar" << " green" << c << endl;
mOutput << "property " << typeName << " b" << c << endl; mOutput << "property " << "uchar" << " blue" << c << endl;
mOutput << "property " << typeName << " a" << c << endl; mOutput << "property " << "uchar" << " alpha" << c << endl;
} }
} }
@ -288,13 +288,13 @@ void PlyExporter::WriteMeshVerts(const aiMesh* m, unsigned int components)
for (unsigned int n = PLY_EXPORT_HAS_COLORS, c = 0; (components & n) && c != AI_MAX_NUMBER_OF_COLOR_SETS; n <<= 1, ++c) { for (unsigned int n = PLY_EXPORT_HAS_COLORS, c = 0; (components & n) && c != AI_MAX_NUMBER_OF_COLOR_SETS; n <<= 1, ++c) {
if (m->HasVertexColors(c)) { if (m->HasVertexColors(c)) {
mOutput << mOutput <<
" " << m->mColors[c][i].r << " " << (int)(m->mColors[c][i].r * 255) <<
" " << m->mColors[c][i].g << " " << (int)(m->mColors[c][i].g * 255) <<
" " << m->mColors[c][i].b << " " << (int)(m->mColors[c][i].b * 255) <<
" " << m->mColors[c][i].a; " " << (int)(m->mColors[c][i].a * 255);
} }
else { else {
mOutput << " -1.0 -1.0 -1.0 -1.0"; mOutput << " 0 0 0";
} }
} }