From 1993989067f0d05f0ccae69fb923eccd83aeb4fc Mon Sep 17 00:00:00 2001 From: Learath2 Date: Tue, 2 Jul 2019 14:54:06 +0200 Subject: [PATCH 1/2] Fix toggle not working with colors --- src/base/color.h | 11 ++++---- src/engine/shared/console.cpp | 19 +++++++++++-- src/game/client/components/menus_settings.cpp | 28 +++++++++---------- 3 files changed, 36 insertions(+), 22 deletions(-) diff --git a/src/base/color.h b/src/base/color.h index f3ea22ed5..f133d78b8 100644 --- a/src/base/color.h +++ b/src/base/color.h @@ -84,9 +84,9 @@ public: vec4 v4() { return vec4(x, y, z, a); }; - unsigned Pack() + unsigned Pack(bool Alpha = true) { - return ((unsigned)(a * 255.0f) << 24) + ((unsigned)(x * 255.0f) << 16) + ((unsigned)(y * 255.0f) << 8) + (unsigned)(z * 255.0f); + return (Alpha ? ((unsigned)(a * 255.0f) << 24) : 0) + ((unsigned)(x * 255.0f) << 16) + ((unsigned)(y * 255.0f) << 8) + (unsigned)(z * 255.0f); } color4_base SetAlpha(float alpha) @@ -96,7 +96,6 @@ public: col.a = alpha; return col; } - }; class ColorHSLA : public color4_base @@ -130,12 +129,12 @@ public: return col; } - int Pack() + unsigned Pack(bool Alpha = true) { if(m_Lit) - return Darken().color4_base::Pack(); + return Darken().color4_base::Pack(Alpha); else - return color4_base::Pack(); + return color4_base::Pack(Alpha); } }; diff --git a/src/engine/shared/console.cpp b/src/engine/shared/console.cpp index 248fc5309..8ec87040b 100644 --- a/src/engine/shared/console.cpp +++ b/src/engine/shared/console.cpp @@ -757,7 +757,7 @@ static void ColVariableCommand(IConsole::IResult *pResult, void *pUserData) if(pResult->NumArguments()) { - int Val = pResult->GetColor(0, pData->m_Light).Pack() & (pData->m_Alpha ? 0xFFFFFFFF : 0xFFFFFF); + int Val = pResult->GetColor(0, pData->m_Light).Pack(pData->m_Alpha); *(pData->m_pVariable) = Val; if(pResult->m_ClientID != IConsole::CLIENT_ID_GAME) @@ -774,7 +774,7 @@ static void ColVariableCommand(IConsole::IResult *pResult, void *pUserData) pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "console", aBuf); ColorRGBA rgb = color_cast(hsl); - str_format(aBuf, sizeof(aBuf), "R: %d, G: %d, B: %d, #%06X", round_truncate(rgb.r * 255), round_truncate(rgb.g * 255), round_truncate(rgb.b * 255), rgb.Pack() & 0xFFFFFF); + str_format(aBuf, sizeof(aBuf), "R: %d, G: %d, B: %d, #%06X", round_truncate(rgb.r * 255), round_truncate(rgb.g * 255), round_truncate(rgb.b * 255), rgb.Pack(false)); pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "console", aBuf); if(pData->m_Alpha) @@ -862,6 +862,21 @@ void CConsole::ConToggle(IConsole::IResult *pResult, void *pUser) pConsole->ExecuteLine(aBuf); aBuf[0] = 0; } + else if(pfnCallback == ColVariableCommand) + { + CColVariableData *pData = static_cast(pUserData); + bool Light = pData->m_Light; + bool Alpha = pData->m_Alpha; + unsigned Cur = *pData->m_pVariable; + ColorHSLA Val = Cur == pResult->GetColor(1, Light).Pack(Alpha) ? pResult->GetColor(2, Light) : pResult->GetColor(1, Light); + if(Light) + Val = Val.Lighten(); + + dbg_msg("console", "%u %s(%u) %s(%u)", Cur, pResult->GetString(1), pResult->GetColor(1, Light).Pack(Alpha), pResult->GetString(2), pResult->GetColor(2, Light).Pack(Alpha)); + str_format(aBuf, sizeof(aBuf), "%s %u", pResult->GetString(0), Val.Pack(Alpha)); + pConsole->ExecuteLine(aBuf); + aBuf[0] = 0; + } else str_format(aBuf, sizeof(aBuf), "Invalid command: '%s'.", pResult->GetString(0)); } diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index 52e6cfa8b..eb20d3551 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -1519,7 +1519,7 @@ void CMenus::RenderSettingsHUD(CUIRect MainView) if(DoButton_Menu(&s_DefaultButton, Localize("Reset"), 0, &Button)) { ColorHSLA HSL = color_cast(ColorRGBA(1.0f, 1.0f, 0.5f)); - g_Config.m_ClMessageSystemColor = HSL.Pack() & 0xFFFFFF; + g_Config.m_ClMessageSystemColor = HSL.Pack(false); } } @@ -1547,7 +1547,7 @@ void CMenus::RenderSettingsHUD(CUIRect MainView) UI()->DoLabelScaled(&Label, Localize("Lht."), 14.0f, -1); SMColor.l = DoScrollbarH(&SMColor.l, &Button, SMColor.l); - g_Config.m_ClMessageSystemColor = SMColor.Pack() & 0xFFFFFF; + g_Config.m_ClMessageSystemColor = SMColor.Pack(false); Left.HSplitTop(10.0f, &Label, &Left); @@ -1577,7 +1577,7 @@ void CMenus::RenderSettingsHUD(CUIRect MainView) if(DoButton_Menu(&s_DefaultButton, Localize("Reset"), 0, &Button)) { ColorHSLA HSL = color_cast(ColorRGBA(1.0f, 0.5f, 0.5f)); - g_Config.m_ClMessageHighlightColor = HSL.Pack() & 0xFFFFFF; + g_Config.m_ClMessageHighlightColor = HSL.Pack(false); } } @@ -1605,7 +1605,7 @@ void CMenus::RenderSettingsHUD(CUIRect MainView) UI()->DoLabelScaled(&Label, Localize("Lht."), 14.0f, -1); HMColor.l = DoScrollbarH(&HMColor.l, &Button, HMColor.l); - g_Config.m_ClMessageHighlightColor = HMColor.Pack() & 0xFFFFFF; + g_Config.m_ClMessageHighlightColor = HMColor.Pack(false); Right.HSplitTop(10.0f, &Label, &Right); TextRender()->TextColor(0.75f, 0.5f, 0.75f, 1.0f); @@ -1638,7 +1638,7 @@ void CMenus::RenderSettingsHUD(CUIRect MainView) if(DoButton_Menu(&s_DefaultButton, Localize("Reset"), 0, &Button)) { ColorHSLA HSL = color_cast(ColorRGBA(0.65f, 1.0f, 0.65f)); - g_Config.m_ClMessageTeamColor = HSL.Pack() & 0xFFFFFF; + g_Config.m_ClMessageTeamColor = HSL.Pack(false); } } @@ -1666,7 +1666,7 @@ void CMenus::RenderSettingsHUD(CUIRect MainView) UI()->DoLabelScaled(&Label, Localize("Lht."), 14.0f, -1); TMColor.l = DoScrollbarH(&TMColor.l, &Button, TMColor.l); - g_Config.m_ClMessageTeamColor = TMColor.Pack() & 0xFFFFFF; + g_Config.m_ClMessageTeamColor = TMColor.Pack(false); Left.HSplitTop(10.0f, &Label, &Left); ColorRGBA rgbn = CalculateNameColor(TMColor); @@ -1694,7 +1694,7 @@ void CMenus::RenderSettingsHUD(CUIRect MainView) { static int s_DefaultButton = 0; if(DoButton_Menu(&s_DefaultButton, Localize("Reset"), 0, &Button)) - g_Config.m_ClMessageFriendColor = ColorHSLA(0, 1, 145/255.0f).Pack() & 0xFFFFFF; + g_Config.m_ClMessageFriendColor = ColorHSLA(0, 1, 145/255.0f).Pack(false); } if(DoButton_CheckBox(&g_Config.m_ClMessageFriend, "", g_Config.m_ClMessageFriend, &Enable)) @@ -1726,7 +1726,7 @@ void CMenus::RenderSettingsHUD(CUIRect MainView) UI()->DoLabelScaled(&Label, Localize("Lht."), 14.0f, -1); FMColor.l = DoScrollbarH(&FMColor.l, &Button, FMColor.l); - g_Config.m_ClMessageFriendColor = FMColor.Pack() & 0xFFFFFF; + g_Config.m_ClMessageFriendColor = FMColor.Pack(false); Right.HSplitTop(10.0f, &Label, &Right); ColorRGBA rgbf = color_cast(FMColor); @@ -1758,7 +1758,7 @@ void CMenus::RenderSettingsHUD(CUIRect MainView) if(DoButton_Menu(&s_DefaultButton, Localize("Reset"), 0, &Button)) { ColorHSLA HSL = color_cast(ColorRGBA(1.0f, 1.0f, 1.0f)); - g_Config.m_ClMessageColor = HSL.Pack() & 0xFFFFFF; + g_Config.m_ClMessageColor = HSL.Pack(false); } } @@ -1786,7 +1786,7 @@ void CMenus::RenderSettingsHUD(CUIRect MainView) UI()->DoLabelScaled(&Label, Localize("Lht."), 14.0f, -1); MColor.l = DoScrollbarH(&MColor.l, &Button, MColor.l); - g_Config.m_ClMessageColor = MColor.Pack() & 0xFFFFFF; + g_Config.m_ClMessageColor = MColor.Pack(false); Left.HSplitTop(10.0f, &Label, &Left); TextRender()->TextColor(0.8f, 0.8f, 0.8f, 1.0f); @@ -1820,7 +1820,7 @@ void CMenus::RenderSettingsHUD(CUIRect MainView) if(DoButton_Menu(&s_DefaultButton, Localize("Reset"), 0, &Button)) { ColorHSLA HSL = color_cast(ColorRGBA(0.5f, 0.5f, 1.0f)); - g_Config.m_ClLaserInnerColor = HSL.Pack() & 0xFFFFFF; + g_Config.m_ClLaserInnerColor = HSL.Pack(false); } } @@ -1847,7 +1847,7 @@ void CMenus::RenderSettingsHUD(CUIRect MainView) UI()->DoLabelScaled(&Label, Localize("Lht."), 12.0f, -1); LIColor.l = DoScrollbarH(&LIColor.l, &Button, LIColor.l); - g_Config.m_ClLaserInnerColor = LIColor.Pack() & 0xFFFFFF; + g_Config.m_ClLaserInnerColor = LIColor.Pack(false); Laser.HSplitTop(10.0f, 0, &Laser); Laser.HSplitTop(20.0f, &Label, &Laser); @@ -1859,7 +1859,7 @@ void CMenus::RenderSettingsHUD(CUIRect MainView) if(DoButton_Menu(&s_DefaultButton, Localize("Reset"), 0, &Button)) { ColorHSLA HSL = color_cast(ColorRGBA(0.075f, 0.075f, 0.25f)); - g_Config.m_ClLaserOutlineColor = HSL.Pack() & 0xFFFFFF; + g_Config.m_ClLaserOutlineColor = HSL.Pack(false); } } @@ -1886,7 +1886,7 @@ void CMenus::RenderSettingsHUD(CUIRect MainView) UI()->DoLabelScaled(&Label, Localize("Lht."), 12.0f, -1); LOColor.l = DoScrollbarH(&LOColor.l, &Button, LOColor.l); - g_Config.m_ClLaserOutlineColor = LOColor.Pack() & 0xFFFFFF; + g_Config.m_ClLaserOutlineColor = LOColor.Pack(false); //Laser.HSplitTop(8.0f, &Weapon, &Laser); Weapon.VSplitLeft(30.0f, 0, &Weapon); From 8469949257f5a1a5a0344441acf9959fd981f374 Mon Sep 17 00:00:00 2001 From: Learath2 Date: Tue, 2 Jul 2019 14:56:02 +0200 Subject: [PATCH 2/2] Remove debug message --- src/engine/shared/console.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/engine/shared/console.cpp b/src/engine/shared/console.cpp index 8ec87040b..fb97ec569 100644 --- a/src/engine/shared/console.cpp +++ b/src/engine/shared/console.cpp @@ -872,7 +872,6 @@ void CConsole::ConToggle(IConsole::IResult *pResult, void *pUser) if(Light) Val = Val.Lighten(); - dbg_msg("console", "%u %s(%u) %s(%u)", Cur, pResult->GetString(1), pResult->GetColor(1, Light).Pack(Alpha), pResult->GetString(2), pResult->GetColor(2, Light).Pack(Alpha)); str_format(aBuf, sizeof(aBuf), "%s %u", pResult->GetString(0), Val.Pack(Alpha)); pConsole->ExecuteLine(aBuf); aBuf[0] = 0;