From 15f0efc2bdbce5cb842bff1f41a8e7a9b7cde5ca Mon Sep 17 00:00:00 2001 From: Jupeyy Date: Tue, 3 Apr 2018 17:40:21 +0200 Subject: [PATCH] fix text color if opengl3.3 is off --- src/engine/client/graphics_threaded.cpp | 57 +++++++++++++++++++++++++ src/engine/client/graphics_threaded.h | 19 +++------ src/engine/client/text.cpp | 22 ++++++++-- src/engine/graphics.h | 14 ++++++ 4 files changed, 95 insertions(+), 17 deletions(-) diff --git a/src/engine/client/graphics_threaded.cpp b/src/engine/client/graphics_threaded.cpp index 33f554eb9..84de1f091 100644 --- a/src/engine/client/graphics_threaded.cpp +++ b/src/engine/client/graphics_threaded.cpp @@ -695,6 +695,63 @@ void CGraphics_Threaded::ChangeColorOfCurrentQuadVertices(float r, float g, floa } } +void CGraphics_Threaded::ChangeColorOfQuadVertices(int QuadOffset, unsigned char r, unsigned char g, unsigned char b, unsigned char a) { + if(g_Config.m_GfxQuadAsTriangle && !m_UseOpenGL3_3) + { + m_aVertices[QuadOffset * 6].m_Color.r = r; + m_aVertices[QuadOffset * 6].m_Color.g = g; + m_aVertices[QuadOffset * 6].m_Color.b = b; + m_aVertices[QuadOffset * 6].m_Color.a = a; + + m_aVertices[QuadOffset * 6 + 1].m_Color.r = r; + m_aVertices[QuadOffset * 6 + 1].m_Color.g = g; + m_aVertices[QuadOffset * 6 + 1].m_Color.b = b; + m_aVertices[QuadOffset * 6 + 1].m_Color.a = a; + + m_aVertices[QuadOffset * 6 + 2].m_Color.r = r; + m_aVertices[QuadOffset * 6 + 2].m_Color.g = g; + m_aVertices[QuadOffset * 6 + 2].m_Color.b = b; + m_aVertices[QuadOffset * 6 + 2].m_Color.a = a; + + m_aVertices[QuadOffset * 6 + 3].m_Color.r = r; + m_aVertices[QuadOffset * 6 + 3].m_Color.g = g; + m_aVertices[QuadOffset * 6 + 3].m_Color.b = b; + m_aVertices[QuadOffset * 6 + 3].m_Color.a = a; + + m_aVertices[QuadOffset * 6 + 4].m_Color.r = r; + m_aVertices[QuadOffset * 6 + 4].m_Color.g = g; + m_aVertices[QuadOffset * 6 + 4].m_Color.b = b; + m_aVertices[QuadOffset * 6 + 4].m_Color.a = a; + + m_aVertices[QuadOffset * 6 + 5].m_Color.r = r; + m_aVertices[QuadOffset * 6 + 5].m_Color.g = g; + m_aVertices[QuadOffset * 6 + 5].m_Color.b = b; + m_aVertices[QuadOffset * 6 + 5].m_Color.a = a; + } + else + { + m_aVertices[QuadOffset * 4].m_Color.r = r; + m_aVertices[QuadOffset * 4].m_Color.g = g; + m_aVertices[QuadOffset * 4].m_Color.b = b; + m_aVertices[QuadOffset * 4].m_Color.a = a; + + m_aVertices[QuadOffset * 4 + 1].m_Color.r = r; + m_aVertices[QuadOffset * 4 + 1].m_Color.g = g; + m_aVertices[QuadOffset * 4 + 1].m_Color.b = b; + m_aVertices[QuadOffset * 4 + 1].m_Color.a = a; + + m_aVertices[QuadOffset * 4 + 2].m_Color.r = r; + m_aVertices[QuadOffset * 4 + 2].m_Color.g = g; + m_aVertices[QuadOffset * 4 + 2].m_Color.b = b; + m_aVertices[QuadOffset * 4 + 2].m_Color.a = a; + + m_aVertices[QuadOffset * 4 + 3].m_Color.r = r; + m_aVertices[QuadOffset * 4 + 3].m_Color.g = g; + m_aVertices[QuadOffset * 4 + 3].m_Color.b = b; + m_aVertices[QuadOffset * 4 + 3].m_Color.a = a; + } +} + void CGraphics_Threaded::SetColor(CCommandBuffer::SVertex *pVertex, int ColorIndex) { CCommandBuffer::SVertex *pVert = (CCommandBuffer::SVertex*)pVertex; diff --git a/src/engine/client/graphics_threaded.h b/src/engine/client/graphics_threaded.h index 8b5f9ab74..ee36487d6 100644 --- a/src/engine/client/graphics_threaded.h +++ b/src/engine/client/graphics_threaded.h @@ -152,20 +152,12 @@ public: WRAP_REPEAT = 0, WRAP_CLAMP, }; - - struct SPoint { float x, y; }; - struct STexCoord { float u, v; }; - struct SColorf { float r, g, b, a; }; - - //use normalized color values - struct SColor { unsigned char r, g, b, a; }; - struct SVertex - { - SPoint m_Pos; - STexCoord m_Tex; - SColor m_Color; - }; + typedef GL_SPoint SPoint; + typedef GL_STexCoord STexCoord; + typedef GL_SColorf SColorf; + typedef GL_SColor SColor; + typedef GL_SVertex SVertex; struct SCommand { @@ -749,6 +741,7 @@ public: // go through all vertices and change their color (only works for quads) virtual void ChangeColorOfCurrentQuadVertices(float r, float g, float b, float a); + virtual void ChangeColorOfQuadVertices(int QuadOffset, unsigned char r, unsigned char g, unsigned char b, unsigned char a); void SetColor(CCommandBuffer::SVertex *pVertex, int ColorIndex); diff --git a/src/engine/client/text.cpp b/src/engine/client/text.cpp index b115eeedd..627146e1e 100644 --- a/src/engine/client/text.cpp +++ b/src/engine/client/text.cpp @@ -1570,13 +1570,27 @@ public: Graphics()->TextureSet(pFont->m_aTextures[0]); if(pTextColor->m_A != 0) { - STextCharQuad& TextCharQuad = TextContainer.m_StringInfo.m_CharacterQuads[0]; - Graphics()->ChangeColorOfCurrentQuadVertices(TextCharQuad.m_Vertices[0].m_Color.m_R / 255.f * pTextColor->m_R, TextCharQuad.m_Vertices[0].m_Color.m_G / 255.f * pTextColor->m_G, TextCharQuad.m_Vertices[0].m_Color.m_B / 255.f * pTextColor->m_B, TextCharQuad.m_Vertices[0].m_Color.m_A / 255.f * pTextColor->m_A); + for(size_t i = 0; i < TextContainer.m_StringInfo.m_QuadNum; ++i) + { + STextCharQuad& TextCharQuad = TextContainer.m_StringInfo.m_CharacterQuads[i]; + unsigned char CR = (unsigned char)((float)(TextCharQuad.m_Vertices[0].m_Color.m_R) * pTextColor->m_R); + unsigned char CG = (unsigned char)((float)(TextCharQuad.m_Vertices[0].m_Color.m_G) * pTextColor->m_G); + unsigned char CB = (unsigned char)((float)(TextCharQuad.m_Vertices[0].m_Color.m_B) * pTextColor->m_B); + unsigned char CA = (unsigned char)((float)(TextCharQuad.m_Vertices[0].m_Color.m_A) * pTextColor->m_A); + Graphics()->ChangeColorOfQuadVertices((int)i, CR, CG, CB, CA); + } } else { - STextCharQuad& TextCharQuad = TextContainer.m_StringInfo.m_CharacterQuads[0]; - Graphics()->ChangeColorOfCurrentQuadVertices(TextCharQuad.m_Vertices[0].m_Color.m_R / 255.f, TextCharQuad.m_Vertices[0].m_Color.m_G / 255.f, TextCharQuad.m_Vertices[0].m_Color.m_B / 255.f, TextCharQuad.m_Vertices[0].m_Color.m_A / 255.f); + for(size_t i = 0; i < TextContainer.m_StringInfo.m_QuadNum; ++i) + { + STextCharQuad& TextCharQuad = TextContainer.m_StringInfo.m_CharacterQuads[i]; + unsigned char CR = TextCharQuad.m_Vertices[0].m_Color.m_R; + unsigned char CG = TextCharQuad.m_Vertices[0].m_Color.m_G; + unsigned char CB = TextCharQuad.m_Vertices[0].m_Color.m_B; + unsigned char CA = TextCharQuad.m_Vertices[0].m_Color.m_A; + Graphics()->ChangeColorOfQuadVertices((int)i, CR, CG, CB, CA); + } } // render non outlined diff --git a/src/engine/graphics.h b/src/engine/graphics.h index a60b980b4..6c7a63ccb 100644 --- a/src/engine/graphics.h +++ b/src/engine/graphics.h @@ -76,6 +76,19 @@ public: int m_Red, m_Green, m_Blue; }; +struct GL_SPoint { float x, y; }; +struct GL_STexCoord { float u, v; }; +struct GL_SColorf { float r, g, b, a; }; + +//use normalized color values +struct GL_SColor { unsigned char r, g, b, a; }; + +struct GL_SVertex +{ + GL_SPoint m_Pos; + GL_STexCoord m_Tex; + GL_SColor m_Color; +}; typedef void(*WINDOW_RESIZE_FUNC)(void *pUser); @@ -226,6 +239,7 @@ public: virtual void SetColorVertex(const CColorVertex *pArray, int Num) = 0; virtual void SetColor(float r, float g, float b, float a) = 0; virtual void ChangeColorOfCurrentQuadVertices(float r, float g, float b, float a) = 0; + virtual void ChangeColorOfQuadVertices(int QuadOffset, unsigned char r, unsigned char g, unsigned char b, unsigned char a) = 0; virtual void TakeScreenshot(const char *pFilename) = 0; virtual void TakeCustomScreenshot(const char *pFilename) = 0;