OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Change canvas rendering to use the aspect ratio of the canvas and generalize 5:4 rendering as AspectTallerThanWide

Browse source
This commit is contained in:
Magnus Norddahl 2016-09-13 23:26:30 +02:00 • committed by Christoph Oelckers
commit 017d1cee29
7 changed files with 36 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/v_draw.cpp
View file

@ -874,7 +874,7 @@ void DCanvas::VirtualToRealCoords(double &x, double &y, double &w, double &h,
double right = x + w;
double bottom = y + h;
if (myratio > 1.4f)
if (myratio > 1.334f)
{ // The target surface is either 16:9 or 16:10, so expand the
// specified virtual size to avoid undesired stretching of the
// image. Does not handle non-4:3 virtual sizes. I'll worry about
@ -887,7 +887,7 @@ void DCanvas::VirtualToRealCoords(double &x, double &y, double &w, double &h,
x = x * Width / vwidth;
w = right * Width / vwidth - x;
}
if (Is54Aspect(myratio))
if (AspectTallerThanWide(myratio))
{ // The target surface is 5:4
y = (y - vheight * 0.5) * Height * 600 / (vheight * AspectBaseHeight(myratio)) + Height * 0.5;
h = (bottom - vheight * 0.5) * Height * 600 / (vheight * AspectBaseHeight(myratio)) + Height * 0.5 - y;
@ -950,7 +950,7 @@ void DCanvas::FillBorder (FTexture *img)
return;
}
int bordtop, bordbottom, bordleft, bordright, bord;
if (Is54Aspect(myratio))
if (AspectTallerThanWide(myratio))
{ // Screen is taller than it is wide
bordleft = bordright = 0;
bord = Height - Height * AspectMultiplier(myratio) / 48;