[](https://github.com/FWGS/xash3d-fwgs/actions/workflows/c-cpp.yml) [](https://cirrus-ci.com/github/FWGS/xash3d-fwgs) [](http://fwgsdiscord.mentality.rip/) \
-[](https://github.com/FWGS/xash3d-fwgs/releases/latest) [](https://github.com/FWGS/xash3d-fwgs/releases/tag/continuous)
+[](https://github.com/FWGS/xash3d-fwgs/releases/latest) [](https://github.com/FWGS/xash3d-fwgs/releases/tag/continuous)
-Xash3D FWGS is a fork of Xash3D Engine by Unkle Mike with extended features and crossplatform.
+Xash3D FWGS is a game engine, aimed to provide compatibility with Half-Life Engine and extend it, as well as to give game developers well known workflow.
-```
-Xash3D is a game engine, aimed to provide compatibility with Half-Life Engine,
-as well as to give game developers well known workflow and extend it.
-Read more about Xash3D on ModDB: https://www.moddb.com/engines/xash3d-engine
-```
+Xash3D FWGS is a heavily modified fork of an original [Xash3D Engine](https://www.moddb.com/engines/xash3d-engine) by Unkle Mike.
+
+## Donate
+[](Documentation/donate.md) \
+If you like Xash3D FWGS, consider supporting individual engine maintainers. By supporting us, you help to continue developing this game engine further. The sponsorship links are available in [documentation](Documentation/donate.md).
## Fork features
-* HLSDK 2.4 support.
-* Crossplatform: supported x86 and ARM on Windows/Linux/BSD/Android. ([see docs for more info](Documentation/ports.md))
-* Modern compilers support: say no more to MSVC6.
-* Better multiplayer support: multiple master servers, headless dedicated server.
-* Mobility API: allows better game integration on mobile devices(vibration, touch controls)
-* Different input methods: touch, gamepad and classic mouse & keyboard.
+* Steam Half-Life (HLSDK 2.4) support.
+* Crossplatform and modern compilers support: supports Windows, Linux, BSD & Android on x86 & ARM and [many more](Documentation/ports.md).
+* Better multiplayer support: multiple master servers, headless dedicated server, voice chat and IPv6 support.
+* Multiple renderers support: OpenGL, GLESv1, GLESv2 and Software.
+* Advanced virtual filesystem: `.pk3` and `.pk3dir` support, compatibility with GoldSrc FS module, fast case-insensitivity emulation for crossplatform.
+* Mobility API: better game integration on mobile devices (vibration, touch controls)
+* Different input methods: touch and gamepad in addition to mouse & keyboard.
* TrueType font rendering, as a part of mainui_cpp.
-* Multiple renderers support: OpenGL, GLESv1, GLESv2, Software.
-* Voice support.
-* External filesystem module like in GoldSrc engine.
-* External vgui support module.
-* PNG image format support.
-* A set of small improvements, without broken compatibility.
-
-## Planned fork features
-* Virtual Reality support and game API.
-* Vulkan renderer.
+* External VGUI support module.
+* PNG & KTX2 image format support.
+* [A set of small improvements](Documentation/), without broken compatibility.
## Installation & Running
0) Get Xash3D FWGS binaries: you can use [testing](https://github.com/FWGS/xash3d-fwgs/releases/tag/continuous) build or you can compile engine from source code.
diff --git a/common/xash3d_types.h b/common/xash3d_types.h
index 3cd1cfec..ad46778e 100644
--- a/common/xash3d_types.h
+++ b/common/xash3d_types.h
@@ -57,6 +57,7 @@ typedef uint64_t longtime_t;
#define MAX_USERMSG_LENGTH 2048 // don't modify it's relies on a client-side definitions
#define BIT( n ) ( 1U << ( n ))
+#define BIT64( n ) ( 1ULL << ( n ))
#define GAMMA ( 2.2f ) // Valve Software gamma
#define INVGAMMA ( 1.0f / 2.2f ) // back to 1.0
#define TEXGAMMA ( 0.9f ) // compensate dim textures
@@ -86,16 +87,19 @@ typedef uint64_t longtime_t;
#endif
#define _format(x) __attribute__((format(printf, x, x+1)))
#define NORETURN __attribute__((noreturn))
+ #define NONNULL __attribute__((nonnull))
#elif defined(_MSC_VER)
#define EXPORT __declspec( dllexport )
#define GAME_EXPORT
#define _format(x)
#define NORETURN
+ #define NONNULL
#else
#define EXPORT
#define GAME_EXPORT
#define _format(x)
#define NORETURN
+ #define NONNULL
#endif
#if ( __GNUC__ >= 3 )
@@ -177,6 +181,7 @@ typedef struct dll_info_s
} dll_info_t;
typedef void (*setpair_t)( const char *key, const void *value, const void *buffer, void *numpairs );
+typedef void *(*pfnCreateInterface_t)( const char *, int * );
// config strings are a general means of communication from
// the server to all connected clients.
diff --git a/engine/client/cl_demo.c b/engine/client/cl_demo.c
index 44ad36cd..e947c76d 100644
--- a/engine/client/cl_demo.c
+++ b/engine/client/cl_demo.c
@@ -1124,7 +1124,10 @@ void CL_FinishTimeDemo( void )
time = host.realtime - cls.td_starttime;
if( !time ) time = 1.0;
- Con_Printf( "%i frames %5.3f seconds %5.3f fps\n", frames, time, frames / time );
+ Con_Printf( "timedemo result: %i frames %5.3f seconds %5.3f fps\n", frames, time, frames / time );
+
+ if( Sys_CheckParm( "-timedemo" ))
+ CL_Quit_f();
}
/*
diff --git a/engine/client/cl_game.c b/engine/client/cl_game.c
index afc229b7..4563c04e 100644
--- a/engine/client/cl_game.c
+++ b/engine/client/cl_game.c
@@ -3336,6 +3336,9 @@ static void GAME_EXPORT NetAPI_SendRequest( int context, int request, int flags,
if( remote_address->type != NA_IPX && remote_address->type != NA_BROADCAST_IPX )
return; // IPX no longer support
+ if( request == NETAPI_REQUEST_SERVERLIST )
+ return; // no support for server list requests
+
// find a free request
for( i = 0; i < MAX_REQUESTS; i++ )
{
@@ -3372,28 +3375,9 @@ static void GAME_EXPORT NetAPI_SendRequest( int context, int request, int flags,
nr->resp.remote_address = *remote_address;
nr->flags = flags;
- if( request == NETAPI_REQUEST_SERVERLIST )
- {
- char fullquery[512];
- size_t len;
-
- len = CL_BuildMasterServerScanRequest( fullquery, sizeof( fullquery ), false );
-
- // make sure that port is specified
- if( !nr->resp.remote_address.port )
- nr->resp.remote_address.port = MSG_BigShort( PORT_MASTER );
-
- // grab the list from the master server
- NET_SendPacket( NS_CLIENT, len, fullquery, nr->resp.remote_address );
- clgame.request_type = NET_REQUEST_CLIENT;
- clgame.master_request = nr; // holds the master request unitl the master acking
- }
- else
- {
- // local servers request
- Q_snprintf( req, sizeof( req ), "netinfo %i %i %i", PROTOCOL_VERSION, context, request );
- Netchan_OutOfBandPrint( NS_CLIENT, nr->resp.remote_address, "%s", req );
- }
+ // local servers request
+ Q_snprintf( req, sizeof( req ), "netinfo %i %i %i", PROTOCOL_VERSION, context, request );
+ Netchan_OutOfBandPrint( NS_CLIENT, nr->resp.remote_address, "%s", req );
}
/*
@@ -3421,13 +3405,6 @@ static void GAME_EXPORT NetAPI_CancelRequest( int context )
nr->pfnFunc( &nr->resp );
}
- if( clgame.net_requests[i].resp.type == NETAPI_REQUEST_SERVERLIST && &clgame.net_requests[i] == clgame.master_request )
- {
- if( clgame.request_type == NET_REQUEST_CLIENT )
- clgame.request_type = NET_REQUEST_CANCEL;
- clgame.master_request = NULL;
- }
-
memset( &clgame.net_requests[i], 0, sizeof( net_request_t ));
break;
}
@@ -3456,8 +3433,6 @@ void GAME_EXPORT NetAPI_CancelAllRequests( void )
}
memset( clgame.net_requests, 0, sizeof( clgame.net_requests ));
- clgame.request_type = NET_REQUEST_CANCEL;
- clgame.master_request = NULL;
}
/*
diff --git a/engine/client/cl_gameui.c b/engine/client/cl_gameui.c
index 59351bee..6263c266 100644
--- a/engine/client/cl_gameui.c
+++ b/engine/client/cl_gameui.c
@@ -983,28 +983,21 @@ pfnCheckGameDll
*/
int GAME_EXPORT pfnCheckGameDll( void )
{
- string dllpath;
- void *hInst;
-
-#if TARGET_OS_IPHONE
- // loading server library drains too many ram
- // so 512MB iPod Touch cannot even connect to
- // to servers in cstrike
+#ifdef XASH_INTERNAL_GAMELIBS
return true;
-#endif
+#else
+ string dllpath;
if( svgame.hInstance )
return true;
COM_GetCommonLibraryPath( LIBRARY_SERVER, dllpath, sizeof( dllpath ));
- if(( hInst = COM_LoadLibrary( dllpath, true, false )) != NULL )
- {
- COM_FreeLibrary( hInst ); // don't increase linker's reference counter
+ if( FS_FileExists( dllpath, false ))
return true;
- }
- Con_Reportf( S_WARN "Could not load server library: %s\n", COM_GetLibraryError() );
+
return false;
+#endif
}
/*
diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
index df78338c..182a8354 100644
--- a/engine/client/cl_main.c
+++ b/engine/client/cl_main.c
@@ -34,7 +34,7 @@ GNU General Public License for more details.
CVAR_DEFINE_AUTO( mp_decals, "300", FCVAR_ARCHIVE, "decals limit in multiplayer" );
CVAR_DEFINE_AUTO( dev_overview, "0", 0, "draw level in overview-mode" );
CVAR_DEFINE_AUTO( cl_resend, "6.0", 0, "time to resend connect" );
-CVAR_DEFINE_AUTO( cl_allow_download, "1", FCVAR_ARCHIVE, "allow to downloading resources from the server" );
+CVAR_DEFINE( cl_allow_download, "cl_allowdownload", "1", FCVAR_ARCHIVE, "allow to downloading resources from the server" );
CVAR_DEFINE_AUTO( cl_allow_upload, "1", FCVAR_ARCHIVE, "allow to uploading resources to the server" );
CVAR_DEFINE_AUTO( cl_download_ingame, "1", FCVAR_ARCHIVE, "allow to downloading resources while client is active" );
CVAR_DEFINE_AUTO( cl_logofile, "lambda", FCVAR_ARCHIVE, "player logo name" );
@@ -92,7 +92,7 @@ client_t cl;
client_static_t cls;
clgame_static_t clgame;
-void CL_InternetServers_f( void );
+static void CL_SendMasterServerScanRequest( void );
//======================================================================
int GAME_EXPORT CL_Active( void )
@@ -1081,7 +1081,7 @@ void CL_CheckForResend( void )
qboolean bandwidthTest;
if( cls.internetservers_wait )
- CL_InternetServers_f();
+ CL_SendMasterServerScanRequest();
// if the local server is running and we aren't then connect
if( cls.state == ca_disconnected && SV_Active( ))
@@ -1574,10 +1574,10 @@ void CL_LocalServers_f( void )
CL_BuildMasterServerScanRequest
=================
*/
-size_t CL_BuildMasterServerScanRequest( char *buf, size_t size, qboolean nat )
+static size_t NONNULL CL_BuildMasterServerScanRequest( char *buf, size_t size, uint32_t *key, qboolean nat, const char *filter )
{
size_t remaining;
- char *info;
+ char *info, temp[32];
if( unlikely( size < sizeof( MS_SCAN_REQUEST )))
return 0;
@@ -1587,7 +1587,9 @@ size_t CL_BuildMasterServerScanRequest( char *buf, size_t size, qboolean nat )
info = buf + sizeof( MS_SCAN_REQUEST ) - 1;
remaining = size - sizeof( MS_SCAN_REQUEST );
- info[0] = 0;
+ Q_strncpy( info, filter, remaining );
+
+ *key = COM_RandomLong( 0, 0x7FFFFFFF );
#ifndef XASH_ALL_SERVERS
Info_SetValueForKey( info, "gamedir", GI->gamefolder, remaining );
@@ -1595,9 +1597,24 @@ size_t CL_BuildMasterServerScanRequest( char *buf, size_t size, qboolean nat )
Info_SetValueForKey( info, "clver", XASH_VERSION, remaining ); // let master know about client version
Info_SetValueForKey( info, "nat", nat ? "1" : "0", remaining );
+ Q_snprintf( temp, sizeof( temp ), "%x", *key );
+ Info_SetValueForKey( info, "key", temp, remaining );
+
return sizeof( MS_SCAN_REQUEST ) + Q_strlen( info );
}
+/*
+=================
+CL_SendMasterServerScanRequest
+=================
+*/
+static void CL_SendMasterServerScanRequest( void )
+{
+ cls.internetservers_wait = NET_SendToMasters( NS_CLIENT,
+ cls.internetservers_query_len, cls.internetservers_query );
+ cls.internetservers_pending = true;
+}
+
/*
=================
CL_InternetServers_f
@@ -1605,26 +1622,24 @@ CL_InternetServers_f
*/
void CL_InternetServers_f( void )
{
- char fullquery[512];
- size_t len;
qboolean nat = cl_nat.value != 0.0f;
+ uint32_t key;
- len = CL_BuildMasterServerScanRequest( fullquery, sizeof( fullquery ), nat );
+ if( Cmd_Argc( ) > 2 || ( Cmd_Argc( ) == 2 && !Info_IsValid( Cmd_Argv( 1 ))))
+ {
+ Con_Printf( S_USAGE "internetservers [filter]\n" );
+ return;
+ }
+
+ cls.internetservers_query_len = CL_BuildMasterServerScanRequest(
+ cls.internetservers_query, sizeof( cls.internetservers_query ),
+ &cls.internetservers_key, nat, Cmd_Argv( 1 ));
Con_Printf( "Scanning for servers on the internet area...\n" );
NET_Config( true, true ); // allow remote
- cls.internetservers_wait = NET_SendToMasters( NS_CLIENT, len, fullquery );
- cls.internetservers_pending = true;
-
- if( !cls.internetservers_wait )
- {
- // now we clearing the vgui request
- if( clgame.master_request != NULL )
- memset( clgame.master_request, 0, sizeof( net_request_t ));
- clgame.request_type = NET_REQUEST_GAMEUI;
- }
+ CL_SendMasterServerScanRequest();
}
/*
@@ -2152,6 +2167,25 @@ void CL_ConnectionlessPacket( netadr_t from, sizebuf_t *msg )
return;
}
+ // check the extra header
+ if( MSG_ReadByte( msg ) == 0x7f )
+ {
+ uint32_t key = MSG_ReadDword( msg );
+
+ if( cls.internetservers_key != key )
+ {
+ Con_Printf( S_WARN "unexpected server list packet from %s (invalid key)\n", NET_AdrToString( from ));
+ return;
+ }
+
+ MSG_ReadByte( msg ); // reserved byte
+ }
+ else
+ {
+ Con_Printf( S_WARN "invalid server list packet from %s (missing extra header)\n", NET_AdrToString( from ));
+ return;
+ }
+
// serverlist got from masterserver
while( MSG_GetNumBitsLeft( msg ) > 8 )
{
@@ -2161,58 +2195,10 @@ void CL_ConnectionlessPacket( netadr_t from, sizebuf_t *msg )
// list is ends here
if( !servadr.port )
- {
- if( clgame.request_type == NET_REQUEST_CLIENT && clgame.master_request != NULL )
- {
- net_request_t *nr = clgame.master_request;
- net_adrlist_t *list, **prev;
-
- // setup the answer
- nr->resp.remote_address = from;
- nr->resp.error = NET_SUCCESS;
- nr->resp.ping = host.realtime - nr->timesend;
-
- if( nr->timeout <= host.realtime )
- SetBits( nr->resp.error, NET_ERROR_TIMEOUT );
-
- Con_Printf( "serverlist call: %s\n", NET_AdrToString( from ));
- nr->pfnFunc( &nr->resp );
-
- // throw the list, now it will be stored in user area
- prev = (net_adrlist_t**)&nr->resp.response;
-
- while( 1 )
- {
- list = *prev;
- if( !list ) break;
-
- // throw out any variables the game created
- *prev = list->next;
- Mem_Free( list );
- }
- memset( nr, 0, sizeof( *nr )); // done
- clgame.request_type = NET_REQUEST_CANCEL;
- clgame.master_request = NULL;
- }
break;
- }
- if( clgame.request_type == NET_REQUEST_CLIENT && clgame.master_request != NULL )
- {
- net_request_t *nr = clgame.master_request;
- net_adrlist_t *list;
-
- // adding addresses into list
- list = Z_Malloc( sizeof( *list ));
- list->remote_address = servadr;
- list->next = nr->resp.response;
- nr->resp.response = list;
- }
- else if( clgame.request_type == NET_REQUEST_GAMEUI )
- {
- NET_Config( true, false ); // allow remote
- Netchan_OutOfBandPrint( NS_CLIENT, servadr, "info %i", PROTOCOL_VERSION );
- }
+ NET_Config( true, false ); // allow remote
+ Netchan_OutOfBandPrint( NS_CLIENT, servadr, "info %i", PROTOCOL_VERSION );
}
if( cls.internetservers_pending )
@@ -2261,10 +2247,13 @@ void CL_ReadNetMessage( void )
while( CL_GetMessage( net_message_buffer, &curSize ))
{
- if( cls.legacymode && *((int *)&net_message_buffer) == 0xFFFFFFFE )
+ const int split_header = LittleLong( 0xFFFFFFFE );
+ if( cls.legacymode && !memcmp( &split_header, net_message_buffer, sizeof( split_header )))
+ {
// Will rewrite existing packet by merged
if( !NetSplit_GetLong( &cls.netchan.netsplit, &net_from, net_message_buffer, &curSize ) )
continue;
+ }
MSG_Init( &net_message, "ServerData", net_message_buffer, curSize );
diff --git a/engine/client/cl_mobile.c b/engine/client/cl_mobile.c
index 480f3c1c..69c61b5d 100644
--- a/engine/client/cl_mobile.c
+++ b/engine/client/cl_mobile.c
@@ -87,15 +87,6 @@ static int pfnDrawScaledCharacter( int x, int y, int number, int r, int g, int b
return CL_DrawCharacter( x, y, number, color, &g_scaled_font, flags );
}
-static void *pfnGetNativeObject( const char *obj )
-{
- if( !obj )
- return NULL;
-
- // Backend should consider that obj is case-sensitive
- return Platform_GetNativeObject( obj );
-}
-
static void pfnTouch_HideButtons( const char *name, byte state )
{
Touch_HideButtons( name, state, true );
@@ -124,7 +115,7 @@ static mobile_engfuncs_t gpMobileEngfuncs =
Touch_ResetDefaultButtons,
pfnDrawScaledCharacter,
Sys_Warn,
- pfnGetNativeObject,
+ Sys_GetNativeObject,
ID_SetCustomClientID,
pfnParseFileSafe
};
diff --git a/engine/client/cl_parse.c b/engine/client/cl_parse.c
index a84734f4..81fd545f 100644
--- a/engine/client/cl_parse.c
+++ b/engine/client/cl_parse.c
@@ -1534,7 +1534,8 @@ void CL_SendConsistencyInfo( sizebuf_t *msg )
{
case force_exactfile:
MD5_HashFile( md5, filename, NULL );
- pc->value = *(int *)md5;
+ memcpy( &pc->value, md5, sizeof( pc->value ));
+ LittleLongSW( pc->value );
if( user_changed_diskfile )
MSG_WriteUBitLong( msg, 0, 32 );
diff --git a/engine/client/cl_scrn.c b/engine/client/cl_scrn.c
index a7d9e0ea..4004a305 100644
--- a/engine/client/cl_scrn.c
+++ b/engine/client/cl_scrn.c
@@ -726,6 +726,7 @@ void SCR_VidInit( void )
// restart console size
Con_VidInit ();
+ Touch_NotifyResize();
}
/*
diff --git a/engine/client/client.h b/engine/client/client.h
index f607189e..c1e8aba7 100644
--- a/engine/client/client.h
+++ b/engine/client/client.h
@@ -423,13 +423,6 @@ typedef struct
float applied_angle;
} screen_shake_t;
-typedef enum
-{
- NET_REQUEST_CANCEL = 0, // request was cancelled for some reasons
- NET_REQUEST_GAMEUI, // called from GameUI
- NET_REQUEST_CLIENT, // called from Client
-} net_request_type_t;
-
typedef struct
{
net_response_t resp;
@@ -491,9 +484,7 @@ typedef struct
client_textmessage_t *titles; // title messages, not network messages
int numTitles;
- net_request_type_t request_type; // filter the requests
net_request_t net_requests[MAX_REQUESTS]; // no reason to keep more
- net_request_t *master_request; // queued master request
efrag_t *free_efrags; // linked efrags
cl_entity_t viewent; // viewmodel
@@ -627,7 +618,10 @@ typedef struct
file_t *demofile;
file_t *demoheader; // contain demo startup info in case we record a demo on this level
qboolean internetservers_wait; // internetservers is waiting for dns request
- qboolean internetservers_pending; // internetservers is waiting for dns request
+ qboolean internetservers_pending; // if true, clean master server pings
+ uint32_t internetservers_key; // compare key to validate master server reply
+ char internetservers_query[512]; // cached query
+ uint32_t internetservers_query_len;
// legacy mode support
qboolean legacymode; // one-way 48 protocol compatibility
@@ -765,7 +759,6 @@ int CL_IsDevOverviewMode( void );
void CL_PingServers_f( void );
void CL_SignonReply( void );
void CL_ClearState( void );
-size_t CL_BuildMasterServerScanRequest( char *buf, size_t size, qboolean nat );
//
// cl_demo.c
diff --git a/engine/client/console.c b/engine/client/console.c
index eadeef71..64ddf883 100644
--- a/engine/client/console.c
+++ b/engine/client/console.c
@@ -1983,7 +1983,7 @@ void Con_DrawConsole( void )
if( cls.state == ca_connecting || cls.state == ca_connected )
{
- if( !cl_allow_levelshots.value )
+ if( !cl_allow_levelshots.value && !cls.timedemo )
{
if(( Cvar_VariableInteger( "cl_background" ) || Cvar_VariableInteger( "sv_background" )) && cls.key_dest != key_console )
con.vislines = con.showlines = 0;
@@ -1993,7 +1993,7 @@ void Con_DrawConsole( void )
{
con.showlines = 0;
- if( host_developer.value >= DEV_EXTENDED )
+ if( host_developer.value >= DEV_EXTENDED && !cls.timedemo )
Con_DrawNotify(); // draw notify lines
}
}
@@ -2025,7 +2025,7 @@ void Con_DrawConsole( void )
{
if( con.vislines )
Con_DrawSolidConsole( con.vislines );
- else if( cls.state == ca_active && ( cls.key_dest == key_game || cls.key_dest == key_message ))
+ else if( cls.state == ca_active && ( cls.key_dest == key_game || cls.key_dest == key_message ) && !cls.timedemo )
Con_DrawNotify(); // draw notify lines
}
break;
diff --git a/engine/client/in_touch.c b/engine/client/in_touch.c
index 04df74d4..a2ed8163 100644
--- a/engine/client/in_touch.c
+++ b/engine/client/in_touch.c
@@ -132,6 +132,8 @@ static struct touch_s
int whitetexture;
int joytexture; // touch indicator
qboolean configchanged;
+ float actual_aspect_ratio; // maximum aspect ratio from launch, or aspect ratio when entering editor
+ float config_aspect_ratio; // aspect ratio set by command from config or after entering editor
} touch;
// private to the engine flags
@@ -168,13 +170,42 @@ CVAR_DEFINE_AUTO( touch_emulate, "0", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "emulate
#define B(x) (button->x)
#define SCR_W ((float)refState.width)
#define SCR_H ((float)refState.height)
-#define TO_SCRN_Y(x) (refState.height * (x))
+#define TO_SCRN_Y(x) (refState.width * (x) * Touch_AspectRatio())
#define TO_SCRN_X(x) (refState.width * (x))
static void IN_TouchCheckCoords( float *x1, float *y1, float *x2, float *y2 );
static void IN_TouchEditClear( void );
static void Touch_InitConfig( void );
+void Touch_NotifyResize( void )
+{
+ if( refState.width && refState.height && ( !touch.configchanged || !touch.actual_aspect_ratio ))
+ {
+ float aspect_ratio = SCR_H/SCR_W;
+ if( aspect_ratio < 0.99 && aspect_ratio > touch.actual_aspect_ratio )
+ touch.actual_aspect_ratio = aspect_ratio;
+ }
+}
+
+static inline float Touch_AspectRatio( void )
+{
+ if( touch.config_aspect_ratio )
+ return touch.config_aspect_ratio;
+ else if( touch.actual_aspect_ratio )
+ return touch.actual_aspect_ratio;
+ else if( refState.width && refState.height )
+ return SCR_H/SCR_W;
+ else
+ return 9.0f / 16.0f;
+}
+
+
+static void Touch_ConfigAspectRatio_f( void )
+{
+ touch.config_aspect_ratio = Q_atof( Cmd_Argv( 1 ));
+}
+
+
/*
==========================
Touch_ExportButtonToConfig
@@ -206,7 +237,7 @@ static inline int Touch_ExportButtonToConfig( file_t *f, touch_button_t *button,
if( keepAspect )
{
- float aspect = ( B(y2) - B(y1) ) / ( ( B(x2) - B(x1) ) /(SCR_H/SCR_W) );
+ float aspect = ( B(y2) - B(y1) ) / ( ( B(x2) - B(x1) ) /(Touch_AspectRatio()) );
FS_Printf( f, " %f\n", aspect );
}
else FS_Printf( f, "\n" );
@@ -271,6 +302,8 @@ qboolean Touch_DumpConfig( const char *name, const char *profilename )
FS_Printf( f, "touch_setclientonly 0\n" );
FS_Printf( f, "\n// touch buttons\n" );
FS_Printf( f, "touch_removeall\n" );
+ FS_Printf( f, "touch_aspectratio %f\n", Touch_AspectRatio());
+
for( button = touch.list_user.first; button; button = button->next )
{
@@ -376,7 +409,7 @@ static void Touch_GenerateCode_f( void )
if( FBitSet( flags, TOUCH_FL_DEF_HIDE ))
SetBits( flags, TOUCH_FL_HIDE );
- aspect = ( B(y2) - B(y1) ) / ( ( B(x2) - B(x1) ) /(SCR_H/SCR_W) );
+ aspect = ( B(y2) - B(y1) ) / ( ( B(x2) - B(x1) ) /(Touch_AspectRatio()) );
if( memcmp( &c, &B(color), sizeof( rgba_t ) ) )
{
Con_Printf( "unsigned char color[] = { %d, %d, %d, %d };\n", B(color[0]), B(color[1]), B(color[2]), B(color[3]) );
@@ -549,6 +582,7 @@ static void Touch_RemoveAll_f( void )
{
IN_TouchEditClear();
Touch_ClearList( &touch.list_user );
+ touch.config_aspect_ratio = 0.0f;
}
static void Touch_SetColor( touchbuttonlist_t *list, const char *name, byte *color )
@@ -726,6 +760,8 @@ static void Touch_SetCommand_f( void )
Con_Printf( S_USAGE "touch_setcommand _E'./pغT! *GF9PT}ֆshui:@?G$qE 7 L:`TFvA OԉJ{x)ْ7cNЀ &XđWU\w51hf}Wc.Klc)͂rbH.uNڛD>]F$Sw 83\XL.Չ<#D[KBL#pn)O#?w_'Up9s~#, 4(n IXvn}##Dӡw ֢/1zN,bcq-F,i5`٪%^GץLJWsDQNa5F`ʹfn#DlPҮ̩#IC]bJs-lU46$$81rG[*iZ ӡSĜdB9=ˑC S zhLɷ)!e<وJ"j)D!H5v˾ENX4sƹ"sAwRIF\ ԥXkx+<&üJ/ O\-zLҞf94 mη!o I) r0=4i:CF7ɫ^qj2xwGAqsD *DVUËUI]A^Ίj8FH]zw#?yHQa2d|%!PHC0&:@[PסELS}B#% 8#D@kmg6SQB&H:7%NƠ:GIC݄}9/%9 ʬ( ̳#%?!qU@)IqNqXuaXG =ȗ&Ͷ^hW#G: hl ޑ& wwi.ZartK$#?E 4Fס>( .+\MhIJv; v;d`Hz8:3!JRDqd,-\멽 鬺L>sf1GSl#mXFp5FHC64Xۖ> b¢"$Y&#?PJ.#Ds*vnNw8qᱭF mXQc!$hl,b\$$ّp#? 8{>7P#?p>ҒO s9Ѱ{]@ #D V`H ApHa!RH A%Ph^=|AAE5CB#%QB(E>@3?wӦ#D`ie(eMrt8t%DN+p**T#%#D#%H J&`}/Ί6) #D| !}p.CϹ^2PE#%d#D#D#D&*x#5j SȘG`*#DA44({K#" Ö.!9ON`xOt8yqTy-0[RlADz{4q7 0ڹUV%#Ur #?` u&SOd]r#%gàr#?3`#? lJ#% G#%V#?(2eFJz#?]1iN T#DwbB;݊6w#%toNi{yH ŰC#jO6̞W 8 *?$ )ښo0nWO5#D)r&Ӑ"d\?B~;߷lKͻxAOlIQ|`0a\WT #%6% 1s AX1!F#?; 9 Lƿ&cJLd[.7` P3 ۼwD( 97tb'_SfUqGR*c&A.e%XF~m$i0·O$paT 46Ff bN oKd_4z߄]s"kB;Uº# m4D` ғB@[rύY&0-OfyFBGe9 ܿOVk9~M's<]C@lC!,=<ʗJ4֣H{ͳxkd+M)_VRӖr/u&!c> w5#xpR煈.PHkqv0~nS R= te 9{~;IUa*9]XئQ \} {zuwL9^,~.M $kO>رMc$#uϨyWi-#V ˁۄ% mRZDS8\ό#_?z ^҂M/7 ,%s"&dĠw/eq WS_)+,?}75MCSHGl$`yaf]"Jy#4c9s\(J(:"kM N;xFL#ѐxHi{!C(&)ťC ^O ozqv>3{^8:< bjmU#_9EW DtR'\Eo|;!|lH#h|"# ֠` E 턗,r{6UR4`PXaZ"I +1ʹT6\ #_i lJJJ dj!8#Vg"$ƭvaM[XW#_wT6DJN ;{ Y<$o I&O캈ᡄCO,n[ `;2Pq#9$VIA_߭nuv3QUU=-*ZA,P3T~æR*jD)L7k8Ph~C+ͫtE')@,( 꼻FxI#,@l/Fݫ+}6 Jݓf(FQ Y KP7.g: H-Y X$ R r!ThhNXu8FUEڠA7:eunejS;үE3#_0(99 zm$|X;t93nü[vCv:f=-,#_g}^W.#Vl &P.H#V@uy;W`ĪFYrho D@݉`q!X:EӫXȈ 9-_ EU"fC4|?+ 1{:YYę=iKͻUٍedI6-,|YMl0 nQ/畽ODp'ZF|\[#`,^UDSHvamˎp' qt%("ꄻe=$CA {b jl QYY2w S%8ʸ`BޕdIr7 BdD/K4mGD֬k{-!j7dZ\^F~wݫuEb d(.Q8gV4NWXBRT|QI7-3w7IP]7Cͳt%MYQtv-zкmgF 9H#Y}jyh=43?-#V7$CkG@4=#Vq xQkqDF`'4a;T$##VzJa5kϻB3w*7 |JUvwc{m/3m#Nm;Ř1>Kܗ4?ѣZİ_[}tҮ 70xI R">u::Y `ޡg9J3<@ 7dt7X=Ri&b!(T? $0C9BFѮ_I7ȧ [ݎ*l|8ov3;2Q3!% |h