godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make Color.{rgba}8 return int instead float 

According to the class doc, these should be int.
Also fixed a little bug: the setter for 'r8' changed the green value

(cherry picked from commit da3247a500)
This commit is contained in:
Andreas Haas 2016-05-31 20:50:19 +02:00 committed by Rémi Verschelde
parent 79e9917367
commit 2b06d7e6f7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/variant_op.cpp
View File

@ -1354,7 +1354,7 @@ void Variant::set(const Variant& p_index, const Variant& p_value, bool *r_valid)
return;
} else if (*str=="r8" ) {
valid=true;
v->g=float(p_value)/255.0;
v->r=float(p_value)/255.0;
return;
} else if (*str=="g8" ) {
valid=true;
@ -2213,16 +2213,16 @@ Variant Variant::get(const Variant& p_index, bool *r_valid) const {
return v->get_v();
} else if (*str=="r8") {
valid=true;
return v->r*255.0;
return (int)Math::round(v->r*255.0);
} else if (*str=="g8" ) {
valid=true;
return v->g*255.0;
return (int)Math::round(v->g*255.0);
} else if (*str=="b8" ) {
valid=true;
return v->b*255.0;
return (int)Math::round(v->b*255.0);
} else if (*str=="a8" ) {
valid=true;
return v->a*255.0;
return (int)Math::round(v->a*255.0);
}
} else if (p_index.get_type()==Variant::INT) {