Updated outline option for chat text

Author: ccw808

Client/core/CSettings.cpp

@@ -1132,7 +1132,7 @@ void CSettings::CreateGUI ( void )
         m_pTrayBalloon->GetPosition ( vecTemp );
         m_pTrayBalloon->AutoSize ( NULL, 20.0f );
 
-        m_pChatTextBlackOutline = reinterpret_cast < CGUICheckBox* > ( pManager->CreateCheckBox ( pTabInterface, _("Chat text black outline") ) );
+        m_pChatTextBlackOutline = reinterpret_cast < CGUICheckBox* > ( pManager->CreateCheckBox ( pTabInterface, _("Chat text black/white outline") ) );
         m_pChatTextBlackOutline->SetPosition ( CVector2D ( vecTemp.fX, vecTemp.fY + fLineHeight ) );
         m_pChatTextBlackOutline->GetPosition ( vecTemp );
         m_pChatTextBlackOutline->AutoSize ( NULL, 20.0f );

Client/core/Graphics/CGraphics.cpp

@@ -115,7 +115,7 @@ void CGraphics::DrawString ( int uiLeft, int uiTop, int uiRight, int uiBottom, u
             std::wstring strText = MbUTF8ToUTF16(szText);
 
             if ( bOutline )
-                DrawStringBlurred( rect, ulColor & 0xFF000000, strText.c_str(), ulFormat, pDXFont );
+                DrawStringOutline( rect, ulColor, strText.c_str(), ulFormat, pDXFont );
             pDXFont->DrawTextW ( m_pDXSprite, strText.c_str(), -1, &rect, ulFormat, ulColor );
         EndDrawBatch ();
     }        
@@ -134,23 +134,43 @@ void CGraphics::DrawString ( int iX, int iY, unsigned long dwColor, float fScale
 }
 
 // Slow
-void CGraphics::DrawStringBlurred(const RECT& rect, unsigned long ulColor, const wchar_t* szText, unsigned long ulFormat, LPD3DXFONT pDXFont)
-{
-    // Blur definition
-    const float E = 0;
-    const float D = 0.33f;
-    const float C = 0.66f;
-    const float B = 1;
-    const float A = 0;
-    static const float kernelData[] = {
-                            E, D, D, D, E,
-                            D, C, B, C, D,
-                            D, B, A, B, D,
-                            D, C, B, C, D,
-                            E, D, D, D, E };
+void CGraphics::DrawStringOutline(const RECT& rect, unsigned long ulColor, const wchar_t* szText, unsigned long ulFormat, LPD3DXFONT pDXFont)
+{
     const uint uiKernelSizeX = 5;
     const uint uiKernelSizeY = 5;
-    const float* pKernel = kernelData;
+    const float* pKernel;
+
+    // Select outline style
+    int iRed = (ulColor & 0x00FF0000) >> 16;
+    int iGreen = (ulColor & 0x0000FF00) >> 8;
+    int iBlue = (ulColor & 0x000000FF) >> 0;
+    float fBrightness = (iRed * 0.299f + iGreen * 0.587f + iBlue * 0.114f);
+    if (fBrightness > 64)
+    {
+        // Use black outline with thicker border
+        ulColor = ulColor & 0xFF000000;
+        const float F = 0, E = 0.16f, D = 0.33f, C = 0.66f, B = 1, A = 0;
+        static const float kernelData[] = {
+                                F, E, D, E, F,
+                                E, C, B, C, E,
+                                D, B, A, B, D,
+                                E, C, B, C, E,
+                                F, E, D, E, F };
+        pKernel = kernelData;
+    }
+    else
+    {
+        // Use white outline with thinner border
+        ulColor = ulColor | 0x00FFFFFF;
+        const float F = 0, E = 0, D = 0.25f, C = 0.5f, B = 1, A = 0;
+        static const float kernelData[] = {
+                                F, E, D, E, F,
+                                E, C, B, C, E,
+                                D, B, A, B, D,
+                                E, C, B, C, E,
+                                F, E, D, E, F };
+        pKernel = kernelData;
+    }
 
     // Apply definition
     int iInputAlpha = (ulColor & 0xFF000000) >> 24;

Client/core/Graphics/CGraphics.h

@@ -82,7 +82,7 @@ class CGraphics : public CGraphicsInterface, public CSingleton < CGraphics >
     void                DrawString              ( int iX, int iY, unsigned long dwColor, float fScale, const char * szText, ... );
     void                DrawLine3D              ( const CVector& vecBegin, const CVector& vecEnd, unsigned long ulColor, float fWidth = 1.0f );
     void                DrawRectangle           ( float fX, float fY, float fWidth, float fHeight, unsigned long ulColor, bool bSubPixelPositioning = false );
-    void                DrawStringBlurred       ( const RECT& rect, unsigned long ulColor, const wchar_t* szText, unsigned long ulFormat, LPD3DXFONT pDXFont );
+    void                DrawStringOutline       ( const RECT& rect, unsigned long ulColor, const wchar_t* szText, unsigned long ulFormat, LPD3DXFONT pDXFont );
 
     void                SetBlendMode            ( EBlendModeType blendMode );
     EBlendModeType      GetBlendMode            ( void );