Skip to content

Add really experimental string support to WheelyWheel #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add really experimental string support to WheelyWheel #28

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58c08c7
add really experimental string support
Bitl Feb 16, 2023
0433735
add support for nvalue to be used like a array index.
Bitl Feb 16, 2023
0393818
remove val out of userdata
Bitl Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 49 additions & 9 deletions src/game/gamepadui/gamepadui_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ struct GamepadUIOption
{
GamepadUIString strOptionText;
int nValue = 0;
const char* sValue = "";

union
{
Expand Down Expand Up @@ -353,9 +354,10 @@ class GamepadUIWheelyWheel : public GamepadUIConvarButton
public:
DECLARE_CLASS_SIMPLE( GamepadUIWheelyWheel, GamepadUIConvarButton );

GamepadUIWheelyWheel( const char *pszCvar, const char *pszCvarDepends, bool bInstantApply, bool bSignOnly, vgui::Panel* pParent, vgui::Panel* pActionSignalTarget, const char *pSchemeFile, const char* pCommand, const char *pText, const char *pDescription )
GamepadUIWheelyWheel( const char *pszCvar, const char *pszCvarDepends, bool bInstantApply, bool bSignOnly, bool bUsesString, vgui::Panel* pParent, vgui::Panel* pActionSignalTarget, const char *pSchemeFile, const char* pCommand, const char *pText, const char *pDescription )
: BaseClass( pszCvar, pszCvarDepends, bInstantApply, pParent, pActionSignalTarget, pSchemeFile, pCommand, pText, pDescription )
, m_bSignOnly( bSignOnly )
, m_bUsesString( bUsesString )
{
}

Expand Down Expand Up @@ -400,6 +402,8 @@ class GamepadUIWheelyWheel : public GamepadUIConvarButton
{
if ( m_bSignOnly )
m_cvar.SetValue( abs( m_cvar.GetFloat() ) * m_Options[m_nSelectedItem].nValue );
else if (m_bUsesString)
m_cvar.SetValue(m_Options[m_nSelectedItem].sValue);
else
m_cvar.SetValue( m_Options[ m_nSelectedItem ].nValue );
}
Expand All @@ -408,7 +412,18 @@ class GamepadUIWheelyWheel : public GamepadUIConvarButton

bool IsDirty() OVERRIDE
{
return m_cvar.IsValid() && GetCvarValue() != m_Options[m_nSelectedItem].nValue;
bool dirty = false;

if (m_bUsesString)
{
dirty = V_strcmp(m_Options[m_nSelectedItem].sValue, m_cvar.GetString());
}
else
{
dirty = GetCvarValue() != m_Options[m_nSelectedItem].nValue;
}

return m_cvar.IsValid() && dirty;
}

virtual void Paint()
Expand Down Expand Up @@ -470,13 +485,25 @@ class GamepadUIWheelyWheel : public GamepadUIConvarButton
{
if ( m_cvar.IsValid() )
{
const int nCurrentValue = GetCvarValue();
for ( int i = 0; i < m_Options.Count(); i++)
if (m_bUsesString)
{
if ( m_Options[ i ].nValue == nCurrentValue )
m_nSelectedItem = i;
const char *sCurrentValue = m_cvar.GetString();
for (int i = 0; i < m_Options.Count(); i++)
{
if (!V_strcmp(m_Options[i].sValue,sCurrentValue))
m_nSelectedItem = i;
}
}
}
else
{
const int nCurrentValue = GetCvarValue();
for ( int i = 0; i < m_Options.Count(); i++)
{
if ( m_Options[ i ].nValue == nCurrentValue )
m_nSelectedItem = i;
}
}
}
}

GamepadUIOption *GetOption( int nIndex )
Expand All @@ -494,6 +521,7 @@ class GamepadUIWheelyWheel : public GamepadUIConvarButton
private:

bool m_bSignOnly = false;
bool m_bUsesString = false;
int m_nSelectedItem = 0;
CUtlVector< GamepadUIOption > m_Options;

Expand Down Expand Up @@ -1825,8 +1853,9 @@ void GamepadUIOptionsPanel::LoadOptionTabs( const char *pszOptionsFile )
const char *pszCvarDepends = pItemData->GetString( "depends_on" );
bool bInstantApply = pItemData->GetBool( "instantapply" );
bool bSignOnly = pItemData->GetBool( "signonly" );
bool bUsesString = pItemData->GetBool("usesstring");
auto button = new GamepadUIWheelyWheel(
pszCvar, pszCvarDepends, bInstantApply, bSignOnly,
pszCvar, pszCvarDepends, bInstantApply, bSignOnly, bUsesString,
this, this,
GAMEPADUI_RESOURCE_FOLDER "schemeoptions_wheelywheel.res",
"button_pressed",
Expand All @@ -1836,12 +1865,23 @@ void GamepadUIOptionsPanel::LoadOptionTabs( const char *pszOptionsFile )
KeyValues *pOptions = pItemData->FindKey( "options" );
if ( pOptions )
{
int i = 0;
for ( KeyValues* pOptionData = pOptions->GetFirstSubKey(); pOptionData != NULL; pOptionData = pOptionData->GetNextKey() )
{
GamepadUIOption option;
option.nValue = V_atoi( pOptionData->GetName() );
if (bUsesString)
{
option.sValue = pOptionData->GetName();
option.nValue = i;
}
else
{
option.nValue = V_atoi( pOptionData->GetName() );
}

option.strOptionText = GamepadUIString( pOptionData->GetString() );
button->AddOptionItem( option );
++i;
}
}
else if ( pszOptionsFrom && *pszOptionsFrom )
Expand Down