williamjcm/raycastlib
1
0
Fork 0
mirror of https://git.coom.tech/drummyfish/raycastlib.git synced 2024-11-21 20:29:59 +01:00
Code Activity

Fix datatype bug

Browse source
This commit is contained in:
Miloslav Číž 2018-09-03 13:06:45 +02:00
parent 03064d6440
commit 3173d76c5d
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
raycastlib.h
View file

@ -532,7 +532,7 @@ Camera _camera;
Unit _floorDepthStep = 0; Unit _floorDepthStep = 0;
Unit _startHeight = 0; Unit _startHeight = 0;
int_maybe32_t _camResYLimit = 0; int_maybe32_t _camResYLimit = 0;
uint16_t _middleRow = 0; Unit _middleRow = 0;
void _columnFunction(HitResult *hits, uint16_t hitCount, uint16_t x, Ray ray) void _columnFunction(HitResult *hits, uint16_t hitCount, uint16_t x, Ray ray)
{ {
@ -569,22 +569,22 @@ void _columnFunction(HitResult *hits, uint16_t hitCount, uint16_t x, Ray ray)
Unit worldZ2Ceil = (UNITS_PER_SQUARE * 5 - wallHeight) - _camera.height; Unit worldZ2Ceil = (UNITS_PER_SQUARE * 5 - wallHeight) - _camera.height;
int16_t z1Screen = _middleRow - perspectiveScale( Unit z1Screen = _middleRow - perspectiveScale(
(worldZPrev * _camera.resolution.y) / UNITS_PER_SQUARE,dist,1); (worldZPrev * _camera.resolution.y) / UNITS_PER_SQUARE,dist,1);
z1Screen = clamp(z1Screen,0,_camResYLimit); z1Screen = clamp(z1Screen,0,_camResYLimit);
int16_t z1ScreenCeil = _middleRow - perspectiveScale( Unit z1ScreenCeil = _middleRow - perspectiveScale(
(worldZPrevCeil * _camera.resolution.y) / UNITS_PER_SQUARE,dist,1); (worldZPrevCeil * _camera.resolution.y) / UNITS_PER_SQUARE,dist,1);
z1ScreenCeil = clamp(z1ScreenCeil,0,_camResYLimit); z1ScreenCeil = clamp(z1ScreenCeil,0,_camResYLimit);
int16_t z2Screen = _middleRow - perspectiveScale( Unit z2Screen = _middleRow - perspectiveScale(
(worldZ2 * _camera.resolution.y) / UNITS_PER_SQUARE,dist,1); (worldZ2 * _camera.resolution.y) / UNITS_PER_SQUARE,dist,1);
z2Screen = clamp(z2Screen,0,_camResYLimit); z2Screen = clamp(z2Screen,0,_camResYLimit);
int16_t z2ScreenCeil = _middleRow - perspectiveScale( Unit z2ScreenCeil = _middleRow - perspectiveScale(
(worldZ2Ceil * _camera.resolution.y) / UNITS_PER_SQUARE,dist,1); (worldZ2Ceil * _camera.resolution.y) / UNITS_PER_SQUARE,dist,1);
z2ScreenCeil = clamp(z2ScreenCeil,0,_camResYLimit); z2ScreenCeil = clamp(z2ScreenCeil,0,_camResYLimit);
@ -659,7 +659,7 @@ void _columnFunction(HitResult *hits, uint16_t hitCount, uint16_t x, Ray ray)
p.isWall = 0; p.isWall = 0;
Unit floorCameraDiff = absVal(worldZPrev) * VERTICAL_DEPTH_MULTIPLY; Unit floorCameraDiff = absVal(worldZPrev) * VERTICAL_DEPTH_MULTIPLY;
uint16_t horizon = y2 < _middleRow ? _middleRow : y2; Unit horizon = y2 < _middleRow ? _middleRow : y2;
for (int_maybe32_t i = y; i >= horizon; --i) for (int_maybe32_t i = y; i >= horizon; --i)
{ {