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

Removed C++11 usage which I accidentally inserted 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1167 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/5/head
ulfjorensen 2012-02-15 23:44:52 +00:00
parent 745c1035bf
commit 4ebba5bdd4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/ColladaExporter.cpp
View File

@ -136,7 +136,7 @@ void ColladaExporter::ReadMaterialSurface( Surface& poSurface, const aiMaterial*
{ {
aiString texfile; aiString texfile;
unsigned int uvChannel = 0; unsigned int uvChannel = 0;
pSrcMat->GetTexture( pTexture, 0, &texfile, nullptr, &uvChannel); pSrcMat->GetTexture( pTexture, 0, &texfile, NULL, &uvChannel);
poSurface.texture = texfile.C_Str(); poSurface.texture = texfile.C_Str();
poSurface.channel = uvChannel; poSurface.channel = uvChannel;
} else } else
@ -198,7 +198,7 @@ void ColladaExporter::WriteMaterials()
ReadMaterialSurface( materials[a].specular, mat, aiTextureType_SPECULAR, AI_MATKEY_COLOR_SPECULAR); ReadMaterialSurface( materials[a].specular, mat, aiTextureType_SPECULAR, AI_MATKEY_COLOR_SPECULAR);
ReadMaterialSurface( materials[a].emissive, mat, aiTextureType_EMISSIVE, AI_MATKEY_COLOR_EMISSIVE); ReadMaterialSurface( materials[a].emissive, mat, aiTextureType_EMISSIVE, AI_MATKEY_COLOR_EMISSIVE);
ReadMaterialSurface( materials[a].reflective, mat, aiTextureType_REFLECTION, AI_MATKEY_COLOR_REFLECTIVE); ReadMaterialSurface( materials[a].reflective, mat, aiTextureType_REFLECTION, AI_MATKEY_COLOR_REFLECTIVE);
ReadMaterialSurface( materials[a].normal, mat, aiTextureType_NORMALS, nullptr, 0, 0); ReadMaterialSurface( materials[a].normal, mat, aiTextureType_NORMALS, NULL, 0, 0);
mat->Get( AI_MATKEY_SHININESS, materials[a].shininess); mat->Get( AI_MATKEY_SHININESS, materials[a].shininess);
} }
@ -206,7 +206,7 @@ void ColladaExporter::WriteMaterials()
// output textures if present // output textures if present
mOutput << startstr << "<library_images>" << endstr; mOutput << startstr << "<library_images>" << endstr;
PushTag(); PushTag();
for( auto it = materials.cbegin(); it != materials.cend(); ++it ) for( std::vector<Material>::const_iterator it = materials.begin(); it != materials.end(); ++it )
{ {
const Material& mat = *it; const Material& mat = *it;
WriteImageEntry( mat.ambient, mat.name + "_ambient_image"); WriteImageEntry( mat.ambient, mat.name + "_ambient_image");
@ -222,7 +222,7 @@ void ColladaExporter::WriteMaterials()
// output effects - those are the actual carriers of information // output effects - those are the actual carriers of information
mOutput << startstr << "<library_effects>" << endstr; mOutput << startstr << "<library_effects>" << endstr;
PushTag(); PushTag();
for( auto it = materials.cbegin(); it != materials.cend(); ++it ) for( std::vector<Material>::const_iterator it = materials.begin(); it != materials.end(); ++it )
{ {
const Material& mat = *it; const Material& mat = *it;
// this is so ridiculous it must be right // this is so ridiculous it must be right
@ -264,7 +264,7 @@ void ColladaExporter::WriteMaterials()
// write materials - they're just effect references // write materials - they're just effect references
mOutput << startstr << "<library_materials>" << endstr; mOutput << startstr << "<library_materials>" << endstr;
PushTag(); PushTag();
for( auto it = materials.cbegin(); it != materials.cend(); ++it ) for( std::vector<Material>::const_iterator it = materials.begin(); it != materials.end(); ++it )
{ {
const Material& mat = *it; const Material& mat = *it;
mOutput << startstr << "<material id=\"" << mat.name << "\" name=\"" << mat.name << "\">" << endstr; mOutput << startstr << "<material id=\"" << mat.name << "\" name=\"" << mat.name << "\">" << endstr;