AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-22 03:12:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

FOV adjustments for skies (#1474)

Browse Source 
* Refactor FOV (again)

* FOV affects `linearskyangle` calculations

* FOV affects sky scale calculations

* Apply fade to color for stretched skies

To prevent tiling at a large FOV.
This commit is contained in:
ceski 2024-02-14 21:43:55 -08:00 committed by GitHub
parent 0c8600b07c
commit bdd1deef59
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/r_main.c
View File

@ -50,6 +50,7 @@ int centerx, centery;
fixed_t centerxfrac, centeryfrac;
fixed_t focallength;
fixed_t projection;
fixed_t skyiscale;
fixed_t viewx, viewy, viewz;
angle_t viewangle;
localview_t localview;
@ -260,8 +261,10 @@ static fixed_t centerxfrac_nonwide;
static void R_InitTextureMapping(void)
{
register int i,x;
double angle; // tan angle with offset applied like vanilla R_InitTables().
fixed_t slopefrac;
angle_t fov;
double slopebam;
// Use tangent table to generate viewangletox:
// viewangletox will give the next greatest x
@ -270,31 +273,32 @@ static void R_InitTextureMapping(void)
// Calc focallength
// so FIELDOFVIEW angles covers SCREENWIDTH.
if (custom_fov != FOV_DEFAULT)
if (custom_fov == FOV_DEFAULT)
{
const double slope = (tan(custom_fov * M_PI / 360.0) *
centerxfrac / centerxfrac_nonwide);
const double angle = atan(slope) + M_PI / FINEANGLES; // finetangent offset.
fov = angle * FINEANGLES / M_PI;
slopefrac = tan(angle) * FRACUNIT;
focallength = FixedDiv(centerxfrac, slopefrac);
projection = centerxfrac / slope;
}
else
{
fov = FIELDOFVIEW;
slopefrac = finetangent[FINEANGLES / 4 + fov / 2];
slopefrac = finetangent[FINEANGLES / 4 + FIELDOFVIEW / 2];
focallength = FixedDiv(centerxfrac_nonwide, slopefrac);
projection = centerxfrac_nonwide;
if (centerxfrac != centerxfrac_nonwide)
if (centerxfrac == centerxfrac_nonwide)
{
angle = (FIELDOFVIEW / 2.0 + 0.5) * 2.0 * M_PI / FINEANGLES;
}
else
{
const double slope = (double)centerxfrac / centerxfrac_nonwide;
const double angle = atan(slope) + M_PI / FINEANGLES; // finetangent offset.
fov = angle * FINEANGLES / M_PI;
angle = atan(slope) + M_PI / FINEANGLES;
slopefrac = tan(angle) * FRACUNIT;
}
}
else
{
const double slope = (tan(custom_fov * M_PI / 360.0) *
centerxfrac / centerxfrac_nonwide);
angle = atan(slope) + M_PI / FINEANGLES;
slopefrac = tan(angle) * FRACUNIT;
focallength = FixedDiv(centerxfrac, slopefrac);
projection = centerxfrac / slope;
}
for (i=0 ; i<FINEANGLES/2 ; i++)
{
@ -321,13 +325,15 @@ static void R_InitTextureMapping(void)
// xtoviewangle will give the smallest view angle
// that maps to x.
slopebam = tan(angle) * ANG90;
for (x=0; x<=viewwidth; x++)
{
for (i=0; viewangletox[i] > x; i++)
;
xtoviewangle[x] = (i<<ANGLETOFINESHIFT)-ANG90;
// [FG] linear horizontal sky scrolling
linearskyangle[x] = ((viewwidth/2-x)*((video.unscaledw<<FRACBITS)/viewwidth))*(ANG90/(NONWIDEWIDTH<<FRACBITS));
linearskyangle[x] = (0.5 - x / (double)viewwidth) * slopebam;
}
// Take out the fencepost cases from viewangletox.
@ -340,7 +346,8 @@ static void R_InitTextureMapping(void)
clipangle = xtoviewangle[0];
vx_clipangle = clipangle - ((fov << ANGLETOFINESHIFT) - ANG90);
fov = angle * ANGLE_MAX / M_PI;
vx_clipangle = clipangle - (fov - ANG90);
}
//
@ -581,6 +588,8 @@ void R_ExecuteSetViewSize (void)
pspritescale = FixedDiv(viewwidth_nonwide, SCREENWIDTH); // killough 11/98
pspriteiscale = FixedDiv(SCREENWIDTH, viewwidth_nonwide) + 1; // killough 11/98
skyiscale = FixedDiv(160 << FRACBITS, focallength);
for (i=0 ; i<viewwidth ; i++)
{
fixed_t cosadj = abs(finecosine[xtoviewangle[i]>>ANGLETOFINESHIFT]);

1
src/r_main.h
View File

@ -39,6 +39,7 @@ extern fixed_t centerxfrac;
extern fixed_t centeryfrac;
extern fixed_t focallength;
extern fixed_t projection;
extern fixed_t skyiscale;
extern int validcount;
extern int linecount;
extern int loopcount;

22
src/r_plane.c
View File

@ -390,6 +390,7 @@ static void do_draw_plane(visplane_t *pl)
int texture;
angle_t an, flip;
boolean vertically_scrolling = false;
boolean stretch;
// killough 10/98: allow skies to come from sidedefs.
// Allows scrolling and/or animated skies, as well as
@ -447,19 +448,22 @@ static void do_draw_plane(visplane_t *pl)
dc_colormap[0] = dc_colormap[1] = fullcolormap; // killough 3/20/98
dc_texheight = textureheight[texture]>>FRACBITS; // killough
dc_iscale = pspriteiscale;
dc_iscale = skyiscale;
// [FG] stretch short skies
if (stretchsky && dc_texheight < 200)
{
dc_iscale = dc_iscale * dc_texheight / SKYSTRETCH_HEIGHT;
dc_texturemid = dc_texturemid * dc_texheight / SKYSTRETCH_HEIGHT;
colfunc = R_DrawColumn;
}
else if (!vertically_scrolling)
stretch = (stretchsky && dc_texheight < 200);
if (stretch || !vertically_scrolling)
{
fixed_t diff;
if (stretch)
{
dc_iscale = dc_iscale * dc_texheight / SKYSTRETCH_HEIGHT;
dc_texturemid = dc_texturemid * dc_texheight / SKYSTRETCH_HEIGHT;
}
// Make sure the fade-to-color effect doesn't happen too early
fixed_t diff = dc_texturemid - SCREENHEIGHT / 2 * FRACUNIT;
diff = dc_texturemid - SCREENHEIGHT / 2 * FRACUNIT;
if (diff < 0)
{
diff += textureheight[texture];