mirror of
https://github.com/nillerusr/source-engine.git
synced 2026-08-08 01:39:36 +00:00
touch: add new commands
This commit is contained in:
nillerusr
+249
-48
@@ -8,6 +8,7 @@
|
||||
#include "cdll_int.h"
|
||||
#include "ienginevgui.h"
|
||||
#include "in_buttons.h"
|
||||
#include "base_texture.h"
|
||||
|
||||
extern ConVar cl_sidespeed;
|
||||
extern ConVar cl_forwardspeed;
|
||||
@@ -59,15 +60,9 @@ CTouchPanel::CTouchPanel( vgui::VPANEL parent ) : BaseClass( NULL, "TouchPanel"
|
||||
SetVisible( true );
|
||||
}
|
||||
|
||||
bool CTouchPanel::ShouldDraw( void )
|
||||
{
|
||||
return touch_enable.GetBool() && !enginevgui->IsGameUIVisible();
|
||||
}
|
||||
|
||||
void CTouchPanel::Paint()
|
||||
{
|
||||
if( ShouldDraw() )
|
||||
gTouch.Frame();
|
||||
gTouch.Frame();
|
||||
}
|
||||
|
||||
CON_COMMAND( touch_addbutton, "add native touch button" )
|
||||
@@ -77,20 +72,28 @@ CON_COMMAND( touch_addbutton, "add native touch button" )
|
||||
|
||||
if( argc >= 12 )
|
||||
{
|
||||
float aspect = 1.f;
|
||||
int flags = 0;
|
||||
|
||||
if( argc >= 13 )
|
||||
flags = Q_atoi( args[12] );
|
||||
if( argc >= 14 )
|
||||
aspect = Q_atof( args[13] );
|
||||
|
||||
color = rgba_t(Q_atoi(args[8]), Q_atoi(args[9]), Q_atoi(args[10]), Q_atoi(args[11]));
|
||||
gTouch.IN_TouchAddButton( args[1], args[2], args[3],
|
||||
gTouch.AddButton( args[1], args[2], args[3],
|
||||
Q_atof( args[4] ), Q_atof( args[5] ),
|
||||
Q_atof( args[6] ), Q_atof( args[7] ) ,
|
||||
color );
|
||||
color, round_aspect, aspect, flags );
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if( argc >= 8 )
|
||||
{
|
||||
color = rgba_t(255,255,255);
|
||||
|
||||
gTouch.IN_TouchAddButton( args[1], args[2], args[3],
|
||||
|
||||
gTouch.AddButton( args[1], args[2], args[3],
|
||||
Q_atof( args[4] ), Q_atof( args[5] ),
|
||||
Q_atof( args[6] ), Q_atof( args[7] ),
|
||||
color );
|
||||
@@ -99,16 +102,130 @@ CON_COMMAND( touch_addbutton, "add native touch button" )
|
||||
if( argc >= 4 )
|
||||
{
|
||||
color = rgba_t(255,255,255);
|
||||
gTouch.IN_TouchAddButton( args[1], args[2], args[3], 0.4, 0.4, 0.6, 0.6 );
|
||||
gTouch.AddButton( args[1], args[2], args[3], 0.4, 0.4, 0.6, 0.6 );
|
||||
return;
|
||||
}
|
||||
|
||||
Msg( "Usage: touch_addbutton <name> <texture> <command> [<x1> <y1> <x2> <y2> [ r g b a ] ]\n" );
|
||||
}
|
||||
|
||||
CON_COMMAND( touch_removebutton, "add native touch button" )
|
||||
{
|
||||
if( args.ArgC() > 1 )
|
||||
gTouch.RemoveButton( args[1] );
|
||||
else
|
||||
Msg( "Usage: touch_removebutton <name>\n" );
|
||||
}
|
||||
|
||||
CON_COMMAND( touch_settexture, "add native touch button" )
|
||||
{
|
||||
if( args.ArgC() >= 3 )
|
||||
{
|
||||
gTouch.SetTexture( args[1], args[2] );
|
||||
return;
|
||||
}
|
||||
Msg( "Usage: touch_settexture <name> <file>\n" );
|
||||
}
|
||||
|
||||
CON_COMMAND( touch_enableedit, "enable button editing mode" )
|
||||
{
|
||||
gTouch.EnableTouchEdit();
|
||||
}
|
||||
|
||||
CON_COMMAND( touch_setcolor, "change button color" )
|
||||
{
|
||||
if( args.ArgC() >= 6 )
|
||||
{
|
||||
rgba_t color( Q_atoi( args[2] ), Q_atoi( args[3] ), Q_atoi( args[4] ), Q_atoi( args[5] ) );
|
||||
gTouch.SetColor( args[1], color );
|
||||
}
|
||||
else
|
||||
Msg( "Usage: touch_setcolor <name> <r> <g> <b> <a>\n" );
|
||||
}
|
||||
|
||||
CON_COMMAND( touch_setcommand, "change button command" )
|
||||
{
|
||||
if( args.ArgC() >= 3 )
|
||||
gTouch.SetCommand( args[1], args[2] );
|
||||
else
|
||||
Msg( "Usage: touch_setcommand <name> <command>\n" );
|
||||
}
|
||||
|
||||
CON_COMMAND( touch_setflags, "change button flags" )
|
||||
{
|
||||
if( args.ArgC() >= 3 )
|
||||
gTouch.SetFlags( args[1], Q_atoi(args[2]) );
|
||||
else
|
||||
Msg( "Usage: touch_setflags <name> <flags>\n" );
|
||||
}
|
||||
|
||||
CON_COMMAND( touch_show, "show button" )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
CON_COMMAND( touch_hide, "hide button" )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
CON_COMMAND( touch_list, "list buttons" )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
CON_COMMAND( touch_removeall, "remove all buttons" )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
CON_COMMAND( touch_loaddefaults, "generate config from defaults" )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
CON_COMMAND( touch_roundall, "round all buttons coordinates to grid" )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
CON_COMMAND( touch_exportconfig, "export config keeping aspect ratio" )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
CON_COMMAND( touch_reloadconfig, "load config, not saving changes" )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
CON_COMMAND( touch_writeconfig, "save current config" )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
CON_COMMAND( touch_fade, "start fade animation for selected buttons" )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
CON_COMMAND( touch_toggleselection, "toggle visibility on selected button in editor" )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void CTouchControls::Init()
|
||||
{
|
||||
m_bHaveAssets = true;
|
||||
if( getAssets() == 0 )
|
||||
{
|
||||
m_bHaveAssets = false;
|
||||
base_textureID = vgui::surface()->CreateNewTextureID(true);
|
||||
vgui::surface()->DrawSetTextureRGBA( base_textureID, base_img_rgba, 120, 96, 0, true );
|
||||
}
|
||||
|
||||
engine->GetScreenSize( screen_w, screen_h );
|
||||
|
||||
initialized = true;
|
||||
btns.EnsureCapacity( 64 );
|
||||
look_finger = move_finger = resize_finger = -1;
|
||||
@@ -116,7 +233,7 @@ void CTouchControls::Init()
|
||||
scolor = rgba_t( -1, -1, -1, -1 );
|
||||
state = state_none;
|
||||
swidth = 1;
|
||||
move = edit = selection = NULL;
|
||||
move_button = edit = selection = NULL;
|
||||
showbuttons = true;
|
||||
clientonly = false;
|
||||
precision = false;
|
||||
@@ -128,24 +245,25 @@ void CTouchControls::Init()
|
||||
|
||||
rgba_t color(255, 255, 255, 255);
|
||||
|
||||
IN_TouchAddButton( "use", "vgui/touch/use", "+use", 0.880000, 0.213333, 1.000000, 0.426667, color );
|
||||
IN_TouchAddButton( "jump", "vgui/touch/jump", "+jump", 0.880000, 0.462222, 1.000000, 0.675556, color );
|
||||
IN_TouchAddButton( "attack", "vgui/touch/shoot", "+attack", 0.760000, 0.583333, 0.880000, 0.796667, color );
|
||||
IN_TouchAddButton( "attack2", "vgui/touch/shoot_alt", "+attack2", 0.760000, 0.320000, 0.880000, 0.533333, color );
|
||||
IN_TouchAddButton( "duck", "vgui/touch/crouch", "+duck", 0.880000, 0.746667, 1.000000, 0.960000, color );
|
||||
IN_TouchAddButton( "tduck", "vgui/touch/tduck", ";+duck", 0.560000, 0.817778, 0.620000, 0.924444, color );
|
||||
IN_TouchAddButton( "_look", "", "", 0.5, 0, 1, 1, color );
|
||||
IN_TouchAddButton( "_move", "", "", 0, 0, 0.5, 1, color );
|
||||
IN_TouchAddButton( "zoom", "vgui/touch/zoom", "+zoom", 0.680000, 0.00000, 0.760000, 0.142222, color );
|
||||
IN_TouchAddButton( "speed", "vgui/touch/speed", "+speed", 0.180000, 0.568889, 0.280000, 0.746667, color );
|
||||
IN_TouchAddButton( "loadquick", "vgui/touch/load", "load quick", 0.760000, 0.000000, 0.840000, 0.142222, color );
|
||||
IN_TouchAddButton( "savequick", "vgui/touch/save", "save quick", 0.840000, 0.000000, 0.920000, 0.142222, color );
|
||||
IN_TouchAddButton( "reload", "vgui/touch/reload", "+reload", 0.000000, 0.320000, 0.120000, 0.533333, color );
|
||||
IN_TouchAddButton( "flashlight", "vgui/touch/flash_light_filled", "impulse 100", 0.920000, 0.000000, 1.000000, 0.142222, color );
|
||||
IN_TouchAddButton( "invnext", "vgui/touch/next_weap", "invnext", 0.000000, 0.533333, 0.120000, 0.746667, color );
|
||||
IN_TouchAddButton( "invprev", "vgui/touch/prev_weap", "invprev", 0.000000, 0.071111, 0.120000, 0.284444, color );
|
||||
//IN_TouchAddButton( "edit", "vgui/touch/settings", "touch_enableedit", 0.420000, 0.000000, 0.500000, 0.151486, color );
|
||||
IN_TouchAddButton( "menu", "vgui/touch/menu", "gameui_activate", 0.000000, 0.00000, 0.080000, 0.142222, color );
|
||||
AddButton( "_look", "", "", 0.5, 0, 1, 1, color, 0, 0, 0 );
|
||||
AddButton( "_move", "", "", 0, 0, 0.5, 1, color, 0, 0, 0 );
|
||||
|
||||
AddButton( "use", "vgui/touch/use", "+use", 0.880000, 0.213333, 1.000000, 0.426667, color );
|
||||
AddButton( "jump", "vgui/touch/jump", "+jump", 0.880000, 0.462222, 1.000000, 0.675556, color );
|
||||
AddButton( "attack", "vgui/touch/shoot", "+attack", 0.760000, 0.583333, 0.880000, 0.796667, color );
|
||||
AddButton( "attack2", "vgui/touch/shoot_alt", "+attack2", 0.760000, 0.320000, 0.880000, 0.533333, color );
|
||||
AddButton( "duck", "vgui/touch/crouch", "+duck", 0.880000, 0.746667, 1.000000, 0.960000, color );
|
||||
AddButton( "tduck", "vgui/touch/tduck", ";+duck", 0.560000, 0.817778, 0.620000, 0.924444, color );
|
||||
AddButton( "zoom", "vgui/touch/zoom", "+scoreboard", 0.680000, 0.00000, 0.760000, 0.142222, color );
|
||||
AddButton( "speed", "vgui/touch/speed", "+speed", 0.180000, 0.568889, 0.280000, 0.746667, color );
|
||||
AddButton( "loadquick", "vgui/touch/load", "load quick", 0.760000, 0.000000, 0.840000, 0.142222, color );
|
||||
AddButton( "savequick", "vgui/touch/save", "save quick", 0.840000, 0.000000, 0.920000, 0.142222, color );
|
||||
AddButton( "reload", "vgui/touch/reload", "+reload", 0.000000, 0.320000, 0.120000, 0.533333, color );
|
||||
AddButton( "flashlight", "vgui/touch/flash_light_filled", "impulse 100", 0.920000, 0.000000, 1.000000, 0.142222, color );
|
||||
AddButton( "invnext", "vgui/touch/next_weap", "invnext", 0.000000, 0.533333, 0.120000, 0.746667, color );
|
||||
AddButton( "invprev", "vgui/touch/prev_weap", "invprev", 0.000000, 0.071111, 0.120000, 0.284444, color );
|
||||
//AddButton( "edit", "vgui/touch/settings", "touch_enableedit", 0.420000, 0.000000, 0.500000, 0.151486, color );
|
||||
AddButton( "menu", "vgui/touch/menu", "gameui_activate", 0.000000, 0.00000, 0.080000, 0.142222, color );
|
||||
}
|
||||
|
||||
void CTouchControls::Shutdown( )
|
||||
@@ -153,7 +271,7 @@ void CTouchControls::Shutdown( )
|
||||
btns.PurgeAndDeleteElements();
|
||||
}
|
||||
|
||||
void CTouchControls::IN_TouchCheckCoords( float *x1, float *y1, float *x2, float *y2 )
|
||||
void CTouchControls::IN_CheckCoords( float *x1, float *y1, float *x2, float *y2 )
|
||||
{
|
||||
/// TODO: grid check here
|
||||
if( *x2 - *x1 < GRID_X * 2 )
|
||||
@@ -203,7 +321,17 @@ void CTouchControls::Frame()
|
||||
return;
|
||||
|
||||
IN_Look();
|
||||
Paint();
|
||||
|
||||
if( !m_bHaveAssets )
|
||||
{
|
||||
vgui::surface()->DrawSetColor(255,255,255,255);
|
||||
vgui::surface()->DrawSetTexture(base_textureID);
|
||||
|
||||
const int off = 50;
|
||||
vgui::surface()->DrawTexturedRect( off, off, screen_w*0.3+off, 0.24f*screen_w+off );
|
||||
}
|
||||
|
||||
if( touch_enable.GetBool() && !enginevgui->IsGameUIVisible() ) Paint();
|
||||
}
|
||||
|
||||
void CTouchControls::Paint( )
|
||||
@@ -218,45 +346,110 @@ void CTouchControls::Paint( )
|
||||
if( btn->type == touch_move || btn->type == touch_look )
|
||||
continue;
|
||||
|
||||
g_pMatSystemSurface->DrawSetColor(255, 255, 255, 155);
|
||||
g_pMatSystemSurface->DrawSetTexture( btn->textureID );
|
||||
g_pMatSystemSurface->DrawTexturedRect( btn->x1*screen_w, btn->y1*screen_h, btn->x2*screen_w, btn->y2*screen_h );
|
||||
vgui::surface()->DrawSetColor(255, 255, 255, 155);
|
||||
vgui::surface()->DrawSetTexture( btn->textureID );
|
||||
vgui::surface()->DrawTexturedRect( btn->x1*screen_w, btn->y1*screen_h, btn->x2*screen_w, btn->y2*screen_h );
|
||||
}
|
||||
}
|
||||
|
||||
void CTouchControls::IN_TouchAddButton( const char *name, const char *texturefile, const char *command, float x1, float y1, float x2, float y2, rgba_t color )
|
||||
void CTouchControls::AddButton( const char *name, const char *texturefile, const char *command, float x1, float y1, float x2, float y2, rgba_t color, int round, float aspect, int flags )
|
||||
{
|
||||
CTouchButton *btn = new CTouchButton;
|
||||
ETouchButtonType type = touch_command;
|
||||
|
||||
|
||||
Q_strncpy( btn->name, name, sizeof(btn->name) );
|
||||
Q_strncpy( btn->texturefile, texturefile, sizeof(btn->texturefile) );
|
||||
Q_strncpy( btn->command, command, sizeof(btn->command) );
|
||||
|
||||
IN_TouchCheckCoords(&x1, &y1, &x2, &y2);
|
||||
IN_CheckCoords(&x1, &y1, &x2, &y2);
|
||||
|
||||
if( round == round_aspect )
|
||||
y2 = y1 + ( x2 - x1 ) * (((float)screen_w)/screen_h);
|
||||
|
||||
btn->x1 = x1;
|
||||
btn->y1 = y1;
|
||||
btn->x2 = x2;
|
||||
btn->y2 = y1 + ( x2 - x1 ) * (((float)screen_w)/screen_h);
|
||||
btn->y2 = y2;
|
||||
|
||||
IN_TouchCheckCoords(&btn->x1, &btn->y1, &btn->x2, &btn->y2);
|
||||
IN_CheckCoords(&btn->x1, &btn->y1, &btn->x2, &btn->y2);
|
||||
|
||||
if( Q_strcmp(name, "_look") == 0 )
|
||||
type = touch_look;
|
||||
else if( Q_strcmp(name, "_move") == 0 )
|
||||
type = touch_move;
|
||||
|
||||
type = touch_move;
|
||||
|
||||
btn->color = color;
|
||||
btn->type = type;
|
||||
btn->finger = -1;
|
||||
btn->textureID = g_pMatSystemSurface->CreateNewTextureID();
|
||||
btn->textureID = vgui::surface()->CreateNewTextureID();
|
||||
|
||||
g_pMatSystemSurface->DrawSetTextureFile( btn->textureID, btn->texturefile, true, false);
|
||||
vgui::surface()->DrawSetTextureFile( btn->textureID, btn->texturefile, true, false);
|
||||
|
||||
btns.AddToTail(btn);
|
||||
}
|
||||
|
||||
void CTouchControls::ShowButton( const char *name )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void CTouchControls::HideButton(const char *name)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void CTouchControls::SetTexture(const char *name, const char *file)
|
||||
{
|
||||
CTouchButton *btn = FindButton(name);
|
||||
|
||||
if( btn )
|
||||
{
|
||||
Q_strncpy( btn->texturefile, file, sizeof(btn->texturefile) );
|
||||
|
||||
btn->textureID = vgui::surface()->CreateNewTextureID();
|
||||
vgui::surface()->DrawSetTextureFile( btn->textureID, file, true, false);
|
||||
}
|
||||
}
|
||||
|
||||
void CTouchControls::SetColor(const char *name, rgba_t color)
|
||||
{
|
||||
CTouchButton *btn = FindButton(name);
|
||||
if( btn ) btn->color = color;
|
||||
}
|
||||
|
||||
void CTouchControls::SetCommand(const char *name, const char *cmd)
|
||||
{
|
||||
CTouchButton *btn = FindButton(name);
|
||||
if( btn ) Q_strncpy(btn->command, cmd, sizeof btn->command);
|
||||
}
|
||||
|
||||
void CTouchControls::SetFlags(const char *name, int flags)
|
||||
{
|
||||
CTouchButton *btn = FindButton(name);
|
||||
if( btn ) btn->flags = flags;
|
||||
}
|
||||
|
||||
void CTouchControls::RemoveButton( const char *name )
|
||||
{
|
||||
for( int i = 0; i < btns.Count(); i++ )
|
||||
{
|
||||
if( Q_strncmp( btns[i]->name, name, sizeof(btns[i]->name)) == 0 )
|
||||
btns.Free(i);
|
||||
}
|
||||
}
|
||||
|
||||
CTouchButton *CTouchControls::FindButton( const char *name )
|
||||
{
|
||||
CUtlLinkedList<CTouchButton*>::iterator it;
|
||||
for( it = btns.begin(); it != btns.end(); it++ )
|
||||
{
|
||||
CTouchButton *button = *it;
|
||||
|
||||
if( Q_strncmp( button->name, name, sizeof(button->name)) == 0 )
|
||||
return button;
|
||||
}
|
||||
}
|
||||
|
||||
void CTouchControls::ProcessEvent(touch_event_t *ev)
|
||||
{
|
||||
if( !touch_enable.GetBool() )
|
||||
@@ -337,7 +530,7 @@ void CTouchControls::FingerPress(touch_event_t *ev)
|
||||
btn->finger = look_finger;
|
||||
}
|
||||
else
|
||||
engine->ClientCmd( btn->command );
|
||||
engine->ClientCmd_Unrestricted( btn->command );
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -363,9 +556,17 @@ void CTouchControls::FingerPress(touch_event_t *ev)
|
||||
|
||||
snprintf( cmd, sizeof cmd, "%s", btn->command );
|
||||
cmd[0] = '-';
|
||||
engine->ClientCmd( cmd );
|
||||
engine->ClientCmd_Unrestricted( cmd );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void CTouchControls::EnableTouchEdit()
|
||||
{
|
||||
state = state_edit;
|
||||
resize_finger = move_finger = look_finger = wheel_finger = -1;
|
||||
move_button = NULL;
|
||||
configchanged = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user