yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-03-02 23:42:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #574 from 0lvin/for_review

Browse source 
fix tearing with fix palette change(explosion near without move)
This commit is contained in:
Yamagi 2020-05-11 12:30:47 +02:00 committed by GitHub
commit 3c681210ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/client/refresh/soft/sw_main.c
View file

@ -47,6 +47,7 @@ static int vid_zminu, vid_zminv, vid_zmaxu, vid_zmaxv;
static vec3_t lastvieworg; static vec3_t lastvieworg;
static vec3_t lastviewangles; static vec3_t lastviewangles;
qboolean fastmoving; qboolean fastmoving;
static qboolean palette_changed;
refimport_t ri; refimport_t ri;
@ -1424,6 +1425,9 @@ static rserr_t SWimp_SetMode(int *pwidth, int *pheight, int mode, int fullscreen
static void static void
RE_BeginFrame( float camera_separation ) RE_BeginFrame( float camera_separation )
{ {
// pallete without changes
palette_changed = false;
while (r_mode->modified || vid_fullscreen->modified || r_vsync->modified) while (r_mode->modified || vid_fullscreen->modified || r_vsync->modified)
{ {
RE_SetMode(); RE_SetMode();
@ -1533,12 +1537,20 @@ R_GammaCorrectAndSetPalette( const unsigned char *palette )
{ {
int i; int i;
// Replace palette
for ( i = 0; i < 256; i++ ) for ( i = 0; i < 256; i++ )
{ {
sw_state.currentpalette[i*4+0] = sw_state.gammatable[palette[i*4+2]]; // blue if (sw_state.currentpalette[i*4+0] != sw_state.gammatable[palette[i*4+2]] ||
sw_state.currentpalette[i*4+1] = sw_state.gammatable[palette[i*4+1]]; // green sw_state.currentpalette[i*4+1] != sw_state.gammatable[palette[i*4+1]] ||
sw_state.currentpalette[i*4+2] = sw_state.gammatable[palette[i*4+0]]; // red sw_state.currentpalette[i*4+2] != sw_state.gammatable[palette[i*4+0]])
sw_state.currentpalette[i*4+3] = 0xFF; // alpha {
sw_state.currentpalette[i*4+0] = sw_state.gammatable[palette[i*4+2]]; // blue
sw_state.currentpalette[i*4+1] = sw_state.gammatable[palette[i*4+1]]; // green
sw_state.currentpalette[i*4+2] = sw_state.gammatable[palette[i*4+0]]; // red
sw_state.currentpalette[i*4+3] = 0xFF; // alpha
palette_changed = true;
}
} }
} }
@ -2087,7 +2099,7 @@ RE_BufferDifferenceEnd(int vmin, int vmax)
back_buffer --; back_buffer --;
front_buffer --; front_buffer --;
} while (back_buffer > back_min && *back_buffer == *front_buffer); } while (back_buffer > back_min && *back_buffer == *front_buffer);
// +1 for fully cover changes // +1 for fully cover changes
return (pixel_t*)back_buffer - swap_frames[0] + sizeof(int); return (pixel_t*)back_buffer - swap_frames[0] + sizeof(int);
} }
@ -2184,20 +2196,24 @@ RE_EndFrame (void)
vmax = vid.height * vid.width; vmax = vid.height * vid.width;
} }
// search real begin/end of difference // if palette changed need to flush whole buffer
vmin = RE_BufferDifferenceStart(vmin, vmax); if (!palette_changed)
// no differences found
if (vmin >= vmax)
{ {
return; // search real begin/end of difference
} vmin = RE_BufferDifferenceStart(vmin, vmax);
// search difference end // no differences found
vmax = RE_BufferDifferenceEnd(vmin, vmax); if (vmin >= vmax)
if (vmax > (vid.height * vid.width)) {
{ return;
vmax = vid.height * vid.width; }
// search difference end
vmax = RE_BufferDifferenceEnd(vmin, vmax);
if (vmax > (vid.height * vid.width))
{
vmax = vid.height * vid.width;
}
} }
RE_FlushFrame(vmin, vmax); RE_FlushFrame(vmin, vmax);