mirror of
https://git.coom.tech/drummyfish/raycastlib.git
synced 2024-11-21 20:29:59 +01:00
Fix FOV
This commit is contained in:
parent
f09006066d
commit
8a4077bd03
1 changed files with 22 additions and 27 deletions
49
raycastlib.h
49
raycastlib.h
|
@ -26,7 +26,7 @@
|
||||||
|
|
||||||
author: Miloslav "drummyfish" Ciz
|
author: Miloslav "drummyfish" Ciz
|
||||||
license: CC0 1.0
|
license: CC0 1.0
|
||||||
version: 0.902
|
version: 0.903
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
@ -107,9 +107,11 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef RCL_VERTICAL_FOV
|
#ifndef RCL_VERTICAL_FOV
|
||||||
#define RCL_VERTICAL_FOV (RCL_UNITS_PER_SQUARE / 2)
|
#define RCL_VERTICAL_FOV (RCL_UNITS_PER_SQUARE / 5)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define RCL_VERTICAL_FOV_TAN (RCL_VERTICAL_FOV * 4) ///< tan approximation
|
||||||
|
|
||||||
#ifndef RCL_HORIZONTAL_FOV
|
#ifndef RCL_HORIZONTAL_FOV
|
||||||
#define RCL_HORIZONTAL_FOV (RCL_UNITS_PER_SQUARE / 4)
|
#define RCL_HORIZONTAL_FOV (RCL_UNITS_PER_SQUARE / 4)
|
||||||
#endif
|
#endif
|
||||||
|
@ -890,8 +892,18 @@ void RCL_castRayMultiHit(RCL_Ray ray, RCL_ArrayFunction arrayFunc,
|
||||||
|
|
||||||
#if !RCL_RECTILINEAR
|
#if !RCL_RECTILINEAR
|
||||||
h.distance = RCL_dist(h.position,ray.start);
|
h.distance = RCL_dist(h.position,ray.start);
|
||||||
#endif
|
#else
|
||||||
|
h.distance = (h.distance * 23) / 32;
|
||||||
|
|
||||||
|
/* ^ UGLY HACK
|
||||||
|
|
||||||
|
For some reason the computed distance with rectilinear is larger, the
|
||||||
|
correct distance is about 0.711 (~= 23/32) of the computed distance, so
|
||||||
|
we correct it here in this ugly way.
|
||||||
|
|
||||||
|
TODO: investigate why, fix nicely
|
||||||
|
*/
|
||||||
|
#endif
|
||||||
if (typeFunc != 0)
|
if (typeFunc != 0)
|
||||||
h.type = typeFunc(currentSquare.x,currentSquare.y);
|
h.type = typeFunc(currentSquare.x,currentSquare.y);
|
||||||
|
|
||||||
|
@ -1202,20 +1214,6 @@ static inline int16_t _RCL_drawWall(
|
||||||
|
|
||||||
RCL_Unit textureCoordScaled = pixelInfo->texCoords.y;
|
RCL_Unit textureCoordScaled = pixelInfo->texCoords.y;
|
||||||
|
|
||||||
#if RCL_RECTILINEAR
|
|
||||||
RCL_Unit tmp = pixelInfo->depth;
|
|
||||||
pixelInfo->depth = (pixelInfo->depth * 23) / 32;
|
|
||||||
|
|
||||||
/* ^ UGLY HACK
|
|
||||||
|
|
||||||
For some reason the computed distance with rectilinear is larger, the
|
|
||||||
correct distance is about 0.711 (~= 23/32) of the computed distance, so
|
|
||||||
we correct it here in this ugly way.
|
|
||||||
|
|
||||||
TODO: investigate why, fix nicely
|
|
||||||
*/
|
|
||||||
#endif
|
|
||||||
|
|
||||||
for (RCL_Unit i = yCurrent + increment;
|
for (RCL_Unit i = yCurrent + increment;
|
||||||
increment == -1 ? i >= limit : i <= limit; // TODO: is efficient?
|
increment == -1 ? i >= limit : i <= limit; // TODO: is efficient?
|
||||||
i += increment)
|
i += increment)
|
||||||
|
@ -1232,10 +1230,6 @@ static inline int16_t _RCL_drawWall(
|
||||||
RCL_PIXEL_FUNCTION(pixelInfo);
|
RCL_PIXEL_FUNCTION(pixelInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if RCL_RECTILINEAR
|
|
||||||
pixelInfo->depth = tmp;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return limit;
|
return limit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1697,10 +1691,11 @@ RCL_PixelInfo RCL_mapToScreen(RCL_Vector2D worldPosition, RCL_Unit height,
|
||||||
result.position.x =
|
result.position.x =
|
||||||
middleColumn + (-1 * toPoint.y * middleColumn) / RCL_nonZero(result.depth);
|
middleColumn + (-1 * toPoint.y * middleColumn) / RCL_nonZero(result.depth);
|
||||||
|
|
||||||
result.position.y = camera.resolution.y / 2 -
|
result.position.y =
|
||||||
(((3 * camera.resolution.y) / 4 ) *
|
camera.resolution.y / 2 -
|
||||||
RCL_perspectiveScale(height - camera.height,result.depth))
|
(RCL_perspectiveScale(height - camera.height,result.depth)
|
||||||
/ RCL_UNITS_PER_SQUARE + camera.shear;
|
* camera.resolution.y) / RCL_UNITS_PER_SQUARE
|
||||||
|
+ camera.shear;
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
@ -1716,7 +1711,7 @@ RCL_Unit RCL_perspectiveScale(RCL_Unit originalSize, RCL_Unit distance)
|
||||||
|
|
||||||
return distance != 0 ?
|
return distance != 0 ?
|
||||||
(originalSize * RCL_UNITS_PER_SQUARE) /
|
(originalSize * RCL_UNITS_PER_SQUARE) /
|
||||||
((RCL_VERTICAL_FOV * 2 * distance) / RCL_UNITS_PER_SQUARE)
|
((RCL_VERTICAL_FOV_TAN * 2 * distance) / RCL_UNITS_PER_SQUARE)
|
||||||
: 0;
|
: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1726,7 +1721,7 @@ RCL_Unit RCL_perspectiveScaleInverse(RCL_Unit originalSize,
|
||||||
return scaledSize != 0 ?
|
return scaledSize != 0 ?
|
||||||
(originalSize * RCL_UNITS_PER_SQUARE + RCL_UNITS_PER_SQUARE / 2) /
|
(originalSize * RCL_UNITS_PER_SQUARE + RCL_UNITS_PER_SQUARE / 2) /
|
||||||
// ^ take the middle
|
// ^ take the middle
|
||||||
((RCL_VERTICAL_FOV * 2 * scaledSize) / RCL_UNITS_PER_SQUARE)
|
((RCL_VERTICAL_FOV_TAN * 2 * scaledSize) / RCL_UNITS_PER_SQUARE)
|
||||||
: RCL_INFINITY;
|
: RCL_INFINITY;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue