Fixed Color Merge Bug

Fixed incorrect color merge calculation
Added comments to color object methods.
This commit is contained in:
Makuna
2014-10-18 09:50:23 -07:00
parent d9e5697999
commit a4173d56a3
2 changed files with 47 additions and 4 deletions
+3 -3
View File
@@ -83,7 +83,7 @@ void RgbColor::Lighten(uint8_t delta)
RgbColor RgbColor::LinearBlend(RgbColor left, RgbColor right, uint8_t progress)
{
return RgbColor( left.R + ((right.R - left.R) * progress >> 8),
left.G + ((right.G - left.G) * progress >> 8),
left.B + ((right.B - left.B) * progress >> 8));
return RgbColor( left.R + ((right.R - left.R) * progress / 255),
left.G + ((right.G - left.G) * progress / 255),
left.B + ((right.B - left.B) * progress / 255));
}