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

made it work again under linux 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@261 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
alil 2008-12-04 22:01:35 +00:00
parent 917db45b3c
commit f601c3c5b9
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
code/ColladaParser.cpp
View File

@ -388,10 +388,14 @@ void ColladaParser::ReadEffect( Collada::Effect& pEffect)
ReadEffectColor( pEffect.mDiffuse, pEffect.mTexDiffuse); ReadEffectColor( pEffect.mDiffuse, pEffect.mTexDiffuse);
else if( IsElement( "specular")) else if( IsElement( "specular"))
ReadEffectColor( pEffect.mSpecular, pEffect.mTexSpecular); ReadEffectColor( pEffect.mSpecular, pEffect.mTexSpecular);
else if( IsElement( "reflective")) else if( IsElement( "reflective")){
ReadEffectColor( pEffect.mReflective, std::string()); std::string buf;
else if( IsElement( "transparent")) ReadEffectColor( pEffect.mReflective, buf);
ReadEffectColor( pEffect.mRefractive, std::string()); }
else if( IsElement( "transparent")){
std::string buf;
ReadEffectColor( pEffect.mRefractive,buf);
}
else if( IsElement( "shininess")) else if( IsElement( "shininess"))
ReadEffectFloat( pEffect.mShininess); ReadEffectFloat( pEffect.mShininess);
else if( IsElement( "reflectivity")) else if( IsElement( "reflectivity"))
@ -426,13 +430,18 @@ void ColladaParser::ReadEffectColor( aiColor4D& pColor, std::string& pSampler)
{ {
// text content contains 4 floats // text content contains 4 floats
const char* content = GetTextContent(); const char* content = GetTextContent();
content = fast_atof_move( content, pColor.r); float fBuf;
content = fast_atof_move( content, fBuf);
pColor.r = fBuf;
SkipSpacesAndLineEnd( &content); SkipSpacesAndLineEnd( &content);
content = fast_atof_move( content, pColor.g); content = fast_atof_move( content, fBuf);
pColor.g = fBuf;
SkipSpacesAndLineEnd( &content); SkipSpacesAndLineEnd( &content);
content = fast_atof_move( content, pColor.b); content = fast_atof_move( content, fBuf);
pColor.b = fBuf;
SkipSpacesAndLineEnd( &content); SkipSpacesAndLineEnd( &content);
content = fast_atof_move( content, pColor.a); content = fast_atof_move( content, fBuf);
pColor.a = fBuf;
SkipSpacesAndLineEnd( &content); SkipSpacesAndLineEnd( &content);
TestClosing( "color"); TestClosing( "color");