zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-25 13:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom into zscript

Browse source
This commit is contained in:
Christoph Oelckers 2016-11-02 11:46:18 +01:00
commit c44dc8d951
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/r_main.cpp
View file

@ -355,7 +355,7 @@ void R_SWRSetWindow(int windowSize, int fullWidth, int fullHeight, int stHeight,
MaxVisForWall = (InvZtoScale * (SCREENWIDTH*r_Yaspect) / MaxVisForWall = (InvZtoScale * (SCREENWIDTH*r_Yaspect) /
(viewwidth*SCREENHEIGHT * FocalTangent)); (viewwidth*SCREENHEIGHT * FocalTangent));
MaxVisForWall = 32767.0 / MaxVisForWall; MaxVisForWall = 32767.0 / MaxVisForWall;
MaxVisForFloor = 32767.0 / (viewheight * FocalLengthY / 160); MaxVisForFloor = 32767.0 / (viewheight >> 2) * FocalLengthY / 160;
// Reset r_*Visibility vars // Reset r_*Visibility vars
R_SetVisibility(R_GetVisibility()); R_SetVisibility(R_GetVisibility());

1
src/win32/fb_d3d9.cpp
View file

@ -1092,6 +1092,7 @@ void D3DFB::Update ()
DrawRateStuff(); DrawRateStuff();
DrawPackedTextures(d3d_showpacks); DrawPackedTextures(d3d_showpacks);
EndBatch(); // Make sure all batched primitives are drawn. EndBatch(); // Make sure all batched primitives are drawn.
In2D = 0;
Flip(); Flip();
} }
In2D = 0; In2D = 0;