From f0789f760837aec9fe27e35dee0952df8484171f Mon Sep 17 00:00:00 2001 From: korenkonder Date: Fri, 4 Apr 2025 23:33:45 +0300 Subject: [PATCH] Formatting fixes --- src/CRE/Glitter/render_scene.cpp | 5 ----- src/CRE/mdl/disp_manager.cpp | 28 +++++++++++++-------------- src/CRE/rob/rob.cpp | 2 +- src/KKdLib/dds.cpp | 6 +++--- src/KKdLib/default.hpp | 4 ++-- src/KKdLib/f2/pof.cpp | 2 +- src/KKdLib/obj.cpp | 2 +- src/ReDIVA/data_test/glitter_test.cpp | 2 +- src/ReDIVA/system_startup.cpp | 2 +- 9 files changed, 24 insertions(+), 29 deletions(-) diff --git a/src/CRE/Glitter/render_scene.cpp b/src/CRE/Glitter/render_scene.cpp index f6fcec36..4068d6e0 100644 --- a/src/CRE/Glitter/render_scene.cpp +++ b/src/CRE/Glitter/render_scene.cpp @@ -2236,9 +2236,6 @@ namespace Glitter { } mdl::DispManager& disp_manager = *rctx_ptr->disp_manager; - const bool object_culling = disp_manager.object_culling; - if (local) - disp_manager.object_culling = false; disp_manager.set_texture_pattern(0, 0); disp_manager.set_obj_flags((mdl::ObjFlags)0); @@ -2308,7 +2305,5 @@ namespace Glitter { } disp_manager.set_texture_transform(0, 0); rend_group->disp = disp; - if (local) - disp_manager.object_culling = object_culling; } } diff --git a/src/CRE/mdl/disp_manager.cpp b/src/CRE/mdl/disp_manager.cpp index ad86081e..225e6d50 100644 --- a/src/CRE/mdl/disp_manager.cpp +++ b/src/CRE/mdl/disp_manager.cpp @@ -2615,7 +2615,7 @@ namespace mdl { ::camera* cam = rctx_ptr->camera; - if ( object_culling && !instances_count && !bone_mat && (!obj + if (object_culling && !instances_count && !bone_mat && (!obj || !obj_bounding_sphere_check_visibility( obj->bounding_sphere, &culling, cam, mat))) { culling.culled.objects++; @@ -3768,21 +3768,21 @@ static void sub_140436760() { *(vec3*)&t = aabb->size; t.w = 1.0f; - float_t view_z = vec4::dot(t ^ vec4( 0.0f, 0.0f, 0.0f, 0.0f ), mat.row2); - if (view_z < vec4::dot(t ^ vec4( 0.0f, 0.0f, -0.0f, 0.0f ), mat.row2)) - view_z = vec4::dot(t ^ vec4( 0.0f, 0.0f, -0.0f, 0.0f ), mat.row2); - if (view_z < vec4::dot(t ^ vec4( 0.0f, -0.0f, 0.0f, 0.0f ), mat.row2)) + float_t view_z = vec4::dot(t ^ vec4( 0.0f, 0.0f, 0.0f, 0.0f ), mat.row2); + if (view_z < vec4::dot(t ^ vec4( 0.0f, 0.0f, -0.0f, 0.0f ), mat.row2)) + view_z = vec4::dot(t ^ vec4( 0.0f, 0.0f, -0.0f, 0.0f ), mat.row2); + if (view_z < vec4::dot(t ^ vec4( 0.0f, -0.0f, 0.0f, 0.0f ), mat.row2)) view_z = -t.y; - if (view_z < vec4::dot(t ^ vec4( 0.0f, -0.0f, -0.0f, 0.0f ), mat.row2)) - view_z = vec4::dot(t ^ vec4( 0.0f, -0.0f, -0.0f, 0.0f ), mat.row2); - if (view_z < vec4::dot(t ^ vec4( -0.0f, 0.0f, 0.0f, 0.0f ), mat.row2)) + if (view_z < vec4::dot(t ^ vec4( 0.0f, -0.0f, -0.0f, 0.0f ), mat.row2)) + view_z = vec4::dot(t ^ vec4( 0.0f, -0.0f, -0.0f, 0.0f ), mat.row2); + if (view_z < vec4::dot(t ^ vec4(-0.0f, 0.0f, 0.0f, 0.0f ), mat.row2)) view_z = -t.x; - if (view_z < vec4::dot(t ^ vec4( -0.0f, 0.0f, -0.0f, 0.0f ), mat.row2)) - view_z = vec4::dot(t ^ vec4( -0.0f, 0.0f, -0.0f, 0.0f ), mat.row2); - if (view_z < vec4::dot(t ^ vec4( -0.0f, -0.0f, 0.0f, 0.0f ), mat.row2)) - view_z = vec4::dot(t ^ vec4( -0.0f, -0.0f, 0.0f, 0.0f ), mat.row2); - if (view_z < vec4::dot(t ^ vec4( -0.0f, -0.0f, -0.0f, 0.0f ), mat.row2)) - view_z = vec4::dot(t ^ vec4( -0.0f, -0.0f, -0.0f, 0.0f ), mat.row2); + if (view_z < vec4::dot(t ^ vec4(-0.0f, 0.0f, -0.0f, 0.0f ), mat.row2)) + view_z = vec4::dot(t ^ vec4(-0.0f, 0.0f, -0.0f, 0.0f ), mat.row2); + if (view_z < vec4::dot(t ^ vec4(-0.0f, -0.0f, 0.0f, 0.0f ), mat.row2)) + view_z = vec4::dot(t ^ vec4(-0.0f, -0.0f, 0.0f, 0.0f ), mat.row2); + if (view_z < vec4::dot(t ^ vec4(-0.0f, -0.0f, -0.0f, 0.0f ), mat.row2)) + view_z = vec4::dot(t ^ vec4(-0.0f, -0.0f, -0.0f, 0.0f ), mat.row2); i->view_z = view_z; } } diff --git a/src/CRE/rob/rob.cpp b/src/CRE/rob/rob.cpp index 2fc6da06..a31b8e79 100644 --- a/src/CRE/rob/rob.cpp +++ b/src/CRE/rob/rob.cpp @@ -12632,7 +12632,7 @@ void MotionBlendFreeze::Blend(bone_data* curr, bone_data* prev) { } else { mat4_mul(&curr->rot_mat_prev[1][field_24], &curr->rot_mat_prev[0][field_24], &prev_mat); - mat4_mul( &curr->rot_mat[1], &curr->rot_mat[0], &mat); + mat4_mul(&curr->rot_mat[1], &curr->rot_mat[0], &mat); mat4_blend_rotation(&prev_mat, &mat, &mat, blend); } mat4_transpose(&curr->rot_mat[0], &ik_mat); diff --git a/src/KKdLib/dds.cpp b/src/KKdLib/dds.cpp index b51ade21..22888ed9 100644 --- a/src/KKdLib/dds.cpp +++ b/src/KKdLib/dds.cpp @@ -55,9 +55,9 @@ struct DDS_PIXELFORMAT { #define DDS_SURFACE_FLAGS_MIPMAP 0x00400008 // DDSCAPS_COMPLEX | DDSCAPS_MIPMAP #define DDS_SURFACE_FLAGS_cube_map 0x00000008 // DDSCAPS_COMPLEX -#define DDS_CUBE_MAP_ALLFACES ( 0x00000400 | 0x00000800 |\ +#define DDS_CUBE_MAP_ALLFACES (0x00000400 | 0x00000800 |\ 0x00001000 | 0x00002000 |\ - 0x00004000 | 0x00008000 | 0x00000200 ) + 0x00004000 | 0x00008000 | 0x00000200) #define DDS_CUBE_MAP 0x00000200 // DDSCAPS2_cube_map @@ -285,7 +285,7 @@ void dds::write(const char* path) { return; wchar_t* path_buf = utf8_to_utf16(path); - write( path_buf); + write(path_buf); free_def(path_buf); } diff --git a/src/KKdLib/default.hpp b/src/KKdLib/default.hpp index 9a522775..c4e462fd 100644 --- a/src/KKdLib/default.hpp +++ b/src/KKdLib/default.hpp @@ -18,8 +18,8 @@ #include #include -#pragma warning( push ) -#pragma warning( disable: 26812 ) +#pragma warning(push) +#pragma warning(disable: 26812) template inline void free_def(T& ptr) { diff --git a/src/KKdLib/f2/pof.cpp b/src/KKdLib/f2/pof.cpp index e2087c66..41ab7fc9 100644 --- a/src/KKdLib/f2/pof.cpp +++ b/src/KKdLib/f2/pof.cpp @@ -186,7 +186,7 @@ static size_t pof_read_offsets_count(stream& s) { i++; j++; } - s.set_position( pos, SEEK_SET); + s.set_position(pos, SEEK_SET); return j; } diff --git a/src/KKdLib/obj.cpp b/src/KKdLib/obj.cpp index 2e2006a9..4ce72921 100644 --- a/src/KKdLib/obj.cpp +++ b/src/KKdLib/obj.cpp @@ -3394,7 +3394,7 @@ static obj_skin_block_osage* obj_classic_read_skin_block_osage( s.position_push(offset, SEEK_SET); if (!(s.read_uint32_t() & 0x8000)) - osg->skin_param = obj_classic_read_skin_param( alloc, s, str); + osg->skin_param = obj_classic_read_skin_param(alloc, s, str); else { s.set_position(offset, SEEK_SET); for (int32_t i = 0; i < osg->num_node; i++) { diff --git a/src/ReDIVA/data_test/glitter_test.cpp b/src/ReDIVA/data_test/glitter_test.cpp index 009ebb91..8142470a 100644 --- a/src/ReDIVA/data_test/glitter_test.cpp +++ b/src/ReDIVA/data_test/glitter_test.cpp @@ -205,7 +205,7 @@ void TaskDataTestGlitterParticle::disp() { } -void TaskDataTestGlitterParticle::SceneFree( ){ +void TaskDataTestGlitterParticle::SceneFree() { Glitter::glt_particle_manager->FreeSceneEffect(scene_counter); } diff --git a/src/ReDIVA/system_startup.cpp b/src/ReDIVA/system_startup.cpp index 9befdce4..a46ca583 100644 --- a/src/ReDIVA/system_startup.cpp +++ b/src/ReDIVA/system_startup.cpp @@ -677,7 +677,7 @@ static void system_startup_pv_information_dest() { } static void system_startup_pv_information_disp() { - std::string buf( "PV INFORMATION : "); + std::string buf("PV INFORMATION : "); switch (system_startup->pv_information_state) { case -2: buf.append("NG");