Merge remote-tracking branch 'upstream/master' into vulkan-upstream-merge-20231102
This commit is contained in:
Ivan Avdeev
commit
1f9b489bdc
|
|
@ -1 +1 @@
|
|||
Subproject commit d6a54bbf0c4aa7acb5d90aff08b6f18f740f392b
|
||||
Subproject commit e456555cf159d2e858694b53fa92717c84e8870e
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
# Developers donation page
|
||||
|
||||
On this page you can find links where you can support each developer individually, who has provided public sponsorship information.
|
||||
|
||||
### [a1batross](https://github.com/a1batross)
|
||||
|
||||
* Initial Xash3D SDL2/Linux port author, Xash3D FWGS engine maintainer, creator of non-commercial Flying With Gauss organization.
|
||||
* Boosty page: https://boosty.to/a1ba
|
||||
|
||||
### [nekonomicon](https://github.com/nekonomicon)
|
||||
|
||||
* [hlsdk-portable](https://github.com/FWGS/hlsdk-portable), [mdldec](../utils/mdldec), [opensource-mods.md](opensource-mods.md) maintainer and Xash3D FWGS [contributor](https://github.com/FWGS/xash3d-fwgs/commits?author=nekonomicon) (*BSD/clang port, PNG support, etc).
|
||||
* Boosty page: https://boosty.to/nekonomicon
|
||||
|
||||
### [Velaron](https://github.com/Velaron)
|
||||
* [cs16-client](https://github.com/Velaron/cs16-client) & [tf15-client](https://github.com/Velaron/tf15-client) maintainer and Xash3D FWGS [contributor](https://github.com/FWGS/xash3d-fwgs/commits?author=Velaron) (Android port, voice chat, etc).
|
||||
* BuyMeACoffee page: https://www.buymeacoffee.com/velaron
|
||||
|
||||
### [SNMetamorph](https://github.com/SNMetamorph)
|
||||
* [PrimeXT](https://github.com/SNMetamorph/PrimeXT) & [GoldSrc Monitor](https://github.com/SNMetamorph/goldsrc-monitor) maintainer and Xash3D FWGS [contributor](https://github.com/FWGS/xash3d-fwgs/commits?author=SNMetamorph) (Windows port, voice chat, etc).
|
||||
* BTC: `16GAzK3qei5AwBW7sggXp3yNcFHBtdpxXj`
|
||||
* ETH (ERC20): `0xb580eeca9756e3881f9d6d026e28db28eb72a383`
|
||||
* USDT (ERC20): `0xb580eeca9756e3881f9d6d026e28db28eb72a383`
|
||||
* USDC (ERC20): `0xb580eeca9756e3881f9d6d026e28db28eb72a383`
|
||||
|
|
@ -133,22 +133,8 @@ Available in mod archive on ModDB - https://www.moddb.com/mods/overturn
|
|||
## Oz Deathmatch
|
||||
Mirrored on github - https://github.com/nekonomicon/OZDM
|
||||
|
||||
## Spirit of Half-Life
|
||||
[Logic&Trick's](https://github.com/LogicAndTrick) mirror - https://files.logic-and-trick.com/#/Half-Life/Mods/Spirit%20of%20Half-Life
|
||||
|
||||
## Threewave CTF
|
||||
*Unfinished mod by Valve Software*
|
||||
|
||||
Available in Valve's Half-Life repository with Deathmatch Classic sources - https://github.com/ValveSoftware/halflife/tree/master/dmc
|
||||
|
||||
## Trinity Render
|
||||
Available on ModDB: https://www.moddb.com/mods/half-life-episode-two/downloads/trinity-rendering-engine-v308f
|
||||
|
||||
## Tyrian: Ground Assault
|
||||
Available on ModDB: https://www.moddb.com/mods/tyriangroundassault/downloads/tyrianga-v1-0-src
|
||||
|
||||
## Paranoia
|
||||
Available on ModDB: https://www.moddb.com/mods/paranoia/downloads/paranoia-toolkit
|
||||
Available on ModDB - https://www.moddb.com/mods/paranoia/downloads/paranoia-toolkit
|
||||
|
||||
## Paranoia 2: The Savior
|
||||
Prealpha, mirrored on github - https://github.com/a1batross/Paranoia2_ancient
|
||||
|
|
@ -163,12 +149,37 @@ Was found on HLFX - http://hlfx.ru/forum/showthread.php?s=2c892dfc52f72be52a89c3
|
|||
## Ricochet
|
||||
Available in Valve's Half-Life repository - https://github.com/ValveSoftware/halflife/tree/master/ricochet
|
||||
|
||||
## Spirit of Half-Life
|
||||
[Logic&Trick's](https://github.com/LogicAndTrick) mirror - https://files.logic-and-trick.com/#/Half-Life/Mods/Spirit%20of%20Half-Life
|
||||
|
||||
## The Wastes
|
||||
Version 1.5: mirrored on code.idtech.space - https://code.idtech.space/vera/halflife-thewastes-sdk
|
||||
|
||||
## Threewave CTF
|
||||
*Unfinished mod by Valve Software*
|
||||
|
||||
Available in Valve's Half-Life repository with Deathmatch Classic sources - https://github.com/ValveSoftware/halflife/tree/master/dmc
|
||||
|
||||
## Trinity Render
|
||||
Available on ModDB - https://www.moddb.com/mods/half-life-episode-two/downloads/trinity-rendering-engine-v308f
|
||||
|
||||
## Tyrian: Ground Assault
|
||||
Available on ModDB - https://www.moddb.com/mods/tyriangroundassault/downloads/tyrianga-v1-0-src
|
||||
|
||||
## Wasteland
|
||||
Mirrored on code.idtech.space - https://code.idtech.space/vera/halflife-wasteland-sdk
|
||||
|
||||
## Wizard Wars
|
||||
Download page on official site - http://www.thothie.com/ww/
|
||||
|
||||
## XashXT
|
||||
Mirrored on github - https://github.com/a1batross/XashXT_original
|
||||
|
||||
## Xen-Warrior
|
||||
*Source code is a part of Spirit of Half-Life 1.0-1.2 under XENWARRIOR macro*
|
||||
|
||||
[Logic&Trick's](https://github.com/LogicAndTrick) mirror - https://files.logic-and-trick.com/#/Half-Life/Mods/Spirit%20of%20Half-Life
|
||||
|
||||
## Zombie-X
|
||||
Available in mod archive on ModDB - https://www.moddb.com/mods/zombie-x-10-final/downloads/zombie-x-10-dle-beta6-last-version
|
||||
|
||||
|
|
@ -190,12 +201,12 @@ malortie's recreation - https://github.com/malortie/hl-aom
|
|||
Branch **aom** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/aom
|
||||
|
||||
## Afraid of Monsters: Director's cut
|
||||
Reverse-engineered code, branch **aomdc** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/aomdc
|
||||
Reverse-engineered code: branch **aomdc** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/aomdc
|
||||
|
||||
## Azure Sheep
|
||||
malortie's recreation - https://github.com/malortie/hl-asheep
|
||||
|
||||
Reverse-engineered code, branch **asheep** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/asheep
|
||||
Reverse-engineered code: branch **asheep** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/asheep
|
||||
|
||||
## Big Lolly
|
||||
malortie's recreation - https://github.com/malortie/hl-biglolly
|
||||
|
|
@ -232,12 +243,17 @@ Recreation by lostgamer aka nillerusr - https://github.com/LostGamerHL/crack_lif
|
|||
## Escape from the Darkness
|
||||
malortie's recreation - https://github.com/malortie/hl-eftd
|
||||
|
||||
Reverse-engineered code, branch **eftd** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/eftd
|
||||
Reverse-engineered code: branch **eftd** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/eftd
|
||||
|
||||
## Half-Life: Black Guard
|
||||
*This mod uses dlls from Cleaner's Adventures*
|
||||
|
||||
Branch **CAd** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/CAd
|
||||
|
||||
## Half-Life: Blue Shift
|
||||
Unkle Mike's recreation - https://hlfx.ru/forum/showthread.php?s=&threadid=5253
|
||||
|
||||
Reverse-engineered code, branch **bshift** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/bshift
|
||||
Reverse-engineered code: branch **bshift** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/bshift
|
||||
|
||||
## Half-Life: Induction
|
||||
Branch **induction** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/induction
|
||||
|
|
@ -245,12 +261,12 @@ Branch **induction** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/
|
|||
## Half-Life: Opposing Force
|
||||
Recreation by lostgamer aka nillerusr - https://github.com/LostGamerHL/hlsdk-xash3d
|
||||
|
||||
Reverse-engineered code, clean branch **opfor** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/opfor
|
||||
Reverse-engineered code: clean branch **opfor** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/opfor
|
||||
|
||||
Spirit of Half Life: Opposing-Force Edition - https://github.com/Hammermaps-DEV/SOHL-V1.9-Opposing-Force-Edition
|
||||
|
||||
## Half-Life: Rebellion
|
||||
Reverse-engineered code, branch **rebellion** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/rebellion
|
||||
Reverse-engineered code: branch **rebellion** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/rebellion
|
||||
|
||||
## Half-Life: Urbicide
|
||||
Branch **hl_urbicide** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/hl_urbicide
|
||||
|
|
@ -258,7 +274,7 @@ Branch **hl_urbicide** in hlsdk-portable - https://github.com/FWGS/hlsdk-portabl
|
|||
## Half-Life: Visitors
|
||||
malortie's recreation - https://github.com/malortie/hl-visitors
|
||||
|
||||
Reverse-engineered code, branch **visitors** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/visitors
|
||||
Reverse-engineered code: branch **visitors** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/visitors
|
||||
|
||||
## Half-Secret
|
||||
Branch **half-secret** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/half-secret
|
||||
|
|
@ -271,18 +287,18 @@ Branch **noffice** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tr
|
|||
## Poke 646
|
||||
malortie's recreation - https://github.com/malortie/hl-poke646
|
||||
|
||||
Reverse-engineered code, branch **poke646** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/poke646
|
||||
Reverse-engineered code: branch **poke646** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/poke646
|
||||
|
||||
## Poke 646: Vendetta
|
||||
malortie's recreation - https://github.com/malortie/hl-poke646-vendetta
|
||||
|
||||
Reverse-engineered code, branch **poke646_vendetta** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/poke646_vendetta
|
||||
Reverse-engineered code: branch **poke646_vendetta** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/poke646_vendetta
|
||||
|
||||
## Residual Life
|
||||
Reverse-engineered code, branch **residual_point** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/residual_point
|
||||
Reverse-engineered code: branch **residual_point** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/residual_point
|
||||
|
||||
## Residual Point
|
||||
Reverse-engineered code, branch **residual_point** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/residual_point
|
||||
Reverse-engineered code: branch **residual_point** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/residual_point
|
||||
|
||||
## Sewer Beta
|
||||
Branch **sewer_beta** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/sewer_beta
|
||||
|
|
@ -293,12 +309,12 @@ Reverse-engineered code by Velaron - https://github.com/Velaron/tf15-client
|
|||
## The Gate
|
||||
malortie's recreation - https://github.com/malortie/hl-thegate
|
||||
|
||||
Reverse-engineered code, branch **thegate** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/thegate
|
||||
Reverse-engineered code: branch **thegate** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/thegate
|
||||
|
||||
## They Hunger
|
||||
malortie's recreation - https://github.com/malortie/hl-theyhunger
|
||||
|
||||
Reverse-engineered code, branch **theyhunger** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/theyhunger
|
||||
Reverse-engineered code: branch **theyhunger** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/theyhunger
|
||||
|
||||
They Hunger: Tactical - https://www.moddb.com/mods/they-hunger-tactical/downloads/tht-source-code-documentation
|
||||
|
||||
|
|
@ -341,16 +357,22 @@ Branch **half-screwed** in hlsdk-portable - https://github.com/FWGS/hlsdk-portab
|
|||
Port to Linux - https://github.com/fmoraw/NS
|
||||
|
||||
## Spirit of Half-Life
|
||||
Version 1.2, branch **sohl1.2** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/sohl1.2
|
||||
Version 1.2: branch **sohl1.2** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/sohl1.2
|
||||
|
||||
## Swiss Cheese Halloween 2002
|
||||
Just more playable version by malortie - https://github.com/malortie/hl-shall
|
||||
|
||||
Branch **halloween** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/halloween
|
||||
|
||||
## The Wastes
|
||||
Version 1.5: Port to Linux - https://git.mentality.rip/a1batross/halflife-thewastes-sdk
|
||||
|
||||
## Threewave CTF
|
||||
Branch **dmc** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/dmc
|
||||
|
||||
## Xen-Warrior
|
||||
Branch **sohl1.2** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/sohl1.2
|
||||
|
||||
## Zombie-X
|
||||
Branch **zombie-x** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/zombie-x
|
||||
|
||||
|
|
|
|||
42
README.md
42
README.md
|
|
@ -39,36 +39,30 @@ Regular upstream Xash3D README.md follows.
|
|||
|
||||
---
|
||||
|
||||
# Xash3D FWGS Engine
|
||||
# Xash3D FWGS Engine <img align="right" width="128" height="128" src="https://github.com/FWGS/xash3d-fwgs/raw/master/game_launch/icon-xash-material.png" alt="Xash3D FWGS icon" />
|
||||
[](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.
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -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 );
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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 );
|
||||
|
|
|
|||
|
|
@ -726,6 +726,7 @@ void SCR_VidInit( void )
|
|||
|
||||
// restart console size
|
||||
Con_VidInit ();
|
||||
Touch_NotifyResize();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 <name> <command>\n" );
|
||||
}
|
||||
|
||||
static void Touch_LoadDefaults_f( void );
|
||||
|
||||
static void Touch_ReloadConfig_f( void )
|
||||
{
|
||||
touch.state = state_none;
|
||||
|
|
@ -735,8 +771,15 @@ static void Touch_ReloadConfig_f( void )
|
|||
touch.selection->finger = -1;
|
||||
touch.edit = touch.selection = NULL;
|
||||
touch.resize_finger = touch.move_finger = touch.look_finger = touch.wheel_finger = -1;
|
||||
|
||||
Cbuf_AddTextf( "exec %s\n", touch_config_file.string );
|
||||
if( FS_FileExists( touch_config_file.string, true ) )
|
||||
{
|
||||
Cbuf_AddTextf( "exec \"%s\"\n", touch_config_file.string );
|
||||
}
|
||||
else
|
||||
{
|
||||
Touch_LoadDefaults_f();
|
||||
touch.configchanged = true;
|
||||
}
|
||||
}
|
||||
|
||||
static touch_button_t *Touch_AddButton( touchbuttonlist_t *list,
|
||||
|
|
@ -784,7 +827,7 @@ void Touch_AddClientButton( const char *name, const char *texture, const char *c
|
|||
IN_TouchCheckCoords( &x1, &y1, &x2, &y2 );
|
||||
if( round == round_aspect )
|
||||
{
|
||||
y2 = y1 + ( x2 - x1 ) * (SCR_W/SCR_H) * aspect;
|
||||
y2 = y1 + ( x2 - x1 ) / (Touch_AspectRatio()) * aspect;
|
||||
}
|
||||
button = Touch_AddButton( &touch.list_user, name, texture, command, x1, y1, x2, y2, color, true );
|
||||
button->flags |= flags | TOUCH_FL_CLIENT | TOUCH_FL_NOEDIT;
|
||||
|
|
@ -809,7 +852,7 @@ static void Touch_LoadDefaults_f( void )
|
|||
if( g_DefaultButtons[i].texturefile[0] == '#' )
|
||||
y2 = y1 + ( (float)clgame.scrInfo.iCharHeight / (float)clgame.scrInfo.iHeight ) * g_DefaultButtons[i].aspect + touch.swidth*2/SCR_H;
|
||||
else
|
||||
y2 = y1 + ( x2 - x1 ) * (SCR_W/SCR_H) * g_DefaultButtons[i].aspect;
|
||||
y2 = y1 + (( x2 - x1 ) / Touch_AspectRatio()) * g_DefaultButtons[i].aspect;
|
||||
}
|
||||
|
||||
IN_TouchCheckCoords( &x1, &y1, &x2, &y2 );
|
||||
|
|
@ -817,6 +860,7 @@ static void Touch_LoadDefaults_f( void )
|
|||
button->flags |= g_DefaultButtons[i].flags;
|
||||
button->aspect = g_DefaultButtons[i].aspect;
|
||||
}
|
||||
touch.configchanged = true;
|
||||
}
|
||||
|
||||
// Add default button from client
|
||||
|
|
@ -909,7 +953,7 @@ static void Touch_AddButton_f( void )
|
|||
if( aspect )
|
||||
{
|
||||
if( B( texturefile )[0] != '#' )
|
||||
B( y2 ) = B( y1 ) + ( B( x2 ) - B( x1 )) * ( SCR_W / SCR_H ) * aspect;
|
||||
B( y2 ) = B( y1 ) + (( B( x2 ) - B( x1 )) / Touch_AspectRatio() ) * aspect;
|
||||
B( aspect ) = aspect;
|
||||
}
|
||||
}
|
||||
|
|
@ -917,11 +961,39 @@ static void Touch_AddButton_f( void )
|
|||
|
||||
static void Touch_EnableEdit_f( void )
|
||||
{
|
||||
touch_button_t *button;
|
||||
float current_ratio = SCR_H/SCR_W;
|
||||
if( touch.state == state_none )
|
||||
touch.state = state_edit;
|
||||
touch.resize_finger = touch.move_finger = touch.look_finger = touch.wheel_finger = -1;
|
||||
touch.move_button = NULL;
|
||||
touch.configchanged = true;
|
||||
/* try determine the best ratio
|
||||
* User enters editor. Window now have correct size. Need to fix aspect ratio in some cases */
|
||||
// Case A: no config was loaded, touch was generated with lower height, but window was resized higher, reset it to actual size
|
||||
if( touch.actual_aspect_ratio > current_ratio )
|
||||
touch.actual_aspect_ratio = current_ratio;
|
||||
if( !touch.config_aspect_ratio )
|
||||
touch.config_aspect_ratio = touch.actual_aspect_ratio;
|
||||
// Case B: config was loaded, but window may be resized later, so keep y coordinate as is
|
||||
touch.actual_aspect_ratio = current_ratio;
|
||||
// convert coordinates to actual aspect ratio after it was updated
|
||||
if( touch.config_aspect_ratio != touch.actual_aspect_ratio )
|
||||
{
|
||||
for( button = touch.list_user.first; button; button = button->next )
|
||||
{
|
||||
B(y1) /= touch.actual_aspect_ratio / touch.config_aspect_ratio;
|
||||
B(y2) /= touch.actual_aspect_ratio / touch.config_aspect_ratio;
|
||||
|
||||
// clamp positions to make buttons visible by user
|
||||
if( B(y2) > 1.0f )
|
||||
{
|
||||
B(y1) -= B(y2) - 1.0f;
|
||||
B(y2) -= B(y2) - 1.0f;
|
||||
}
|
||||
}
|
||||
touch.config_aspect_ratio = touch.actual_aspect_ratio;
|
||||
}
|
||||
}
|
||||
|
||||
static void Touch_DisableEdit_f( void )
|
||||
|
|
@ -956,7 +1028,7 @@ static void Touch_DeleteProfile_f( void )
|
|||
|
||||
static void Touch_InitEditor( void )
|
||||
{
|
||||
float x = 0.1f * (SCR_H/SCR_W);
|
||||
float x = 0.1f * (Touch_AspectRatio());
|
||||
float y = 0.05f;
|
||||
touch_button_t *temp;
|
||||
rgba_t color;
|
||||
|
|
@ -1051,6 +1123,7 @@ void Touch_Init( void )
|
|||
Cmd_AddRestrictedCommand( "touch_generate_code", Touch_GenerateCode_f, "create code sample for mobility API" );
|
||||
Cmd_AddCommand( "touch_fade", Touch_Fade_f, "start fade animation for selected buttons" );
|
||||
Cmd_AddRestrictedCommand( "touch_toggleselection", Touch_ToggleSelection_f, "toggle vidibility on selected button in editor" );
|
||||
Cmd_AddRestrictedCommand( "touch_aspectratio", Touch_ConfigAspectRatio_f, "set current aspect ratio" );
|
||||
|
||||
// not saved, just runtime state for scripting
|
||||
Cvar_RegisterVariable( &touch_in_menu );
|
||||
|
|
@ -1087,7 +1160,7 @@ void Touch_Init( void )
|
|||
#if SDL_VERSION_ATLEAST( 2, 0, 10 )
|
||||
SDL_SetHint( SDL_HINT_MOUSE_TOUCH_EVENTS, "0" );
|
||||
SDL_SetHint( SDL_HINT_TOUCH_MOUSE_EVENTS, "0" );
|
||||
#else
|
||||
#elif defined(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH)
|
||||
SDL_SetHint( SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH, "1" );
|
||||
#endif
|
||||
|
||||
|
|
@ -1170,9 +1243,9 @@ static void Touch_DrawTexture ( float x1, float y1, float x2, float y2, int text
|
|||
}
|
||||
|
||||
#define GRID_COUNT_X ((int)touch_grid_count.value)
|
||||
#define GRID_COUNT_Y (((int)touch_grid_count.value) * SCR_H / SCR_W)
|
||||
#define GRID_COUNT_Y (((int)touch_grid_count.value) * Touch_AspectRatio())
|
||||
#define GRID_X (1.0f/GRID_COUNT_X)
|
||||
#define GRID_Y (SCR_W/SCR_H/GRID_COUNT_X)
|
||||
#define GRID_Y (1.0f/Touch_AspectRatio()/GRID_COUNT_X)
|
||||
#define GRID_ROUND_X(x) ((float)round( x * GRID_COUNT_X ) / GRID_COUNT_X)
|
||||
#define GRID_ROUND_Y(x) ((float)round( x * GRID_COUNT_Y ) / GRID_COUNT_Y)
|
||||
|
||||
|
|
@ -1250,7 +1323,7 @@ static float Touch_DrawText( float x1, float y1, float x2, float y2, const char
|
|||
{
|
||||
while( *s && ( *s != '\n' ) && ( *s != ';' ) && ( x1 < maxx ) )
|
||||
x1 += Touch_DrawCharacter( x1, y1, *s++, size );
|
||||
y1 += cls.creditsFont.charHeight / 1024.f * size / SCR_H * SCR_W;
|
||||
y1 += cls.creditsFont.charHeight / 1024.f * size / Touch_AspectRatio();
|
||||
|
||||
if( y1 >= maxy )
|
||||
break;
|
||||
|
|
@ -1357,11 +1430,12 @@ void Touch_Draw( void )
|
|||
if( !touch.initialized || ( !touch_enable.value && !touch.clientonly ))
|
||||
return;
|
||||
|
||||
Touch_InitConfig();
|
||||
|
||||
if( cls.key_dest != key_game && !touch_in_menu.value )
|
||||
return;
|
||||
|
||||
Touch_InitConfig();
|
||||
|
||||
|
||||
ref.dllFuncs.GL_SetRenderMode( kRenderTransTexture );
|
||||
|
||||
if( touch.state >= state_edit && touch_grid_enable.value )
|
||||
|
|
@ -1948,6 +2022,8 @@ static int Touch_ControlsEvent( touchEventType type, int fingerID, float x, floa
|
|||
|
||||
int IN_TouchEvent( touchEventType type, int fingerID, float x, float y, float dx, float dy )
|
||||
{
|
||||
y *= SCR_H/SCR_W/Touch_AspectRatio();
|
||||
// Con_Printf("%f %f\n", TO_SCRN_X(x), TO_SCRN_Y(y));
|
||||
// simulate menu mouse click
|
||||
if( cls.key_dest != key_game && !touch_in_menu.value )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -172,6 +172,8 @@ void IN_ToggleClientMouse( int newstate, int oldstate )
|
|||
{
|
||||
if( newstate == oldstate )
|
||||
return;
|
||||
if( m_ignore.value )
|
||||
return;
|
||||
|
||||
// since SetCursorType controls cursor visibility
|
||||
// execute it first, and then check mouse grab state
|
||||
|
|
@ -212,6 +214,9 @@ void IN_CheckMouseState( qboolean active )
|
|||
qboolean useRawInput = true; // always use SDL code
|
||||
#endif
|
||||
|
||||
if( m_ignore.value )
|
||||
return;
|
||||
|
||||
if( active && useRawInput && !host.mouse_visible && cls.state == ca_active )
|
||||
{
|
||||
if( !s_bRawInput )
|
||||
|
|
|
|||
|
|
@ -75,6 +75,7 @@ void Touch_ResetDefaultButtons( void );
|
|||
int IN_TouchEvent( touchEventType type, int fingerID, float x, float y, float dx, float dy );
|
||||
void Touch_KeyEvent( int key, int down );
|
||||
qboolean Touch_WantVisibleCursor( void );
|
||||
void Touch_NotifyResize( void );
|
||||
|
||||
//
|
||||
// in_joy.c
|
||||
|
|
|
|||
|
|
@ -659,7 +659,7 @@ static void make_hull_windings( hull_t *hull, hull_model_t *model )
|
|||
Con_Reportf( "%i hull polys\n", model->num_polys );
|
||||
}
|
||||
|
||||
void Mod_InitDebugHulls( void )
|
||||
void Mod_InitDebugHulls( model_t *loadmodel )
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
|
|||
|
|
@ -99,16 +99,6 @@ static void *pfnMod_Extradata( int type, model_t *m )
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static model_t *pfnMod_GetCurrentLoadingModel( void )
|
||||
{
|
||||
return loadmodel;
|
||||
}
|
||||
|
||||
static void pfnMod_SetCurrentLoadingModel( model_t *m )
|
||||
{
|
||||
loadmodel = m;
|
||||
}
|
||||
|
||||
static void pfnGetPredictedOrigin( vec3_t v )
|
||||
{
|
||||
VectorCopy( cl.simorg, v );
|
||||
|
|
@ -283,8 +273,6 @@ static ref_api_t gEngfuncs =
|
|||
Mod_ForName,
|
||||
pfnMod_Extradata,
|
||||
CL_ModelHandle,
|
||||
pfnMod_GetCurrentLoadingModel,
|
||||
pfnMod_SetCurrentLoadingModel,
|
||||
|
||||
CL_GetRemapInfoForEntity,
|
||||
CL_AllocRemapInfo,
|
||||
|
|
|
|||
|
|
@ -381,6 +381,7 @@ typedef void (*xcommand_t)( void );
|
|||
qboolean FS_LoadProgs( void );
|
||||
void FS_Init( void );
|
||||
void FS_Shutdown( void );
|
||||
void *FS_GetNativeObject( const char *obj );
|
||||
|
||||
//
|
||||
// cmd.c
|
||||
|
|
@ -747,8 +748,6 @@ void SV_ShutdownGame( void );
|
|||
void SV_ExecLoadLevel( void );
|
||||
void SV_ExecLoadGame( void );
|
||||
void SV_ExecChangeLevel( void );
|
||||
qboolean SV_InitGameProgs( void );
|
||||
void SV_FreeGameProgs( void );
|
||||
void CL_WriteMessageHistory( void );
|
||||
void CL_SendCmd( void );
|
||||
void CL_Disconnect( void );
|
||||
|
|
|
|||
|
|
@ -1423,15 +1423,11 @@ save serverinfo variables into server.cfg (using for dedicated server too)
|
|||
*/
|
||||
void GAME_EXPORT Host_WriteServerConfig( const char *name )
|
||||
{
|
||||
qboolean already_loaded;
|
||||
file_t *f;
|
||||
string newconfigfile;
|
||||
|
||||
Q_snprintf( newconfigfile, MAX_STRING, "%s.new", name );
|
||||
|
||||
// TODO: remove this mechanism, make it safer for now
|
||||
already_loaded = SV_InitGameProgs(); // collect user variables
|
||||
|
||||
// FIXME: move this out until menu parser is done
|
||||
CSCR_LoadDefaultCVars( "settings.scr" );
|
||||
|
||||
|
|
@ -1448,10 +1444,6 @@ void GAME_EXPORT Host_WriteServerConfig( const char *name )
|
|||
Host_FinalizeConfig( f, name );
|
||||
}
|
||||
else Con_DPrintf( S_ERROR "Couldn't write %s.\n", name );
|
||||
|
||||
// don't unload library that wasn't loaded by us
|
||||
if( !already_loaded )
|
||||
SV_FreeGameProgs(); // release progs with all variables
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -23,8 +23,17 @@ GNU General Public License for more details.
|
|||
fs_api_t g_fsapi;
|
||||
fs_globals_t *FI;
|
||||
|
||||
static pfnCreateInterface_t fs_pfnCreateInterface;
|
||||
static HINSTANCE fs_hInstance;
|
||||
|
||||
void *FS_GetNativeObject( const char *obj )
|
||||
{
|
||||
if( fs_pfnCreateInterface )
|
||||
return fs_pfnCreateInterface( obj, NULL );
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void FS_Rescan_f( void )
|
||||
{
|
||||
FS_Rescan();
|
||||
|
|
@ -53,7 +62,7 @@ static fs_interface_t fs_memfuncs =
|
|||
_Mem_Realloc,
|
||||
_Mem_Free,
|
||||
|
||||
Platform_GetNativeObject,
|
||||
Sys_GetNativeObject,
|
||||
};
|
||||
|
||||
static void FS_UnloadProgs( void )
|
||||
|
|
@ -98,6 +107,13 @@ qboolean FS_LoadProgs( void )
|
|||
return false;
|
||||
}
|
||||
|
||||
if( !( fs_pfnCreateInterface = (pfnCreateInterface_t)COM_GetProcAddress( fs_hInstance, "CreateInterface" )))
|
||||
{
|
||||
FS_UnloadProgs();
|
||||
Host_Error( "FS_LoadProgs: can't find CreateInterface entry point in %s\n", name );
|
||||
return false;
|
||||
}
|
||||
|
||||
Con_DPrintf( "FS_LoadProgs: filesystem_stdio successfully loaded\n" );
|
||||
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ GNU General Public License for more details.
|
|||
#include "common.h"
|
||||
#include "base_cmd.h"
|
||||
#include "client.h"
|
||||
#include "server.h"
|
||||
#include "netchan.h"
|
||||
#include "protocol.h"
|
||||
#include "mod_local.h"
|
||||
|
|
@ -127,6 +128,7 @@ void Sys_PrintUsage( void )
|
|||
O("-noenginejoy ", "disable engine builtin joystick support")
|
||||
O("-noenginemouse ", "disable engine builtin mouse support")
|
||||
O("-nosound ", "disable sound output")
|
||||
O("-timedemo ", "run timedemo and exit")
|
||||
#endif
|
||||
|
||||
"\nPlatform-specific options:\n"
|
||||
|
|
@ -1016,21 +1018,31 @@ void Host_InitCommon( int argc, char **argv, const char *progname, qboolean bCha
|
|||
else
|
||||
{
|
||||
#if TARGET_OS_IOS
|
||||
const char *IOS_GetDocsDir();
|
||||
Q_strncpy( host.rootdir, IOS_GetDocsDir(), sizeof(host.rootdir) );
|
||||
Q_strncpy( host.rootdir, IOS_GetDocsDir(), sizeof( host.rootdir ));
|
||||
#elif XASH_ANDROID && XASH_SDL
|
||||
Q_strncpy( host.rootdir, SDL_AndroidGetExternalStoragePath(), sizeof( host.rootdir ));
|
||||
#elif XASH_PSVITA
|
||||
if ( !PSVita_GetBasePath( host.rootdir, sizeof( host.rootdir ) ) )
|
||||
if ( !PSVita_GetBasePath( host.rootdir, sizeof( host.rootdir )))
|
||||
{
|
||||
Sys_Error( "couldn't find xash3d data directory" );
|
||||
host.rootdir[0] = 0;
|
||||
}
|
||||
#elif (XASH_SDL == 2) && !XASH_NSWITCH // GetBasePath not impl'd in switch-sdl2
|
||||
char *szBasePath;
|
||||
|
||||
if( !( szBasePath = SDL_GetBasePath() ) )
|
||||
char *szBasePath = SDL_GetBasePath();
|
||||
if( szBasePath )
|
||||
{
|
||||
Q_strncpy( host.rootdir, szBasePath, sizeof( host.rootdir ));
|
||||
SDL_free( szBasePath );
|
||||
}
|
||||
else
|
||||
{
|
||||
#if XASH_POSIX || XASH_WIN32
|
||||
if( !getcwd( host.rootdir, sizeof( host.rootdir )))
|
||||
Sys_Error( "couldn't determine current directory: %s, getcwd: %s", SDL_GetError(), strerror( errno ));
|
||||
#else
|
||||
Sys_Error( "couldn't determine current directory: %s", SDL_GetError() );
|
||||
Q_strncpy( host.rootdir, szBasePath, sizeof( host.rootdir ));
|
||||
SDL_free( szBasePath );
|
||||
#endif
|
||||
}
|
||||
#else
|
||||
if( !getcwd( host.rootdir, sizeof( host.rootdir )))
|
||||
{
|
||||
|
|
@ -1149,6 +1161,7 @@ Host_Main
|
|||
int EXPORT Host_Main( int argc, char **argv, const char *progname, int bChangeGame, pfnChangeGame func )
|
||||
{
|
||||
static double oldtime, newtime;
|
||||
string demoname;
|
||||
|
||||
host.starttime = Sys_DoubleTime();
|
||||
|
||||
|
|
@ -1245,6 +1258,9 @@ int EXPORT Host_Main( int argc, char **argv, const char *progname, int bChangeGa
|
|||
Cbuf_ExecStuffCmds(); // execute stuffcmds (commandline)
|
||||
SCR_CheckStartupVids(); // must be last
|
||||
|
||||
if( Sys_GetParmFromCmdLine( "-timedemo", demoname ))
|
||||
Cbuf_AddTextf( "timedemo %s\n", demoname );
|
||||
|
||||
oldtime = Sys_DoubleTime() - 0.1;
|
||||
|
||||
if( Host_IsDedicated( ))
|
||||
|
|
@ -1293,6 +1309,7 @@ void EXPORT Host_Shutdown( void )
|
|||
#endif
|
||||
|
||||
SV_Shutdown( "Server shutdown\n" );
|
||||
SV_UnloadProgs();
|
||||
SV_ShutdownFilter();
|
||||
CL_Shutdown();
|
||||
|
||||
|
|
|
|||
|
|
@ -362,10 +362,10 @@ qboolean Image_LoadDDS( const char *name, const byte *buffer, fs_offset_t filesi
|
|||
SetBits( image.flags, IMAGE_HAS_ALPHA );
|
||||
else if( image.type == PF_DXT5 && Image_CheckDXT5Alpha( &header, fin ))
|
||||
SetBits( image.flags, IMAGE_HAS_ALPHA );
|
||||
else if ( image.type == PF_BC5_SIGNED || image.type == PF_BC5_UNSIGNED )
|
||||
SetBits(image.flags, IMAGE_HAS_ALPHA);
|
||||
else if ( image.type == PF_BC7_UNORM || image.type == PF_BC7_SRGB )
|
||||
SetBits(image.flags, IMAGE_HAS_ALPHA);
|
||||
else if( image.type == PF_BC5_SIGNED || image.type == PF_BC5_UNSIGNED )
|
||||
SetBits( image.flags, IMAGE_HAS_ALPHA );
|
||||
else if( image.type == PF_BC7_UNORM || image.type == PF_BC7_SRGB )
|
||||
SetBits( image.flags, IMAGE_HAS_ALPHA );
|
||||
if( !FBitSet( header.dsPixelFormat.dwFlags, DDS_LUMINANCE ))
|
||||
SetBits( image.flags, IMAGE_HAS_COLOR );
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
img_ktx2.c - KTX2 format load
|
||||
img_ktx2.c - ktx2 format load
|
||||
Copyright (C) 2023 Provod
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -15,51 +15,49 @@ GNU General Public License for more details.
|
|||
|
||||
#include "imagelib.h"
|
||||
#include "xash3d_mathlib.h"
|
||||
#include "ktx2.h"
|
||||
#include "img_ktx2.h"
|
||||
|
||||
static void Image_KTX2Format( uint32_t ktx2_format )
|
||||
{
|
||||
switch ( ktx2_format )
|
||||
switch( ktx2_format )
|
||||
{
|
||||
case KTX2_FORMAT_BC4_UNORM_BLOCK:
|
||||
// 1 component for ref_gl
|
||||
ClearBits( image.flags, IMAGE_HAS_COLOR | IMAGE_HAS_ALPHA | IMAGE_HAS_LUMA );
|
||||
image.type = PF_BC4_UNSIGNED;
|
||||
// 1 component for ref_gl
|
||||
break;
|
||||
case KTX2_FORMAT_BC4_SNORM_BLOCK:
|
||||
// 1 component for ref_gl
|
||||
ClearBits( image.flags, IMAGE_HAS_COLOR | IMAGE_HAS_ALPHA | IMAGE_HAS_LUMA );
|
||||
image.type = PF_BC4_SIGNED;
|
||||
// 1 component for ref_gl
|
||||
break;
|
||||
case KTX2_FORMAT_BC5_UNORM_BLOCK:
|
||||
ClearBits( image.flags, IMAGE_HAS_COLOR | IMAGE_HAS_LUMA );
|
||||
image.flags |= IMAGE_HAS_ALPHA; // 2 components for ref_gl
|
||||
image.type = PF_BC5_UNSIGNED;
|
||||
// 2 components for ref_gl
|
||||
SetBits( image.flags, IMAGE_HAS_ALPHA );
|
||||
break;
|
||||
case KTX2_FORMAT_BC5_SNORM_BLOCK:
|
||||
ClearBits( image.flags, IMAGE_HAS_COLOR | IMAGE_HAS_LUMA );
|
||||
image.flags |= IMAGE_HAS_ALPHA; // 2 components for ref_gl
|
||||
image.type = PF_BC5_SIGNED;
|
||||
// 2 components for ref_gl
|
||||
SetBits( image.flags, IMAGE_HAS_ALPHA );
|
||||
break;
|
||||
case KTX2_FORMAT_BC6H_UFLOAT_BLOCK:
|
||||
ClearBits( image.flags, IMAGE_HAS_ALPHA | IMAGE_HAS_LUMA );
|
||||
image.flags |= IMAGE_HAS_COLOR;
|
||||
image.type = PF_BC6H_UNSIGNED;
|
||||
// 3 components for ref_gl
|
||||
SetBits( image.flags, IMAGE_HAS_COLOR );
|
||||
break;
|
||||
case KTX2_FORMAT_BC6H_SFLOAT_BLOCK:
|
||||
ClearBits( image.flags, IMAGE_HAS_ALPHA | IMAGE_HAS_LUMA );
|
||||
image.flags |= IMAGE_HAS_COLOR;
|
||||
image.type = PF_BC6H_SIGNED;
|
||||
// 3 components for ref_gl
|
||||
SetBits( image.flags, IMAGE_HAS_COLOR );
|
||||
break;
|
||||
case KTX2_FORMAT_BC7_UNORM_BLOCK:
|
||||
ClearBits( image.flags, IMAGE_HAS_LUMA );
|
||||
image.flags |= IMAGE_HAS_COLOR | IMAGE_HAS_ALPHA;
|
||||
image.type = PF_BC7_UNORM;
|
||||
// 4 components for ref_gl
|
||||
SetBits( image.flags, IMAGE_HAS_COLOR | IMAGE_HAS_ALPHA );
|
||||
break;
|
||||
case KTX2_FORMAT_BC7_SRGB_BLOCK:
|
||||
ClearBits( image.flags, IMAGE_HAS_LUMA );
|
||||
image.flags |= IMAGE_HAS_COLOR | IMAGE_HAS_ALPHA;
|
||||
image.type = PF_BC7_SRGB;
|
||||
// 4 components for ref_gl
|
||||
SetBits( image.flags, IMAGE_HAS_COLOR | IMAGE_HAS_ALPHA );
|
||||
break;
|
||||
default:
|
||||
image.type = PF_UNKNOWN;
|
||||
|
|
@ -77,7 +75,6 @@ static qboolean Image_KTX2Parse( const ktx2_header_t *header, const byte *buffer
|
|||
// Sets image.type and image.flags
|
||||
Image_KTX2Format( header->vkFormat );
|
||||
|
||||
// TODO add logs for these
|
||||
if( image.type == PF_UNKNOWN )
|
||||
{
|
||||
Con_DPrintf( S_ERROR "%s: unsupported KTX2 format %d\n", __FUNCTION__, header->vkFormat );
|
||||
|
|
@ -120,7 +117,7 @@ static qboolean Image_KTX2Parse( const ktx2_header_t *header, const byte *buffer
|
|||
return false;
|
||||
}
|
||||
|
||||
memcpy( &index, buffer + KTX2_IDENTIFIER_SIZE + sizeof( ktx2_header_t ), sizeof index );
|
||||
memcpy( &index, buffer + KTX2_IDENTIFIER_SIZE + sizeof( ktx2_header_t ), sizeof( index ));
|
||||
|
||||
for( int mip = 0; mip < header->levelCount; ++mip )
|
||||
{
|
||||
|
|
@ -129,7 +126,7 @@ static qboolean Image_KTX2Parse( const ktx2_header_t *header, const byte *buffer
|
|||
const uint32_t mip_size = Image_ComputeSize( image.type, width, height, image.depth );
|
||||
|
||||
ktx2_level_t level;
|
||||
memcpy( &level, levels_begin + mip * sizeof level, sizeof level );
|
||||
memcpy( &level, levels_begin + mip * sizeof( level ), sizeof( level ));
|
||||
|
||||
if( mip_size != level.byteLength )
|
||||
{
|
||||
|
|
@ -154,7 +151,7 @@ static qboolean Image_KTX2Parse( const ktx2_header_t *header, const byte *buffer
|
|||
for( int mip = 0, cursor = 0; mip < header->levelCount; ++mip )
|
||||
{
|
||||
ktx2_level_t level;
|
||||
memcpy( &level, levels_begin + mip * sizeof level, sizeof level );
|
||||
memcpy( &level, levels_begin + mip * sizeof( level ), sizeof( level ));
|
||||
memcpy( image.rgba + cursor, buffer + level.byteOffset, level.byteLength );
|
||||
cursor += level.byteLength;
|
||||
}
|
||||
|
|
@ -175,13 +172,15 @@ qboolean Image_LoadKTX2( const char *name, const byte *buffer, fs_offset_t files
|
|||
return false;
|
||||
}
|
||||
|
||||
memcpy( &header, buffer + KTX2_IDENTIFIER_SIZE, sizeof header );
|
||||
memcpy( &header, buffer + KTX2_IDENTIFIER_SIZE, sizeof( header ));
|
||||
|
||||
image.width = header.pixelWidth;
|
||||
image.height = header.pixelHeight;
|
||||
image.depth = Q_max( 1, header.pixelDepth );
|
||||
image.num_mips = 1;
|
||||
|
||||
ClearBits( image.flags, IMAGE_HAS_COLOR | IMAGE_HAS_ALPHA | IMAGE_HAS_LUMA );
|
||||
|
||||
if( !Image_KTX2Parse( &header, buffer, filesize ))
|
||||
{
|
||||
if( !Image_CheckFlag( IL_KTX2_RAW ))
|
||||
|
|
@ -190,7 +189,6 @@ qboolean Image_LoadKTX2( const char *name, const byte *buffer, fs_offset_t files
|
|||
// If KTX2 to imagelib conversion failed, try passing the file as raw data.
|
||||
// This is useful for ref_vk which can directly support hundreds of formats which we don't convert to pixformat_t here
|
||||
|
||||
// TODO something like Image_CheckFlag( IL_SUPPORTS_KTX2_RAW )?
|
||||
Con_DPrintf( S_WARN "%s: (%s) could not be converted to supported imagelib format, passing as raw KTX2 data\n", __FUNCTION__, name );
|
||||
// This is a catch-all for ref_vk, which can do this format directly and natively
|
||||
image.type = PF_KTX2_RAW;
|
||||
|
|
@ -198,9 +196,6 @@ qboolean Image_LoadKTX2( const char *name, const byte *buffer, fs_offset_t files
|
|||
image.size = filesize;
|
||||
//image.encode = TODO custom encode type?
|
||||
|
||||
// Unknown format, no idea what's inside
|
||||
ClearBits( image.flags, IMAGE_HAS_COLOR | IMAGE_HAS_ALPHA | IMAGE_HAS_LUMA );
|
||||
|
||||
image.rgba = Mem_Malloc( host.imagepool, image.size );
|
||||
memcpy( image.rgba, buffer, image.size );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,79 @@
|
|||
/*
|
||||
img_ktx2.h - ktx2 format reference
|
||||
Copyright (C) 2023 Provod
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
*/
|
||||
#ifndef IMG_KTX2_H
|
||||
#define IMG_KTX2_H
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#define KTX2_IDENTIFIER_SIZE 12
|
||||
#define KTX2_IDENTIFIER "\xABKTX 20\xBB\r\n\x1A\n"
|
||||
|
||||
/*
|
||||
static const char k_ktx2_identifier[KTX2_IDENTIFIER_SIZE] =
|
||||
{
|
||||
'\xAB', 'K', 'T', 'X', ' ', '2', '0', '\xBB', '\r', '\n', '\x1A', '\n'
|
||||
};
|
||||
*/
|
||||
|
||||
typedef struct
|
||||
{
|
||||
uint32_t vkFormat;
|
||||
uint32_t typeSize;
|
||||
uint32_t pixelWidth;
|
||||
uint32_t pixelHeight;
|
||||
uint32_t pixelDepth;
|
||||
uint32_t layerCount;
|
||||
uint32_t faceCount;
|
||||
uint32_t levelCount;
|
||||
uint32_t supercompressionScheme;
|
||||
} ktx2_header_t;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
uint32_t dfdByteOffset;
|
||||
uint32_t dfdByteLength;
|
||||
uint32_t kvdByteOffset;
|
||||
uint32_t kvdByteLength;
|
||||
uint64_t sgdByteOffset;
|
||||
uint64_t sgdByteLength;
|
||||
} ktx2_index_t;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
uint64_t byteOffset;
|
||||
uint64_t byteLength;
|
||||
uint64_t uncompressedByteLength;
|
||||
} ktx2_level_t;
|
||||
|
||||
#define KTX2_LEVELS_OFFSET ( KTX2_IDENTIFIER_SIZE + sizeof( ktx2_header_t ) + sizeof( ktx2_index_t ))
|
||||
|
||||
#define KTX2_MINIMAL_HEADER_SIZE ( KTX2_LEVELS_OFFSET + sizeof( ktx2_level_t ))
|
||||
|
||||
// These have the same values as enum VkFormat in vulkan_core.h
|
||||
// There are hundreds of formats which can be contained in KTX2.
|
||||
// Below are listed the ones which are supported here. This list can be extended.
|
||||
typedef enum
|
||||
{
|
||||
KTX2_FORMAT_BC4_UNORM_BLOCK = 139,
|
||||
KTX2_FORMAT_BC4_SNORM_BLOCK = 140,
|
||||
KTX2_FORMAT_BC5_UNORM_BLOCK = 141,
|
||||
KTX2_FORMAT_BC5_SNORM_BLOCK = 142,
|
||||
KTX2_FORMAT_BC6H_UFLOAT_BLOCK = 143,
|
||||
KTX2_FORMAT_BC6H_SFLOAT_BLOCK = 144,
|
||||
KTX2_FORMAT_BC7_UNORM_BLOCK = 145,
|
||||
KTX2_FORMAT_BC7_SRGB_BLOCK = 146,
|
||||
} ktx2_format_t;
|
||||
|
||||
#endif // IMG_KTX2_H
|
||||
|
|
@ -284,8 +284,10 @@ int Image_ComparePalette( const byte *pal )
|
|||
void Image_SetPalette( const byte *pal, uint *d_table )
|
||||
{
|
||||
byte rgba[4];
|
||||
uint uirgba; // TODO: palette looks byte-swapped on big-endian
|
||||
int i;
|
||||
|
||||
|
||||
// setup palette
|
||||
switch( image.d_rendermode )
|
||||
{
|
||||
|
|
@ -296,7 +298,8 @@ void Image_SetPalette( const byte *pal, uint *d_table )
|
|||
rgba[1] = pal[i*3+1];
|
||||
rgba[2] = pal[i*3+2];
|
||||
rgba[3] = 0xFF;
|
||||
d_table[i] = *(uint *)rgba;
|
||||
memcpy( &uirgba, rgba, sizeof( uirgba ));
|
||||
d_table[i] = uirgba;
|
||||
}
|
||||
break;
|
||||
case LUMP_GRADIENT:
|
||||
|
|
@ -306,7 +309,8 @@ void Image_SetPalette( const byte *pal, uint *d_table )
|
|||
rgba[1] = pal[766];
|
||||
rgba[2] = pal[767];
|
||||
rgba[3] = i;
|
||||
d_table[i] = *(uint *)rgba;
|
||||
memcpy( &uirgba, rgba, sizeof( uirgba ));
|
||||
d_table[i] = uirgba;
|
||||
}
|
||||
break;
|
||||
case LUMP_MASKED:
|
||||
|
|
@ -316,7 +320,8 @@ void Image_SetPalette( const byte *pal, uint *d_table )
|
|||
rgba[1] = pal[i*3+1];
|
||||
rgba[2] = pal[i*3+2];
|
||||
rgba[3] = 0xFF;
|
||||
d_table[i] = *(uint *)rgba;
|
||||
memcpy( &uirgba, rgba, sizeof( uirgba ));
|
||||
d_table[i] = uirgba;
|
||||
}
|
||||
d_table[255] = 0;
|
||||
break;
|
||||
|
|
@ -327,7 +332,8 @@ void Image_SetPalette( const byte *pal, uint *d_table )
|
|||
rgba[1] = pal[i*4+1];
|
||||
rgba[2] = pal[i*4+2];
|
||||
rgba[3] = pal[i*4+3];
|
||||
d_table[i] = *(uint *)rgba;
|
||||
memcpy( &uirgba, rgba, sizeof( uirgba ));
|
||||
d_table[i] = uirgba;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,15 +23,6 @@ GNU General Public License for more details.
|
|||
|
||||
#if XASH_EMSCRIPTEN
|
||||
#include <emscripten.h>
|
||||
#elif XASH_WIN32
|
||||
extern "C"
|
||||
{
|
||||
// Enable NVIDIA High Performance Graphics while using Integrated Graphics.
|
||||
__declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
|
||||
|
||||
// Enable AMD High Performance Graphics while using Integrated Graphics.
|
||||
__declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
#define E_GAME "XASH3D_GAME" // default env dir to start from
|
||||
|
|
@ -39,6 +30,10 @@ __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
|
|||
#define XASH_GAMEDIR "valve"
|
||||
#endif
|
||||
|
||||
#if XASH_WIN32
|
||||
#error "Single-binary or dedicated builds aren't supported for Windows!"
|
||||
#endif
|
||||
|
||||
static char szGameDir[128]; // safe place to keep gamedir
|
||||
static int szArgc;
|
||||
static char **szArgv;
|
||||
|
|
@ -47,7 +42,7 @@ static void Sys_ChangeGame( const char *progname )
|
|||
{
|
||||
// a1ba: may never be called within engine
|
||||
// if platform supports execv() function
|
||||
Q_strncpy( szGameDir, progname, sizeof( szGameDir ) - 1 );
|
||||
Q_strncpy( szGameDir, progname, sizeof( szGameDir ));
|
||||
Host_Shutdown( );
|
||||
exit( Host_Main( szArgc, szArgv, szGameDir, 1, &Sys_ChangeGame ) );
|
||||
}
|
||||
|
|
@ -88,7 +83,6 @@ _inline int Sys_Start( void )
|
|||
return ret;
|
||||
}
|
||||
|
||||
#if !XASH_WIN32
|
||||
int main( int argc, char **argv )
|
||||
{
|
||||
#if XASH_PSVITA
|
||||
|
|
@ -100,36 +94,4 @@ int main( int argc, char **argv )
|
|||
#endif // XASH_PSVITA
|
||||
return Sys_Start();
|
||||
}
|
||||
#else
|
||||
int __stdcall WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdLine, int nShow)
|
||||
{
|
||||
LPWSTR* lpArgv;
|
||||
int ret, i;
|
||||
|
||||
lpArgv = CommandLineToArgvW( GetCommandLineW(), &szArgc );
|
||||
szArgv = ( char** )malloc( (szArgc + 1) * sizeof( char* ));
|
||||
|
||||
for( i = 0; i < szArgc; ++i )
|
||||
{
|
||||
size_t size = wcslen(lpArgv[i]) + 1;
|
||||
|
||||
// just in case, allocate some more memory
|
||||
szArgv[i] = ( char * )malloc( size * sizeof( wchar_t ));
|
||||
wcstombs( szArgv[i], lpArgv[i], size );
|
||||
}
|
||||
szArgv[szArgc] = 0;
|
||||
|
||||
LocalFree( lpArgv );
|
||||
|
||||
ret = Sys_Start();
|
||||
|
||||
for( ; i < szArgc; ++i )
|
||||
free( szArgv[i] );
|
||||
free( szArgv );
|
||||
|
||||
return ret;
|
||||
}
|
||||
#endif // XASH_WIN32
|
||||
|
||||
|
||||
#endif
|
||||
#endif // SINGLE_BINARY
|
||||
|
|
|
|||
|
|
@ -419,5 +419,6 @@ void NET_InitMasters( void )
|
|||
|
||||
// keep main master always there
|
||||
NET_AddMaster( MASTERSERVER_ADR, false );
|
||||
NET_AddMaster( MASTERSERVER_ADR_TEST, false );
|
||||
NET_LoadMasters( );
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -118,7 +118,6 @@ typedef struct world_static_s
|
|||
#ifndef REF_DLL
|
||||
extern world_static_t world;
|
||||
extern poolhandle_t com_studiocache;
|
||||
extern model_t *loadmodel;
|
||||
extern convar_t mod_studiocache;
|
||||
extern convar_t r_wadtextures;
|
||||
extern convar_t r_showhull;
|
||||
|
|
@ -164,7 +163,7 @@ void Mod_PrintWorldStats_f( void );
|
|||
//
|
||||
// mod_dbghulls.c
|
||||
//
|
||||
void Mod_InitDebugHulls( void );
|
||||
void Mod_InitDebugHulls( model_t *mod );
|
||||
void Mod_CreatePolygonsForHull( int hullnum );
|
||||
void Mod_ReleaseHullPolygons( void );
|
||||
|
||||
|
|
|
|||
|
|
@ -851,11 +851,11 @@ void Mod_LoadStudioModel( model_t *mod, const void *buffer, qboolean *loaded )
|
|||
char poolname[MAX_VA_STRING];
|
||||
studiohdr_t *phdr;
|
||||
|
||||
Q_snprintf( poolname, sizeof( poolname ), "^2%s^7", loadmodel->name );
|
||||
Q_snprintf( poolname, sizeof( poolname ), "^2%s^7", mod->name );
|
||||
|
||||
if( loaded ) *loaded = false;
|
||||
loadmodel->mempool = Mem_AllocPool( poolname );
|
||||
loadmodel->type = mod_studio;
|
||||
mod->mempool = Mem_AllocPool( poolname );
|
||||
mod->type = mod_studio;
|
||||
|
||||
phdr = R_StudioLoadHeader( mod, buffer );
|
||||
if( !phdr ) return; // bad model
|
||||
|
|
@ -886,9 +886,9 @@ void Mod_LoadStudioModel( model_t *mod, const void *buffer, qboolean *loaded )
|
|||
// give space for textures and skinrefs
|
||||
size1 = thdr->numtextures * sizeof( mstudiotexture_t );
|
||||
size2 = thdr->numskinfamilies * thdr->numskinref * sizeof( short );
|
||||
mod->cache.data = Mem_Calloc( loadmodel->mempool, phdr->length + size1 + size2 );
|
||||
memcpy( loadmodel->cache.data, buffer, phdr->length ); // copy main mdl buffer
|
||||
phdr = (studiohdr_t *)loadmodel->cache.data; // get the new pointer on studiohdr
|
||||
mod->cache.data = Mem_Calloc( mod->mempool, phdr->length + size1 + size2 );
|
||||
memcpy( mod->cache.data, buffer, phdr->length ); // copy main mdl buffer
|
||||
phdr = (studiohdr_t *)mod->cache.data; // get the new pointer on studiohdr
|
||||
phdr->numskinfamilies = thdr->numskinfamilies;
|
||||
phdr->numtextures = thdr->numtextures;
|
||||
phdr->numskinref = thdr->numskinref;
|
||||
|
|
@ -905,52 +905,52 @@ void Mod_LoadStudioModel( model_t *mod, const void *buffer, qboolean *loaded )
|
|||
else
|
||||
{
|
||||
// NOTE: don't modify source buffer because it's used for CRC computing
|
||||
loadmodel->cache.data = Mem_Calloc( loadmodel->mempool, phdr->length );
|
||||
memcpy( loadmodel->cache.data, buffer, phdr->length );
|
||||
phdr = (studiohdr_t *)loadmodel->cache.data; // get the new pointer on studiohdr
|
||||
mod->cache.data = Mem_Calloc( mod->mempool, phdr->length );
|
||||
memcpy( mod->cache.data, buffer, phdr->length );
|
||||
phdr = (studiohdr_t *)mod->cache.data; // get the new pointer on studiohdr
|
||||
#if !XASH_DEDICATED
|
||||
ref.dllFuncs.Mod_StudioLoadTextures( mod, phdr );
|
||||
#endif
|
||||
|
||||
// NOTE: we wan't keep raw textures in memory. just cutoff model pointer above texture base
|
||||
loadmodel->cache.data = Mem_Realloc( loadmodel->mempool, loadmodel->cache.data, phdr->texturedataindex );
|
||||
phdr = (studiohdr_t *)loadmodel->cache.data; // get the new pointer on studiohdr
|
||||
mod->cache.data = Mem_Realloc( mod->mempool, mod->cache.data, phdr->texturedataindex );
|
||||
phdr = (studiohdr_t *)mod->cache.data; // get the new pointer on studiohdr
|
||||
phdr->length = phdr->texturedataindex; // update model size
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// just copy model into memory
|
||||
loadmodel->cache.data = Mem_Calloc( loadmodel->mempool, phdr->length );
|
||||
memcpy( loadmodel->cache.data, buffer, phdr->length );
|
||||
mod->cache.data = Mem_Calloc( mod->mempool, phdr->length );
|
||||
memcpy( mod->cache.data, buffer, phdr->length );
|
||||
|
||||
phdr = loadmodel->cache.data;
|
||||
phdr = mod->cache.data;
|
||||
}
|
||||
|
||||
// setup bounding box
|
||||
if( !VectorCompare( vec3_origin, phdr->bbmin ))
|
||||
{
|
||||
// clipping bounding box
|
||||
VectorCopy( phdr->bbmin, loadmodel->mins );
|
||||
VectorCopy( phdr->bbmax, loadmodel->maxs );
|
||||
VectorCopy( phdr->bbmin, mod->mins );
|
||||
VectorCopy( phdr->bbmax, mod->maxs );
|
||||
}
|
||||
else if( !VectorCompare( vec3_origin, phdr->min ))
|
||||
{
|
||||
// movement bounding box
|
||||
VectorCopy( phdr->min, loadmodel->mins );
|
||||
VectorCopy( phdr->max, loadmodel->maxs );
|
||||
VectorCopy( phdr->min, mod->mins );
|
||||
VectorCopy( phdr->max, mod->maxs );
|
||||
}
|
||||
else
|
||||
{
|
||||
// well compute bounds from vertices and round to nearest even values
|
||||
Mod_StudioComputeBounds( phdr, loadmodel->mins, loadmodel->maxs, true );
|
||||
RoundUpHullSize( loadmodel->mins );
|
||||
RoundUpHullSize( loadmodel->maxs );
|
||||
Mod_StudioComputeBounds( phdr, mod->mins, mod->maxs, true );
|
||||
RoundUpHullSize( mod->mins );
|
||||
RoundUpHullSize( mod->maxs );
|
||||
}
|
||||
|
||||
loadmodel->numframes = Mod_StudioBodyVariations( loadmodel );
|
||||
loadmodel->radius = RadiusFromBounds( loadmodel->mins, loadmodel->maxs );
|
||||
loadmodel->flags = phdr->flags; // copy header flags
|
||||
mod->numframes = Mod_StudioBodyVariations( mod );
|
||||
mod->radius = RadiusFromBounds( mod->mins, mod->maxs );
|
||||
mod->flags = phdr->flags; // copy header flags
|
||||
|
||||
if( loaded ) *loaded = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ poolhandle_t com_studiocache; // cache for submodels
|
|||
CVAR_DEFINE( mod_studiocache, "r_studiocache", "1", FCVAR_ARCHIVE, "enables studio cache for speedup tracing hitboxes" );
|
||||
CVAR_DEFINE_AUTO( r_wadtextures, "0", 0, "completely ignore textures in the bsp-file if enabled" );
|
||||
CVAR_DEFINE_AUTO( r_showhull, "0", 0, "draw collision hulls 1-3" );
|
||||
model_t *loadmodel;
|
||||
|
||||
/*
|
||||
===============================================================================
|
||||
|
|
@ -287,7 +286,6 @@ model_t *Mod_LoadModel( model_t *mod, qboolean crash )
|
|||
Con_Reportf( "loading %s\n", mod->name );
|
||||
mod->needload = NL_PRESENT;
|
||||
mod->type = mod_bad;
|
||||
loadmodel = mod;
|
||||
|
||||
// call the apropriate loader
|
||||
switch( *(uint *)buf )
|
||||
|
|
|
|||
|
|
@ -274,8 +274,8 @@ static void NET_NetadrToSockadr( netadr_t *a, struct sockaddr_storage *s )
|
|||
else if( a->type == NA_IP )
|
||||
{
|
||||
((struct sockaddr_in *)s)->sin_family = AF_INET;
|
||||
((struct sockaddr_in *)s)->sin_addr.s_addr = *(uint32_t *)&a->ip;
|
||||
((struct sockaddr_in *)s)->sin_port = a->port;
|
||||
((struct sockaddr_in *)s)->sin_addr.s_addr = a->ip4;
|
||||
}
|
||||
else if( a->type6 == NA_IP6 )
|
||||
{
|
||||
|
|
@ -314,7 +314,7 @@ static void NET_SockadrToNetadr( const struct sockaddr_storage *s, netadr_t *a )
|
|||
if( s->ss_family == AF_INET )
|
||||
{
|
||||
a->type = NA_IP;
|
||||
*(int *)&a->ip = ((struct sockaddr_in *)s)->sin_addr.s_addr;
|
||||
a->ip4 = ((struct sockaddr_in *)s)->sin_addr.s_addr;
|
||||
a->port = ((struct sockaddr_in *)s)->sin_port;
|
||||
}
|
||||
else if( s->ss_family == AF_INET6 )
|
||||
|
|
@ -444,6 +444,7 @@ static void NET_InitializeCriticalSections( void )
|
|||
void NET_ResolveThread( void )
|
||||
{
|
||||
struct sockaddr_storage addr;
|
||||
qboolean res;
|
||||
|
||||
RESOLVE_DBG( "[resolve thread] starting resolve for " );
|
||||
RESOLVE_DBG( nsthread.hostname );
|
||||
|
|
@ -453,13 +454,14 @@ void NET_ResolveThread( void )
|
|||
RESOLVE_DBG( " with gethostbyname\n" );
|
||||
#endif
|
||||
|
||||
if( NET_GetHostByName( nsthread.hostname, nsthread.family, &addr ))
|
||||
if(( res = NET_GetHostByName( nsthread.hostname, nsthread.family, &addr )))
|
||||
RESOLVE_DBG( "[resolve thread] success\n" );
|
||||
else
|
||||
RESOLVE_DBG( "[resolve thread] failed\n" );
|
||||
mutex_lock( &nsthread.mutexres );
|
||||
nsthread.addr = addr;
|
||||
nsthread.busy = false;
|
||||
nsthread.result = res ? NET_EAI_OK : NET_EAI_NONAME;
|
||||
RESOLVE_DBG( "[resolve thread] returning result\n" );
|
||||
mutex_unlock( &nsthread.mutexres );
|
||||
RESOLVE_DBG( "[resolve thread] exiting thread\n" );
|
||||
|
|
@ -544,6 +546,7 @@ static net_gai_state_t NET_StringToSockaddr( const char *s, struct sockaddr_stor
|
|||
memset( &nsthread.addr, 0, sizeof( nsthread.addr ));
|
||||
|
||||
detach_thread( nsthread.thread );
|
||||
asyncfailed = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ GNU General Public License for more details.
|
|||
#define NET_MAX_MESSAGE PAD_NUMBER(( NET_MAX_PAYLOAD + HEADER_BYTES ), 16 )
|
||||
|
||||
#define MASTERSERVER_ADR "mentality.rip:27010"
|
||||
#define MASTERSERVER_ADR_TEST "mentality.rip:27011"
|
||||
#define MS_SCAN_REQUEST "1\xFF" "0.0.0.0:0\0"
|
||||
|
||||
#define PORT_MASTER 27010
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ void Sys_InitLog( void )
|
|||
s_ld.logfileno = fileno( s_ld.logfile );
|
||||
|
||||
fprintf( s_ld.logfile, "=================================================================================\n" );
|
||||
fprintf( s_ld.logfile, "\t%s (build %i) started at %s\n", s_ld.title, Q_buildnum(), Q_timestamp( TIME_FULL ) );
|
||||
fprintf( s_ld.logfile, "\t%s (build %i commit %s (%s-%s)) started at %s\n", s_ld.title, Q_buildnum(), Q_buildcommit(), Q_buildos(), Q_buildarch(), Q_timestamp( TIME_FULL ) );
|
||||
fprintf( s_ld.logfile, "=================================================================================\n" );
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -649,3 +649,31 @@ qboolean Sys_NewInstance( const char *gamedir )
|
|||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
==================
|
||||
Sys_GetNativeObject
|
||||
|
||||
Get platform-specific native object
|
||||
==================
|
||||
*/
|
||||
void *Sys_GetNativeObject( const char *obj )
|
||||
{
|
||||
void *ptr;
|
||||
|
||||
if( !COM_CheckString( obj ))
|
||||
return NULL;
|
||||
|
||||
ptr = FS_GetNativeObject( obj );
|
||||
|
||||
if( ptr )
|
||||
return ptr;
|
||||
|
||||
// Backend should consider that obj is case-sensitive
|
||||
#if XASH_ANDROID
|
||||
ptr = Android_GetNativeObject( obj );
|
||||
#endif // XASH_ANDROID
|
||||
|
||||
return ptr;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ void Sys_InitLog( void );
|
|||
void Sys_CloseLog( void );
|
||||
void Sys_Quit( void ) NORETURN;
|
||||
qboolean Sys_NewInstance( const char *gamedir );
|
||||
void *Sys_GetNativeObject( const char *obj );
|
||||
|
||||
//
|
||||
// sys_con.c
|
||||
|
|
|
|||
|
|
@ -38,6 +38,11 @@ void Platform_MessageBox( const char *title, const char *message, qboolean paren
|
|||
qboolean Sys_DebuggerPresent( void ); // optional, see Sys_DebugBreak
|
||||
void Platform_SetStatus( const char *status );
|
||||
|
||||
// legacy iOS port functions
|
||||
#if TARGET_OS_IOS
|
||||
const char *IOS_GetDocsDir( void );
|
||||
#endif // TARGET_OS_IOS
|
||||
|
||||
#if XASH_WIN32 || XASH_LINUX
|
||||
#define XASH_PLATFORM_HAVE_STATUS 1
|
||||
#else
|
||||
|
|
@ -135,17 +140,6 @@ static inline void Platform_Shutdown( void )
|
|||
#endif
|
||||
}
|
||||
|
||||
static inline void *Platform_GetNativeObject( const char *name )
|
||||
{
|
||||
void *ptr = NULL;
|
||||
|
||||
#if XASH_ANDROID
|
||||
ptr = Android_GetNativeObject( name );
|
||||
#endif
|
||||
|
||||
return ptr;
|
||||
}
|
||||
|
||||
/*
|
||||
==============================================================================
|
||||
|
||||
|
|
@ -154,7 +148,6 @@ static inline void *Platform_GetNativeObject( const char *name )
|
|||
==============================================================================
|
||||
*/
|
||||
void Platform_Vibrate( float life, char flags );
|
||||
void*Platform_GetNativeObject( const char *name );
|
||||
|
||||
/*
|
||||
==============================================================================
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ static qboolean SDLash_IsInstanceIDAGameController( SDL_JoystickID joyId )
|
|||
return true;
|
||||
return false;
|
||||
#else
|
||||
if( SDL_GameControllerFromInstanceID( joyId ) )
|
||||
if( SDL_GameControllerFromInstanceID( joyId ) != NULL )
|
||||
return true;
|
||||
return false;
|
||||
#endif
|
||||
|
|
@ -148,7 +148,7 @@ static void SDLash_KeyEvent( SDL_KeyboardEvent key )
|
|||
#else
|
||||
int keynum = key.keysym.sym;
|
||||
#endif
|
||||
qboolean numLock = SDL_GetModState() & KMOD_NUM;
|
||||
qboolean numLock = FBitSet( SDL_GetModState(), KMOD_NUM );
|
||||
|
||||
#if XASH_ANDROID
|
||||
if( keynum == SDL_SCANCODE_VOLUMEUP || keynum == SDL_SCANCODE_VOLUMEDOWN )
|
||||
|
|
@ -159,7 +159,7 @@ static void SDLash_KeyEvent( SDL_KeyboardEvent key )
|
|||
|
||||
if( SDL_IsTextInputActive() && down && cls.key_dest != key_game )
|
||||
{
|
||||
if( SDL_GetModState() & KMOD_CTRL )
|
||||
if( FBitSet( SDL_GetModState(), KMOD_CTRL ))
|
||||
{
|
||||
if( keynum >= SDL_SCANCODE_A && keynum <= SDL_SCANCODE_Z )
|
||||
{
|
||||
|
|
@ -176,7 +176,7 @@ static void SDLash_KeyEvent( SDL_KeyboardEvent key )
|
|||
|
||||
if( isprint( keynum ) )
|
||||
{
|
||||
if( SDL_GetModState() & KMOD_SHIFT )
|
||||
if( FBitSet( SDL_GetModState(), KMOD_SHIFT ))
|
||||
{
|
||||
keynum = Key_ToUpper( keynum );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -159,8 +159,8 @@ void *SW_LockBuffer( void )
|
|||
void *pixels;
|
||||
int stride;
|
||||
|
||||
if( SDL_LockTexture(sw.tex, NULL, &pixels, &stride ) )
|
||||
Sys_Error("%s", SDL_GetError());
|
||||
if( SDL_LockTexture(sw.tex, NULL, &pixels, &stride ) < 0 )
|
||||
Sys_Error( "%s: %s", __func__, SDL_GetError( ));
|
||||
return pixels;
|
||||
}
|
||||
|
||||
|
|
@ -273,7 +273,7 @@ static void R_InitVideoModes( void )
|
|||
int j;
|
||||
SDL_DisplayMode mode;
|
||||
|
||||
if( SDL_GetDisplayMode( displayIndex, i, &mode ) )
|
||||
if( SDL_GetDisplayMode( displayIndex, i, &mode ) < 0 )
|
||||
{
|
||||
Msg( "SDL_GetDisplayMode: %s\n", SDL_GetError() );
|
||||
continue;
|
||||
|
|
@ -420,12 +420,16 @@ static qboolean WIN_SetWindowIcon( HICON ico )
|
|||
{
|
||||
SDL_SysWMinfo wminfo;
|
||||
|
||||
if( SDL_GetWindowWMInfo( host.hWnd, &wminfo ))
|
||||
SDL_VERSION( &wminfo.version );
|
||||
|
||||
if( SDL_GetWindowWMInfo( host.hWnd, &wminfo ) == SDL_TRUE )
|
||||
{
|
||||
SendMessage( wminfo.info.win.window, WM_SETICON, ICON_SMALL, (LONG_PTR)ico );
|
||||
SendMessage( wminfo.info.win.window, WM_SETICON, ICON_BIG, (LONG_PTR)ico );
|
||||
return true;
|
||||
}
|
||||
|
||||
Con_Reportf( S_ERROR "%s: %s", __func__, SDL_GetError( ));
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -439,6 +443,25 @@ GL_GetProcAddress
|
|||
void *GL_GetProcAddress( const char *name )
|
||||
{
|
||||
void *func = SDL_GL_GetProcAddress( name );
|
||||
#if !SDL_VERSION_ATLEAST( 2, 0, 6 ) && XASH_POSIX
|
||||
if( !func && Sys_CheckParm( "-egl" ))
|
||||
{
|
||||
/*
|
||||
* SDL2 has broken SDL_GL_GetProcAddress until this commit if using egl:
|
||||
* https://github.com/libsdl-org/SDL/commit/466ba57d42d244e80357e9ad3011c50af30ed225
|
||||
* so call eglGetProcAddress directly
|
||||
* */
|
||||
static void *(*peglGetProcAddress)( const char * );
|
||||
if( !peglGetProcAddress )
|
||||
{
|
||||
void *lib = dlopen( "libEGL.so", RTLD_NOW );
|
||||
if( lib )
|
||||
*(void**)&peglGetProcAddress = dlsym( lib, "eglGetProcAddress" );
|
||||
}
|
||||
if( peglGetProcAddress )
|
||||
func = peglGetProcAddress( name );
|
||||
}
|
||||
#endif
|
||||
|
||||
#if XASH_PSVITA
|
||||
// try to find in main module
|
||||
|
|
@ -474,8 +497,8 @@ void GL_UpdateSwapInterval( void )
|
|||
{
|
||||
ClearBits( gl_vsync.flags, FCVAR_CHANGED );
|
||||
|
||||
if( SDL_GL_SetSwapInterval( gl_vsync.value ) )
|
||||
Con_Reportf( S_ERROR "SDL_GL_SetSwapInterval: %s\n", SDL_GetError( ) );
|
||||
if( SDL_GL_SetSwapInterval( gl_vsync.value ) < 0 )
|
||||
Con_Reportf( S_ERROR "SDL_GL_SetSwapInterval: %s\n", SDL_GetError( ));
|
||||
}
|
||||
#endif // SDL_VERSION_ATLEAST( 2, 0, 0 )
|
||||
}
|
||||
|
|
@ -524,7 +547,7 @@ GL_UpdateContext
|
|||
static qboolean GL_UpdateContext( void )
|
||||
{
|
||||
#if SDL_VERSION_ATLEAST( 2, 0, 0 )
|
||||
if( SDL_GL_MakeCurrent( host.hWnd, glw_state.context ))
|
||||
if( SDL_GL_MakeCurrent( host.hWnd, glw_state.context ) < 0 )
|
||||
{
|
||||
Con_Reportf( S_ERROR "GL_UpdateContext: %s\n", SDL_GetError());
|
||||
return GL_DeleteContext();
|
||||
|
|
@ -581,7 +604,7 @@ static qboolean VID_SetScreenResolution( int width, int height, window_mode_t wi
|
|||
want.w = width;
|
||||
want.h = height;
|
||||
|
||||
if( SDL_GetClosestDisplayMode( 0, &want, &got ) < 0 )
|
||||
if( SDL_GetClosestDisplayMode( 0, &want, &got ) == NULL )
|
||||
{
|
||||
Con_Printf( S_ERROR "%s: SDL_GetClosestDisplayMode: %s", __func__, SDL_GetError( ));
|
||||
return false;
|
||||
|
|
@ -627,9 +650,9 @@ void VID_RestoreScreenResolution( void )
|
|||
#endif // SDL_VERSION_ATLEAST( 2, 0, 0 )
|
||||
}
|
||||
|
||||
#if SDL_VERSION_ATLEAST( 2, 0, 0 )
|
||||
static void VID_SetWindowIcon( SDL_Window *hWnd )
|
||||
{
|
||||
#if SDL_VERSION_ATLEAST( 2, 0, 0 )
|
||||
rgbdata_t *icon = NULL;
|
||||
char iconpath[MAX_STRING];
|
||||
const char *localIcoPath;
|
||||
|
|
@ -667,8 +690,8 @@ static void VID_SetWindowIcon( SDL_Window *hWnd )
|
|||
#if XASH_WIN32 // ICO support only for Win32
|
||||
WIN_SetWindowIcon( LoadIcon( host.hInst, MAKEINTRESOURCE( 101 )));
|
||||
#endif
|
||||
#endif // SDL_VERSION_ATLEAST( 2, 0, 0 )
|
||||
}
|
||||
#endif // SDL_VERSION_ATLEAST( 2, 0, 0 )
|
||||
|
||||
static qboolean VID_CreateWindowWithSafeGL( const char *wndname, int xpos, int ypos, int w, int h, uint32_t flags )
|
||||
{
|
||||
|
|
@ -794,6 +817,7 @@ qboolean VID_CreateWindow( int width, int height, window_mode_t window_mode )
|
|||
else VID_RestoreScreenResolution();
|
||||
#endif
|
||||
|
||||
VID_SetWindowIcon( host.hWnd );
|
||||
SDL_ShowWindow( host.hWnd );
|
||||
|
||||
if( glw_state.context_type == REF_SOFTWARE )
|
||||
|
|
@ -1040,8 +1064,12 @@ qboolean R_Init_Video( const int type )
|
|||
refState.desktopBitsPixel = 16;
|
||||
#endif
|
||||
|
||||
#ifdef SDL_HINT_QTWAYLAND_WINDOW_FLAGS
|
||||
SDL_SetHint( SDL_HINT_QTWAYLAND_WINDOW_FLAGS, "OverridesSystemGestures" );
|
||||
#endif
|
||||
#ifdef SDL_HINT_QTWAYLAND_CONTENT_ORIENTATION
|
||||
SDL_SetHint( SDL_HINT_QTWAYLAND_CONTENT_ORIENTATION, "landscape" );
|
||||
#endif
|
||||
|
||||
#if SDL_VERSION_ATLEAST( 2, 0, 0 ) && !XASH_WIN32
|
||||
SDL_SetHint( "SDL_VIDEO_X11_XRANDR", "1" );
|
||||
|
|
@ -1067,7 +1095,7 @@ qboolean R_Init_Video( const int type )
|
|||
// refdll can request some attributes
|
||||
GL_SetupAttributes( );
|
||||
|
||||
if( SDL_GL_LoadLibrary( EGL_LIB ) )
|
||||
if( SDL_GL_LoadLibrary( EGL_LIB ) < 0 )
|
||||
{
|
||||
Con_Reportf( S_ERROR "Couldn't initialize OpenGL: %s\n", SDL_GetError());
|
||||
return false;
|
||||
|
|
@ -1108,7 +1136,11 @@ rserr_t R_ChangeDisplaySettings( int width, int height, window_mode_t window_mod
|
|||
#if SDL_VERSION_ATLEAST( 2, 0, 0 )
|
||||
SDL_DisplayMode displayMode;
|
||||
|
||||
SDL_GetCurrentDisplayMode( 0, &displayMode );
|
||||
if( SDL_GetCurrentDisplayMode( 0, &displayMode ) < 0 )
|
||||
{
|
||||
Con_Printf( S_ERROR "SDL_GetCurrentDisplayMode: %s", SDL_GetError( ));
|
||||
return rserr_invalid_mode;
|
||||
}
|
||||
|
||||
// check our desktop attributes
|
||||
refState.desktopBitsPixel = SDL_BITSPERPIXEL( displayMode.format );
|
||||
|
|
@ -1137,8 +1169,11 @@ rserr_t R_ChangeDisplaySettings( int width, int height, window_mode_t window_mod
|
|||
VID_RestoreScreenResolution();
|
||||
|
||||
#if SDL_VERSION_ATLEAST( 2, 0, 0 )
|
||||
if( SDL_SetWindowFullscreen( host.hWnd, 0 ))
|
||||
if( SDL_SetWindowFullscreen( host.hWnd, 0 ) < 0 )
|
||||
{
|
||||
Con_Printf( S_ERROR "SDL_SetWindowFullscreen: %s", SDL_GetError( ));
|
||||
return rserr_invalid_fullscreen;
|
||||
}
|
||||
#if SDL_VERSION_ATLEAST( 2, 0, 5 )
|
||||
SDL_SetWindowResizable( host.hWnd, SDL_TRUE );
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -333,8 +333,6 @@ typedef struct ref_api_s
|
|||
model_t *(*Mod_ForName)( const char *name, qboolean crash, qboolean trackCRC );
|
||||
void *(*Mod_Extradata)( int type, model_t *model );
|
||||
struct model_s *(*pfnGetModelByIndex)( int index ); // CL_ModelHandle
|
||||
struct model_s *(*Mod_GetCurrentLoadingModel)( void ); // loadmodel
|
||||
void (*Mod_SetCurrentLoadingModel)( struct model_s* ); // loadmodel
|
||||
|
||||
// remap
|
||||
struct remap_info_s *(*CL_GetRemapInfoForEntity)( cl_entity_t *e );
|
||||
|
|
@ -513,7 +511,7 @@ typedef struct ref_interface_s
|
|||
|
||||
// bmodel
|
||||
void (*R_InitSkyClouds)( struct mip_s *mt, struct texture_s *tx, qboolean custom_palette );
|
||||
void (*GL_SubdivideSurface)( msurface_t *fa );
|
||||
void (*GL_SubdivideSurface)( model_t *mod, msurface_t *fa );
|
||||
void (*CL_RunLightStyles)( void );
|
||||
|
||||
// sprites
|
||||
|
|
|
|||
|
|
@ -360,7 +360,6 @@ typedef struct
|
|||
typedef struct
|
||||
{
|
||||
qboolean initialized; // sv_init has completed
|
||||
qboolean game_library_loaded; // is game library loaded in SV_InitGame
|
||||
double timestart; // just for profiling
|
||||
|
||||
int maxclients; // server max clients
|
||||
|
|
|
|||
|
|
@ -121,8 +121,10 @@ void SV_ParseConsistencyResponse( sv_client_t *cl, sizebuf_t *msg )
|
|||
{
|
||||
value = MSG_ReadUBitLong( msg, 32 );
|
||||
|
||||
LittleLongSW( value );
|
||||
|
||||
// will be compare only first 4 bytes
|
||||
if( value != *(int *)r->rgucMD5_hash )
|
||||
if( memcmp( &value, r->rgucMD5_hash, 4 ))
|
||||
badresindex = idx + 1;
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -3031,7 +3031,7 @@ void SV_SetStringArrayMode( qboolean dynamic )
|
|||
#endif
|
||||
}
|
||||
|
||||
#if XASH_64BIT && !XASH_WIN32 && !XASH_APPLE && !XASH_NSWITCH
|
||||
#if XASH_64BIT && !XASH_WIN32 && !XASH_APPLE && !XASH_NSWITCH && !XASH_ANDROID
|
||||
#define USE_MMAP
|
||||
#include <sys/mman.h>
|
||||
#endif
|
||||
|
|
@ -5130,7 +5130,6 @@ void SV_UnloadProgs( void )
|
|||
|
||||
Mod_ResetStudioAPI ();
|
||||
|
||||
svs.game_library_loaded = false;
|
||||
COM_FreeLibrary( svgame.hInstance );
|
||||
Mem_FreePool( &svgame.mempool );
|
||||
memset( &svgame, 0, sizeof( svgame ));
|
||||
|
|
@ -5148,7 +5147,14 @@ qboolean SV_LoadProgs( const char *name )
|
|||
static playermove_t gpMove;
|
||||
edict_t *e;
|
||||
|
||||
if( svgame.hInstance ) SV_UnloadProgs();
|
||||
if( svgame.hInstance )
|
||||
{
|
||||
#if XASH_WIN32
|
||||
SV_UnloadProgs();
|
||||
#else // XASH_WIN32
|
||||
return true;
|
||||
#endif // XASH_WIN32
|
||||
}
|
||||
|
||||
// fill it in
|
||||
svgame.pmove = &gpMove;
|
||||
|
|
|
|||
|
|
@ -706,7 +706,7 @@ qboolean SV_InitGame( void )
|
|||
{
|
||||
string dllpath;
|
||||
|
||||
if( svs.game_library_loaded )
|
||||
if( svgame.hInstance )
|
||||
return true;
|
||||
|
||||
// first initialize?
|
||||
|
|
@ -721,7 +721,6 @@ qboolean SV_InitGame( void )
|
|||
}
|
||||
|
||||
// client frames will be allocated in SV_ClientConnect
|
||||
svs.game_library_loaded = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -1042,8 +1041,9 @@ qboolean SV_SpawnServer( const char *mapname, const char *startspot, qboolean ba
|
|||
// force normal player collisions for single player
|
||||
if( svs.maxclients == 1 ) Cvar_SetValue( "sv_clienttrace", 1 );
|
||||
|
||||
// make sure what server name doesn't contain path and extension
|
||||
COM_FileBase( mapname, sv.name, sizeof( sv.name ));
|
||||
// allow loading maps from subdirectories, strip extension anyway
|
||||
Q_strncpy( sv.name, mapname, sizeof( sv.name ));
|
||||
COM_StripExtension( sv.name );
|
||||
|
||||
// precache and static commands can be issued during map initialization
|
||||
Host_SetServerState( ss_loading );
|
||||
|
|
@ -1115,28 +1115,6 @@ int SV_GetMaxClients( void )
|
|||
return svs.maxclients;
|
||||
}
|
||||
|
||||
qboolean SV_InitGameProgs( void )
|
||||
{
|
||||
string dllpath;
|
||||
|
||||
if( svgame.hInstance ) return true; // already loaded
|
||||
|
||||
COM_GetCommonLibraryPath( LIBRARY_SERVER, dllpath, sizeof( dllpath ));
|
||||
|
||||
// just try to initialize
|
||||
SV_LoadProgs( dllpath );
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
void SV_FreeGameProgs( void )
|
||||
{
|
||||
if( svs.initialized ) return; // server is active
|
||||
|
||||
// unload progs (free cvars and commands)
|
||||
SV_UnloadProgs();
|
||||
}
|
||||
|
||||
/*
|
||||
================
|
||||
SV_ExecLoadLevel
|
||||
|
|
|
|||
|
|
@ -48,7 +48,8 @@ CVAR_DEFINE_AUTO( sv_send_logos, "1", 0, "send custom decal logo to other player
|
|||
CVAR_DEFINE_AUTO( sv_send_resources, "1", 0, "allow to download missed resources for players" );
|
||||
CVAR_DEFINE_AUTO( sv_logbans, "0", 0, "print into the server log info about player bans" );
|
||||
CVAR_DEFINE_AUTO( sv_allow_upload, "1", FCVAR_SERVER, "allow uploading custom resources on a server" );
|
||||
CVAR_DEFINE_AUTO( sv_allow_download, "1", FCVAR_SERVER, "allow downloading custom resources to the client" );
|
||||
CVAR_DEFINE( sv_allow_download, "sv_allowdownload", "1", FCVAR_SERVER, "allow downloading custom resources to the client" );
|
||||
static CVAR_DEFINE_AUTO( sv_allow_dlfile, "1", 0, "compatibility cvar, does nothing" );
|
||||
CVAR_DEFINE_AUTO( sv_uploadmax, "0.5", FCVAR_SERVER, "max size to upload custom resources (500 kB as default)" );
|
||||
CVAR_DEFINE_AUTO( sv_downloadurl, "", FCVAR_PROTECTED, "location from which clients can download missing files" );
|
||||
CVAR_DEFINE( sv_consistency, "mp_consistency", "1", FCVAR_SERVER, "enbale consistency check in multiplayer" );
|
||||
|
|
@ -925,6 +926,7 @@ void SV_Init( void )
|
|||
Cvar_RegisterVariable( &sv_unlagsamples );
|
||||
Cvar_RegisterVariable( &sv_allow_upload );
|
||||
Cvar_RegisterVariable( &sv_allow_download );
|
||||
Cvar_RegisterVariable( &sv_allow_dlfile );
|
||||
Cvar_RegisterVariable( &sv_send_logos );
|
||||
Cvar_RegisterVariable( &sv_send_resources );
|
||||
Cvar_RegisterVariable( &sv_uploadmax );
|
||||
|
|
@ -1089,7 +1091,9 @@ void SV_Shutdown( const char *finalmsg )
|
|||
if( CL_IsPlaybackDemo( ))
|
||||
CL_Drop();
|
||||
|
||||
SV_UnloadProgs ();
|
||||
#if XASH_WIN32
|
||||
SV_UnloadProgs();
|
||||
#endif // XASH_WIN32
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1106,7 +1110,10 @@ void SV_Shutdown( const char *finalmsg )
|
|||
NET_MasterShutdown();
|
||||
|
||||
NET_Config( false, false );
|
||||
SV_UnloadProgs ();
|
||||
SV_DeactivateServer();
|
||||
#if XASH_WIN32
|
||||
SV_UnloadProgs();
|
||||
#endif // XASH_WIN32
|
||||
CL_Drop();
|
||||
|
||||
// free current level
|
||||
|
|
|
|||
|
|
@ -80,8 +80,8 @@ static qboolean SV_CopyEdictToPhysEnt( physent_t *pe, edict_t *ed )
|
|||
}
|
||||
else
|
||||
{
|
||||
// otherwise copy the classname
|
||||
Q_strncpy( pe->name, STRING( ed->v.classname ), sizeof( pe->name ));
|
||||
// otherwise copy the modelname
|
||||
Q_strncpy( pe->name, mod->name, sizeof( pe->name ));
|
||||
}
|
||||
|
||||
pe->model = pe->studiomodel = NULL;
|
||||
|
|
|
|||
|
|
@ -150,7 +150,10 @@ public:
|
|||
|
||||
void RemoveFile( const char *path, const char *id ) override
|
||||
{
|
||||
FS_Delete( path ); // FS_Delete is aware of slashes
|
||||
char dir[MAX_VA_STRING], fullpath[MAX_VA_STRING];
|
||||
|
||||
Q_snprintf( fullpath, sizeof( fullpath ), "%s/%s", IdToDir( dir, sizeof( dir ), id ), path );
|
||||
FS_Delete( fullpath ); // FS_Delete is aware of slashes
|
||||
}
|
||||
|
||||
void CreateDirHierarchy( const char *path, const char *id ) override
|
||||
|
|
|
|||
|
|
@ -150,6 +150,4 @@ public:
|
|||
virtual void AddSearchPathNoWrite(const char *, const char *) = 0; /* linkage=_ZN11IFileSystem20AddSearchPathNoWriteEPKcS1_ */
|
||||
};
|
||||
|
||||
#define FILESYSTEM_INTERFACE_VERSION "VFileSystem009" // never change this!
|
||||
|
||||
#endif // VFILESYSTEM009_H
|
||||
|
|
|
|||
|
|
@ -770,13 +770,13 @@ void FS_ParseGenericGameInfo( gameinfo_t *GameInfo, const char *buf, const qbool
|
|||
else if( !Q_stricmp( token, "secure" ))
|
||||
{
|
||||
pfile = COM_ParseFile( pfile, token, sizeof( token ));
|
||||
GameInfo->secure = Q_atoi( token );
|
||||
GameInfo->secure = Q_atoi( token ) ? true : false;
|
||||
}
|
||||
// valid for both
|
||||
else if( !Q_stricmp( token, "nomodels" ))
|
||||
{
|
||||
pfile = COM_ParseFile( pfile, token, sizeof( token ));
|
||||
GameInfo->nomodels = Q_atoi( token );
|
||||
GameInfo->nomodels = Q_atoi( token ) ? true : false;
|
||||
}
|
||||
else if( !Q_stricmp( token, isGameInfo ? "max_edicts" : "edicts" ))
|
||||
{
|
||||
|
|
@ -844,17 +844,17 @@ void FS_ParseGenericGameInfo( gameinfo_t *GameInfo, const char *buf, const qbool
|
|||
else if( !Q_stricmp( token, "noskills" ))
|
||||
{
|
||||
pfile = COM_ParseFile( pfile, token, sizeof( token ));
|
||||
GameInfo->noskills = Q_atoi( token );
|
||||
GameInfo->noskills = Q_atoi( token ) ? true : false;
|
||||
}
|
||||
else if( !Q_stricmp( token, "render_picbutton_text" ))
|
||||
{
|
||||
pfile = COM_ParseFile( pfile, token, sizeof( token ));
|
||||
GameInfo->render_picbutton_text = Q_atoi( token );
|
||||
GameInfo->render_picbutton_text = Q_atoi( token ) ? true : false;
|
||||
}
|
||||
else if( !Q_stricmp( token, "internal_vgui_support" ))
|
||||
{
|
||||
pfile = COM_ParseFile( pfile, token, sizeof( token ));
|
||||
GameInfo->internal_vgui_support = Q_atoi( token );
|
||||
GameInfo->internal_vgui_support = Q_atoi( token ) ? true : false;
|
||||
}
|
||||
else if( !Q_stricmp( token, "quicksave_aged_count" ))
|
||||
{
|
||||
|
|
@ -1386,7 +1386,7 @@ static void _Sys_Error( const char *fmt, ... )
|
|||
exit( 1 );
|
||||
}
|
||||
|
||||
static void *_Platform_GetNativeObject_stub( const char *object )
|
||||
static void *Sys_GetNativeObject_stub( const char *object )
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -2841,7 +2841,7 @@ fs_interface_t g_engfuncs =
|
|||
_Mem_Alloc,
|
||||
_Mem_Realloc,
|
||||
_Mem_Free,
|
||||
_Platform_GetNativeObject_stub
|
||||
Sys_GetNativeObject_stub
|
||||
};
|
||||
|
||||
static qboolean FS_InitInterface( int version, fs_interface_t *engfuncs )
|
||||
|
|
@ -2883,9 +2883,9 @@ static qboolean FS_InitInterface( int version, fs_interface_t *engfuncs )
|
|||
Con_Reportf( "filesystem_stdio: custom memory allocation functions found\n" );
|
||||
}
|
||||
|
||||
if( engfuncs->_Platform_GetNativeObject )
|
||||
if( engfuncs->_Sys_GetNativeObject )
|
||||
{
|
||||
g_engfuncs._Platform_GetNativeObject = engfuncs->_Platform_GetNativeObject;
|
||||
g_engfuncs._Sys_GetNativeObject = engfuncs->_Sys_GetNativeObject;
|
||||
Con_Reportf( "filesystem_stdio: custom platform-specific functions found\n" );
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,8 @@ extern "C"
|
|||
#endif // __cplusplus
|
||||
|
||||
#define FS_API_VERSION 2 // not stable yet!
|
||||
#define FS_API_CREATEINTERFACE_TAG "XashFileSystem002" // follow FS_API_VERSION!!!
|
||||
#define FS_API_CREATEINTERFACE_TAG "XashFileSystem002" // follow FS_API_VERSION!!!
|
||||
#define FILESYSTEM_INTERFACE_VERSION "VFileSystem009" // never change this!
|
||||
|
||||
// search path flags
|
||||
enum
|
||||
|
|
@ -210,7 +211,7 @@ typedef struct fs_interface_t
|
|||
void (*_Mem_Free)( void *data, const char *filename, int fileline );
|
||||
|
||||
// platform
|
||||
void *(*_Platform_GetNativeObject)( const char *object );
|
||||
void *(*_Sys_GetNativeObject)( const char *object );
|
||||
} fs_interface_t;
|
||||
|
||||
typedef int (*FSAPI)( int version, fs_api_t *api, fs_globals_t **globals, fs_interface_t *interface );
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ extern const fs_archive_t g_archives[];
|
|||
#define Con_DPrintf (*g_engfuncs._Con_DPrintf)
|
||||
#define Con_Reportf (*g_engfuncs._Con_Reportf)
|
||||
#define Sys_Error (*g_engfuncs._Sys_Error)
|
||||
#define Platform_GetNativeObject (*g_engfuncs._Platform_GetNativeObject)
|
||||
#define Sys_GetNativeObject (*g_engfuncs._Sys_GetNativeObject)
|
||||
|
||||
//
|
||||
// filesystem.c
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ typedef void *HMODULE;
|
|||
|
||||
HMODULE g_hModule;
|
||||
FSAPI g_pfnGetFSAPI;
|
||||
typedef void *(*pfnCreateInterface_t)( const char *, int * );
|
||||
pfnCreateInterface_t g_pfnCreateInterface;
|
||||
fs_api_t g_fs;
|
||||
fs_globals_t *g_nullglobals;
|
||||
|
|
|
|||
|
|
@ -645,10 +645,10 @@ void COM_ExtractFilePath( const char *path, char *dest )
|
|||
const char *src = path + Q_strlen( path ) - 1;
|
||||
|
||||
// back up until a \ or the start
|
||||
while( src != path && !(*(src - 1) == '\\' || *(src - 1) == '/' ))
|
||||
while( src > path && !(*(src - 1) == '\\' || *(src - 1) == '/' ))
|
||||
src--;
|
||||
|
||||
if( src != path )
|
||||
if( src > path )
|
||||
{
|
||||
memcpy( dest, path, src - path );
|
||||
dest[src - path - 1] = 0; // cutoff backslash
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
#include <stdlib.h>
|
||||
#include "crtlib.h"
|
||||
#include <stdio.h>
|
||||
|
||||
int Test_ExtractFilePath( void )
|
||||
{
|
||||
char dst[64];
|
||||
const char *strings[] =
|
||||
{
|
||||
"dir/file", "dir",
|
||||
"bark\\meow", "bark",
|
||||
"nopath", "",
|
||||
"knee/deep/in/paths", "knee/deep/in",
|
||||
// yes, it removes the behavior/ even if it might be technically a directory
|
||||
"keep/the/original/func/behavior/", "keep/the/original/func",
|
||||
"backslashes\\are\\annoying\\af", "backslashes\\are\\annoying",
|
||||
"", ""
|
||||
};
|
||||
size_t i;
|
||||
|
||||
for( i = 0; i < sizeof( strings ) / sizeof( strings[0] ); i += 2 )
|
||||
{
|
||||
COM_ExtractFilePath( strings[i], dst );
|
||||
if( Q_strcmp( dst, strings[i+1] ))
|
||||
{
|
||||
printf( "%s %s %s\n", strings[i], strings[i+1], dst );
|
||||
return (i >> 1) + 1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int main( void )
|
||||
{
|
||||
if( Test_ExtractFilePath( ))
|
||||
return EXIT_FAILURE;
|
||||
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
|
@ -12,8 +12,7 @@ def options(opt):
|
|||
return
|
||||
|
||||
def configure(conf):
|
||||
# stub
|
||||
return
|
||||
conf.define('XASH_BUILD_COMMIT', conf.env.GIT_VERSION if conf.env.GIT_VERSION else 'notset')
|
||||
|
||||
def build(bld):
|
||||
bld(name = 'sdk_includes', export_includes = '. ../common ../pm_shared ../engine')
|
||||
|
|
@ -28,6 +27,7 @@ def build(bld):
|
|||
'strings': 'tests/test_strings.c',
|
||||
'build': 'tests/test_build.c',
|
||||
'filebase': 'tests/test_filebase.c',
|
||||
'efp': 'tests/test_efp.c',
|
||||
}
|
||||
|
||||
for i in tests:
|
||||
|
|
|
|||
|
|
@ -1014,7 +1014,7 @@ static void APIENTRY GL2_TexImage2D( GLenum target, GLint level, GLint internalf
|
|||
}
|
||||
internalformat = format;
|
||||
}
|
||||
if( internalformat == GL_LUMINANCE8_ALPHA8 || internalformat == GL_RGB )
|
||||
if( internalformat == GL_LUMINANCE8_ALPHA8 || internalformat == GL_RGB || internalformat == GL_RGB8 || internalformat == GL_RGB5 )
|
||||
internalformat = GL_RGBA;
|
||||
rpglTexImage2D( target, level, internalformat, width, height, border, format, type, data );
|
||||
if( data != pixels )
|
||||
|
|
@ -1309,9 +1309,9 @@ static void GL2_Mul4x4( const GLfloat *in0, const GLfloat *in1, GLfloat *out )
|
|||
static void GL2_UpdateMVP( gl2wrap_prog_t *prog )
|
||||
{
|
||||
// use bitset to determine if need update matrix for this prog
|
||||
if( FBitSet( gl2wrap_matrix.update, BIT( prog->flags )))
|
||||
if( FBitSet( gl2wrap_matrix.update, BIT64( prog->flags )))
|
||||
{
|
||||
ClearBits( gl2wrap_matrix.update, BIT( prog->flags ));
|
||||
ClearBits( gl2wrap_matrix.update, BIT64( prog->flags ));
|
||||
GL2_Mul4x4( gl2wrap_matrix.mv, gl2wrap_matrix.pr, gl2wrap_matrix.mvp );
|
||||
pglUniformMatrix4fvARB( prog->uMVP, 1, false, (void *)gl2wrap_matrix.mvp );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -418,7 +418,6 @@ rgbdata_t *Mod_CreateSkinData( model_t *mod, byte *data, int width, int height )
|
|||
static rgbdata_t skin;
|
||||
char name[MAX_QPATH];
|
||||
int i;
|
||||
model_t *loadmodel = gEngfuncs.Mod_GetCurrentLoadingModel();
|
||||
|
||||
skin.width = width;
|
||||
skin.height = height;
|
||||
|
|
@ -443,7 +442,7 @@ rgbdata_t *Mod_CreateSkinData( model_t *mod, byte *data, int width, int height )
|
|||
}
|
||||
}
|
||||
|
||||
COM_FileBase( loadmodel->name, name, sizeof( name ));
|
||||
COM_FileBase( mod->name, name, sizeof( name ));
|
||||
|
||||
// for alias models only player can have remap textures
|
||||
if( mod != NULL && !Q_stricmp( name, "player" ))
|
||||
|
|
@ -476,12 +475,11 @@ rgbdata_t *Mod_CreateSkinData( model_t *mod, byte *data, int width, int height )
|
|||
return gEngfuncs.FS_CopyImage( &skin );
|
||||
}
|
||||
|
||||
void *Mod_LoadSingleSkin( daliasskintype_t *pskintype, int skinnum, int size )
|
||||
void *Mod_LoadSingleSkin( model_t *loadmodel, daliasskintype_t *pskintype, int skinnum, int size )
|
||||
{
|
||||
string name, lumaname;
|
||||
string checkname;
|
||||
rgbdata_t *pic;
|
||||
model_t *loadmodel = gEngfuncs.Mod_GetCurrentLoadingModel();
|
||||
|
||||
Q_snprintf( name, sizeof( name ), "%s:frame%i", loadmodel->name, skinnum );
|
||||
Q_snprintf( lumaname, sizeof( lumaname ), "%s:luma%i", loadmodel->name, skinnum );
|
||||
|
|
@ -508,14 +506,13 @@ void *Mod_LoadSingleSkin( daliasskintype_t *pskintype, int skinnum, int size )
|
|||
return ((byte *)(pskintype + 1) + size);
|
||||
}
|
||||
|
||||
void *Mod_LoadGroupSkin( daliasskintype_t *pskintype, int skinnum, int size )
|
||||
void *Mod_LoadGroupSkin( model_t *loadmodel, daliasskintype_t *pskintype, int skinnum, int size )
|
||||
{
|
||||
daliasskininterval_t *pinskinintervals;
|
||||
daliasskingroup_t *pinskingroup;
|
||||
string name, lumaname;
|
||||
rgbdata_t *pic;
|
||||
int i, j;
|
||||
model_t *loadmodel = gEngfuncs.Mod_GetCurrentLoadingModel();
|
||||
|
||||
// animating skin group. yuck.
|
||||
pskintype++;
|
||||
|
|
@ -555,7 +552,7 @@ void *Mod_LoadGroupSkin( daliasskintype_t *pskintype, int skinnum, int size )
|
|||
Mod_LoadAllSkins
|
||||
===============
|
||||
*/
|
||||
void *Mod_LoadAllSkins( int numskins, daliasskintype_t *pskintype )
|
||||
void *Mod_LoadAllSkins( model_t *mod, int numskins, daliasskintype_t *pskintype )
|
||||
{
|
||||
int i, size;
|
||||
|
||||
|
|
@ -568,11 +565,11 @@ void *Mod_LoadAllSkins( int numskins, daliasskintype_t *pskintype )
|
|||
{
|
||||
if( pskintype->type == ALIAS_SKIN_SINGLE )
|
||||
{
|
||||
pskintype = (daliasskintype_t *)Mod_LoadSingleSkin( pskintype, i, size );
|
||||
pskintype = (daliasskintype_t *)Mod_LoadSingleSkin( mod, pskintype, i, size );
|
||||
}
|
||||
else
|
||||
{
|
||||
pskintype = (daliasskintype_t *)Mod_LoadGroupSkin( pskintype, i, size );
|
||||
pskintype = (daliasskintype_t *)Mod_LoadGroupSkin( mod, pskintype, i, size );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -680,7 +677,7 @@ void Mod_LoadAliasModel( model_t *mod, const void *buffer, qboolean *loaded )
|
|||
|
||||
// load the skins
|
||||
pskintype = (daliasskintype_t *)&pinmodel[1];
|
||||
pskintype = Mod_LoadAllSkins( m_pAliasHeader->numskins, pskintype );
|
||||
pskintype = Mod_LoadAllSkins( mod, m_pAliasHeader->numskins, pskintype );
|
||||
|
||||
// load base s and t vertices
|
||||
pinstverts = (stvert_t *)pskintype;
|
||||
|
|
@ -725,7 +722,7 @@ void Mod_LoadAliasModel( model_t *mod, const void *buffer, qboolean *loaded )
|
|||
GL_MakeAliasModelDisplayLists( mod );
|
||||
|
||||
// move the complete, relocatable alias model to the cache
|
||||
gEngfuncs.Mod_GetCurrentLoadingModel()->cache.data = m_pAliasHeader;
|
||||
mod->cache.data = m_pAliasHeader;
|
||||
|
||||
if( loaded ) *loaded = true; // done
|
||||
}
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ void GL_ApplyTextureParams( gl_texture_t *tex )
|
|||
}
|
||||
else if( FBitSet( tex->flags, TF_NOMIPMAP ) || tex->numMips <= 1 )
|
||||
{
|
||||
if( FBitSet( tex->flags, TF_NEAREST ) || ( IsLightMap( tex ) && gl_lightmap_nearest.value ))
|
||||
if( FBitSet( tex->flags, TF_NEAREST ) || ( IsLightMap( tex ) && gl_lightmap_nearest.value ) || ( tex->flags == TF_SKYSIDE && gl_texture_nearest.value ))
|
||||
{
|
||||
pglTexParameteri( tex->target, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
|
||||
pglTexParameteri( tex->target, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
|
||||
|
|
@ -342,6 +342,8 @@ void R_SetTextureParameters( void )
|
|||
// change all the existing mipmapped texture objects
|
||||
for( i = 0; i < gl_numTextures; i++ )
|
||||
GL_UpdateTextureParams( i );
|
||||
|
||||
R_UpdateRippleTexParams();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -2317,6 +2319,7 @@ void R_InitImages( void )
|
|||
// validate cvars
|
||||
R_SetTextureParameters();
|
||||
GL_CreateInternalTextures();
|
||||
R_InitRipples();
|
||||
|
||||
gEngfuncs.Cmd_AddCommand( "texturelist", R_TextureList_f, "display loaded textures list" );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -426,7 +426,7 @@ void R_MarkLeaves( void );
|
|||
void R_DrawWorld( void );
|
||||
void R_DrawWaterSurfaces( void );
|
||||
void R_DrawBrushModel( cl_entity_t *e );
|
||||
void GL_SubdivideSurface( msurface_t *fa );
|
||||
void GL_SubdivideSurface( model_t *mod, msurface_t *fa );
|
||||
void GL_BuildPolygonFromSurface( model_t *mod, msurface_t *fa );
|
||||
void DrawGLPoly( glpoly_t *p, float xScale, float yScale );
|
||||
texture_t *R_TextureAnimation( msurface_t *s );
|
||||
|
|
@ -489,6 +489,11 @@ void R_ClearSkyBox( void );
|
|||
void R_DrawSkyBox( void );
|
||||
void R_DrawClouds( void );
|
||||
void EmitWaterPolys( msurface_t *warp, qboolean reverse );
|
||||
void R_InitRipples( void );
|
||||
void R_ResetRipples( void );
|
||||
void R_AnimateRipples( void );
|
||||
void R_UpdateRippleTexParams( void );
|
||||
void R_UploadRipples( texture_t *image );
|
||||
|
||||
//
|
||||
// gl_vgui.c
|
||||
|
|
@ -750,6 +755,9 @@ extern convar_t r_vbo;
|
|||
extern convar_t r_vbo_dlightmode;
|
||||
extern convar_t r_studio_sort_textures;
|
||||
extern convar_t r_studio_drawelements;
|
||||
extern convar_t r_ripple;
|
||||
extern convar_t r_ripple_updatetime;
|
||||
extern convar_t r_ripple_spawntime;
|
||||
|
||||
//
|
||||
// engine shared convars
|
||||
|
|
|
|||
|
|
@ -26,10 +26,14 @@ CVAR_DEFINE_AUTO( r_novis, "0", 0, "ignore vis information (perfomance test)" );
|
|||
CVAR_DEFINE_AUTO( r_nocull, "0", 0, "ignore frustrum culling (perfomance test)" );
|
||||
CVAR_DEFINE_AUTO( r_lockpvs, "0", FCVAR_CHEAT, "lockpvs area at current point (pvs test)" );
|
||||
CVAR_DEFINE_AUTO( r_lockfrustum, "0", FCVAR_CHEAT, "lock frustrum area at current point (cull test)" );
|
||||
CVAR_DEFINE_AUTO( r_traceglow, "1", FCVAR_GLCONFIG, "cull flares behind models" );
|
||||
CVAR_DEFINE_AUTO( r_traceglow, "0", FCVAR_GLCONFIG, "cull flares behind models" );
|
||||
CVAR_DEFINE_AUTO( gl_round_down, "2", FCVAR_GLCONFIG|FCVAR_READ_ONLY, "round texture sizes to nearest POT value" );
|
||||
CVAR_DEFINE( r_vbo, "gl_vbo", "0", FCVAR_ARCHIVE, "draw world using VBO (known to be glitchy)" );
|
||||
CVAR_DEFINE( r_vbo_dlightmode, "gl_vbo_dlightmode", "1", FCVAR_ARCHIVE, "vbo dlight rendering mode (0-1)" );
|
||||
CVAR_DEFINE_AUTO( r_ripple, "0", FCVAR_GLCONFIG, "enable software-like water texture ripple simulation" );
|
||||
CVAR_DEFINE_AUTO( r_ripple_updatetime, "0.05", FCVAR_GLCONFIG, "how fast ripple simulation is" );
|
||||
CVAR_DEFINE_AUTO( r_ripple_spawntime, "0.1", FCVAR_GLCONFIG, "how fast new ripples spawn" );
|
||||
|
||||
|
||||
DEFINE_ENGINE_SHARED_CVAR_LIST()
|
||||
|
||||
|
|
@ -549,24 +553,54 @@ qboolean GL_CheckExtension( const char *name, const dllfunc_t *funcs, const char
|
|||
for( func = funcs; func && func->name; func++ )
|
||||
{
|
||||
// functions are cleared before all the extensions are evaluated
|
||||
if((*func->func = (void *)gEngfuncs.GL_GetProcAddress( func->name )) == NULL )
|
||||
if(( *func->func = (void *)gEngfuncs.GL_GetProcAddress( func->name )) == NULL )
|
||||
{
|
||||
string name;
|
||||
char *end;
|
||||
size_t i = 0;
|
||||
#ifdef XASH_GLES
|
||||
const char *suffixes[] = { "", "EXT", "OES" };
|
||||
#else
|
||||
const char *suffixes[] = { "", "EXT" };
|
||||
#endif
|
||||
|
||||
// HACK: fix ARB names
|
||||
char *str = Q_strstr( func->name, "ARB" );
|
||||
if(str)
|
||||
Q_strncpy( name, func->name, sizeof( name ));
|
||||
if(( end = Q_strstr( name, "ARB" )))
|
||||
{
|
||||
string name;
|
||||
|
||||
Q_strncpy( name, func->name, MAX_STRING );
|
||||
name[str - func->name] = '\0';
|
||||
*func->func = gEngfuncs.GL_GetProcAddress( name );
|
||||
|
||||
if( !*func->func )
|
||||
GL_SetExtension( r_ext, false );
|
||||
*end = '\0';
|
||||
}
|
||||
else
|
||||
// one or more functions are invalid, extension will be disabled
|
||||
else // I need Q_strstrnul
|
||||
{
|
||||
end = name + Q_strlen( name );
|
||||
i++; // skip empty suffix
|
||||
}
|
||||
|
||||
for( ; i < sizeof( suffixes ) / sizeof( suffixes[0] ); i++ )
|
||||
{
|
||||
void *f;
|
||||
|
||||
Q_strncat( name, suffixes[i], sizeof( name ));
|
||||
|
||||
if(( f = gEngfuncs.GL_GetProcAddress( name )))
|
||||
{
|
||||
// GL_GetProcAddress prints errors about missing functions, so tell user that we found it with different name
|
||||
gEngfuncs.Con_Printf( S_NOTE "found %s\n", name );
|
||||
|
||||
*func->func = f;
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
*end = '\0'; // cut suffix, try next
|
||||
}
|
||||
}
|
||||
|
||||
// not found...
|
||||
if( i == sizeof( suffixes ) / sizeof( suffixes[0] ))
|
||||
{
|
||||
GL_SetExtension( r_ext, false );
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
@ -829,7 +863,9 @@ void GL_InitExtensionsGLES( void )
|
|||
#endif
|
||||
case GL_DEBUG_OUTPUT:
|
||||
if( glw_state.extended )
|
||||
GL_CheckExtension( "GL_KHR_debug", NULL, NULL, extid, 0 );
|
||||
GL_CheckExtension( "GL_KHR_debug", debugoutputfuncs, "gl_debug_output", extid, 0 );
|
||||
else
|
||||
GL_SetExtension( extid, false );
|
||||
break;
|
||||
// case GL_TEXTURE_COMPRESSION_EXT: NOPE
|
||||
// case GL_SHADER_GLSL100_EXT: NOPE
|
||||
|
|
@ -1093,6 +1129,7 @@ void GL_InitExtensions( void )
|
|||
|
||||
// force everything to happen in the main thread instead of in a separate driver thread
|
||||
pglEnable( GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB );
|
||||
|
||||
}
|
||||
|
||||
// enable all the low priority messages
|
||||
|
|
@ -1153,6 +1190,9 @@ void GL_InitCommands( void )
|
|||
gEngfuncs.Cvar_RegisterVariable( &r_traceglow );
|
||||
gEngfuncs.Cvar_RegisterVariable( &r_studio_sort_textures );
|
||||
gEngfuncs.Cvar_RegisterVariable( &r_studio_drawelements );
|
||||
gEngfuncs.Cvar_RegisterVariable( &r_ripple );
|
||||
gEngfuncs.Cvar_RegisterVariable( &r_ripple_updatetime );
|
||||
gEngfuncs.Cvar_RegisterVariable( &r_ripple_spawntime );
|
||||
|
||||
gEngfuncs.Cvar_RegisterVariable( &gl_extensions );
|
||||
gEngfuncs.Cvar_RegisterVariable( &gl_texture_nearest );
|
||||
|
|
@ -1345,7 +1385,7 @@ void GL_SetupAttributes( int safegl )
|
|||
#ifdef XASH_NANOGL
|
||||
gEngfuncs.GL_SetAttribute( REF_GL_CONTEXT_MAJOR_VERSION, 1 );
|
||||
gEngfuncs.GL_SetAttribute( REF_GL_CONTEXT_MINOR_VERSION, 1 );
|
||||
#elif defined( XASH_WES ) || defined( XASH_REGAL )
|
||||
#else
|
||||
gEngfuncs.GL_SetAttribute( REF_GL_CONTEXT_MAJOR_VERSION, 2 );
|
||||
gEngfuncs.GL_SetAttribute( REF_GL_CONTEXT_MINOR_VERSION, 0 );
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -969,6 +969,8 @@ void R_RenderScene( void )
|
|||
|
||||
R_MarkLeaves();
|
||||
R_DrawFog ();
|
||||
if( RI.drawWorld )
|
||||
R_AnimateRipples();
|
||||
|
||||
R_CheckGLFog();
|
||||
R_DrawWorld();
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ static void R_ParseDetailTextures( const char *filename )
|
|||
if( Q_stricmp( tex->name, texname ))
|
||||
continue;
|
||||
|
||||
tex->dt_texturenum = GL_LoadTexture( detail_path, NULL, 0, TF_FORCE_COLOR );
|
||||
tex->dt_texturenum = GL_LoadTexture( detail_path, NULL, 0, TF_FORCE_COLOR|TF_NOFLIP_TGA );
|
||||
|
||||
// texture is loaded
|
||||
if( tex->dt_texturenum )
|
||||
|
|
@ -150,6 +150,7 @@ void R_NewMap( void )
|
|||
|
||||
GL_BuildLightmaps ();
|
||||
R_GenerateVBO();
|
||||
R_ResetRipples();
|
||||
|
||||
if( gEngfuncs.drawFuncs->R_NewMap != NULL )
|
||||
gEngfuncs.drawFuncs->R_NewMap();
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ static void BoundPoly( int numverts, float *verts, vec3_t mins, vec3_t maxs )
|
|||
}
|
||||
}
|
||||
|
||||
static void SubdividePolygon_r( msurface_t *warpface, int numverts, float *verts )
|
||||
static void SubdividePolygon_r( model_t *loadmodel, msurface_t *warpface, int numverts, float *verts )
|
||||
{
|
||||
vec3_t front[SUBDIVIDE_SIZE], back[SUBDIVIDE_SIZE];
|
||||
mextrasurf_t *warpinfo = warpface->info;
|
||||
|
|
@ -88,7 +88,6 @@ static void SubdividePolygon_r( msurface_t *warpface, int numverts, float *verts
|
|||
float sample_size;
|
||||
vec3_t mins, maxs;
|
||||
glpoly_t *poly;
|
||||
model_t *loadmodel = gEngfuncs.Mod_GetCurrentLoadingModel();
|
||||
|
||||
if( numverts > ( SUBDIVIDE_SIZE - 4 ))
|
||||
gEngfuncs.Host_Error( "Mod_SubdividePolygon: too many vertexes on face ( %i )\n", numverts );
|
||||
|
|
@ -143,8 +142,8 @@ static void SubdividePolygon_r( msurface_t *warpface, int numverts, float *verts
|
|||
}
|
||||
}
|
||||
|
||||
SubdividePolygon_r( warpface, f, front[0] );
|
||||
SubdividePolygon_r( warpface, b, back[0] );
|
||||
SubdividePolygon_r( loadmodel, warpface, f, front[0] );
|
||||
SubdividePolygon_r( loadmodel, warpface, b, back[0] );
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -205,7 +204,7 @@ void GL_SetupFogColorForSurfaces( void )
|
|||
vec3_t fogColor;
|
||||
float factor, div;
|
||||
|
||||
if( !glState.isFogEnabled)
|
||||
if( !glState.isFogEnabled )
|
||||
return;
|
||||
|
||||
if( RI.currententity && RI.currententity->curstate.rendermode == kRenderTransTexture )
|
||||
|
|
@ -238,13 +237,12 @@ boundaries so that turbulent and sky warps
|
|||
can be done reasonably.
|
||||
================
|
||||
*/
|
||||
void GL_SubdivideSurface( msurface_t *fa )
|
||||
void GL_SubdivideSurface( model_t *loadmodel, msurface_t *fa )
|
||||
{
|
||||
vec3_t verts[SUBDIVIDE_SIZE];
|
||||
int numverts;
|
||||
int i, lindex;
|
||||
float *vec;
|
||||
model_t *loadmodel = gEngfuncs.Mod_GetCurrentLoadingModel();
|
||||
|
||||
// convert edges back to a normal polygon
|
||||
numverts = 0;
|
||||
|
|
@ -261,7 +259,7 @@ void GL_SubdivideSurface( msurface_t *fa )
|
|||
SetBits( fa->flags, SURF_DRAWTURB_QUADS ); // predict state
|
||||
|
||||
// do subdivide
|
||||
SubdividePolygon_r( fa, numverts, verts[0] );
|
||||
SubdividePolygon_r( loadmodel, fa, numverts, verts[0] );
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -877,7 +875,7 @@ void DrawGLPolyChain( glpoly_t *p, float soffset, float toffset )
|
|||
}
|
||||
}
|
||||
|
||||
_inline qboolean R_HasLightmap( void )
|
||||
static qboolean R_HasLightmap( void )
|
||||
{
|
||||
if( r_fullbright->value || !WORLDMODEL->lightdata )
|
||||
return false;
|
||||
|
|
@ -1137,14 +1135,15 @@ void R_RenderBrushPoly( msurface_t *fa, int cull_type )
|
|||
|
||||
t = R_TextureAnimation( fa );
|
||||
|
||||
GL_Bind( XASH_TEXTURE0, t->gl_texturenum );
|
||||
|
||||
if( FBitSet( fa->flags, SURF_DRAWTURB ))
|
||||
{
|
||||
R_UploadRipples( t );
|
||||
|
||||
// warp texture, no lightmaps
|
||||
EmitWaterPolys( fa, (cull_type == CULL_BACKSIDE));
|
||||
return;
|
||||
}
|
||||
else GL_Bind( XASH_TEXTURE0, t->gl_texturenum );
|
||||
|
||||
if( t->fb_texturenum )
|
||||
{
|
||||
|
|
@ -1413,7 +1412,7 @@ void R_DrawWaterSurfaces( void )
|
|||
continue;
|
||||
|
||||
// set modulate mode explicitly
|
||||
GL_Bind( XASH_TEXTURE0, t->gl_texturenum );
|
||||
R_UploadRipples( t );
|
||||
|
||||
for( ; s; s = s->texturechain )
|
||||
EmitWaterPolys( s, false );
|
||||
|
|
|
|||
|
|
@ -1726,7 +1726,7 @@ static void R_LightLambert( vec4_t light[MAX_LOCALLIGHTS], const vec3_t normal,
|
|||
out[2] = Q_min( (int)( finalLight[2] ), 255 );
|
||||
}
|
||||
|
||||
static void R_StudioSetColorArray(short *ptricmds, vec3_t *pstudionorms, byte *color )
|
||||
static void R_StudioSetColorArray( short *ptricmds, vec3_t *pstudionorms, byte *color )
|
||||
{
|
||||
float *lv = (float *)g_studio.lightvalues[ptricmds[1]];
|
||||
|
||||
|
|
@ -1896,9 +1896,8 @@ R_StudioDrawNormalMesh
|
|||
generic path
|
||||
===============
|
||||
*/
|
||||
_inline void R_StudioDrawNormalMesh( short *ptricmds, vec3_t *pstudionorms, float s, float t )
|
||||
static void R_StudioDrawNormalMesh( short *ptricmds, vec3_t *pstudionorms, float s, float t )
|
||||
{
|
||||
float *lv;
|
||||
int i;
|
||||
|
||||
while(( i = *( ptricmds++ )))
|
||||
|
|
@ -1929,9 +1928,8 @@ R_StudioDrawNormalMesh
|
|||
generic path
|
||||
===============
|
||||
*/
|
||||
_inline void R_StudioDrawFloatMesh( short *ptricmds, vec3_t *pstudionorms )
|
||||
static void R_StudioDrawFloatMesh( short *ptricmds, vec3_t *pstudionorms )
|
||||
{
|
||||
float *lv;
|
||||
int i;
|
||||
|
||||
while(( i = *( ptricmds++ )))
|
||||
|
|
@ -1961,7 +1959,7 @@ R_StudioDrawNormalMesh
|
|||
generic path
|
||||
===============
|
||||
*/
|
||||
_inline void R_StudioDrawChromeMesh( short *ptricmds, vec3_t *pstudionorms, float s, float t, float scale )
|
||||
static void R_StudioDrawChromeMesh( short *ptricmds, vec3_t *pstudionorms, float s, float t, float scale )
|
||||
{
|
||||
float *lv, *av;
|
||||
int i, idx;
|
||||
|
|
@ -2006,7 +2004,7 @@ _inline void R_StudioDrawChromeMesh( short *ptricmds, vec3_t *pstudionorms, floa
|
|||
}
|
||||
|
||||
|
||||
_inline int R_StudioBuildIndices( qboolean tri_strip, int vertexState )
|
||||
static int R_StudioBuildIndices( qboolean tri_strip, int vertexState )
|
||||
{
|
||||
// build in indices
|
||||
if( vertexState++ < 3 )
|
||||
|
|
@ -2049,7 +2047,7 @@ R_StudioDrawNormalMesh
|
|||
generic path
|
||||
===============
|
||||
*/
|
||||
_inline void R_StudioBuildArrayNormalMesh( short *ptricmds, vec3_t *pstudionorms, float s, float t )
|
||||
static void R_StudioBuildArrayNormalMesh( short *ptricmds, vec3_t *pstudionorms, float s, float t )
|
||||
{
|
||||
float *lv;
|
||||
int i;
|
||||
|
|
@ -2092,7 +2090,7 @@ R_StudioDrawNormalMesh
|
|||
generic path
|
||||
===============
|
||||
*/
|
||||
_inline void R_StudioBuildArrayFloatMesh( short *ptricmds, vec3_t *pstudionorms )
|
||||
static void R_StudioBuildArrayFloatMesh( short *ptricmds, vec3_t *pstudionorms )
|
||||
{
|
||||
float *lv;
|
||||
int i;
|
||||
|
|
@ -2135,7 +2133,7 @@ R_StudioDrawNormalMesh
|
|||
generic path
|
||||
===============
|
||||
*/
|
||||
_inline void R_StudioBuildArrayChromeMesh( short *ptricmds, vec3_t *pstudionorms, float s, float t, float scale )
|
||||
static void R_StudioBuildArrayChromeMesh( short *ptricmds, vec3_t *pstudionorms, float s, float t, float scale )
|
||||
{
|
||||
float *lv, *av;
|
||||
int i, idx;
|
||||
|
|
@ -2192,7 +2190,7 @@ _inline void R_StudioBuildArrayChromeMesh( short *ptricmds, vec3_t *pstudionorms
|
|||
}
|
||||
}
|
||||
|
||||
_inline void R_StudioDrawArrays( uint startverts, uint startelems )
|
||||
static void R_StudioDrawArrays( uint startverts, uint startelems )
|
||||
{
|
||||
pglEnableClientState( GL_VERTEX_ARRAY );
|
||||
pglVertexPointer( 3, GL_FLOAT, 12, g_studio.arrayverts );
|
||||
|
|
|
|||
227
ref/gl/gl_warp.c
227
ref/gl/gl_warp.c
|
|
@ -62,6 +62,29 @@ static float r_turbsin[] =
|
|||
#include "warpsin.h"
|
||||
};
|
||||
|
||||
#define RIPPLES_CACHEWIDTH_BITS 7
|
||||
#define RIPPLES_CACHEWIDTH ( 1 << RIPPLES_CACHEWIDTH_BITS )
|
||||
#define RIPPLES_CACHEWIDTH_MASK (( RIPPLES_CACHEWIDTH ) - 1 )
|
||||
#define RIPPLES_TEXSIZE ( RIPPLES_CACHEWIDTH * RIPPLES_CACHEWIDTH )
|
||||
#define RIPPLES_TEXSIZE_MASK ( RIPPLES_TEXSIZE - 1 )
|
||||
|
||||
STATIC_ASSERT( RIPPLES_TEXSIZE == 0x4000, "fix the algorithm to work with custom resolution" );
|
||||
|
||||
static struct
|
||||
{
|
||||
double time;
|
||||
double oldtime;
|
||||
|
||||
short *curbuf, *oldbuf;
|
||||
short buf[2][RIPPLES_TEXSIZE];
|
||||
qboolean update;
|
||||
|
||||
uint32_t texture[RIPPLES_TEXSIZE];
|
||||
int gl_texturenum;
|
||||
int rippletexturenum;
|
||||
float texturescale; // not all textures are 128x128, scale the texcoords down
|
||||
} g_ripple;
|
||||
|
||||
static qboolean CheckSkybox( const char *name, char out[6][MAX_STRING] )
|
||||
{
|
||||
const char *skybox_ext[3] = { "dds", "tga", "bmp" };
|
||||
|
|
@ -799,10 +822,18 @@ void EmitWaterPolys( msurface_t *warp, qboolean reverse )
|
|||
os = v[3];
|
||||
ot = v[4];
|
||||
|
||||
s = os + r_turbsin[(int)((ot * 0.125f + gpGlobals->time) * TURBSCALE) & 255];
|
||||
s *= ( 1.0f / SUBDIVIDE_SIZE );
|
||||
if( !r_ripple.value )
|
||||
{
|
||||
s = os + r_turbsin[(int)((ot * 0.125f + gpGlobals->time) * TURBSCALE) & 255];
|
||||
t = ot + r_turbsin[(int)((os * 0.125f + gpGlobals->time) * TURBSCALE) & 255];
|
||||
}
|
||||
else
|
||||
{
|
||||
s = os / g_ripple.texturescale;
|
||||
t = ot / g_ripple.texturescale;
|
||||
}
|
||||
|
||||
t = ot + r_turbsin[(int)((os * 0.125f + gpGlobals->time) * TURBSCALE) & 255];
|
||||
s *= ( 1.0f / SUBDIVIDE_SIZE );
|
||||
t *= ( 1.0f / SUBDIVIDE_SIZE );
|
||||
|
||||
pglTexCoord2f( s, t );
|
||||
|
|
@ -822,3 +853,193 @@ void EmitWaterPolys( msurface_t *warp, qboolean reverse )
|
|||
|
||||
GL_SetupFogColorForSurfaces();
|
||||
}
|
||||
|
||||
/*
|
||||
============================================================
|
||||
|
||||
HALF-LIFE SOFTWARE WATER
|
||||
|
||||
============================================================
|
||||
*/
|
||||
void R_ResetRipples( void )
|
||||
{
|
||||
g_ripple.curbuf = g_ripple.buf[0];
|
||||
g_ripple.oldbuf = g_ripple.buf[1];
|
||||
g_ripple.time = g_ripple.oldtime = gpGlobals->time - 0.1;
|
||||
memset( g_ripple.buf, 0, sizeof( g_ripple.buf ));
|
||||
}
|
||||
|
||||
void R_InitRipples( void )
|
||||
{
|
||||
rgbdata_t pic = { 0 };
|
||||
|
||||
pic.width = pic.height = RIPPLES_CACHEWIDTH;
|
||||
pic.depth = 1;
|
||||
pic.flags = IMAGE_HAS_COLOR;
|
||||
pic.buffer = (byte *)g_ripple.texture;
|
||||
pic.type = PF_RGBA_32;
|
||||
pic.size = sizeof( g_ripple.texture );
|
||||
pic.numMips = 1;
|
||||
memset( pic.buffer, 0, pic.size );
|
||||
|
||||
g_ripple.rippletexturenum = GL_LoadTextureInternal( "*rippletex", &pic, TF_NOMIPMAP );
|
||||
}
|
||||
|
||||
static void R_SwapBufs( void )
|
||||
{
|
||||
short *tempbufp = g_ripple.curbuf;
|
||||
g_ripple.curbuf = g_ripple.oldbuf;
|
||||
g_ripple.oldbuf = tempbufp;
|
||||
}
|
||||
|
||||
static void R_SpawnNewRipple( int x, int y, short val )
|
||||
{
|
||||
#define PIXEL( x, y ) ((( x ) & RIPPLES_CACHEWIDTH_MASK ) + ((( y ) & RIPPLES_CACHEWIDTH_MASK) << 7 ))
|
||||
g_ripple.oldbuf[PIXEL( x, y )] += val;
|
||||
|
||||
val >>= 2;
|
||||
g_ripple.oldbuf[PIXEL( x + 1, y )] += val;
|
||||
g_ripple.oldbuf[PIXEL( x - 1, y )] += val;
|
||||
g_ripple.oldbuf[PIXEL( x, y + 1 )] += val;
|
||||
g_ripple.oldbuf[PIXEL( x, y - 1 )] += val;
|
||||
#undef PIXEL
|
||||
}
|
||||
|
||||
static void R_RunRipplesAnimation( const short *oldbuf, short *pbuf )
|
||||
{
|
||||
size_t i = 0;
|
||||
const int w = RIPPLES_CACHEWIDTH;
|
||||
const int m = RIPPLES_TEXSIZE_MASK;
|
||||
|
||||
for( i = w; i < m + w; i++, pbuf++ )
|
||||
{
|
||||
*pbuf = (
|
||||
( (int)oldbuf[( i - ( w * 2 )) & m]
|
||||
+ (int)oldbuf[( i - ( w + 1 )) & m]
|
||||
+ (int)oldbuf[( i - ( w - 1 )) & m]
|
||||
+ (int)oldbuf[( i ) & m]) >> 1 ) - (int)*pbuf;
|
||||
|
||||
*pbuf -= ( *pbuf >> 6 );
|
||||
}
|
||||
}
|
||||
|
||||
static int MostSignificantBit( unsigned int v )
|
||||
{
|
||||
#if __GNUC__
|
||||
return 31 - __builtin_clz( v );
|
||||
#else
|
||||
int i;
|
||||
for( i = 0, v >>= 1; v; v >>= 1, i++ );
|
||||
return i;
|
||||
#endif
|
||||
}
|
||||
|
||||
void R_AnimateRipples( void )
|
||||
{
|
||||
double frametime = gpGlobals->time - g_ripple.time;
|
||||
|
||||
g_ripple.update = r_ripple.value && frametime >= r_ripple_updatetime.value;
|
||||
|
||||
if( !g_ripple.update )
|
||||
return;
|
||||
|
||||
g_ripple.time = gpGlobals->time;
|
||||
|
||||
R_SwapBufs();
|
||||
|
||||
if( g_ripple.time - g_ripple.oldtime > r_ripple_spawntime.value )
|
||||
{
|
||||
int x, y, val;
|
||||
|
||||
g_ripple.oldtime = g_ripple.time;
|
||||
|
||||
x = rand() & 0x7fff;
|
||||
y = rand() & 0x7fff;
|
||||
val = rand() & 0x3ff;
|
||||
|
||||
R_SpawnNewRipple( x, y, val );
|
||||
}
|
||||
|
||||
R_RunRipplesAnimation( g_ripple.oldbuf, g_ripple.curbuf );
|
||||
}
|
||||
|
||||
void R_UpdateRippleTexParams( void )
|
||||
{
|
||||
gl_texture_t *tex = R_GetTexture( g_ripple.rippletexturenum );
|
||||
|
||||
GL_Bind( XASH_TEXTURE0, g_ripple.rippletexturenum );
|
||||
|
||||
if( gl_texture_nearest.value )
|
||||
{
|
||||
pglTexParameteri( tex->target, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
|
||||
pglTexParameteri( tex->target, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
|
||||
}
|
||||
else
|
||||
{
|
||||
pglTexParameteri( tex->target, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
|
||||
pglTexParameteri( tex->target, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
|
||||
}
|
||||
}
|
||||
|
||||
void R_UploadRipples( texture_t *image )
|
||||
{
|
||||
gl_texture_t *glt;
|
||||
uint32_t *pixels;
|
||||
int wbits, wmask, wshft;
|
||||
|
||||
// discard unuseful textures
|
||||
if( !r_ripple.value || image->width > RIPPLES_CACHEWIDTH || image->width != image->height )
|
||||
{
|
||||
GL_Bind( XASH_TEXTURE0, image->gl_texturenum );
|
||||
return;
|
||||
}
|
||||
|
||||
glt = R_GetTexture( image->gl_texturenum );
|
||||
if( !glt || !glt->original || !glt->original->buffer || !FBitSet( glt->flags, TF_EXPAND_SOURCE ))
|
||||
{
|
||||
GL_Bind( XASH_TEXTURE0, image->gl_texturenum );
|
||||
return;
|
||||
}
|
||||
|
||||
GL_Bind( XASH_TEXTURE0, g_ripple.rippletexturenum );
|
||||
|
||||
// no updates this frame
|
||||
if( !g_ripple.update && image->gl_texturenum == g_ripple.gl_texturenum )
|
||||
return;
|
||||
|
||||
g_ripple.gl_texturenum = image->gl_texturenum;
|
||||
if( r_ripple.value == 1.0f )
|
||||
{
|
||||
g_ripple.texturescale = Q_max( 1.0f, image->width / 64.0f );
|
||||
}
|
||||
else
|
||||
{
|
||||
g_ripple.texturescale = 1.0f;
|
||||
}
|
||||
|
||||
|
||||
pixels = (uint32_t *)glt->original->buffer;
|
||||
wbits = MostSignificantBit( image->width );
|
||||
wshft = 7 - wbits;
|
||||
wmask = image->width - 1;
|
||||
|
||||
for( int y = 0; y < image->height; y++ )
|
||||
{
|
||||
int ry = y << ( 7 + wshft );
|
||||
|
||||
for( int x = 0; x < image->width; x++ )
|
||||
{
|
||||
int rx = x << wshft;
|
||||
int val = g_ripple.curbuf[ry + rx] >> 4;
|
||||
|
||||
int py = (y - val) & wmask;
|
||||
int px = (x + val) & wmask;
|
||||
int p = ( py << wbits ) + px;
|
||||
|
||||
g_ripple.texture[(y << wbits) + x] = pixels[p];
|
||||
}
|
||||
}
|
||||
|
||||
pglTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, image->width, image->width, 0,
|
||||
GL_RGBA, GL_UNSIGNED_BYTE, g_ripple.texture );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@ void R_InitSkyClouds(mip_t *mt, texture_t *tx, qboolean custom_palette)
|
|||
|
||||
}
|
||||
|
||||
void GAME_EXPORT GL_SubdivideSurface(msurface_t *fa)
|
||||
void GAME_EXPORT GL_SubdivideSurface( model_t *mod, msurface_t *fa )
|
||||
{
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ CVAR_DEFINE_AUTO( sw_surfcacheoverride, "0", 0, "");
|
|||
static CVAR_DEFINE_AUTO( sw_waterwarp, "1", FCVAR_GLCONFIG, "nothing");
|
||||
static CVAR_DEFINE_AUTO( sw_notransbrushes, "0", FCVAR_GLCONFIG, "do not apply transparency to water/glasses (faster)");
|
||||
CVAR_DEFINE_AUTO( sw_noalphabrushes, "0", FCVAR_GLCONFIG, "do not draw brush holes (faster)");
|
||||
CVAR_DEFINE_AUTO( r_traceglow, "1", FCVAR_GLCONFIG, "cull flares behind models" );
|
||||
CVAR_DEFINE_AUTO( r_traceglow, "0", FCVAR_GLCONFIG, "cull flares behind models" );
|
||||
CVAR_DEFINE_AUTO( sw_texfilt, "0", FCVAR_GLCONFIG, "texture dither");
|
||||
static CVAR_DEFINE_AUTO( r_novis, "0", 0, "" );
|
||||
|
||||
|
|
|
|||
|
|
@ -1891,7 +1891,7 @@ R_StudioDrawNormalMesh
|
|||
generic path
|
||||
===============
|
||||
*/
|
||||
_inline void R_StudioDrawNormalMesh( short *ptricmds, vec3_t *pstudionorms, float s, float t )
|
||||
static void R_StudioDrawNormalMesh( short *ptricmds, vec3_t *pstudionorms, float s, float t )
|
||||
{
|
||||
float *lv;
|
||||
int i;
|
||||
|
|
@ -1924,7 +1924,7 @@ R_StudioDrawNormalMesh
|
|||
generic path
|
||||
===============
|
||||
*/
|
||||
_inline void R_StudioDrawFloatMesh( short *ptricmds, vec3_t *pstudionorms )
|
||||
static void R_StudioDrawFloatMesh( short *ptricmds, vec3_t *pstudionorms )
|
||||
{
|
||||
float *lv;
|
||||
int i;
|
||||
|
|
@ -1956,7 +1956,7 @@ R_StudioDrawNormalMesh
|
|||
generic path
|
||||
===============
|
||||
*/
|
||||
_inline void R_StudioDrawChromeMesh( short *ptricmds, vec3_t *pstudionorms, float s, float t, float scale )
|
||||
static void R_StudioDrawChromeMesh( short *ptricmds, vec3_t *pstudionorms, float s, float t, float scale )
|
||||
{
|
||||
float *lv, *av;
|
||||
int i, idx;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ compiler_optimizations.CFLAGS['gottagofast'] = {
|
|||
}
|
||||
'''
|
||||
|
||||
VALID_BUILD_TYPES = ['fastnative', 'fast', 'release', 'debug', 'sanitize', 'msan', 'none']
|
||||
VALID_BUILD_TYPES = ['fastnative', 'fast', 'humanrights', 'debug', 'sanitize', 'msan', 'none']
|
||||
|
||||
LINKFLAGS = {
|
||||
'common': {
|
||||
|
|
@ -75,7 +75,7 @@ CFLAGS = {
|
|||
'clang': ['-Ofast', '-march=native'],
|
||||
'default': ['-O3']
|
||||
},
|
||||
'release': {
|
||||
'humanrights': {
|
||||
'msvc': ['/O2', '/Zi'],
|
||||
'owcc': ['-O3', '-foptimize-sibling-calls', '-fomit-leaf-frame-pointer', '-fomit-frame-pointer', '-fschedule-insns', '-funsafe-math-optimizations', '-funroll-loops', '-frerun-optimizer', '-finline-functions', '-finline-limit=512', '-fguess-branch-probability', '-fno-strict-aliasing', '-floop-optimize'],
|
||||
'gcc': ['-O3', '-fno-semantic-interposition'],
|
||||
|
|
@ -119,7 +119,7 @@ POLLY_CFLAGS = {
|
|||
def options(opt):
|
||||
grp = opt.add_option_group('Compiler optimization options')
|
||||
|
||||
grp.add_option('-T', '--build-type', action='store', dest='BUILD_TYPE', default='release',
|
||||
grp.add_option('-T', '--build-type', action='store', dest='BUILD_TYPE', default='humanrights',
|
||||
help = 'build type: debug, release or none(custom flags)')
|
||||
|
||||
grp.add_option('--enable-lto', action = 'store_true', dest = 'LTO', default = False,
|
||||
|
|
@ -131,6 +131,11 @@ def options(opt):
|
|||
def configure(conf):
|
||||
conf.start_msg('Build type')
|
||||
|
||||
# legacy naming for default release build
|
||||
# https://chaos.social/@karolherbst/111340511652012860
|
||||
if conf.options.BUILD_TYPE == 'release':
|
||||
conf.options.BUILD_TYPE = 'humanrights'
|
||||
|
||||
if not conf.options.BUILD_TYPE in VALID_BUILD_TYPES:
|
||||
conf.end_msg(conf.options.BUILD_TYPE, color='RED')
|
||||
conf.fatal('Invalid build type. Valid are: %s' % ', '.join(VALID_BUILD_TYPES))
|
||||
|
|
|
|||
|
|
@ -41,21 +41,17 @@ static void SequenceNameFix( void )
|
|||
{
|
||||
int i, j, counter;
|
||||
qboolean hasduplicates = false;
|
||||
mstudioseqdesc_t *seqdesc, *seqdesc1;
|
||||
mstudioseqdesc_t *seqdesc = (mstudioseqdesc_t *)( (byte *)model_hdr + model_hdr->seqindex ), *seqdesc1;
|
||||
|
||||
for( i = 0; i < model_hdr->numseq; i++ )
|
||||
for( i = 0; i < model_hdr->numseq; ++i, ++seqdesc )
|
||||
{
|
||||
seqdesc = (mstudioseqdesc_t *)( (byte *)model_hdr + model_hdr->seqindex ) + i;
|
||||
|
||||
counter = 1;
|
||||
|
||||
for( j = 0; j < model_hdr->numseq; j++ )
|
||||
{
|
||||
seqdesc1 = (mstudioseqdesc_t *)( (byte *)model_hdr + model_hdr->seqindex ) + j;
|
||||
seqdesc1 = (mstudioseqdesc_t *)( (byte *)model_hdr + model_hdr->seqindex );
|
||||
|
||||
for( j = 0; j < model_hdr->numseq; ++j, ++seqdesc1 )
|
||||
if( j != i && !Q_strncmp( seqdesc1->label, seqdesc->label, sizeof( seqdesc1->label ) ) )
|
||||
Q_snprintf( seqdesc1->label, sizeof( seqdesc1->label ), "%s_%i", seqdesc1->label, ++counter );
|
||||
}
|
||||
|
||||
if( counter > 1 )
|
||||
{
|
||||
|
|
@ -79,15 +75,11 @@ BoneNameFix
|
|||
static void BoneNameFix( void )
|
||||
{
|
||||
int i, counter = 0;
|
||||
mstudiobone_t *bone;
|
||||
|
||||
for( i = 0; i < model_hdr->numbones; i++ )
|
||||
{
|
||||
bone = (mstudiobone_t *)( (byte *)model_hdr + model_hdr->boneindex ) + i;
|
||||
mstudiobone_t *bone = (mstudiobone_t *)( (byte *)model_hdr + model_hdr->boneindex );
|
||||
|
||||
for( i = 0; i < model_hdr->numbones; ++i, ++bone )
|
||||
if( bone->name[0] == '\0' )
|
||||
Q_snprintf( bone->name, sizeof( bone->name ), "MDLDEC_Bone%i", ++counter );
|
||||
}
|
||||
|
||||
if( counter )
|
||||
printf( "WARNING: Gived name to %i unnamed bone(s).\n", counter );
|
||||
|
|
|
|||
|
|
@ -249,7 +249,7 @@ WriteSkinFamilyInfo
|
|||
static void WriteSkinFamilyInfo( FILE *fp )
|
||||
{
|
||||
int i, j, k;
|
||||
short *skinref, index;
|
||||
short *skinref, *index;
|
||||
mstudiotexture_t *texture;
|
||||
|
||||
if( texture_hdr->numskinfamilies < 2 )
|
||||
|
|
@ -260,23 +260,22 @@ static void WriteSkinFamilyInfo( FILE *fp )
|
|||
fputs( "$texturegroup \"skinfamilies\"\n{\n", fp );
|
||||
|
||||
skinref = (short *)( (byte *)texture_hdr + texture_hdr->skinindex );
|
||||
texture = (mstudiotexture_t *)( (byte *)texture_hdr + texture_hdr->textureindex );
|
||||
|
||||
for( i = 0; i < texture_hdr->numskinfamilies; ++i )
|
||||
{
|
||||
fputs( "\t{\n", fp );
|
||||
|
||||
for( j = 0; j < texture_hdr->numskinref; ++j )
|
||||
{
|
||||
index = *( skinref + i * texture_hdr->numskinref + j );
|
||||
index = skinref + i * texture_hdr->numskinref;
|
||||
|
||||
for( j = 0; j < texture_hdr->numskinref; ++j, ++index )
|
||||
{
|
||||
for( k = 0; k < texture_hdr->numskinfamilies; ++k )
|
||||
{
|
||||
if( index == *( skinref + k * texture_hdr->numskinref + j ) )
|
||||
if( *index == *( skinref + k * texture_hdr->numskinref + j ) )
|
||||
continue;
|
||||
|
||||
texture = (mstudiotexture_t *)( (byte *)texture_hdr + texture_hdr->textureindex ) + index;
|
||||
|
||||
fprintf( fp, "\t\t\"%s\"\n", texture->name );
|
||||
fprintf( fp, "\t\t\"%s\"\n", texture[*index].name );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -301,15 +300,13 @@ static void WriteAttachmentInfo( FILE *fp )
|
|||
if( !model_hdr->numattachments )
|
||||
return;
|
||||
|
||||
attachment = (mstudioattachment_t *)( (byte *)model_hdr + model_hdr->attachmentindex );
|
||||
bone = (mstudiobone_t *)( (byte *)model_hdr + model_hdr->boneindex );
|
||||
|
||||
fprintf( fp, "// %i attachment%s\n", model_hdr->numattachments, model_hdr->numattachments > 1 ? "s" : "" );
|
||||
|
||||
for( i = 0; i < model_hdr->numattachments; ++i )
|
||||
{
|
||||
attachment = (mstudioattachment_t *)( (byte *)model_hdr + model_hdr->attachmentindex ) + i;
|
||||
bone = (mstudiobone_t *)( (byte *)model_hdr + model_hdr->boneindex ) + attachment->bone;
|
||||
|
||||
fprintf( fp, "$attachment %i \"%s\" %f %f %f\n", i, bone->name, attachment->org[0], attachment->org[1], attachment->org[2] );
|
||||
}
|
||||
for( i = 0; i < model_hdr->numattachments; ++i, ++attachment )
|
||||
fprintf( fp, "$attachment %i \"%s\" %f %f %f\n", i, bone[attachment->bone].name, attachment->org[0], attachment->org[1], attachment->org[2] );
|
||||
|
||||
fputs( "\n", fp );
|
||||
}
|
||||
|
|
@ -322,20 +319,18 @@ WriteBodyGroupInfo
|
|||
static void WriteBodyGroupInfo( FILE *fp )
|
||||
{
|
||||
int i, j;
|
||||
mstudiobodyparts_t *bodypart;
|
||||
mstudiobodyparts_t *bodypart = (mstudiobodyparts_t *) ( (byte *)model_hdr + model_hdr->bodypartindex );
|
||||
mstudiomodel_t *model;
|
||||
char modelname[64];
|
||||
|
||||
fprintf( fp, "// %i reference mesh%s\n", model_hdr->numbodyparts, model_hdr->numbodyparts > 1 ? "es" : "" );
|
||||
|
||||
for( i = 0; i < model_hdr->numbodyparts; ++i )
|
||||
for( i = 0; i < model_hdr->numbodyparts; ++i, ++bodypart )
|
||||
{
|
||||
bodypart = (mstudiobodyparts_t *) ( (byte *)model_hdr + model_hdr->bodypartindex ) + i;
|
||||
model = (mstudiomodel_t *)( (byte *)model_hdr + bodypart->modelindex );
|
||||
|
||||
if( bodypart->nummodels == 1 )
|
||||
{
|
||||
model = (mstudiomodel_t *)( (byte *)model_hdr + bodypart->modelindex );
|
||||
|
||||
COM_FileBase( model->name, modelname, sizeof( modelname ));
|
||||
|
||||
fprintf( fp, "$body \"%s\" \"%s\"\n", bodypart->name, modelname );
|
||||
|
|
@ -346,10 +341,8 @@ static void WriteBodyGroupInfo( FILE *fp )
|
|||
|
||||
fputs( "{\n", fp );
|
||||
|
||||
for( j = 0; j < bodypart->nummodels; ++j )
|
||||
for( j = 0; j < bodypart->nummodels; ++j, ++model )
|
||||
{
|
||||
model = (mstudiomodel_t *)( (byte *)model_hdr + bodypart->modelindex ) + j;
|
||||
|
||||
if( !Q_strncmp( model->name, "blank", 5 ) )
|
||||
{
|
||||
fputs( "\tblank\n", fp );
|
||||
|
|
@ -382,13 +375,13 @@ static void WriteControllerInfo( FILE *fp )
|
|||
if( !model_hdr->numbonecontrollers )
|
||||
return;
|
||||
|
||||
bonecontroller = (mstudiobonecontroller_t *)( (byte *)model_hdr + model_hdr->bonecontrollerindex );
|
||||
bone = (mstudiobone_t *)( (byte *)model_hdr + model_hdr->boneindex );
|
||||
|
||||
fprintf( fp, "// %i bone controller%s\n", model_hdr->numbonecontrollers, model_hdr->numbonecontrollers > 1 ? "s" : "" );
|
||||
|
||||
for( i = 0; i < model_hdr->numbonecontrollers; ++i )
|
||||
for( i = 0; i < model_hdr->numbonecontrollers; ++i, ++bonecontroller )
|
||||
{
|
||||
bonecontroller = (mstudiobonecontroller_t *)( (byte *)model_hdr + model_hdr->bonecontrollerindex ) + i;
|
||||
bone = (mstudiobone_t *)( (byte *)model_hdr + model_hdr->boneindex ) + bonecontroller->bone;
|
||||
|
||||
GetMotionTypeString( bonecontroller->type & ~STUDIO_RLOOP, motion_types, sizeof( motion_types ), false );
|
||||
|
||||
fputs( "$controller ", fp );
|
||||
|
|
@ -399,7 +392,7 @@ static void WriteControllerInfo( FILE *fp )
|
|||
fprintf( fp, "%i", bonecontroller->index );
|
||||
|
||||
fprintf( fp, " \"%s\" %s %f %f\n",
|
||||
bone->name, motion_types,
|
||||
bone[bonecontroller->bone].name, motion_types,
|
||||
bonecontroller->start, bonecontroller->end );
|
||||
}
|
||||
|
||||
|
|
@ -420,18 +413,16 @@ static void WriteHitBoxInfo( FILE *fp )
|
|||
if( !model_hdr->numhitboxes )
|
||||
return;
|
||||
|
||||
hitbox = (mstudiobbox_t *)( (byte *)model_hdr + model_hdr->hitboxindex );
|
||||
bone = (mstudiobone_t *)( (byte *)model_hdr + model_hdr->boneindex );
|
||||
|
||||
fprintf( fp, "// %i hit box%s\n", model_hdr->numhitboxes, model_hdr->numhitboxes > 1 ? "es" : "" );
|
||||
|
||||
for( i = 0; i < model_hdr->numhitboxes; i++ )
|
||||
{
|
||||
hitbox = (mstudiobbox_t *)( (byte *)model_hdr + model_hdr->hitboxindex ) + i;
|
||||
bone = (mstudiobone_t *)( (byte *)model_hdr + model_hdr->boneindex ) + hitbox->bone;
|
||||
|
||||
for( i = 0; i < model_hdr->numhitboxes; ++i, ++hitbox )
|
||||
fprintf( fp, "$hbox %i \"%s\" %f %f %f %f %f %f\n",
|
||||
hitbox->group, bone->name,
|
||||
hitbox->group, bone[hitbox->bone].name,
|
||||
hitbox->bbmin[0], hitbox->bbmin[1], hitbox->bbmin[2],
|
||||
hitbox->bbmax[0], hitbox->bbmax[1], hitbox->bbmax[2] );
|
||||
}
|
||||
|
||||
fputs( "\n", fp );
|
||||
}
|
||||
|
|
@ -477,19 +468,18 @@ static void WriteSequenceInfo( FILE *fp )
|
|||
|
||||
if( model_hdr->numseq > 0 )
|
||||
fprintf( fp, "// %i animation sequence%s\n", model_hdr->numseq, model_hdr->numseq > 1 ? "s" : "" );
|
||||
else return;
|
||||
|
||||
for( i = 0; i < model_hdr->numseq; ++i )
|
||||
seqdesc = (mstudioseqdesc_t *)( (byte *)model_hdr + model_hdr->seqindex );
|
||||
|
||||
for( i = 0; i < model_hdr->numseq; ++i, ++seqdesc )
|
||||
{
|
||||
seqdesc = (mstudioseqdesc_t *)( (byte *)model_hdr + model_hdr->seqindex ) + i;
|
||||
|
||||
fprintf( fp, "$sequence \"%s\" {\n", seqdesc->label );
|
||||
|
||||
if( seqdesc->numblends > 1 )
|
||||
{
|
||||
for( j = 0; j < seqdesc->numblends; j++ )
|
||||
{
|
||||
fprintf( fp, "\t\"%s_blend%02i\"\n", seqdesc->label, j + 1 );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -513,18 +503,21 @@ static void WriteSequenceInfo( FILE *fp )
|
|||
}
|
||||
}
|
||||
|
||||
if( seqdesc->blendtype[0] )
|
||||
if( seqdesc->numblends > 1 )
|
||||
{
|
||||
GetMotionTypeString( seqdesc->blendtype[0], motion_types, sizeof( motion_types ), false );
|
||||
|
||||
fprintf( fp, "\tblend %s %.0f %.0f\n",
|
||||
motion_types, seqdesc->blendstart[0], seqdesc->blendend[0] );
|
||||
|
||||
if( !seqdesc->blendtype[0] )
|
||||
printf( "WARNING: Something wrong with blending type for sequence: %s\n", seqdesc->label );
|
||||
}
|
||||
|
||||
for( j = 0; j < seqdesc->numevents; j++ )
|
||||
{
|
||||
event = (mstudioevent_t *)( (byte *)model_hdr + seqdesc->eventindex ) + j;
|
||||
event = (mstudioevent_t *)( (byte *)model_hdr + seqdesc->eventindex );
|
||||
|
||||
for( j = 0; j < seqdesc->numevents; ++j, ++event )
|
||||
{
|
||||
fprintf( fp, "\t{ event %i %i", event->event, event->frame );
|
||||
|
||||
if( event->options[0] != '\0' )
|
||||
|
|
@ -613,7 +606,7 @@ void WriteQCScript( void )
|
|||
|
||||
WriteBodyGroupInfo( fp );
|
||||
|
||||
fprintf( fp, "$flags %i\n\n", model_hdr->flags );
|
||||
fprintf( fp, "$flags %u\n\n", model_hdr->flags &~( STUDIO_HAS_BONEINFO | STUDIO_HAS_BONEWEIGHTS ) );
|
||||
fprintf( fp, "$eyeposition %f %f %f\n\n", model_hdr->eyeposition[0], model_hdr->eyeposition[1], model_hdr->eyeposition[2] );
|
||||
|
||||
if( !model_hdr->numtextures )
|
||||
|
|
@ -621,6 +614,10 @@ void WriteQCScript( void )
|
|||
|
||||
WriteSkinFamilyInfo( fp );
|
||||
WriteTextureRenderMode( fp );
|
||||
|
||||
if( model_hdr->flags & ( STUDIO_HAS_BONEINFO | STUDIO_HAS_BONEWEIGHTS ) )
|
||||
fputs( "$boneweights\n\n", fp );
|
||||
|
||||
WriteAttachmentInfo( fp );
|
||||
|
||||
fprintf( fp, "$bbox %f %f %f", model_hdr->min[0], model_hdr->min[1], model_hdr->min[2] );
|
||||
|
|
|
|||
|
|
@ -25,17 +25,18 @@ GNU General Public License for more details.
|
|||
#include "smd.h"
|
||||
|
||||
static matrix3x4 *bonetransform;
|
||||
static matrix3x4 *worldtransform;
|
||||
|
||||
/*
|
||||
============
|
||||
CreateBoneTransformMatrices
|
||||
============
|
||||
*/
|
||||
static qboolean CreateBoneTransformMatrices( void )
|
||||
static qboolean CreateBoneTransformMatrices( matrix3x4 **matrix )
|
||||
{
|
||||
bonetransform = calloc( model_hdr->numbones, sizeof( matrix3x4 ) );
|
||||
*matrix = calloc( model_hdr->numbones, sizeof( matrix3x4 ) );
|
||||
|
||||
if( !bonetransform )
|
||||
if( !*matrix )
|
||||
{
|
||||
fputs( "ERROR: Couldn't allocate memory for bone transformation matrices!\n", stderr );
|
||||
return false;
|
||||
|
|
@ -52,14 +53,12 @@ FillBoneTransformMatrices
|
|||
static void FillBoneTransformMatrices( void )
|
||||
{
|
||||
int i;
|
||||
mstudiobone_t *bone;
|
||||
mstudiobone_t *bone = (mstudiobone_t *)( (byte *)model_hdr + model_hdr->boneindex );
|
||||
matrix3x4 bonematrix;
|
||||
vec4_t q;
|
||||
|
||||
for( i = 0; i < model_hdr->numbones; i++ )
|
||||
for( i = 0; i < model_hdr->numbones; ++i, ++bone )
|
||||
{
|
||||
bone = (mstudiobone_t *)( (byte *)model_hdr + model_hdr->boneindex ) + i;
|
||||
|
||||
AngleQuaternion( &bone->value[3], q, true );
|
||||
Matrix3x4_FromOriginQuat( bonematrix, q, bone->value );
|
||||
|
||||
|
|
@ -73,14 +72,28 @@ static void FillBoneTransformMatrices( void )
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
============
|
||||
FillWorldTransformMatrices
|
||||
============
|
||||
*/
|
||||
static void FillWorldTransformMatrices( void )
|
||||
{
|
||||
int i;
|
||||
mstudioboneinfo_t *boneinfo = (mstudioboneinfo_t *)( (byte *)model_hdr + model_hdr->boneindex + model_hdr->numbones * sizeof( mstudiobone_t ) );
|
||||
|
||||
for( i = 0; i < model_hdr->numbones; ++i, ++boneinfo )
|
||||
Matrix3x4_ConcatTransforms( worldtransform[i], bonetransform[i], boneinfo->poseToBone );
|
||||
}
|
||||
|
||||
/*
|
||||
============
|
||||
RemoveBoneTransformMatrices
|
||||
============
|
||||
*/
|
||||
static void RemoveBoneTransformMatrices( void )
|
||||
static void RemoveBoneTransformMatrices( matrix3x4 **matrix )
|
||||
{
|
||||
free( bonetransform );
|
||||
free( *matrix );
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -171,16 +184,12 @@ WriteNodes
|
|||
static void WriteNodes( FILE *fp )
|
||||
{
|
||||
int i;
|
||||
mstudiobone_t *bone;
|
||||
mstudiobone_t *bone = (mstudiobone_t *)( (byte *)model_hdr + model_hdr->boneindex );
|
||||
|
||||
fputs( "nodes\n", fp );
|
||||
|
||||
for( i = 0; i < model_hdr->numbones; i++ )
|
||||
{
|
||||
bone = (mstudiobone_t *)( (byte *)model_hdr + model_hdr->boneindex ) + i;
|
||||
|
||||
for( i = 0; i < model_hdr->numbones; ++i, ++bone )
|
||||
fprintf( fp, "%3i \"%s\" %i\n", i, bone->name, bone->parent );
|
||||
}
|
||||
|
||||
fputs( "end\n", fp );
|
||||
}
|
||||
|
|
@ -193,15 +202,13 @@ WriteSkeleton
|
|||
static void WriteSkeleton( FILE *fp )
|
||||
{
|
||||
int i, j;
|
||||
mstudiobone_t *bone;
|
||||
mstudiobone_t *bone = (mstudiobone_t *)( (byte *)model_hdr + model_hdr->boneindex );
|
||||
|
||||
fputs( "skeleton\n", fp );
|
||||
fputs( "time 0\n", fp );
|
||||
|
||||
for( i = 0; i < model_hdr->numbones; i++ )
|
||||
for( i = 0; i < model_hdr->numbones; ++i, ++bone )
|
||||
{
|
||||
bone = (mstudiobone_t *)( (byte *)model_hdr + model_hdr->boneindex ) + i;
|
||||
|
||||
fprintf( fp, "%3i", i );
|
||||
|
||||
for( j = 0; j < 6; j++ )
|
||||
|
|
@ -220,32 +227,24 @@ WriteTriangleInfo
|
|||
*/
|
||||
static void WriteTriangleInfo( FILE *fp, mstudiomodel_t *model, mstudiotexture_t *texture, mstudiotrivert_t **triverts, qboolean isevenstrip )
|
||||
{
|
||||
int i, indices[3];
|
||||
int vert_index;
|
||||
int norm_index;
|
||||
int bone_index;
|
||||
float s, t, u, v;
|
||||
byte *vertbone;
|
||||
vec3_t *studioverts;
|
||||
vec3_t *studionorms;
|
||||
vec3_t vert, norm;
|
||||
|
||||
if( isevenstrip )
|
||||
{
|
||||
indices[0] = 1;
|
||||
indices[1] = 2;
|
||||
indices[2] = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
indices[0] = 0;
|
||||
indices[1] = 1;
|
||||
indices[2] = 2;
|
||||
}
|
||||
int i, j, k, l, index;
|
||||
int vert_index;
|
||||
int norm_index;
|
||||
int bone_index;
|
||||
int valid_bones;
|
||||
float s, t, u, v;
|
||||
byte *vertbone;
|
||||
vec3_t *studioverts;
|
||||
vec3_t *studionorms;
|
||||
vec3_t vert, norm;
|
||||
float weights[MAXSTUDIOBONEWEIGHTS], oldweight, totalweight;
|
||||
matrix3x4 bonematrix[MAXSTUDIOBONEWEIGHTS], skinmatrix, *pskinmatrix;
|
||||
mstudioboneweight_t *studioboneweights;
|
||||
|
||||
vertbone = ( (byte *)model_hdr + model->vertinfoindex );
|
||||
studioverts = (vec3_t *)( (byte *)model_hdr + model->vertindex );
|
||||
studionorms = (vec3_t *)( (byte *)model_hdr + model->normindex );
|
||||
studioboneweights = (mstudioboneweight_t *)( (byte *)model_hdr + model->blendvertinfoindex );
|
||||
|
||||
s = 1.0f / texture->width;
|
||||
t = 1.0f / texture->height;
|
||||
|
|
@ -254,30 +253,76 @@ static void WriteTriangleInfo( FILE *fp, mstudiomodel_t *model, mstudiotexture_t
|
|||
|
||||
for( i = 0; i < 3; i++ )
|
||||
{
|
||||
vert_index = triverts[indices[i]]->vertindex;
|
||||
norm_index = triverts[indices[i]]->normindex;
|
||||
index = isevenstrip ? ( i + 1 ) % 3 : i;
|
||||
vert_index = triverts[index]->vertindex;
|
||||
norm_index = triverts[index]->normindex;
|
||||
bone_index = vertbone[vert_index];
|
||||
|
||||
Matrix3x4_VectorTransform( bonetransform[bone_index], studioverts[vert_index], vert );
|
||||
Matrix3x4_VectorRotate( bonetransform[bone_index], studionorms[norm_index], norm );
|
||||
if( model_hdr->flags & STUDIO_HAS_BONEWEIGHTS )
|
||||
{
|
||||
valid_bones = 0, totalweight = 0;
|
||||
memset( skinmatrix, 0, sizeof( matrix3x4 ) );
|
||||
|
||||
for( j = 0; j < MAXSTUDIOBONEWEIGHTS; ++j )
|
||||
if( studioboneweights[vert_index].bone[j] != -1 )
|
||||
valid_bones++;
|
||||
|
||||
for( j = 0; j < valid_bones; ++j )
|
||||
{
|
||||
Matrix3x4_Copy( bonematrix[j], worldtransform[studioboneweights[vert_index].bone[j]] );
|
||||
weights[j] = studioboneweights[vert_index].weight[j] / 255.0f;
|
||||
totalweight += weights[j];
|
||||
}
|
||||
|
||||
oldweight = weights[0];
|
||||
|
||||
if( totalweight < 1.0f )
|
||||
weights[0] += 1.0f - totalweight;
|
||||
|
||||
for( j = 0; j < valid_bones; ++j )
|
||||
for( k = 0; k < 3; ++k )
|
||||
for( l = 0; l < 4; ++l )
|
||||
skinmatrix[k][l] += bonematrix[j][k][l] * weights[j];
|
||||
|
||||
pskinmatrix = &skinmatrix;
|
||||
}
|
||||
else
|
||||
pskinmatrix = &bonetransform[bone_index];
|
||||
|
||||
Matrix3x4_VectorTransform( *pskinmatrix, studioverts[vert_index], vert );
|
||||
Matrix3x4_VectorRotate( *pskinmatrix, studionorms[norm_index], norm );
|
||||
VectorNormalize( norm );
|
||||
|
||||
if( texture->flags & STUDIO_NF_UV_COORDS )
|
||||
{
|
||||
u = HalfToFloat( triverts[indices[i]]->s );
|
||||
v = -HalfToFloat( triverts[indices[i]]->t );
|
||||
u = HalfToFloat( triverts[index]->s );
|
||||
v = -HalfToFloat( triverts[index]->t );
|
||||
}
|
||||
else
|
||||
{
|
||||
u = ( triverts[indices[i]]->s + 1.0f ) * s;
|
||||
v = 1.0f - triverts[indices[i]]->t * t;
|
||||
u = ( triverts[index]->s + 1.0f ) * s;
|
||||
v = 1.0f - triverts[index]->t * t;
|
||||
}
|
||||
|
||||
fprintf( fp, "%3i %f %f %f %f %f %f %f %f\n",
|
||||
fprintf( fp, "%3i %f %f %f %f %f %f %f %f",
|
||||
bone_index,
|
||||
vert[0], vert[1], vert[2],
|
||||
norm[0], norm[1], norm[2],
|
||||
u, v );
|
||||
|
||||
if( model_hdr->flags & STUDIO_HAS_BONEWEIGHTS )
|
||||
{
|
||||
fprintf( fp, " %d", valid_bones );
|
||||
|
||||
weights[0] = oldweight;
|
||||
|
||||
for( j = 0; j < valid_bones; ++j )
|
||||
fprintf( fp, " %d %f",
|
||||
studioboneweights[vert_index].bone[j],
|
||||
weights[j] );
|
||||
}
|
||||
|
||||
fputs( "\n", fp );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -289,16 +334,15 @@ WriteTriangles
|
|||
static void WriteTriangles( FILE *fp, mstudiomodel_t *model )
|
||||
{
|
||||
int i, j, k;
|
||||
mstudiomesh_t *mesh;
|
||||
mstudiomesh_t *mesh = (mstudiomesh_t *)( (byte *)model_hdr + model->meshindex );
|
||||
mstudiotexture_t *texture;
|
||||
mstudiotrivert_t *triverts[3];
|
||||
short *tricmds;
|
||||
|
||||
fputs( "triangles\n", fp );
|
||||
|
||||
for( i = 0; i < model->nummesh; i++ )
|
||||
for( i = 0; i < model->nummesh; ++i, ++mesh )
|
||||
{
|
||||
mesh = (mstudiomesh_t *)( (byte *)model_hdr + model->meshindex ) + i;
|
||||
tricmds = (short *)( (byte *)model_hdr + mesh->triindex );
|
||||
texture = (mstudiotexture_t *)( (byte *)texture_hdr + texture_hdr->textureindex ) + mesh->skinref;
|
||||
|
||||
|
|
@ -385,14 +429,12 @@ static void WriteFrameInfo( FILE *fp, mstudioanim_t *anim, mstudioseqdesc_t *seq
|
|||
int i, j;
|
||||
float scale;
|
||||
vec_t motion[6]; // x, y, z, xr, yr, zr
|
||||
mstudiobone_t *bone;
|
||||
mstudiobone_t *bone = (mstudiobone_t *)( (byte *)model_hdr + model_hdr->boneindex );
|
||||
|
||||
fprintf( fp, "time %i\n", frame );
|
||||
|
||||
for( i = 0; i < model_hdr->numbones; i++, anim++ )
|
||||
for( i = 0; i < model_hdr->numbones; ++i, ++anim, ++bone )
|
||||
{
|
||||
bone = (mstudiobone_t *)( (byte *)model_hdr + model_hdr->boneindex ) + i;
|
||||
|
||||
CalcBonePosition( anim, bone, motion, frame );
|
||||
|
||||
if( bone->parent == -1 )
|
||||
|
|
@ -451,19 +493,27 @@ static void WriteReferences( void )
|
|||
char name[64];
|
||||
char filename[MAX_SYSPATH];
|
||||
|
||||
if( !CreateBoneTransformMatrices() )
|
||||
if( !CreateBoneTransformMatrices( &bonetransform ) )
|
||||
return;
|
||||
|
||||
FillBoneTransformMatrices();
|
||||
|
||||
for( i = 0; i < model_hdr->numbodyparts; i++ )
|
||||
if( model_hdr->flags & STUDIO_HAS_BONEINFO )
|
||||
{
|
||||
bodypart = (mstudiobodyparts_t *)( (byte *)model_hdr + model_hdr->bodypartindex ) + i;
|
||||
if( !CreateBoneTransformMatrices( &worldtransform ) )
|
||||
return;
|
||||
|
||||
for( j = 0; j < bodypart->nummodels; j++ )
|
||||
FillWorldTransformMatrices();
|
||||
}
|
||||
|
||||
bodypart = (mstudiobodyparts_t *)( (byte *)model_hdr + model_hdr->bodypartindex );
|
||||
|
||||
for( i = 0; i < model_hdr->numbodyparts; ++i, ++bodypart )
|
||||
{
|
||||
model = (mstudiomodel_t *)( (byte *)model_hdr + bodypart->modelindex );
|
||||
|
||||
for( j = 0; j < bodypart->nummodels; ++j, ++model )
|
||||
{
|
||||
model = (mstudiomodel_t *)( (byte *)model_hdr + bodypart->modelindex ) + j;
|
||||
|
||||
if( !Q_strncmp( model->name, "blank", 5 ) )
|
||||
continue;
|
||||
|
||||
|
|
@ -474,8 +524,7 @@ static void WriteReferences( void )
|
|||
if( len == -1 )
|
||||
{
|
||||
fprintf( stderr, "ERROR: Destination path is too long. Can't write %s.smd\n", name );
|
||||
RemoveBoneTransformMatrices();
|
||||
return;
|
||||
goto _fail;
|
||||
}
|
||||
|
||||
fp = fopen( filename, "w" );
|
||||
|
|
@ -483,8 +532,7 @@ static void WriteReferences( void )
|
|||
if( !fp )
|
||||
{
|
||||
fprintf( stderr, "ERROR: Can't write %s\n", filename );
|
||||
RemoveBoneTransformMatrices();
|
||||
return;
|
||||
goto _fail;
|
||||
}
|
||||
|
||||
fputs( "version 1\n", fp );
|
||||
|
|
@ -499,7 +547,11 @@ static void WriteReferences( void )
|
|||
}
|
||||
}
|
||||
|
||||
RemoveBoneTransformMatrices();
|
||||
_fail:
|
||||
RemoveBoneTransformMatrices( &bonetransform );
|
||||
|
||||
if( model_hdr->flags & STUDIO_HAS_BONEINFO )
|
||||
RemoveBoneTransformMatrices( &worldtransform );
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -513,12 +565,10 @@ static void WriteSequences( void )
|
|||
int len;
|
||||
FILE *fp;
|
||||
char filename[MAX_SYSPATH];
|
||||
mstudioseqdesc_t *seqdesc;
|
||||
mstudioseqdesc_t *seqdesc = (mstudioseqdesc_t *)( (byte *)model_hdr + model_hdr->seqindex );
|
||||
|
||||
for( i = 0; i < model_hdr->numseq; i++ )
|
||||
for( i = 0; i < model_hdr->numseq; ++i, ++seqdesc )
|
||||
{
|
||||
seqdesc = (mstudioseqdesc_t *)( (byte *)model_hdr + model_hdr->seqindex ) + i;
|
||||
|
||||
for( j = 0; j < seqdesc->numblends; j++ )
|
||||
{
|
||||
if( seqdesc->numblends == 1 )
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ static void WriteBMP( mstudiotexture_t *texture )
|
|||
int i, len;
|
||||
FILE *fp;
|
||||
const byte *p;
|
||||
byte *palette, *pic, *buf;
|
||||
byte *palette, *pic;
|
||||
char filename[MAX_SYSPATH], texturename[64];
|
||||
rgba_t rgba_palette[256];
|
||||
bmp_t bmp_hdr = {0,};
|
||||
|
|
@ -87,23 +87,17 @@ static void WriteBMP( mstudiotexture_t *texture )
|
|||
|
||||
fwrite( rgba_palette, sizeof( rgba_palette ), 1, fp );
|
||||
|
||||
buf = malloc( texture_size );
|
||||
|
||||
p = pic;
|
||||
p += ( bmp_hdr.height - 1 ) * bmp_hdr.width;
|
||||
|
||||
for( i = 0; i < bmp_hdr.height; i++ )
|
||||
{
|
||||
memcpy( buf + bmp_hdr.width * i, p, bmp_hdr.width );
|
||||
fwrite( p, bmp_hdr.width, 1, fp );
|
||||
p -= bmp_hdr.width;
|
||||
}
|
||||
|
||||
fwrite( buf, texture_size, 1, fp );
|
||||
|
||||
fclose( fp );
|
||||
|
||||
free( buf );
|
||||
|
||||
printf( "Texture: %s\n", filename );
|
||||
}
|
||||
|
||||
|
|
@ -115,13 +109,9 @@ WriteTextures
|
|||
void WriteTextures( void )
|
||||
{
|
||||
int i;
|
||||
mstudiotexture_t *texture;
|
||||
|
||||
for( i = 0; i < texture_hdr->numtextures; i++ )
|
||||
{
|
||||
texture = (mstudiotexture_t *)( (byte *)texture_hdr + texture_hdr->textureindex ) + i;
|
||||
mstudiotexture_t *texture = (mstudiotexture_t *)( (byte *)texture_hdr + texture_hdr->textureindex );
|
||||
|
||||
for( i = 0; i < texture_hdr->numtextures; ++i, ++texture )
|
||||
WriteBMP( texture );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
6
wscript
6
wscript
|
|
@ -169,7 +169,7 @@ def configure(conf):
|
|||
conf.env.MSVC_TARGETS = ['x86' if not conf.options.ALLOW64 else 'x64']
|
||||
|
||||
# Load compilers early
|
||||
conf.load('xshlib xcompile compiler_c compiler_cxx')
|
||||
conf.load('xshlib xcompile compiler_c compiler_cxx cmake gccdeps msvcdeps')
|
||||
|
||||
if conf.options.NSWITCH:
|
||||
conf.load('nswitch')
|
||||
|
|
@ -301,6 +301,7 @@ def configure(conf):
|
|||
# '-Werror=format=2',
|
||||
'-Werror=implicit-fallthrough=2',
|
||||
'-Werror=logical-op',
|
||||
'-Werror=nonnull',
|
||||
'-Werror=packed',
|
||||
'-Werror=packed-not-aligned',
|
||||
'-Werror=parentheses',
|
||||
|
|
@ -475,12 +476,11 @@ int main(int argc, char **argv) { strchrnul(argv[1], 'x'); return 0; }'''
|
|||
if conf.check_cfg(package='opus', uselib_store='opus', args='opus >= 1.4 --cflags --libs', mandatory=False):
|
||||
# now try to link with export that only exists with CUSTOM_MODES defined
|
||||
frag='''#include <opus_custom.h>
|
||||
int main(void) { return !opus_custom_encoder_init(0, 0, 0); }'''
|
||||
int main(void) { return !opus_custom_encoder_init((OpusCustomEncoder *)1, (const OpusCustomMode *)1, 1); }'''
|
||||
|
||||
if conf.check_cc(msg='Checking if opus supports custom modes', defines='CUSTOM_MODES=1', use='opus', fragment=frag, mandatory=False):
|
||||
conf.env.HAVE_SYSTEM_OPUS = True
|
||||
|
||||
conf.define('XASH_BUILD_COMMIT', conf.env.GIT_VERSION if conf.env.GIT_VERSION else 'notset')
|
||||
conf.define('XASH_LOW_MEMORY', conf.options.LOW_MEMORY)
|
||||
|
||||
for i in SUBDIRS:
|
||||
|
|
|
|||
Loading…
Reference in New Issue