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

ref_gu: depth bug fixed, sort code removed

Browse Source
This commit is contained in:
Crow-bar
2022-10-20 16:50:48 +03:00
parent f5ca0175a5
commit 89ee68d5d0
2 changed files with 8 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/common/mod_bmodel.c
View File

@@ -1616,12 +1616,16 @@ static void Mod_LoadSubmodels( dbspmodel_t *bmod )
oldmaxfaces = Q_max( oldmaxfaces, out->numfaces );
}
#if XASH_PSP
refState.max_surfaces = 0; // sorting disabled
#else
// these array used to sort translucent faces in bmodels
if( oldmaxfaces > refState.max_surfaces )
{
refState.draw_surfaces = (sortedface_t *)Z_Realloc( refState.draw_surfaces, oldmaxfaces * sizeof( sortedface_t ));
refState.max_surfaces = oldmaxfaces;
}
#endif
}
/*

47
ref_gu/gu_rsurf.c
View File

@@ -1578,7 +1578,7 @@ void R_SetRenderMode( cl_entity_t *e )
sceGuTexFunc( GU_TFX_MODULATE, GU_TCC_RGBA );
sceGuBlendFunc( GU_ADD, GU_SRC_ALPHA, GU_ONE_MINUS_SRC_ALPHA, 0, 0 );
sceGuColor( GUCOLOR4F( 1.0f, 1.0f, 1.0f, tr.blend ) );
sceGuDepthMask( GU_TRUE );
sceGuDepthMask( GU_FALSE ); // bug?
sceGuEnable( GU_BLEND );
break;
}
@@ -1662,8 +1662,10 @@ void R_DrawBrushModel( cl_entity_t *e )
}
psurf = &clmodel->surfaces[clmodel->firstmodelsurface];
#if 1 /* no sorting */
GU_ClipBeginBrush();
// sorting is not required, +Z_Realloc in Mod_LoadSubmodels (mod_bmodel.c)
for( i = 0; i < clmodel->nummodelsurfaces; i++, psurf++ )
{
if( FBitSet( psurf->flags, SURF_DRAWTURB ) && !ENGINE_GET_PARM( PARM_QUAKE_COMPATIBLE ))
@@ -1689,48 +1691,7 @@ void R_DrawBrushModel( cl_entity_t *e )
if( e->curstate.rendermode == kRenderTransColor )
sceGuEnable( GU_TEXTURE_2D );
#else
num_sorted = 0;
for( i = 0; i < clmodel->nummodelsurfaces; i++, psurf++ )
{
if( FBitSet( psurf->flags, SURF_DRAWTURB ) && !ENGINE_GET_PARM( PARM_QUAKE_COMPATIBLE ))
{
if( psurf->plane->type != PLANE_Z && !FBitSet( e->curstate.effects, EF_WATERSIDES ))
continue;
if( mins[2] + 1.0f >= psurf->plane->dist )
continue;
}
cull_type = R_CullSurface( psurf, &RI.frustum, RI.frustum.clipFlags );
if( cull_type >= CULL_FRUSTUM )
continue;
if( cull_type == CULL_BACKSIDE )
{
if( !FBitSet( psurf->flags, SURF_DRAWTURB ) && !( psurf->pdecals && e->curstate.rendermode == kRenderTransTexture ))
continue;
}
if( num_sorted < gpGlobals->max_surfaces )
{
gpGlobals->draw_surfaces[num_sorted].surf = psurf;
gpGlobals->draw_surfaces[num_sorted].cull = cull_type;
num_sorted++;
}
}
// sort faces if needs
if( !FBitSet( clmodel->flags, MODEL_LIQUID ) && e->curstate.rendermode == kRenderTransTexture && !CVAR_TO_BOOL( gl_nosort ))
qsort( gpGlobals->draw_surfaces, num_sorted, sizeof( sortedface_t ), R_SurfaceCompare );
// draw sorted translucent surfaces
GU_ClipBeginBrush();
for( i = 0; i < num_sorted; i++ )
R_RenderBrushPoly( gpGlobals->draw_surfaces[i].surf, gpGlobals->draw_surfaces[i].cull );
if( e->curstate.rendermode == kRenderTransColor )
sceGuEnable( GU_TEXTURE_2D );
#endif
DrawDecalsBatch();
GL_ResetFogColor();
R_BlendLightmaps();