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

Add vertical FOV

Browse source
This commit is contained in:
Miloslav Číž 2018-09-03 16:38:49 +02:00
parent 4172f44731
commit 1dc3f2f763
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
raycastlib.h
View file

@ -17,8 +17,6 @@
clockwise, a full angle has UNITS_PER_SQUARE Units. clockwise, a full angle has UNITS_PER_SQUARE Units.
*/ */
#include <stdio.h>
#include <stdint.h> #include <stdint.h>
#ifndef RAYCAST_TINY #ifndef RAYCAST_TINY
@ -39,6 +37,8 @@ typedef uint16_t uint_maybe32_t;
#endif #endif
#define VERTICAL_FOV (UNITS_PER_SQUARE / 2)
#define logVector2D(v)\ #define logVector2D(v)\
printf("[%d,%d]\n",v.x,v.y); printf("[%d,%d]\n",v.x,v.y);
@ -81,6 +81,8 @@ typedef struct
uint8_t direction; ///< Direction of hit. uint8_t direction; ///< Direction of hit.
} HitResult; } HitResult;
// TODO: things like FOV could be constants to make them precomp. and faster?
typedef struct typedef struct
{ {
Vector2D position; Vector2D position;
@ -151,7 +153,7 @@ Unit len(Vector2D v);
Unit degreesToUnitsAngle(int16_t degrees); Unit degreesToUnitsAngle(int16_t degrees);
///< Computes the change in size of an object due to perspective. ///< Computes the change in size of an object due to perspective.
Unit perspectiveScale(Unit originalSize, Unit distance, Unit fov); Unit perspectiveScale(Unit originalSize, Unit distance);
/** /**
Casts rays for given camera view and for each hit calls a user provided Casts rays for given camera view and for each hit calls a user provided
@ -582,28 +584,28 @@ 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;
int_maybe32_t z1Screen = _middleRow - perspectiveScale( int_maybe32_t z1Screen = _middleRow - perspectiveScale(
(worldZPrev * _camera.resolution.y) / UNITS_PER_SQUARE,dist,1); (worldZPrev * _camera.resolution.y) / UNITS_PER_SQUARE,dist);
int_maybe32_t z1ScreenNoClamp = z1Screen; int_maybe32_t z1ScreenNoClamp = z1Screen;
z1Screen = clamp(z1Screen,0,_camResYLimit); z1Screen = clamp(z1Screen,0,_camResYLimit);
int_maybe32_t z1ScreenCeil = _middleRow - perspectiveScale( int_maybe32_t z1ScreenCeil = _middleRow - perspectiveScale(
(worldZPrevCeil * _camera.resolution.y) / UNITS_PER_SQUARE,dist,1); (worldZPrevCeil * _camera.resolution.y) / UNITS_PER_SQUARE,dist);
int_maybe32_t z1ScreenCeilNoClamp = z1ScreenCeil; int_maybe32_t z1ScreenCeilNoClamp = z1ScreenCeil;
z1ScreenCeil = clamp(z1ScreenCeil,0,_camResYLimit); z1ScreenCeil = clamp(z1ScreenCeil,0,_camResYLimit);
int_maybe32_t z2Screen = _middleRow - perspectiveScale( int_maybe32_t z2Screen = _middleRow - perspectiveScale(
(worldZ2 * _camera.resolution.y) / UNITS_PER_SQUARE,dist,1); (worldZ2 * _camera.resolution.y) / UNITS_PER_SQUARE,dist);
int_maybe32_t wallScreenHeightNoClamp = z2Screen - z1ScreenNoClamp; int_maybe32_t wallScreenHeightNoClamp = z2Screen - z1ScreenNoClamp;
z2Screen = clamp(z2Screen,0,_camResYLimit); z2Screen = clamp(z2Screen,0,_camResYLimit);
int_maybe32_t z2ScreenCeil = _middleRow - perspectiveScale( int_maybe32_t z2ScreenCeil = _middleRow - perspectiveScale(
(worldZ2Ceil * _camera.resolution.y) / UNITS_PER_SQUARE,dist,1); (worldZ2Ceil * _camera.resolution.y) / UNITS_PER_SQUARE,dist);
int_maybe32_t wallScreenHeightCeilNoClamp = z2ScreenCeil - z1ScreenCeilNoClamp; int_maybe32_t wallScreenHeightCeilNoClamp = z2ScreenCeil - z1ScreenCeilNoClamp;
@ -757,14 +759,11 @@ Unit degreesToUnitsAngle(int16_t degrees)
return (degrees * UNITS_PER_SQUARE) / 360; return (degrees * UNITS_PER_SQUARE) / 360;
} }
Unit perspectiveScale(Unit originalSize, Unit distance, Unit fov) Unit perspectiveScale(Unit originalSize, Unit distance)
{ {
return (originalSize * UNITS_PER_SQUARE) / distance; return (originalSize * UNITS_PER_SQUARE) /
((VERTICAL_FOV * 2 * distance) / UNITS_PER_SQUARE);
distance *= fov; // ^ approximation of tan function
distance = distance == 0 ? 1 : distance; // prevent division by zero
return originalSize / distance;
} }
#endif #endif