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

Clamp negative depth to 0

Browse source
This commit is contained in:
Miloslav Číž 2019-10-11 15:02:13 +02:00
parent 646755b45d
commit f891b6317a
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
raycastlib.h
View file

@ -26,7 +26,7 @@
author: Miloslav "drummyfish" Ciz author: Miloslav "drummyfish" Ciz
license: CC0 1.0 license: CC0 1.0
version: 0.87 version: 0.88
*/ */
#include <stdint.h> #include <stdint.h>
@ -280,6 +280,10 @@ typedef struct
very often. very often.
*/ */
typedef RCL_Unit (*RCL_ArrayFunction)(int16_t x, int16_t y); typedef RCL_Unit (*RCL_ArrayFunction)(int16_t x, int16_t y);
/*
TODO: maybe array functions should be replaced by defines of funtion names
like with pixelFunc? Could be more efficient than function pointers.
*/
/** /**
Function that renders a single pixel at the display. It is handed an info Function that renders a single pixel at the display. It is handed an info
@ -1034,7 +1038,7 @@ RCL_Unit RCL_adjustDistance(RCL_Unit distance, RCL_Camera *camera,
} }
/// Helper for drawing floor or ceiling. Returns the last drawn pixel position. /// Helper for drawing floor or ceiling. Returns the last drawn pixel position.
static inline int16_t _RCL_drawVertical( static inline int16_t _RCL_drawHorizontalColumn(
RCL_Unit yCurrent, RCL_Unit yCurrent,
RCL_Unit yTo, RCL_Unit yTo,
RCL_Unit limit1, // TODO: int16_t? RCL_Unit limit1, // TODO: int16_t?
@ -1058,13 +1062,19 @@ static inline int16_t _RCL_drawVertical(
int16_t limit = RCL_clamp(yTo,limit1,limit2); int16_t limit = RCL_clamp(yTo,limit1,limit2);
RCL_Unit depth = 0; /* TODO: this is for clamping depth to 0 so that we don't
have negative depths, but we should do it more
elegantly and efficiently */
_RCL_UNUSED(depth);
/* for performance reasons have different version of the critical loop /* for performance reasons have different version of the critical loop
to be able to branch early */ to be able to branch early */
#define loop(doDepth,doCoords)\ #define loop(doDepth,doCoords)\
{\ {\
if (doDepth) /*constant condition - compiler should optimize it out*/\ if (doDepth) /*constant condition - compiler should optimize it out*/\
{\ {\
pixelInfo->depth += RCL_absVal(verticalOffset) *\ depth = pixelInfo->depth + RCL_absVal(verticalOffset) *\
RCL_VERTICAL_DEPTH_MULTIPLY;\ RCL_VERTICAL_DEPTH_MULTIPLY;\
depthIncrement = depthIncrementMultiplier *\ depthIncrement = depthIncrementMultiplier *\
_RCL_horizontalDepthStep;\ _RCL_horizontalDepthStep;\
@ -1080,7 +1090,10 @@ static inline int16_t _RCL_drawVertical(
{\ {\
pixelInfo->position.y = i;\ pixelInfo->position.y = i;\
if (doDepth) /*constant condition - compiler should optimize it out*/\ if (doDepth) /*constant condition - compiler should optimize it out*/\
pixelInfo->depth += depthIncrement;\ {\
depth += depthIncrement;\
pixelInfo->depth = RCL_max(0,depth); /*TODO: optimize */\
}\
if (doCoords) /*constant condition - compiler should optimize it out*/\ if (doCoords) /*constant condition - compiler should optimize it out*/\
{\ {\
RCL_Unit d = _RCL_floorPixelDistances[i];\ RCL_Unit d = _RCL_floorPixelDistances[i];\
@ -1287,7 +1300,7 @@ void _RCL_columnFunctionComplex(RCL_HitResult *hits, uint16_t hitCount, uint16_t
p.depth = 0; p.depth = 0;
#endif #endif
limit = _RCL_drawVertical(fPosY,fZ1Screen,cPosY + 1, limit = _RCL_drawHorizontalColumn(fPosY,fZ1Screen,cPosY + 1,
_RCL_camera.resolution.y,fZ1World,-1,RCL_COMPUTE_FLOOR_DEPTH, _RCL_camera.resolution.y,fZ1World,-1,RCL_COMPUTE_FLOOR_DEPTH,
// ^ purposfully allow outside screen bounds // ^ purposfully allow outside screen bounds
RCL_COMPUTE_FLOOR_TEXCOORDS && p.height == RCL_FLOOR_TEXCOORDS_HEIGHT, RCL_COMPUTE_FLOOR_TEXCOORDS && p.height == RCL_FLOOR_TEXCOORDS_HEIGHT,
@ -1307,7 +1320,7 @@ void _RCL_columnFunctionComplex(RCL_HitResult *hits, uint16_t hitCount, uint16_t
_RCL_horizontalDepthStep; _RCL_horizontalDepthStep;
#endif #endif
limit = _RCL_drawVertical(cPosY,cZ1Screen, limit = _RCL_drawHorizontalColumn(cPosY,cZ1Screen,
-1,fPosY - 1,cZ1World,1,RCL_COMPUTE_CEILING_DEPTH,0,1,&ray,&p); -1,fPosY - 1,cZ1World,1,RCL_COMPUTE_CEILING_DEPTH,0,1,&ray,&p);
// ^ purposfully allow outside screen bounds here // ^ purposfully allow outside screen bounds here
@ -1472,7 +1485,7 @@ void _RCL_columnFunctionSimple(RCL_HitResult *hits, uint16_t hitCount,
p.depth = 1; p.depth = 1;
p.height = RCL_UNITS_PER_SQUARE; p.height = RCL_UNITS_PER_SQUARE;
y = _RCL_drawVertical(-1,wallStart,-1,_RCL_middleRow,_RCL_camera.height,1, y = _RCL_drawHorizontalColumn(-1,wallStart,-1,_RCL_middleRow,_RCL_camera.height,1,
RCL_COMPUTE_CEILING_DEPTH,0,1,&ray,&p); RCL_COMPUTE_CEILING_DEPTH,0,1,&ray,&p);
// draw wall // draw wall
@ -1503,7 +1516,7 @@ void _RCL_columnFunctionSimple(RCL_HitResult *hits, uint16_t hitCount,
p.depth = (_RCL_camera.resolution.y - y) * _RCL_horizontalDepthStep + 1; p.depth = (_RCL_camera.resolution.y - y) * _RCL_horizontalDepthStep + 1;
#endif #endif
_RCL_drawVertical(y,_RCL_camResYLimit,-1,_RCL_camResYLimit, _RCL_drawHorizontalColumn(y,_RCL_camResYLimit,-1,_RCL_camResYLimit,
_RCL_camera.height,1,RCL_COMPUTE_FLOOR_DEPTH,RCL_COMPUTE_FLOOR_TEXCOORDS, _RCL_camera.height,1,RCL_COMPUTE_FLOOR_DEPTH,RCL_COMPUTE_FLOOR_TEXCOORDS,
-1,&ray,&p); -1,&ray,&p);
} }
@ -1627,8 +1640,6 @@ RCL_PixelInfo RCL_mapToScreen(RCL_Vector2D worldPosition, RCL_Unit height,
{ {
RCL_PixelInfo result; RCL_PixelInfo result;
RCL_Unit d = RCL_dist(worldPosition,camera.position);
RCL_Vector2D toPoint; RCL_Vector2D toPoint;
toPoint.x = worldPosition.x - camera.position.x; toPoint.x = worldPosition.x - camera.position.x;