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

FIX: gcc complains because binding a packed field to a normal reference is not permitted. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@707 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2010-04-26 12:27:36 +00:00
parent 4746b954b8
commit 1748e38753
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
code/OgreImporterMaterial.cpp
View File

@ -120,26 +120,30 @@ aiMaterial* OgreImporter::LoadMaterial(const std::string MaterialName) const
ss >> Line; ss >> Line;
if(Line=="ambient") if(Line=="ambient")
{ {
aiColor3D Color; float r,g,b;
ss >> Color.r >> Color.g >> Color.b; ss >> r >> g >> b;
const aiColor3D Color(r,g,b);
NewMaterial->AddProperty(&Color, 1, AI_MATKEY_COLOR_AMBIENT); NewMaterial->AddProperty(&Color, 1, AI_MATKEY_COLOR_AMBIENT);
} }
else if(Line=="diffuse") else if(Line=="diffuse")
{ {
aiColor3D Color; float r,g,b;
ss >> Color.r >> Color.g >> Color.b; ss >> r >> g >> b;
const aiColor3D Color(r,g,b);
NewMaterial->AddProperty(&Color, 1, AI_MATKEY_COLOR_DIFFUSE); NewMaterial->AddProperty(&Color, 1, AI_MATKEY_COLOR_DIFFUSE);
} }
else if(Line=="specular") else if(Line=="specular")
{ {
aiColor3D Color; float r,g,b;
ss >> Color.r >> Color.g >> Color.b; ss >> r >> g >> b;
const aiColor3D Color(r,g,b);
NewMaterial->AddProperty(&Color, 1, AI_MATKEY_COLOR_SPECULAR); NewMaterial->AddProperty(&Color, 1, AI_MATKEY_COLOR_SPECULAR);
} }
else if(Line=="emmisive") else if(Line=="emmisive")
{ {
aiColor3D Color; float r,g,b;
ss >> Color.r >> Color.g >> Color.b; ss >> r >> g >> b;
const aiColor3D Color(r,g,b);
NewMaterial->AddProperty(&Color, 1, AI_MATKEY_COLOR_EMISSIVE); NewMaterial->AddProperty(&Color, 1, AI_MATKEY_COLOR_EMISSIVE);
} }
else if(Line=="texture_unit") else if(Line=="texture_unit")