mirror of
https://github.com/Mauler125/r5sdk.git
synced 2025-02-09 19:15:03 +01:00
Add flag textures and logic for 3 or more flags
Only check if FCVAR_DEVELOPMENTONLY or FCVAR_CHEAT is set and return a blue/red colored checkered texture. Return a rainbow checkered if 3 or more flags are encountered which are not indexed. Return half texture if 2 flags are encountered, but the second bit is not indexed.
This commit is contained in:
Kawe Mazidjatari
parent
d00aaa933d
commit
a8fd5a24f5
@ -26,6 +26,11 @@
|
||||
#define IDB_PNG22 122
|
||||
#define IDB_PNG23 123
|
||||
#define IDB_PNG24 124
|
||||
#define IDB_PNG25 125
|
||||
#define IDB_PNG26 126
|
||||
#define IDB_PNG27 127
|
||||
#define IDB_PNG28 128
|
||||
#define IDB_PNG29 129
|
||||
#define DEV 256
|
||||
#define PNG 256
|
||||
|
||||
|
||||
@ -368,7 +368,7 @@ void CConsole::SuggestPanel(void)
|
||||
|
||||
if (con_suggestion_showflags->GetBool())
|
||||
{
|
||||
const int k = GetFlagColorIndex(suggest.m_nFlags);
|
||||
const int k = GetFlagTextureIndex(suggest.m_nFlags);
|
||||
ImGui::Image(m_vFlagIcons[k].m_idIcon, ImVec2(m_vFlagIcons[k].m_nWidth, m_vFlagIcons[k].m_nHeight));
|
||||
ImGui::SameLine();
|
||||
}
|
||||
@ -667,7 +667,7 @@ bool CConsole::LoadFlagIcons(void)
|
||||
bool ret = false;
|
||||
|
||||
// Get all image resources for displaying flags.
|
||||
for (int i = IDB_PNG3, k = NULL; i <= IDB_PNG24; i++, k++)
|
||||
for (int i = IDB_PNG3, k = NULL; i <= IDB_PNG29; i++, k++)
|
||||
{
|
||||
m_vFlagIcons.push_back(MODULERESOURCE(GetModuleResource(i)));
|
||||
MODULERESOURCE& rFlagIcon = m_vFlagIcons[k];
|
||||
@ -681,57 +681,79 @@ bool CConsole::LoadFlagIcons(void)
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: returns flag image index for CommandBase (must be aligned with resource.h!)
|
||||
// Purpose: returns flag texture index for CommandBase (must be aligned with resource.h!)
|
||||
// this will be refactored to build the image procedurally with use of popcnt
|
||||
// Input : nFlags -
|
||||
//-----------------------------------------------------------------------------
|
||||
int CConsole::GetFlagColorIndex(int nFlags) const
|
||||
int CConsole::GetFlagTextureIndex(int nFlags) const
|
||||
{
|
||||
switch (nFlags)
|
||||
switch (nFlags) // All indices for single/dual flag textures.
|
||||
{
|
||||
case FCVAR_NONE:
|
||||
return 1;
|
||||
case FCVAR_DEVELOPMENTONLY:
|
||||
return 2;
|
||||
case FCVAR_GAMEDLL:
|
||||
return 3;
|
||||
case FCVAR_CLIENTDLL:
|
||||
return 4;
|
||||
case FCVAR_REPLICATED:
|
||||
return 5;
|
||||
case FCVAR_CHEAT:
|
||||
return 6;
|
||||
case FCVAR_RELEASE:
|
||||
return 7;
|
||||
case FCVAR_MATERIAL_SYSTEM_THREAD:
|
||||
case FCVAR_GAMEDLL:
|
||||
return 8;
|
||||
case FCVAR_DEVELOPMENTONLY | FCVAR_GAMEDLL:
|
||||
case FCVAR_CLIENTDLL:
|
||||
return 9;
|
||||
case FCVAR_DEVELOPMENTONLY | FCVAR_CLIENTDLL:
|
||||
case FCVAR_REPLICATED:
|
||||
return 10;
|
||||
case FCVAR_DEVELOPMENTONLY | FCVAR_REPLICATED:
|
||||
case FCVAR_CHEAT:
|
||||
return 11;
|
||||
case FCVAR_DEVELOPMENTONLY | FCVAR_CHEAT:
|
||||
case FCVAR_RELEASE:
|
||||
return 12;
|
||||
case FCVAR_DEVELOPMENTONLY | FCVAR_MATERIAL_SYSTEM_THREAD:
|
||||
case FCVAR_MATERIAL_SYSTEM_THREAD:
|
||||
return 13;
|
||||
case FCVAR_REPLICATED | FCVAR_CHEAT:
|
||||
case FCVAR_DEVELOPMENTONLY | FCVAR_GAMEDLL:
|
||||
return 14;
|
||||
case FCVAR_REPLICATED | FCVAR_RELEASE:
|
||||
case FCVAR_DEVELOPMENTONLY | FCVAR_CLIENTDLL:
|
||||
return 15;
|
||||
case FCVAR_GAMEDLL | FCVAR_CHEAT:
|
||||
case FCVAR_DEVELOPMENTONLY | FCVAR_REPLICATED:
|
||||
return 16;
|
||||
case FCVAR_GAMEDLL | FCVAR_RELEASE:
|
||||
case FCVAR_DEVELOPMENTONLY | FCVAR_CHEAT:
|
||||
return 17;
|
||||
case FCVAR_CLIENTDLL | FCVAR_CHEAT:
|
||||
case FCVAR_DEVELOPMENTONLY | FCVAR_MATERIAL_SYSTEM_THREAD:
|
||||
return 18;
|
||||
case FCVAR_CLIENTDLL | FCVAR_RELEASE:
|
||||
case FCVAR_REPLICATED | FCVAR_CHEAT:
|
||||
return 19;
|
||||
case FCVAR_MATERIAL_SYSTEM_THREAD | FCVAR_CHEAT:
|
||||
case FCVAR_REPLICATED | FCVAR_RELEASE:
|
||||
return 20;
|
||||
case FCVAR_MATERIAL_SYSTEM_THREAD | FCVAR_RELEASE:
|
||||
case FCVAR_GAMEDLL | FCVAR_CHEAT:
|
||||
return 21;
|
||||
default:
|
||||
return 0;
|
||||
case FCVAR_GAMEDLL | FCVAR_RELEASE:
|
||||
return 22;
|
||||
case FCVAR_CLIENTDLL | FCVAR_CHEAT:
|
||||
return 23;
|
||||
case FCVAR_CLIENTDLL | FCVAR_RELEASE:
|
||||
return 24;
|
||||
case FCVAR_MATERIAL_SYSTEM_THREAD | FCVAR_CHEAT:
|
||||
return 25;
|
||||
case FCVAR_MATERIAL_SYSTEM_THREAD | FCVAR_RELEASE:
|
||||
return 26;
|
||||
|
||||
default: // Hit when flag is non-indexed or 3+ bits are set.
|
||||
|
||||
int v = __popcnt(nFlags);
|
||||
switch (v)
|
||||
{
|
||||
case 0:
|
||||
return 0; // Pink checkered texture (FCVAR_NONE)
|
||||
case 1:
|
||||
return 1; // Yellow checkered texture (non-indexed).
|
||||
default:
|
||||
int ret = NULL;
|
||||
bool mul = v > 2; // If 3 or more bits are set we display a checkered texture.
|
||||
|
||||
if (nFlags & FCVAR_DEVELOPMENTONLY)
|
||||
{
|
||||
return ret = mul ? 4 : 3;
|
||||
}
|
||||
else if (nFlags & FCVAR_CHEAT)
|
||||
{
|
||||
return ret = mul ? 6 : 5;
|
||||
}
|
||||
|
||||
return 2; // Rainbow checkered texture (user needs to manually check flags).
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -39,7 +39,7 @@ private:
|
||||
void ClampHistorySize(void);
|
||||
|
||||
bool LoadFlagIcons(void);
|
||||
int GetFlagColorIndex(int nFlags) const;
|
||||
int GetFlagTextureIndex(int nFlags) const;
|
||||
|
||||
int TextEditCallback(ImGuiInputTextCallbackData* pData);
|
||||
static int TextEditCallbackStub(ImGuiInputTextCallbackData* pData);
|
||||
|
||||
BIN
r5dev/resource/png/vf_cheat_unknown.png
Normal file
BIN
r5dev/resource/png/vf_cheat_unknown.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
BIN
r5dev/resource/png/vf_cheat_unknown_e.png
Normal file
BIN
r5dev/resource/png/vf_cheat_unknown_e.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
BIN
r5dev/resource/png/vf_developmentonly_unknown.png
Normal file
BIN
r5dev/resource/png/vf_developmentonly_unknown.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
BIN
r5dev/resource/png/vf_developmentonly_unknown_e.png
Normal file
BIN
r5dev/resource/png/vf_developmentonly_unknown_e.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
BIN
r5dev/resource/png/vf_unknown_e.png
Normal file
BIN
r5dev/resource/png/vf_unknown_e.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
@ -55,28 +55,33 @@ IDB_PNG2 DEV "png\\lockedserver.png"
|
||||
//
|
||||
// PNG
|
||||
//
|
||||
IDB_PNG3 PNG "png\\vf_default.png"
|
||||
IDB_PNG4 PNG "png\\vf_none.png"
|
||||
IDB_PNG5 PNG "png\\vf_developmentonly.png"
|
||||
IDB_PNG6 PNG "png\\vf_gamedll.png"
|
||||
IDB_PNG7 PNG "png\\vf_clientdll.png"
|
||||
IDB_PNG8 PNG "png\\vf_replicated.png"
|
||||
IDB_PNG9 PNG "png\\vf_cheat.png"
|
||||
IDB_PNG10 PNG "png\\vf_release.png"
|
||||
IDB_PNG11 PNG "png\\vf_msthread.png"
|
||||
IDB_PNG12 PNG "png\\vf_developmentonly_gamedll.png"
|
||||
IDB_PNG13 PNG "png\\vf_developmentonly_clientdll.png"
|
||||
IDB_PNG14 PNG "png\\vf_developmentonly_replicated.png"
|
||||
IDB_PNG15 PNG "png\\vf_developmentonly_cheat.png"
|
||||
IDB_PNG16 PNG "png\\vf_developmentonly_msthread.png"
|
||||
IDB_PNG17 PNG "png\\vf_replicated_cheat.png"
|
||||
IDB_PNG18 PNG "png\\vf_replicated_release.png"
|
||||
IDB_PNG19 PNG "png\\vf_gamedll_cheat.png"
|
||||
IDB_PNG20 PNG "png\\vf_gamedll_release.png"
|
||||
IDB_PNG21 PNG "png\\vf_clientdll_cheat.png"
|
||||
IDB_PNG22 PNG "png\\vf_clientdll_release.png"
|
||||
IDB_PNG23 PNG "png\\vf_msthread_cheat.png"
|
||||
IDB_PNG24 PNG "png\\vf_msthread_release.png"
|
||||
IDB_PNG3 PNG "png\\vf_none.png"
|
||||
IDB_PNG4 PNG "png\\vf_unknown.png"
|
||||
IDB_PNG5 PNG "png\\vf_unknown_e.png"
|
||||
IDB_PNG6 PNG "png\\vf_developmentonly_unknown.png"
|
||||
IDB_PNG7 PNG "png\\vf_developmentonly_unknown_e.png"
|
||||
IDB_PNG8 PNG "png\\vf_cheat_unknown.png"
|
||||
IDB_PNG9 PNG "png\\vf_cheat_unknown_e.png"
|
||||
IDB_PNG10 PNG "png\\vf_developmentonly.png"
|
||||
IDB_PNG11 PNG "png\\vf_gamedll.png"
|
||||
IDB_PNG12 PNG "png\\vf_clientdll.png"
|
||||
IDB_PNG13 PNG "png\\vf_replicated.png"
|
||||
IDB_PNG14 PNG "png\\vf_cheat.png"
|
||||
IDB_PNG15 PNG "png\\vf_release.png"
|
||||
IDB_PNG16 PNG "png\\vf_msthread.png"
|
||||
IDB_PNG17 PNG "png\\vf_developmentonly_gamedll.png"
|
||||
IDB_PNG18 PNG "png\\vf_developmentonly_clientdll.png"
|
||||
IDB_PNG19 PNG "png\\vf_developmentonly_replicated.png"
|
||||
IDB_PNG20 PNG "png\\vf_developmentonly_cheat.png"
|
||||
IDB_PNG21 PNG "png\\vf_developmentonly_msthread.png"
|
||||
IDB_PNG22 PNG "png\\vf_replicated_cheat.png"
|
||||
IDB_PNG23 PNG "png\\vf_replicated_release.png"
|
||||
IDB_PNG24 PNG "png\\vf_gamedll_cheat.png"
|
||||
IDB_PNG25 PNG "png\\vf_gamedll_release.png"
|
||||
IDB_PNG26 PNG "png\\vf_clientdll_cheat.png"
|
||||
IDB_PNG27 PNG "png\\vf_clientdll_release.png"
|
||||
IDB_PNG28 PNG "png\\vf_msthread_cheat.png"
|
||||
IDB_PNG29 PNG "png\\vf_msthread_release.png"
|
||||
|
||||
#endif // English (United States) resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user