OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Remove r_swtruecolor variable as it is redundant

Browse source
This commit is contained in:
Magnus Norddahl 2017-02-01 21:42:08 +01:00
commit 93166fa150
18 changed files with 49 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/swrenderer/things/r_voxel.cpp
View file

@ -251,17 +251,19 @@ namespace swrenderer
double dy = (view_origin.Y - sprite_origin.Y) / sprite_xscale;
int backX = (int)(dx * spriteCos - dy * spriteSin + mip.Pivot.X);
int backY = (int)(dy * spriteCos + dx * spriteSin + mip.Pivot.Y);
int endX = clamp(backX, 0, mip.SizeX - 1);
int endY = clamp(backY, 0, mip.SizeY - 1);
//int endX = clamp(backX, 0, mip.SizeX - 1);
//int endY = clamp(backY, 0, mip.SizeY - 1);
int endX = mip.SizeX - 1;// clamp(backX, 0, mip.SizeX - 1);
int endY = mip.SizeY - 1;// clamp(backY, 0, mip.SizeY - 1);
// Draw the voxel cube:
for (int index = 0; index < 4; index++)
for (int index = 0; index < 1; index++)
{
if ((stepX[index] < 0 && endX >= startX[index]) ||
/*if ((stepX[index] < 0 && endX >= startX[index]) ||
(stepX[index] > 0 && endX <= startX[index]) ||
(stepY[index] < 0 && endY >= startY[index]) ||
(stepY[index] > 0 && endY <= startY[index])) continue;
(stepY[index] > 0 && endY <= startY[index])) continue;*/
for (int x = startX[index]; x != endX; x += stepX[index])
{
@ -346,7 +348,7 @@ namespace swrenderer
int y1 = MAX((int)(screenY - screenExtentY), 0);
int y2 = MIN((int)(screenY + screenExtentY + 0.5f), viewheight - 1);
int pixelsize = viewport->r_swtruecolor ? 4 : 1;
int pixelsize = viewport->RenderTarget->IsBgra() ? 4 : 1;
if (y1 < y2)
{