TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

code review

Browse source 
Revert Hsb to using integers
Clamp drag values
This commit is contained in:
marauder2k7 2025-01-27 08:04:55 +00:00
parent a91ddfffa1
commit 44a6ceab2d
3 changed files with 31 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,11 +46,11 @@ const F32 gOneOver255 = 1.f / 255.f;
struct Hsb struct Hsb
{ {
Hsb() :hue(0), sat(0), brightness(0) {}; Hsb() :hue(0), sat(0), brightness(0) {};
Hsb(F64 h, F64 s, F64 b) :hue(h), sat(s), brightness(b) {}; Hsb(U32 h, U32 s, U32 b) :hue(h), sat(s), brightness(b) {};
F64 hue; ///Hue U32 hue; ///Hue
F64 sat; ///Saturation U32 sat; ///Saturation
F64 brightness; //Brightness/Value/Lightness U32 brightness; //Brightness/Value/Lightness
}; };
class ColorI; class ColorI;

33
Engine/source/gui/controls/guiColorPicker.cpp
View file

@ -514,14 +514,15 @@ void GuiColorPickerCtrl::onMouseDragged(const GuiEvent &event)
Point2I ext = getExtent(); Point2I ext = getExtent();
Point2I mousePoint = globalToLocalCoord(event.mousePoint); Point2I mousePoint = globalToLocalCoord(event.mousePoint);
F32 relX = mClampF(F32(mousePoint.x) / F32(ext.x), 0.0, 1.0);
F32 relY = mClampF(F32(mousePoint.y) / F32(ext.y), 0.0, 1.0);
switch (mDisplayMode) switch (mDisplayMode)
{ {
case GuiColorPickerCtrl::pPalette: case GuiColorPickerCtrl::pPalette:
return; return;
case GuiColorPickerCtrl::pBlendRange: case GuiColorPickerCtrl::pBlendRange:
{ {
F32 relX = F32(mousePoint.x) / F32(ext.x); relY = 1.0f - relY;
F32 relY = 1.0f - F32(mousePoint.y) / F32(ext.y);
setSelectedSaturation(relX * 100.0); setSelectedSaturation(relX * 100.0);
setSelectedBrightness(relY * 100.0); setSelectedBrightness(relY * 100.0);
break; break;
@ -532,13 +533,11 @@ void GuiColorPickerCtrl::onMouseDragged(const GuiEvent &event)
{ {
case GuiColorPickerCtrl::sHorizontal: case GuiColorPickerCtrl::sHorizontal:
{ {
F32 relX = F32(mousePoint.x) / F32(ext.x);
setSelectedHue(relX * 360.0); setSelectedHue(relX * 360.0);
break; break;
} }
case GuiColorPickerCtrl::sVertical: case GuiColorPickerCtrl::sVertical:
{ {
F32 relY = F32(mousePoint.y) / F32(ext.y);
setSelectedHue(relY * 360.0); setSelectedHue(relY * 360.0);
break; break;
} }
@ -553,13 +552,11 @@ void GuiColorPickerCtrl::onMouseDragged(const GuiEvent &event)
{ {
case GuiColorPickerCtrl::sHorizontal: case GuiColorPickerCtrl::sHorizontal:
{ {
F32 relX = F32(mousePoint.x) / F32(ext.x);
setSelectedAlpha(relX * 255.0); setSelectedAlpha(relX * 255.0);
break; break;
} }
case GuiColorPickerCtrl::sVertical: case GuiColorPickerCtrl::sVertical:
{ {
F32 relY = F32(mousePoint.y) / F32(ext.y);
setSelectedAlpha(relY * 255.0); setSelectedAlpha(relY * 255.0);
break; break;
} }
@ -623,7 +620,7 @@ void GuiColorPickerCtrl::onMouseUp(const GuiEvent&)
mouseUnlock(); mouseUnlock();
} }
void GuiColorPickerCtrl::setSelectedHue(const F64& hueValue) void GuiColorPickerCtrl::setSelectedHue(const U32& hueValue)
{ {
if (hueValue < 0) if (hueValue < 0)
{ {
@ -641,7 +638,7 @@ void GuiColorPickerCtrl::setSelectedHue(const F64& hueValue)
} }
void GuiColorPickerCtrl::setSelectedBrightness(const F64& brightValue) void GuiColorPickerCtrl::setSelectedBrightness(const U32& brightValue)
{ {
if (brightValue < 0) if (brightValue < 0)
{ {
@ -658,7 +655,7 @@ void GuiColorPickerCtrl::setSelectedBrightness(const F64& brightValue)
mSelectedBrightness = brightValue; mSelectedBrightness = brightValue;
} }
void GuiColorPickerCtrl::setSelectedSaturation(const F64& satValue) void GuiColorPickerCtrl::setSelectedSaturation(const U32& satValue)
{ {
if (satValue < 0) if (satValue < 0)
{ {
@ -675,7 +672,7 @@ void GuiColorPickerCtrl::setSelectedSaturation(const F64& satValue)
mSelectedSaturation = satValue; mSelectedSaturation = satValue;
} }
void GuiColorPickerCtrl::setSelectedAlpha(const F64& alphaValue) void GuiColorPickerCtrl::setSelectedAlpha(const U32& alphaValue)
{ {
if (alphaValue < 0) if (alphaValue < 0)
{ {
@ -731,42 +728,42 @@ DefineEngineMethod(GuiColorPickerCtrl, activateEyeDropper, void, (), , "Activate
object->activateEyeDropper(); object->activateEyeDropper();
} }
DefineEngineMethod(GuiColorPickerCtrl, setSelectedHue, void, (F64 hueValue), , "Sets the selected hue value should be 0-360.") DefineEngineMethod(GuiColorPickerCtrl, setSelectedHue, void, (S32 hueValue), , "Sets the selected hue value should be 0-360.")
{ {
object->setSelectedHue(hueValue); object->setSelectedHue(hueValue);
} }
DefineEngineMethod(GuiColorPickerCtrl, getSelectedHue, F64, (), , "Gets the current selected hue value.") DefineEngineMethod(GuiColorPickerCtrl, getSelectedHue, S32, (), , "Gets the current selected hue value.")
{ {
return object->getSelectedHue(); return object->getSelectedHue();
} }
DefineEngineMethod(GuiColorPickerCtrl, setSelectedBrightness, void, (F64 brightness), , "Sets the selected brightness value should be 0-100.") DefineEngineMethod(GuiColorPickerCtrl, setSelectedBrightness, void, (S32 brightness), , "Sets the selected brightness value should be 0-100.")
{ {
object->setSelectedBrightness(brightness); object->setSelectedBrightness(brightness);
} }
DefineEngineMethod(GuiColorPickerCtrl, getSelectedBrightness, F64, (), , "Gets the current selected brightness.") DefineEngineMethod(GuiColorPickerCtrl, getSelectedBrightness, S32, (), , "Gets the current selected brightness.")
{ {
return object->getSelectedBrightness(); return object->getSelectedBrightness();
} }
DefineEngineMethod(GuiColorPickerCtrl, setSelectedSaturation, void, (F64 saturation), , "Sets the selected saturation value should be 0-100.") DefineEngineMethod(GuiColorPickerCtrl, setSelectedSaturation, void, (S32 saturation), , "Sets the selected saturation value should be 0-100.")
{ {
object->setSelectedSaturation(saturation); object->setSelectedSaturation(saturation);
} }
DefineEngineMethod(GuiColorPickerCtrl, getSelectedSaturation, F64, (), , "Gets the current selected saturation value.") DefineEngineMethod(GuiColorPickerCtrl, getSelectedSaturation, S32, (), , "Gets the current selected saturation value.")
{ {
return object->getSelectedSaturation(); return object->getSelectedSaturation();
} }
DefineEngineMethod(GuiColorPickerCtrl, setSelectedAlpha, void, (F64 alpha), , "Sets the selected alpha value should be 0-255.") DefineEngineMethod(GuiColorPickerCtrl, setSelectedAlpha, void, (S32 alpha), , "Sets the selected alpha value should be 0-255.")
{ {
object->setSelectedAlpha(alpha); object->setSelectedAlpha(alpha);
} }
DefineEngineMethod(GuiColorPickerCtrl, getSelectedAlpha, F64, (), , "Gets the current selected alpha value.") DefineEngineMethod(GuiColorPickerCtrl, getSelectedAlpha, S32, (), , "Gets the current selected alpha value.")
{ {
return object->getSelectedAlpha(); return object->getSelectedAlpha();
} }

24
Engine/source/gui/controls/guiColorPicker.h
View file

@ -114,10 +114,10 @@ class GuiColorPickerCtrl : public GuiControl
/// @{ /// @{
PickMode mDisplayMode; ///< Current color display mode of the selector PickMode mDisplayMode; ///< Current color display mode of the selector
SelectorMode mSelectorMode; ///< Current color display mode of the selector SelectorMode mSelectorMode; ///< Current color display mode of the selector
F64 mSelectedHue; U32 mSelectedHue;
F64 mSelectedSaturation; U32 mSelectedSaturation;
F64 mSelectedBrightness; U32 mSelectedBrightness;
F64 mSelectedAlpha; U32 mSelectedAlpha;
Point2I eyeDropperPos; Point2I eyeDropperPos;
GBitmap* eyeDropperCap; GBitmap* eyeDropperCap;
GFXTexHandle eyeHandle; GFXTexHandle eyeHandle;
@ -162,29 +162,29 @@ class GuiColorPickerCtrl : public GuiControl
/// Set the selected hue. /// Set the selected hue.
/// </summary> /// </summary>
/// <param name="hueValue">Hue value, 0 - 360.</param> /// <param name="hueValue">Hue value, 0 - 360.</param>
void setSelectedHue(const F64& hueValue); void setSelectedHue(const U32& hueValue);
F64 getSelectedHue() { return mSelectedHue; } U32 getSelectedHue() { return mSelectedHue; }
/// <summary> /// <summary>
/// Set the selected brightness. /// Set the selected brightness.
/// </summary> /// </summary>
/// <param name="brightValue">Brightness value, 0 - 100.</param> /// <param name="brightValue">Brightness value, 0 - 100.</param>
void setSelectedBrightness(const F64& brightValue); void setSelectedBrightness(const U32& brightValue);
F64 getSelectedBrightness() { return mSelectedBrightness; } U32 getSelectedBrightness() { return mSelectedBrightness; }
/// <summary> /// <summary>
/// Set the selected saturation. /// Set the selected saturation.
/// </summary> /// </summary>
/// <param name="satValue">Saturation value, 0 - 100.</param> /// <param name="satValue">Saturation value, 0 - 100.</param>
void setSelectedSaturation(const F64& satValue); void setSelectedSaturation(const U32& satValue);
F64 getSelectedSaturation() { return mSelectedSaturation; } U32 getSelectedSaturation() { return mSelectedSaturation; }
/// <summary> /// <summary>
/// Set the selected alpha. /// Set the selected alpha.
/// </summary> /// </summary>
/// <param name="alphaValue">Alpha value, 0 - 255.</param> /// <param name="alphaValue">Alpha value, 0 - 255.</param>
void setSelectedAlpha(const F64& alphaValue); void setSelectedAlpha(const U32& alphaValue);
F64 getSelectedAlpha() { return mSelectedAlpha; } U32 getSelectedAlpha() { return mSelectedAlpha; }
void activateEyeDropper(); void activateEyeDropper();