Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ObjExporter_nomtl

Browse Source
This commit is contained in:
Kim Kulling
2017-11-04 09:32:50 +01:00
committed by GitHub
parent 931542bf3c eeee744e21
commit b7bd006304
47 changed files with 103 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/ObjExporter.cpp
View File

@@ -58,7 +58,7 @@ namespace Assimp {
// ------------------------------------------------------------------------------------------------
// Worker function for exporting a scene to Wavefront OBJ. Prototyped and registered in Exporter.cpp
void ExportSceneObj(const char* pFile,IOSystem* pIOSystem, const aiScene* pScene, const ExportProperties* pProperties) {
void ExportSceneObj(const char* pFile,IOSystem* pIOSystem, const aiScene* pScene, const ExportProperties* /*pProperties*/) {
// invoke the exporter
ObjExporter exporter(pFile, pScene);
@@ -116,7 +116,7 @@ ObjExporter::ObjExporter(const char* _filename, const aiScene* pScene, bool noMt
, vp()
, vn()
, vt()
, vc()
, vc()
, mVpMap()
, mVnMap()
, mVtMap()
@@ -216,7 +216,7 @@ void ObjExporter::WriteMaterialFile()
if(AI_SUCCESS == mat->Get(AI_MATKEY_COLOR_TRANSPARENT,c)) {
mOutputMat << "Tf " << c.r << " " << c.g << " " << c.b << endl;
}
ai_real o;
if(AI_SUCCESS == mat->Get(AI_MATKEY_OPACITY,o)) {
mOutputMat << "d " << o << endl;
@@ -366,7 +366,7 @@ int ObjExporter::colIndexMap::getIndex( const aiColor4D& col ) {
colMap[ col ] = mNextIndex;
int ret = mNextIndex;
mNextIndex++;
return ret;
}