TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2066 from rextimmy/color_fix

Browse source 
ColorI::fromLinear fix
This commit is contained in:
Areloch 2017-08-14 01:57:34 -05:00 • committed by GitHub
commit 04c6307f7a
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/core/color.h
View file

@ -884,10 +884,10 @@ inline ColorI LinearColorF::toColorI(const bool keepAsLinear)
inline ColorI ColorI::fromLinear() inline ColorI ColorI::fromLinear()
{ {
//manually create LinearColorF, otherwise it will try and convert to linear first //manually create LinearColorF, otherwise it will try and convert to linear first
LinearColorF linearColor = LinearColorF(F32(red) * 255.0f + 0.5f, LinearColorF linearColor = LinearColorF(F32(red) * gOneOver255,
F32(red) * 255.0f + 0.5f, F32(green) * gOneOver255,
F32(red) * 255.0f + 0.5f, F32(blue) * gOneOver255,
F32(alpha) * 255.0f + 0.5f); F32(alpha) * gOneOver255);
//convert back to srgb //convert back to srgb
return linearColor.toColorI(); return linearColor.toColorI();
} }