TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-05 13:30:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Implementation of sRGB image support. Overhauls the linearization setup to utilize the sRGB image types, as well as refactors the use of ColorF and ColorI to be properly internally consistent. ColorIs are used only for front-facing/editing/UI settings, and ColorFs, now renamed to LinearColorF to reduce confusion of purpose, are used for color info in the engine itself. This avoids confusing and expensive conversions back and forth between types and avoids botches with linearity. Majority work done by @rextimmy

Browse source
This commit is contained in:
Areloch 2017-06-23 11:36:20 -05:00
parent 8780f83262
commit 25686ed4be
294 changed files with 3894 additions and 2813 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Engine/source/gui/controls/guiGradientCtrl.h
View file

@ -74,7 +74,7 @@ public:
{
GuiGradientSwatchCtrl* swatch;
S32 pos;
ColorF color;
LinearColorF color;
};
Vector<ColorRange> mColorRange;
@ -93,8 +93,8 @@ private:
/// @name Core Variables
/// @{
ColorF mPickColor; ///< Color that has been picked from control
ColorF mBaseColor; ///< Colour we display (in case of pallet and blend mode)
LinearColorF mPickColor; ///< Color that has been picked from control
LinearColorF mBaseColor; ///< Colour we display (in case of pallet and blend mode)
PickMode mDisplayMode; ///< Current color display mode of the selector
PickMode mSaveDisplayMode;
@ -105,11 +105,11 @@ private:
GFXStateBlockRef mStateBlock;
ColorF colorWhite;
ColorF colorWhiteBlend;
ColorF colorBlack;
ColorF colorAlpha;
ColorF colorAlphaW;
LinearColorF colorWhite;
LinearColorF colorWhiteBlend;
LinearColorF colorBlack;
LinearColorF colorAlpha;
LinearColorF colorAlphaW;
/// @}
String mColorFunction;
@ -126,9 +126,9 @@ public:
/// @name Color Value Functions
/// @{
/// NOTE: setValue only sets baseColor, since setting pickColor wouldn't be useful
void setValue(ColorF &value) {mBaseColor = value;}
void setValue(LinearColorF &value) {mBaseColor = value;}
/// NOTE: getValue() returns baseColor if pallet (since pallet controls can't "pick" colours themselves)
ColorF getValue() {return mPickColor;}
LinearColorF getValue() {return mPickColor;}
void updateColor() {mPositionChanged = true;}
/// @}
@ -148,7 +148,7 @@ public:
void inspectPreApply();
void inspectPostApply();
void reInitSwatches( GuiGradientCtrl::PickMode );
void addColorRange(Point2I pos, const ColorF& color);
void addColorRange(Point2I pos, const LinearColorF& color);
void removeColorRange( GuiGradientSwatchCtrl* swatch );
void sortColorRange();