Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

floor rendering fix #48

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,7 @@ modules.order
Module.symvers
Mkfile.old
dkms.conf

*.rot
build/
.vscode/
31 changes: 16 additions & 15 deletions src/rt_floor.c
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,9 @@ void DrawHLine (int xleft, int xright, int yp)
buf=floorptr;
hd=yp-centery;
height=(hd<<13)/(maxheight-pheight+32);

mr_xstep=FixedScale((viewsin<<8),((maxheight-pheight+32)),hd);
mr_ystep=FixedScale((viewcos<<8),((maxheight-pheight+32)),hd);
}
else
{
Expand All @@ -505,16 +508,17 @@ void DrawHLine (int xleft, int xright, int yp)

hd=centery-yp;
height=(hd<<13)/pheight;

mr_xstep=FixedScale((viewsin<<8),(pheight),hd);
mr_ystep=FixedScale((viewcos<<8),(pheight),hd);
}
SetFCLightLevel(height>>(8-HEIGHTFRACTION-1));
mr_xstep = ((viewsin<<8)/(height));
mr_ystep = ((viewcos<<8)/(height));

startxfrac = ((viewx>>1) + FixedMulShift(mr_ystep,scale,2))-
FixedMulShift(mr_xstep,(centerx-xleft),2);
startxfrac = ((viewx<<14) + mr_ystep * scale)-
(mr_xstep * (centerx-xleft));

startyfrac = ((viewy>>1) - FixedMulShift(mr_xstep,scale,2))-
FixedMulShift(mr_ystep,(centerx-xleft),2);
startyfrac = ((viewy<<14) - mr_xstep * scale)-
(mr_ystep * (centerx-xleft));

dest=(byte *)bufferofs+ylookup[yp];

Expand All @@ -527,10 +531,6 @@ void DrawHLine (int xleft, int xright, int yp)
mr_xfrac = startxfrac;
mr_yfrac = startyfrac;

// back off the pixel increment (orig. is 4x)
mr_xstep >>= 2;
mr_ystep >>= 2;

mr_count = xright-xleft+1;

if (mr_count)
Expand Down Expand Up @@ -595,17 +595,18 @@ void DrawPlanes( void )

void DrawRow(int count, byte * dest, byte * src)
{
unsigned frac, fracstep;
int coord;

frac = (mr_yfrac<<16) + (mr_xfrac&0xffff);
fracstep = (mr_ystep<<16) + (mr_xstep&0xffff);
unsigned xfrac = mr_xfrac;
unsigned yfrac = mr_yfrac;

while (count--) {
/* extract the x/y coordinates */
coord = ((frac >> (32-7)) | ((frac >> (32-23)) << 7)) & 16383;
coord = ((yfrac >> 24) & 0b00000001111111) | (( xfrac >> 17) & 0b11111110000000);
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Binary constants are not standard C, but it makes the code easier to understand. I can change this if needed.


*dest++ = shadingtable[src[coord]];
frac += fracstep;

xfrac += mr_xstep;
yfrac += mr_ystep;
}
}
6 changes: 5 additions & 1 deletion src/w_wad.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
// W_wad.c

#include <alloca.h>
#if defined(_MSC_VER) || defined(__MINGW32__)
#include <malloc.h> // alloca
#else
#include <alloca.h> // alloca
#endif
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
Expand Down