q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-24 21:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

ioquake3 resync to commit 60dfabbe from f9547e45

Browse source 
opengl1: Fix skybox in OpenGL 1.1
Update SECURITY.md
This commit is contained in:
Zack Middleton 2024-05-10 19:51:56 -05:00
parent 6f62f2806a
commit 157273b493
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/Makefile
View file

@ -48,7 +48,7 @@ ifndef BUILD_AUTOUPDATER # DON'T build unless you mean to!
endif endif
# ioquake3 git commit that this is based on # ioquake3 git commit that this is based on
IOQ3_REVISION = f9547e45 IOQ3_REVISION = 60dfabbe
############################################################################# #############################################################################
# #

20
engine/code/renderergl1/tr_sky.c
View file

@ -387,12 +387,17 @@ static void DrawSkySide( struct image_s *image, const int mins[2], const int max
static void DrawSkyBox( shader_t *shader ) static void DrawSkyBox( shader_t *shader )
{ {
int i; int i;
float w_offset, w_scale;
float h_offset, h_scale;
sky_min = 0; sky_min = 0;
sky_max = 1; sky_max = 1;
Com_Memset( s_skyTexCoords, 0, sizeof( s_skyTexCoords ) ); Com_Memset( s_skyTexCoords, 0, sizeof( s_skyTexCoords ) );
w_offset = h_offset = 0;
w_scale = h_scale = 1;
for (i=0 ; i<6 ; i++) for (i=0 ; i<6 ; i++)
{ {
int sky_mins_subd[2], sky_maxs_subd[2]; int sky_mins_subd[2], sky_maxs_subd[2];
@ -432,6 +437,15 @@ static void DrawSkyBox( shader_t *shader )
else if ( sky_maxs_subd[1] > HALF_SKY_SUBDIVISIONS ) else if ( sky_maxs_subd[1] > HALF_SKY_SUBDIVISIONS )
sky_maxs_subd[1] = HALF_SKY_SUBDIVISIONS; sky_maxs_subd[1] = HALF_SKY_SUBDIVISIONS;
if ( !haveClampToEdge )
{
w_offset = 0.5f / shader->sky.outerbox[sky_texorder[i]]->width;
h_offset = 0.5f / shader->sky.outerbox[sky_texorder[i]]->height;
w_scale = 1.0f - w_offset * 2;
h_scale = 1.0f - h_offset * 2;
}
// //
// iterate through the subdivisions // iterate through the subdivisions
// //
@ -444,6 +458,12 @@ static void DrawSkyBox( shader_t *shader )
i, i,
s_skyTexCoords[t][s], s_skyTexCoords[t][s],
s_skyPoints[t][s] ); s_skyPoints[t][s] );
s_skyTexCoords[t][s][0] *= w_scale;
s_skyTexCoords[t][s][0] += w_offset;
s_skyTexCoords[t][s][1] *= h_scale;
s_skyTexCoords[t][s][1] += h_offset;
} }
} }