From fde41a7b4aa1030db438fc21b36e4e1b6cc58195 Mon Sep 17 00:00:00 2001 From: korenkonder Date: Sun, 8 Oct 2023 17:32:03 +0300 Subject: [PATCH] Replaced `fabs` with `fabsf` where appropriate --- src/CRE/auth_2d.cpp | 12 ++++++------ src/CRE/light_param/light.cpp | 4 ++-- src/CRE/pv_param.cpp | 4 ++-- src/CRE/task_effect.cpp | 2 +- src/KKdLib/mat.cpp | 2 +- src/ReDIVA/main.cpp | 2 +- src/ReDIVA/pv_game/pv_game_pv_data.cpp | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/CRE/auth_2d.cpp b/src/CRE/auth_2d.cpp index a9d35c36..f288b1a1 100644 --- a/src/CRE/auth_2d.cpp +++ b/src/CRE/auth_2d.cpp @@ -1164,17 +1164,17 @@ void AetObj::CalcMat(mat4& mat, const aet_layer* layer, float_t frame) { } mat4_translate_mult(&mat, pos_x, pos_y, -pos_z, &mat); - if (fabs(dir_x) > 0.000001f) + if (fabsf(dir_x) > 0.000001f) mat4_rotate_x_mult(&mat, -dir_x, &mat); - if (fabs(dir_y) > 0.000001f) + if (fabsf(dir_y) > 0.000001f) mat4_rotate_y_mult(&mat, -dir_y, &mat); - if (fabs(dir_z) > 0.000001f) + if (fabsf(dir_z) > 0.000001f) mat4_rotate_z_mult(&mat, dir_z * scale_size.x * scale_size.y, &mat); - if (fabs(rot_x) > 0.000001f) + if (fabsf(rot_x) > 0.000001f) mat4_rotate_x_mult(&mat, -rot_x, &mat); - if (fabs(rot_y) > 0.000001f) + if (fabsf(rot_y) > 0.000001f) mat4_rotate_y_mult(&mat, -rot_y, &mat); - if (fabs(rot_z) > 0.000001f) + if (fabsf(rot_z) > 0.000001f) mat4_rotate_z_mult(&mat, rot_z * scale_size.x * scale_size.y, &mat); mat4_scale_rot(&mat, scale_x, scale_y, scale_z, &mat); mat4_translate_mult(&mat, -anchor_x, -anchor_y, -anchor_z, &mat); diff --git a/src/CRE/light_param/light.cpp b/src/CRE/light_param/light.cpp index 954b11ad..f02bd331 100644 --- a/src/CRE/light_param/light.cpp +++ b/src/CRE/light_param/light.cpp @@ -447,8 +447,8 @@ void light_set::data_set(face& face, light_set_id id) { vec4 light_reflect_dir; lights[LIGHT_CHARA].get_position(light_reflect_dir); - if (fabs(light_reflect_dir.x) <= 0.000001f && fabs(light_reflect_dir.y) <= 0.000001f - && fabs(light_reflect_dir.z) <= 0.000001f) + if (fabsf(light_reflect_dir.x) <= 0.000001f && fabsf(light_reflect_dir.y) <= 0.000001f + && fabsf(light_reflect_dir.z) <= 0.000001f) *(vec3*)&light_reflect_dir = vec3(0.0f, 1.0f, 0.0f); else { float_t length = vec3::length(*(vec3*)&light_reflect_dir); diff --git a/src/CRE/pv_param.cpp b/src/CRE/pv_param.cpp index 5b3017fe..a90d3479 100644 --- a/src/CRE/pv_param.cpp +++ b/src/CRE/pv_param.cpp @@ -999,7 +999,7 @@ namespace pv_param_task { } float_t value; - if (fabs(i.duration) <= 0.000001) + if (fabsf(i.duration) <= 0.000001f) value = i.alpha; else if (i.duration <= 0.0) value = i.prev_alpha; @@ -1059,7 +1059,7 @@ namespace pv_param_task { } float_t value; - if (fabs(i.duration) <= 0.000001) + if (fabsf(i.duration) <= 0.000001f) value = i.alpha; else if (i.duration <= 0.0) value = i.prev_alpha; diff --git a/src/CRE/task_effect.cpp b/src/CRE/task_effect.cpp index 55b3af89..069b2133 100644 --- a/src/CRE/task_effect.cpp +++ b/src/CRE/task_effect.cpp @@ -1038,7 +1038,7 @@ void TaskEffectFogRing::Data::Ctrl() { } void TaskEffectFogRing::Data::CtrlInner(float_t delta_time) { - if (fabs(delta_time) <= 0.000001f) + if (fabsf(delta_time) <= 0.000001f) return; sub_140347B40(delta_time); diff --git a/src/KKdLib/mat.cpp b/src/KKdLib/mat.cpp index cf0790d1..082dbff0 100644 --- a/src/KKdLib/mat.cpp +++ b/src/KKdLib/mat.cpp @@ -2097,7 +2097,7 @@ inline void mat4_get_rotation(const mat4* x, vec3* z) { else z->y = asinf(-x->row0.z); - if (fabs(x->row0.z) < 0.99999899f) { + if (fabsf(x->row0.z) < 0.99999899f) { z->x = atan2f(x->row1.z, x->row2.z); z->z = atan2f(x->row0.y, x->row0.x); } diff --git a/src/ReDIVA/main.cpp b/src/ReDIVA/main.cpp index eae223f3..10f72dc5 100644 --- a/src/ReDIVA/main.cpp +++ b/src/ReDIVA/main.cpp @@ -88,7 +88,7 @@ static bool a3da_to_dof_data(const char* a3da_path, dft_dsc_data& data) { for (int32_t i = 0; i < data.frames; i++) { cam_a3da.dof.model_transform.interpolate((float_t)i); - bool enable = fabs(cam_a3da.dof.model_transform.rotation_value.z) > 0.000001f; + bool enable = fabsf(cam_a3da.dof.model_transform.rotation_value.z) > 0.000001f; if (!enable) { data.dof_index.push_back(0); continue; diff --git a/src/ReDIVA/pv_game/pv_game_pv_data.cpp b/src/ReDIVA/pv_game/pv_game_pv_data.cpp index 18aa89d7..234350ed 100644 --- a/src/ReDIVA/pv_game/pv_game_pv_data.cpp +++ b/src/ReDIVA/pv_game/pv_game_pv_data.cpp @@ -136,7 +136,7 @@ void pv_play_data_motion_data::ctrl_inner() { rob_chr->set_osage_reset(); if (rob_chr->check_for_ageageagain_module()) { - if (fabs(vec3::distance(start_pos, end_pos) <= 0.000001f && fabsf(end_rot - start_rot) <= 0.000001f)) { + if (fabsf(vec3::distance(start_pos, end_pos) <= 0.000001f && fabsf(end_rot - start_rot) <= 0.000001f)) { rob_chara_age_age_array_set_skip(rob_chr->chara_id, 1); rob_chara_age_age_array_set_skip(rob_chr->chara_id, 2); }