mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-13 11:38:49 -04:00
Fix JUT_ASSERT and several other macros (#2711)
* Fix JUT_ASSERT to be a nested define * Switch names that appear in asserts to be constants instead of defines * Replace `0` in asserts with `NULL` or `FALSE` * Fix fpclassify * Fix ARRAY_SIZE * Use G_CM3D_F_INF * More fixes for fpclassify * Remove FLOAT_LABEL * Remove incorrect FLAG_ON macro * Remove UNK_BSS macro * Silence clangd unused header warning for PCH
This commit is contained in:
@@ -3,11 +3,15 @@
|
||||
* BG Collision Line Check
|
||||
*/
|
||||
|
||||
#include "d/dolzel.h"
|
||||
#include "d/dolzel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/d_bg_s_lin_chk.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
|
||||
#define CHECK_FLOAT_RANGE(line, x) JUT_ASSERT(line, -1.0e32f < x && x < 1.0e32f);
|
||||
|
||||
static const f32 INF = 2000000000.0f;
|
||||
|
||||
/* 80077C68-80077CDC 0725A8 0074+00 8/8 3/3 388/388 .text __ct__11dBgS_LinChkFv */
|
||||
dBgS_LinChk::dBgS_LinChk() {
|
||||
SetPolyPassChk(GetPolyPassChkInfo());
|
||||
@@ -20,8 +24,27 @@ dBgS_LinChk::~dBgS_LinChk() {}
|
||||
/* 80077D64-80077DA4 0726A4 0040+00 0/0 15/15 307/307 .text
|
||||
* Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c */
|
||||
void dBgS_LinChk::Set(cXyz const* pi_start, cXyz const* pi_end, fopAc_ac_c const* p_actor) {
|
||||
u32 id;
|
||||
JUT_ASSERT(45, !isnan(pi_start->x));
|
||||
JUT_ASSERT(46, !isnan(pi_start->y));
|
||||
JUT_ASSERT(47, !isnan(pi_start->z));
|
||||
JUT_ASSERT(48, !isnan(pi_end->x));
|
||||
JUT_ASSERT(49, !isnan(pi_end->y));
|
||||
//! @bug Two asserts on pi_end->y instead of one on py_end->z
|
||||
JUT_ASSERT(50, !isnan(pi_end->y));
|
||||
|
||||
JUT_ASSERT(54, -INF < pi_start->x && pi_start->x < INF);
|
||||
JUT_ASSERT(55, -INF < pi_start->y && pi_start->y < INF);
|
||||
JUT_ASSERT(56, -INF < pi_start->z && pi_start->z < INF);
|
||||
JUT_ASSERT(57, -INF < pi_end->x && pi_end->x < INF);
|
||||
JUT_ASSERT(58, -INF < pi_end->y && pi_end->y < INF);
|
||||
JUT_ASSERT(59, -INF < pi_end->z && pi_end->z < INF);
|
||||
|
||||
JUT_ASSERT(61, pi_start->y != G_CM3D_F_INF);
|
||||
JUT_ASSERT(62, pi_start->y != -G_CM3D_F_INF);
|
||||
JUT_ASSERT(63, pi_end->y != G_CM3D_F_INF);
|
||||
JUT_ASSERT(64, pi_end->y != -G_CM3D_F_INF);
|
||||
|
||||
u32 id;
|
||||
if (p_actor != NULL) {
|
||||
id = fopAcM_GetID(p_actor);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user