manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

automatically detect the color format (integer between 0 and 255 or 

floats between 0 and 1)
This commit is contained in:
Paolo Cignoni 2011-01-17 10:06:15 +00:00
parent dfba841714
commit 423fce1321
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wrap/io_trimesh/import_obj.h
View File

@ -291,10 +291,13 @@ public:
{ {
if(numTokens>=7) if(numTokens>=7)
{ {
unsigned char r = (unsigned char) ((ScalarType) atof(tokens[4].c_str()) * 255.0); ScalarType rf(atof(tokens[4].c_str())), gf(atof(tokens[5].c_str())), bf(atof(tokens[6].c_str()));
unsigned char g = (unsigned char) ((ScalarType) atof(tokens[5].c_str()) * 255.0); ScalarType scaling = (rf<=1 && gf<=1 && bf<=1) ? 255. : 1;
unsigned char b = (unsigned char) ((ScalarType) atof(tokens[6].c_str()) * 255.0);
unsigned char alpha = (unsigned char) ((numTokens>=8 ? (ScalarType) atof(tokens[7].c_str()) : 1) * 255.0); unsigned char r = (unsigned char) ((ScalarType) atof(tokens[4].c_str()) * scaling);
unsigned char g = (unsigned char) ((ScalarType) atof(tokens[5].c_str()) * scaling);
unsigned char b = (unsigned char) ((ScalarType) atof(tokens[6].c_str()) * scaling);
unsigned char alpha = (unsigned char) ((numTokens>=8 ? (ScalarType) atof(tokens[7].c_str()) : 1) * scaling);
(*vi).C() = Color4b(r, g, b, alpha); (*vi).C() = Color4b(r, g, b, alpha);
} }
else else