Merge branch 'ioquake:main' into teamArenaSupport

This commit is contained in:
Kevin Remisoski 2024-05-04 05:09:21 -04:00 committed by GitHub
commit ac6f36366a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 1 deletions

View file

@ -4,7 +4,7 @@ We take security very seriously at ioquake3. We welcome any peer review of our 1
### Where should I report security issues?
In order to give the community time to respond and upgrade we strongly urge you report all security issues privately.
Please e-mail zachary@ioquake.org directly to provide details and repro steps and we will respond as soon as possible, but please note:
Please e-mail jack@ioquake.org directly to provide details and repro steps and we will respond as soon as possible, but please note:
### This is an entirely free software project without much in the way of external funding or sponsorships.
### We cannot guarantee quick responses but we very much appreciate your discretion when reporting security vulnerabilities.

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 )
{
int i;
float w_offset, w_scale;
float h_offset, h_scale;
sky_min = 0;
sky_max = 1;
Com_Memset( s_skyTexCoords, 0, sizeof( s_skyTexCoords ) );
w_offset = h_offset = 0;
w_scale = h_scale = 1;
for (i=0 ; i<6 ; i++)
{
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 )
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
//
@ -444,6 +458,12 @@ static void DrawSkyBox( shader_t *shader )
i,
s_skyTexCoords[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;
}
}