diff options
Diffstat (limited to 'src/utils/include')
| -rw-r--r-- | src/utils/include/engine/utils.h | 4 | ||||
| -rw-r--r-- | src/utils/include/engine/utils/fov.h | 6 | ||||
| -rw-r--r-- | src/utils/include/engine/utils/vector.h | 39 |
3 files changed, 5 insertions, 44 deletions
diff --git a/src/utils/include/engine/utils.h b/src/utils/include/engine/utils.h index aa1343b..5096aa4 100644 --- a/src/utils/include/engine/utils.h +++ b/src/utils/include/engine/utils.h @@ -6,7 +6,7 @@ extern "C" { #endif #include <engine/core/types.h> -#include <engine/utils/vector.h> +#include <cglm/ivec2.h> #define MIN(a, b) ((a < b) ? (a) : (b)) #define MAX(a, b) ((a > b) ? (a) : (b)) @@ -31,7 +31,7 @@ u32 hash(char* str); /* Masks surrounding tiles of a kernel size of 3x3 */ /* In reality we only need 9 bits for this, but I think I had a reason for using * i32 */ -i32* kernmap(const void* map, i32* dstmap, const v2_i32 mapsize, +i32* kernmap(const void* map, i32* dstmap, const ivec2 mapsize, predicate_t* predicate); /* Returns an index from the given weights. */ diff --git a/src/utils/include/engine/utils/fov.h b/src/utils/include/engine/utils/fov.h index 50df8fa..be64a9e 100644 --- a/src/utils/include/engine/utils/fov.h +++ b/src/utils/include/engine/utils/fov.h @@ -6,8 +6,8 @@ extern "C" { #endif #include <engine/core/types.h> -#include <engine/utils/vector.h> #include <stdbool.h> +#include <cglm/ivec2.h> /* `fov_shadowcast`: */ /* map: your 2D enum tile grid @@ -18,9 +18,9 @@ extern "C" { * distance to the source. range: visibility range/radius. src: 2D * point to calculate FOV from * */ -void fov_shadowcast(const void* map, const v2_i32 mapsize, +void fov_shadowcast(const void* map, const ivec2 mapsize, bool (*visblocking)(const void*), i32* lightmap, - const i32 range, v2_i32 src); + const i32 range, const ivec2 src); #ifdef __cplusplus } diff --git a/src/utils/include/engine/utils/vector.h b/src/utils/include/engine/utils/vector.h deleted file mode 100644 index 7f4c4a4..0000000 --- a/src/utils/include/engine/utils/vector.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef VECTOR_H -#define VECTOR_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include <engine/core/types.h> - -#include <stdbool.h> -#include <stdio.h> - -typedef struct { - i32 x; - i32 y; -} v2_i32; - -bool v2_i32_eq(const v2_i32 a, const v2_i32 b); - -v2_i32 v2_i32_add(v2_i32 a, v2_i32 b); -v2_i32 v2_i32_add_i(v2_i32 a, i32 b); -v2_i32 v2_i32_sub(v2_i32 a, v2_i32 b); -v2_i32 v2_i32_sub_i(v2_i32 a, i32 b); -v2_i32 v2_i32_div(v2_i32 a, v2_i32 b); -v2_i32 v2_i32_div_i(v2_i32 a, i32 b); -v2_i32 v2_i32_mul(v2_i32 a, v2_i32 b); -v2_i32 v2_i32_mul_i(v2_i32 a, i32 b); -v2_i32 v2_i32_mod(v2_i32 a, v2_i32 b); -v2_i32 v2_i32_mod_i(v2_i32 a, i32 b); -v2_i32 v2_i32_max(v2_i32 a, v2_i32 b); -v2_i32 v2_i32_min(v2_i32 a, v2_i32 b); -v2_i32 v2_i32_lerp(f32 dt, v2_i32 a, v2_i32 b); - -void v2_i32_fprintf(FILE* stream, v2_i32 a); - -#ifdef __cplusplus -} -#endif -#endif |
