RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

engine: consolidate all box clipnodes used in studio models, pmove and server in a single place

Browse Source
This commit is contained in:
Alibek Omarov
2025-01-08 08:17:21 +03:00
parent e70ba7ad64
commit a0b46da04b
5 changed files with 45 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
engine/common/pm_trace.c
View File

@@ -25,8 +25,6 @@ GNU General Public License for more details.
#define PM_AllowHitBoxTrace( model, hull ) ( model && model->type == mod_studio && ( FBitSet( model->flags, STUDIO_TRACE_HITBOX ) || hull == 2 ))
static mplane_t pm_boxplanes[6];
static mclipnode16_t pm_boxclipnodes16[6];
static mclipnode32_t pm_boxclipnodes32[6];
static hull_t pm_boxhull;
// default hullmins
@@ -66,34 +64,15 @@ can just be stored out and get a proper hull_t structure.
*/
void PM_InitBoxHull( void )
{
int i, side;
int i;
pm_boxhull.clipnodes16 = pm_boxclipnodes16;
pm_boxhull.clipnodes16 = (mclipnode16_t *)box_clipnodes16;
pm_boxhull.planes = pm_boxplanes;
pm_boxhull.firstclipnode = 0;
pm_boxhull.lastclipnode = 5;
for( i = 0; i < 6; i++ )
{
pm_boxclipnodes16[i].planenum = i;
pm_boxclipnodes32[i].planenum = i;
side = i & 1;
pm_boxclipnodes16[i].children[side] = CONTENTS_EMPTY;
pm_boxclipnodes32[i].children[side] = CONTENTS_EMPTY;
if( i != 5 )
{
pm_boxclipnodes16[i].children[side^1] = i + 1;
pm_boxclipnodes32[i].children[side^1] = i + 1;
}
else
{
pm_boxclipnodes16[i].children[side^1] = CONTENTS_SOLID;
pm_boxclipnodes32[i].children[side^1] = i + 1;
}
pm_boxplanes[i].type = i>>1;
pm_boxplanes[i].normal[i>>1] = 1.0f;
pm_boxplanes[i].signbits = 0;
@@ -119,9 +98,9 @@ static hull_t *PM_HullForBox( const vec3_t mins, const vec3_t maxs )
pm_boxplanes[5].dist = mins[2];
if( world.version == QBSP2_VERSION )
pm_boxhull.clipnodes32 = pm_boxclipnodes32;
pm_boxhull.clipnodes32 = (mclipnode32_t *)box_clipnodes32;
else
pm_boxhull.clipnodes16 = pm_boxclipnodes16;
pm_boxhull.clipnodes16 = (mclipnode16_t *)box_clipnodes16;
return &pm_boxhull;
}