thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 10:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'revert-b9078802' into 'master'

Browse source 
Sky offsets

See merge request KartKrew/Kart!1796
This commit is contained in:
Oni 2024-01-09 08:11:04 +00:00
commit 130adcdb92
3 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/r_plane.cpp
View file

@ -734,6 +734,8 @@ static void R_DrawSkyPlane(visplane_t *pl, void(*colfunc)(drawcolumndata_t*), bo
} }
INT32 angle = (pl->viewangle + xtoviewangle[viewssnum][x + i])>>ANGLETOSKYSHIFT; INT32 angle = (pl->viewangle + xtoviewangle[viewssnum][x + i])>>ANGLETOSKYSHIFT;
angle -= (skytextureoffset >> FRACBITS);
dc.iscale = FixedMul(skyscale[viewssnum], FINECOSINE(xtoviewangle[viewssnum][x + i]>>ANGLETOFINESHIFT)); dc.iscale = FixedMul(skyscale[viewssnum], FINECOSINE(xtoviewangle[viewssnum][x + i]>>ANGLETOFINESHIFT));
dc.x = x + i; dc.x = x + i;
dc.source = dc.source =

23
src/r_sky.c
View file

@ -37,10 +37,14 @@ INT32 skyflatnum;
*/ */
INT32 skytexture; INT32 skytexture;
/** \brief the horizon line in a 256x128 sky texture /** \brief the horizon line of the sky texture
*/ */
INT32 skytexturemid; INT32 skytexturemid;
/** \brief the x offset of the sky texture
*/
INT32 skytextureoffset;
/** \brief the scale of the sky /** \brief the scale of the sky
*/ */
fixed_t skyscale[MAXSPLITSCREENPLAYERS]; fixed_t skyscale[MAXSPLITSCREENPLAYERS];
@ -61,12 +65,19 @@ char globallevelskytexture[9];
*/ */
void R_SetupSkyDraw(void) void R_SetupSkyDraw(void)
{ {
// the horizon line in a 256x128 sky texture // the horizon line in the sky texture
skytexturemid = (textures[skytexture]->height/2)<<FRACBITS; skytexturemid = (textures[skytexture]->height / 2) << FRACBITS;
skytextureoffset = 0;
// Sal: Add arbritrary offset that makes it if (textures[skytexture]->type == TEXTURETYPE_SINGLEPATCH)
// line up with the horizon line special {
skytexturemid += (16 << FRACBITS); // Sal: Allow for sky offsets
texpatch_t *const tex_patch = &textures[skytexture]->patches[0];
patch_t *patch = W_CachePatchNumPwad(tex_patch->wad, tex_patch->lump, PU_CACHE);
skytexturemid += (patch->topoffset << FRACBITS);
skytextureoffset += (patch->leftoffset << FRACBITS);
}
R_SetSkyScale(); R_SetSkyScale();
} }

2
src/r_sky.h
View file

@ -26,7 +26,7 @@ extern "C" {
/// \brief The sky map is 256*128*4 maps. /// \brief The sky map is 256*128*4 maps.
#define ANGLETOSKYSHIFT 22 #define ANGLETOSKYSHIFT 22
extern INT32 skytexture, skytexturemid; extern INT32 skytexture, skytexturemid, skytextureoffset;
extern fixed_t skyscale[MAXSPLITSCREENPLAYERS]; extern fixed_t skyscale[MAXSPLITSCREENPLAYERS];
extern INT32 skyflatnum; extern INT32 skyflatnum;