Merge branch 'ColorPickerAdvanced' of https://github.com/Azaezel/Torque3D into ColorPickerAdvanced

Engine/source/console/consoleFunctions.cpp

@@ -875,8 +875,10 @@ DefineConsoleFunction(ColorHEXToRGB, ColorI, (const char* hex), ,
 	"@endtsexample\n"
 	"@ingroup Strings")
 {
+   S32 rgb = dAtoui(hex, 16);
+
    ColorI color;
-	color.set(hex);
+   color.set(rgb & 0x000000FF, (rgb & 0x0000FF00) >> 8, (rgb & 0x00FF0000) >> 16);
    return color;
 }
 

Engine/source/gui/controls/guiColorPicker.cpp

@@ -57,7 +57,6 @@ ConsoleDocClass( GuiColorPickerCtrl,
    "@internal"
 );
 
-//--------------------------------------------------------------------------
 GuiColorPickerCtrl::GuiColorPickerCtrl()
 {
    setExtent(140, 30);
@@ -85,8 +84,6 @@ GuiColorPickerCtrl::~GuiColorPickerCtrl()
    }
 }
 
-//--------------------------------------------------------------------------
-
 ImplementEnumType( GuiColorPickMode,
    "\n\n"
    "@ingroup GuiUtil"
@@ -102,24 +99,20 @@ ImplementEnumType( GuiColorPickMode,
    { GuiColorPickerCtrl::pDropperBackground, "Dropper" },
 EndImplementEnumType;
 
-//--------------------------------------------------------------------------
 void GuiColorPickerCtrl::initPersistFields()
 {
    addGroup("ColorPicker");
-   
       addField("baseColor", TypeColorF, Offset(mBaseColor, GuiColorPickerCtrl));
       addField("pickColor", TypeColorF, Offset(mPickColor, GuiColorPickerCtrl));
       addField("selectorGap", TypeS32,  Offset(mSelectorGap, GuiColorPickerCtrl)); 
       addField("displayMode", TYPEID< PickMode >(), Offset(mDisplayMode, GuiColorPickerCtrl) );
       addField("actionOnMove", TypeBool,Offset(mActionOnMove, GuiColorPickerCtrl));
       addField("showReticle", TypeBool, Offset(mShowReticle, GuiColorPickerCtrl));
-   
    endGroup("ColorPicker");
 
    Parent::initPersistFields();
 }
 
-//--------------------------------------------------------------------------
 // Function to draw a box which can have 4 different colors in each corner blended together
 void GuiColorPickerCtrl::drawBlendBox(RectI &bounds, ColorF &c1, ColorF &c2, ColorF &c3, ColorF &c4)
 {
@@ -252,8 +245,7 @@ void GuiColorPickerCtrl::drawSelector(RectI &bounds, Point2I &selectorPos, Selec
    switch (mode)
    {
       case sVertical:
-			// Now draw the vertical selector
+         // Now draw the vertical selector Up -> Pos
-			// Up -> Pos
          if (selectorPos.y != bounds.point.y+1)
             GFX->getDrawUtil()->drawLine(selectorPos.x, bounds.point.y, selectorPos.x, selectorPos.y-sMax-1, colorWhiteBlend);
          // Down -> Pos
@@ -261,8 +253,7 @@ void GuiColorPickerCtrl::drawSelector(RectI &bounds, Point2I &selectorPos, Selec
             GFX->getDrawUtil()->drawLine(selectorPos.x,	selectorPos.y + sMax, selectorPos.x, bounds.point.y + bounds.extent.y, colorWhiteBlend);
       break;
       case sHorizontal:
-			// Now draw the horizontal selector
+         // Now draw the horizontal selector Left -> Pos
-			// Left -> Pos
          if (selectorPos.x != bounds.point.x) 
             GFX->getDrawUtil()->drawLine(bounds.point.x, selectorPos.y-1, selectorPos.x-sMax, selectorPos.y-1, colorWhiteBlend);
          // Right -> Pos
@@ -365,6 +356,7 @@ void GuiColorPickerCtrl::onRender(Point2I offset, const RectI& updateRect)
 
       mPositionChanged = false;
       Point2I extent = getRoot()->getExtent();
+
       // If we are anything but a pallete, change the pick color
       if (mDisplayMode != pPallet)
       {
@@ -373,9 +365,7 @@ void GuiColorPickerCtrl::onRender(Point2I offset, const RectI& updateRect)
          U32 buf_x = offset.x + mSelectorPos.x + 1;
          U32 buf_y = resolution.y - (extent.y - (offset.y + mSelectorPos.y + 1));
 
-			GFXTexHandle bb(resolution.x,
+         GFXTexHandle bb( resolution.x, resolution.y, GFXFormatR8G8B8A8, &GFXDefaultRenderTargetProfile, avar("%s() - bb (line %d)", __FUNCTION__, __LINE__) );
-				resolution.y,
-				GFXFormatR8G8B8A8, &GFXDefaultRenderTargetProfile, avar("%s() - bb (line %d)", __FUNCTION__, __LINE__));
 
          Point2I tmpPt(buf_x, buf_y);
 
@@ -392,8 +382,6 @@ void GuiColorPickerCtrl::onRender(Point2I offset, const RectI& updateRect)
 
          bb.copyToBmp(mBitmap);
 
-			//bmp.writePNGDebug( "foo.png" );
-
          if (!nullBitmap)
          {
             if (mSelectColor)
@@ -401,7 +389,6 @@ void GuiColorPickerCtrl::onRender(Point2I offset, const RectI& updateRect)
                Point2I pos = findColor(mSetColor, offset, resolution, *mBitmap);
                mSetColor = mSetColor.BLACK;
                mSelectColor = false;
-
                setSelectorPos(pos);
             }
             else
@@ -417,7 +404,6 @@ void GuiColorPickerCtrl::onRender(Point2I offset, const RectI& updateRect)
             }
          }
       }
-
    }
 
    //render the children
@@ -492,7 +478,6 @@ Point2I GuiColorPickerCtrl::findColor(const ColorF & color, const Point2I& offse
       {
          buf_x = offset.x + x + 1;
          buf_y = (resolution.y - (offset.y + y + 1));
-			if (GFX->getAdapterType() != OpenGL)
          buf_y = resolution.y - buf_y;
 
          //Get the color at that position
@@ -519,7 +504,6 @@ Point2I GuiColorPickerCtrl::findColor(const ColorF & color, const Point2I& offse
    return closestPos;
 }
 
-//--------------------------------------------------------------------------
 void GuiColorPickerCtrl::setSelectorPos(const Point2I &pos)
 {
    Point2I extent = getExtent();
@@ -564,7 +548,6 @@ void GuiColorPickerCtrl::setSelectorPos(const Point2I &pos)
    }
 }
 
-//--------------------------------------------------------------------------
 void GuiColorPickerCtrl::onMouseDown(const GuiEvent &event)
 {
    if (!mActive)
@@ -600,10 +583,8 @@ void GuiColorPickerCtrl::onMouseDragged(const GuiEvent &event)
 
    if( !mActionOnMove )
       execAltConsoleCallback();
-
 }
 
-//--------------------------------------------------------------------------
 void GuiColorPickerCtrl::onMouseMove(const GuiEvent &event)
 {
    // Only for dropper mode
@@ -611,20 +592,17 @@ void GuiColorPickerCtrl::onMouseMove(const GuiEvent &event)
       setSelectorPos(globalToLocalCoord(event.mousePoint));
 }
 
-//--------------------------------------------------------------------------
 void GuiColorPickerCtrl::onMouseEnter(const GuiEvent &event)
 {
    mMouseOver = true;
 }
 
-//--------------------------------------------------------------------------
 void GuiColorPickerCtrl::onMouseLeave(const GuiEvent &)
 {
    // Reset state
    mMouseOver = false;
 }
 
-//--------------------------------------------------------------------------
 void GuiColorPickerCtrl::onMouseUp(const GuiEvent &)
 {
    //if we released the mouse within this control, perform the action
@@ -640,7 +618,6 @@ void GuiColorPickerCtrl::onMouseUp(const GuiEvent &)
    mouseUnlock();
 }
 
-//--------------------------------------------------------------------------
 const char *GuiColorPickerCtrl::getScriptValue()
 {
    static char temp[256];
@@ -649,7 +626,6 @@ const char *GuiColorPickerCtrl::getScriptValue()
    return temp;
 }
 
-//--------------------------------------------------------------------------    
 void GuiColorPickerCtrl::setScriptValue(const char *value)
 {
    ColorF newValue;

Engine/source/gui/controls/guiColorPicker.h

@@ -77,7 +77,6 @@ class GuiColorPickerCtrl : public GuiControl
    };
 
   protected:
-   
    /// @name Core Rendering functions
    /// @{
    void renderColorBox(RectI &bounds); ///< Function that draws the actual color box

Engine/source/gui/controls/guiTextEditCtrl.cpp

@@ -1262,7 +1262,7 @@ void GuiTextEditCtrl::onRender(Point2I offset, const RectI &updateRect)
    if ( mProfile->mOpaque )
    {
 	   if (!mTextValid)
-		   GFX->getDrawUtil()->drawRectFill(ctrlRect, mProfile->mFillColorNA);
+		   GFX->getDrawUtil()->drawRectFill(ctrlRect, mProfile->mFillColorERR);
 	   else if (isFirstResponder())
 		   GFX->getDrawUtil()->drawRectFill(ctrlRect, mProfile->mFillColorHL);
 	   else
@@ -1274,7 +1274,7 @@ void GuiTextEditCtrl::onRender(Point2I offset, const RectI &updateRect)
    {
 	   renderBorder(ctrlRect, mProfile);
 	   if (!mTextValid)
-		   GFX->getDrawUtil()->drawRectFill(ctrlRect, mProfile->mFillColorNA);
+		   GFX->getDrawUtil()->drawRectFill(ctrlRect, mProfile->mFillColorERR);
    }
 
    drawText( ctrlRect, isFirstResponder() );

Engine/source/gui/core/guiTypes.cpp

@@ -269,6 +269,7 @@ GuiControlProfile::GuiControlProfile(void) :
    mFillColor(255,0,255,255),
    mFillColorHL(255,0,255,255),
    mFillColorNA(255,0,255,255),
+   mFillColorERR(255,0,0,255),
    mFillColorSEL(255,0,255,255),
    mBorderColor(255,0,255,255),
    mBorderColorHL(255,0,255,255),
@@ -334,6 +335,7 @@ GuiControlProfile::GuiControlProfile(void) :
       mFillColor     = def->mFillColor;
       mFillColorHL   = def->mFillColorHL;
       mFillColorNA   = def->mFillColorNA;
+      mFillColorERR  = def->mFillColorERR;
       mFillColorSEL  = def->mFillColorSEL;
 
       mBorder        = def->mBorder;
@@ -398,6 +400,7 @@ void GuiControlProfile::initPersistFields()
       addField("fillColor",     TypeColorI,     Offset(mFillColor, GuiControlProfile));
       addField("fillColorHL",   TypeColorI,     Offset(mFillColorHL, GuiControlProfile));
       addField("fillColorNA",   TypeColorI,     Offset(mFillColorNA, GuiControlProfile));
+      addField("fillColorERR",  TypeColorI,     Offset(mFillColorERR, GuiControlProfile));
       addField("fillColorSEL",  TypeColorI,     Offset(mFillColorSEL, GuiControlProfile));
       addField("border",        TypeS32,        Offset(mBorder, GuiControlProfile),
          "Border type (0=no border)." );

Engine/source/gui/core/guiTypes.h

@@ -385,6 +385,7 @@ public:
    ColorI mFillColor;                              ///< Fill color, this is used to fill the bounds of the control if it is opaque
    ColorI mFillColorHL;                            ///< This is used instead of mFillColor if the object is highlighted
    ColorI mFillColorNA;                            ///< This is used instead of mFillColor if the object is not active or disabled
+   ColorI mFillColorERR;                           ///< This is used instead of mFillColor if the object has an error or is invalid
    ColorI mFillColorSEL;                           ///< This is used instead of mFillColor if the object is selected
 
    S32 mBorder;                                    ///< For most controls, if mBorder is > 0 a border will be drawn, some controls use this to draw different types of borders however @see guiDefaultControlRender.cc