Revert "Cleanup of Client Core"

This reverts commit 91cc4d0.

Author: jushar

Client/core/CAdditionalVertexStreamManager.cpp

@@ -38,6 +38,31 @@ namespace
 }
 
 
+
+///////////////////////////////////////////////////////////////
+//
+// CAdditionalVertexStreamManager::CAdditionalVertexStreamManager
+//
+//
+//
+///////////////////////////////////////////////////////////////
+CAdditionalVertexStreamManager::CAdditionalVertexStreamManager ( void )
+{
+}
+
+
+///////////////////////////////////////////////////////////////
+//
+// CAdditionalVertexStreamManager::~CAdditionalVertexStreamManager
+//
+//
+//
+///////////////////////////////////////////////////////////////
+CAdditionalVertexStreamManager::~CAdditionalVertexStreamManager ( void )
+{
+}
+
+
 ///////////////////////////////////////////////////////////////
 //
 // CAdditionalVertexStreamManager::GetSingleton

Client/core/CAdditionalVertexStreamManager.h

@@ -2,12 +2,13 @@
 *
 *  PROJECT:     Multi Theft Auto v1.0
 *  LICENSE:     See LICENSE in the top level directory
+*  FILE:
+*  PURPOSE:
 *  DEVELOPERS:  D3DOCD
 *
 *  Multi Theft Auto is available from http://www.multitheftauto.com/
 *
 *****************************************************************************/
-#pragma once
 
 //
 // SAdditionalStreamInfo
@@ -78,8 +79,8 @@ class CAdditionalVertexStreamManager
 {
 public:
     ZERO_ON_NEW
-                            CAdditionalVertexStreamManager      ( void ) = default;
-    virtual                 ~CAdditionalVertexStreamManager     ( void ) = default;
+                            CAdditionalVertexStreamManager      ( void );
+    virtual                 ~CAdditionalVertexStreamManager     ( void );
 
     void                    OnDeviceCreate                      ( IDirect3DDevice9* pDevice );
     bool                    MaybeSetAdditionalVertexStream      ( D3DPRIMITIVETYPE PrimitiveType,INT BaseVertexIndex,UINT MinVertexIndex,UINT NumVertices,UINT startIndex,UINT primCount );

Client/core/Chat/CChat.cpp renamed to Client/core/CChat.cpp

@@ -14,6 +14,8 @@
 #include "StdInc.h"
 #include <game/CGame.h>
 
+using std::vector;
+
 extern CCore* g_pCore;
 
 CChat * g_pChat = NULL;
@@ -57,19 +59,19 @@ CChat::CChat ( CGUI* pManager, const CVector2D & vecPosition )
     m_iReportCount = 0;
 
     // Background area
-    m_pBackground.reset(m_pManager->CreateStaticImage ());
-    m_pBackgroundTexture.reset(m_pManager->CreateTexture ());
-    m_pBackground->LoadFromTexture ( m_pBackgroundTexture.get() );
+    m_pBackground = m_pManager->CreateStaticImage ();
+    m_pBackgroundTexture = m_pManager->CreateTexture ();
+    m_pBackground->LoadFromTexture ( m_pBackgroundTexture );
     m_pBackground->MoveToBack ();
     m_pBackground->SetPosition ( m_vecBackgroundPosition );
     m_pBackground->SetSize ( m_vecBackgroundSize );
     m_pBackground->SetEnabled ( false );
     m_pBackground->SetVisible ( false );
 
     // Input area
-    m_pInput.reset(m_pManager->CreateStaticImage ());
-    m_pInputTexture.reset(m_pManager->CreateTexture ());
-    m_pInput->LoadFromTexture ( m_pInputTexture.get() );
+    m_pInput = m_pManager->CreateStaticImage ();
+    m_pInputTexture = m_pManager->CreateTexture ();
+    m_pInput->LoadFromTexture ( m_pInputTexture );
     m_pInput->MoveToBack ();
     m_pInput->SetPosition ( m_vecInputPosition );
     m_pInput->SetSize ( m_vecInputSize );
@@ -89,6 +91,10 @@ CChat::~CChat ( void )
     ClearInput ();
 
     SetDxFont( NULL );
+    SAFE_DELETE ( m_pBackground );
+    SAFE_DELETE ( m_pBackgroundTexture );
+    SAFE_DELETE ( m_pInput );
+    SAFE_DELETE ( m_pInputTexture );
 
     if ( g_pChat == this )
         g_pChat = NULL;
@@ -694,7 +700,7 @@ bool CChat::CharacterKeyHandler ( CGUIKeyEventArgs KeyboardArgs )
                         else // we have any char from Extended ASCII, any ANSI code page or UNICODE range
                         {
                             // Generate a null-terminating string for our character
-                            wchar_t wUNICODE[2] = { (wchar_t)uiCharacter, '\0' };
+                            wchar_t wUNICODE[2] = { uiCharacter, '\0' };
 
                             // Convert our UTF character into an ANSI string
                             std::string strANSI = UTF16ToMbUTF8(wUNICODE);
@@ -832,7 +838,7 @@ void CChat::SetColor ( const CColor& Color )
     unsigned long ulBackgroundColor = COLOR_ARGB ( Color.A, Color.R, Color.G, Color.B );
 
     m_pBackgroundTexture->LoadFromMemory ( &ulBackgroundColor, 1, 1 );
-    m_pBackground->LoadFromTexture ( m_pBackgroundTexture.get() );
+    m_pBackground->LoadFromTexture ( m_pBackgroundTexture );
 }
 
 
@@ -844,7 +850,7 @@ void CChat::SetInputColor ( const CColor& Color )
         m_pInputTexture->LoadFromMemory ( &ulInputColor, 1, 1 );
 
     if ( m_pInput )
-        m_pInput->LoadFromTexture ( m_pInputTexture.get() );
+        m_pInput->LoadFromTexture ( m_pInputTexture );
 }
 
 
@@ -979,3 +985,220 @@ void CChat::DrawTextString ( const char * szText, CRect2D DrawArea, float fZ, CR
     }
 }
 
+
+CChatLine::CChatLine ( void )
+{
+    m_bActive = false;
+    UpdateCreationTime ();
+}
+
+void CChatLine::UpdateCreationTime ()
+{
+    m_ulCreationTime = GetTickCount32 ();
+}
+
+
+//
+// Calculate the equivalent ansi string pointer of szPosition.
+//
+const char* CalcAnsiPtr ( const char* szStringAnsi, const wchar_t* szPosition )
+{
+    int iOrigSize = strlen ( szStringAnsi );
+    int iEndSize = UTF16ToMbUTF8 ( szPosition ).length();
+    int iOffset = iOrigSize - iEndSize;
+    return szStringAnsi + iOffset;
+}
+
+
+const char* CChatLine::Format ( const char* szStringAnsi, float fWidth, CColor& color, bool bColorCoded )
+{
+    std::wstring wString = MbUTF8ToUTF16 ( szStringAnsi );
+    const wchar_t* szString = wString.c_str ();
+
+    float fPrevSectionsWidth = 0.0f;
+    m_Sections.clear ();
+
+    const wchar_t* szSectionStart = szString;
+    const wchar_t* szSectionEnd = szString;
+    const wchar_t* szLastWrapPoint = szString;
+    bool bLastSection = false;
+    while ( !bLastSection )      // iterate over sections
+    {
+        m_Sections.resize ( m_Sections.size () + 1 );
+        CChatLineSection& section = *(m_Sections.end () - 1);
+        section.SetColor ( color );
+
+        if ( m_Sections.size () > 1 && bColorCoded)      // If we've processed sections before
+            szSectionEnd += 7;                           // skip the color code
+
+        szSectionStart = szSectionEnd;
+        szLastWrapPoint = szSectionStart;
+        unsigned int uiSeekPos = 0;
+        std::wstring strSectionStart = szSectionStart;
+
+        while ( true )      // find end of this section
+        {
+            float fSectionWidth = CChat::GetTextExtent ( UTF16ToMbUTF8 ( strSectionStart.substr ( 0 , uiSeekPos ) ).c_str (), g_pChat->m_vecScale.fX );
+
+            if ( *szSectionEnd == '\0' || *szSectionEnd == '\n' || fPrevSectionsWidth + fSectionWidth > fWidth )
+            {
+                bLastSection = true;
+                break;
+            }
+            if ( bColorCoded && IsColorCode ( UTF16ToMbUTF8 ( szSectionEnd ).c_str () ) )
+            {
+                unsigned long ulColor = 0;
+                sscanf ( UTF16ToMbUTF8 ( szSectionEnd ).c_str () + 1, "%06x", &ulColor );
+                color = ulColor;
+                fPrevSectionsWidth += fSectionWidth;
+                break;
+            }
+            if ( isspace ( (unsigned char)*szSectionEnd ) || ispunct ( (unsigned char)*szSectionEnd ) )
+            {
+                szLastWrapPoint = szSectionEnd;
+            }
+            szSectionEnd++;
+            uiSeekPos++;
+        }
+        section.m_strText = UTF16ToMbUTF8 ( strSectionStart.substr ( 0 , uiSeekPos ) );
+    }
+
+    if ( *szSectionEnd == '\0' )
+    {
+        return NULL;
+    }
+    else if( *szSectionEnd == '\n' )
+    {
+        return CalcAnsiPtr ( szStringAnsi, szSectionEnd + 1 );
+    }
+    else
+    {
+        // Do word wrap
+        if ( szLastWrapPoint == szSectionStart )
+        {
+            // Wrapping point coincides with the start of a section.
+            if ( szLastWrapPoint == szString )
+            {
+                // The line consists of one huge word. Leave the one section we created as it
+                // is (with the huge word cut off) and return szRemaining as the rest of the word
+                return CalcAnsiPtr ( szStringAnsi, szSectionEnd );
+            }
+            else
+            {
+                // There's more than one section, remove the last one (where our wrap point is)
+                m_Sections.pop_back ();
+            }
+        }
+        else
+        {
+            // Wrapping point is in the middle of a section, truncate
+            CChatLineSection& last = *( m_Sections.end () - 1 );
+            std::wstring wstrTemp = MbUTF8ToUTF16 ( last.m_strText );
+            wstrTemp.resize ( szLastWrapPoint - szSectionStart );
+            last.m_strText = UTF16ToMbUTF8 ( wstrTemp );
+        }
+        return CalcAnsiPtr ( szStringAnsi, szLastWrapPoint );
+    }
+}
+
+
+void CChatLine::Draw ( const CVector2D& vecPosition, unsigned char ucAlpha, bool bShadow, const CRect2D& RenderBounds )
+{
+    float fCurrentX = vecPosition.fX;
+    std::vector < CChatLineSection >::iterator iter = m_Sections.begin ();
+    for ( ; iter != m_Sections.end () ; iter++ )
+    {
+        (*iter).Draw ( CVector2D ( fCurrentX, vecPosition.fY ), ucAlpha, bShadow, RenderBounds );
+        fCurrentX += (*iter).GetWidth ();
+    }
+}
+
+
+float CChatLine::GetWidth ()
+{
+    float fWidth = 0.0f;
+    std::vector < CChatLineSection >::iterator it;
+    for ( it = m_Sections.begin (); it != m_Sections.end (); it++ )
+    {
+        fWidth += (*it).GetWidth ();
+    }
+    return fWidth;
+}
+
+
+void CChatInputLine::Draw ( CVector2D& vecPosition, unsigned char ucAlpha, bool bShadow )
+{
+    CRect2D RenderBounds ( 0, 0, 9999, 9999 );
+
+    CColor colPrefix;
+    m_Prefix.GetColor ( colPrefix );
+    if ( colPrefix.A > 0 )
+        m_Prefix.Draw ( vecPosition, colPrefix.A, bShadow, RenderBounds );
+    
+    if ( g_pChat->m_InputTextColor.A > 0 && m_Sections.size () > 0 )
+    {
+        m_Sections [ 0 ].Draw ( CVector2D ( vecPosition.fX + m_Prefix.GetWidth (), vecPosition.fY ),
+            g_pChat->m_InputTextColor.A, bShadow, RenderBounds );
+
+        float fLineDifference = CChat::GetFontHeight ( g_pChat->m_vecScale.fY );
+
+        vector < CChatLine >::iterator iter = m_ExtraLines.begin ();
+        for ( ; iter != m_ExtraLines.end () ; iter++ )
+        {
+            vecPosition.fY += fLineDifference;
+            (*iter).Draw ( vecPosition, g_pChat->m_InputTextColor.A, bShadow, RenderBounds );
+        }
+    }
+}
+
+
+void CChatInputLine::Clear ( void )
+{
+    m_Sections.clear ();
+    m_ExtraLines.clear ();
+}
+
+CChatLineSection::CChatLineSection ()
+{
+    m_fCachedWidth = -1.0f;
+    m_uiCachedLength = 0;
+}
+
+CChatLineSection::CChatLineSection ( const CChatLineSection& other )
+{
+    *this = other;
+}
+
+CChatLineSection& CChatLineSection::operator = ( const CChatLineSection& other )
+{
+    m_strText = other.m_strText;
+    m_Color = other.m_Color;
+    m_fCachedWidth = other.m_fCachedWidth;
+    m_uiCachedLength = other.m_uiCachedLength;
+    return *this;
+}
+
+void CChatLineSection::Draw ( const CVector2D& vecPosition, unsigned char ucAlpha, bool bShadow, const CRect2D& RenderBounds )
+{
+    if ( !m_strText.empty () && ucAlpha > 0 )
+    {
+        if ( bShadow )
+        {
+            CRect2D drawShadowAt ( vecPosition.fX + 1.0f, vecPosition.fY + 1.0f, vecPosition.fX + 1000.0f, vecPosition.fY + 1000.0f );
+            CChat::DrawTextString ( m_strText.c_str (), drawShadowAt, 0.0f, drawShadowAt, 0, COLOR_ARGB ( ucAlpha, 0, 0, 0 ), g_pChat->m_vecScale.fX, g_pChat->m_vecScale.fY, RenderBounds );                
+        }
+        CRect2D drawAt ( vecPosition.fX, vecPosition.fY, vecPosition.fX + 1000.0f, vecPosition.fY + 1000.0f );
+        CChat::DrawTextString ( m_strText.c_str (), drawAt, 0.0f, drawAt, 0, COLOR_ARGB ( ucAlpha, m_Color.R, m_Color.G, m_Color.B ), g_pChat->m_vecScale.fX, g_pChat->m_vecScale.fY, RenderBounds );
+    }
+}
+
+
+float CChatLineSection::GetWidth ()
+{
+    if ( m_fCachedWidth < 0.0f || m_strText.size () != m_uiCachedLength )
+    {
+        m_fCachedWidth = CChat::GetTextExtent ( m_strText.c_str (), g_pChat->m_vecScale.fX ) / Max ( 0.01f, g_pChat->m_vecScale.fX );
+        m_uiCachedLength = m_strText.size ();
+    }
+    return m_fCachedWidth * g_pChat->m_vecScale.fX;
+}