From b97b07b91a42f89eac28bdb811ebdb6d92bb81e5 Mon Sep 17 00:00:00 2001 From: korenkonder Date: Sun, 22 Dec 2024 21:10:06 +0300 Subject: [PATCH] Removed some whitespaces --- src/CRE/Vulkan/gl_wrap.cpp | 4 +--- src/CRE/mdl/disp_manager.cpp | 7 +++---- src/CRE/render_manager.cpp | 3 +-- src/KKdLib/enbaya.cpp | 2 -- src/KKdLib/f2/header.hpp | 20 ++++++++++---------- src/ReDIVA/data_test/misc_test.cpp | 1 - src/ReDIVA/dw.hpp | 4 ++-- 7 files changed, 17 insertions(+), 24 deletions(-) diff --git a/src/CRE/Vulkan/gl_wrap.cpp b/src/CRE/Vulkan/gl_wrap.cpp index ef5b0144..c5fefda4 100644 --- a/src/CRE/Vulkan/gl_wrap.cpp +++ b/src/CRE/Vulkan/gl_wrap.cpp @@ -301,7 +301,7 @@ namespace Vulkan { if (vk_fbo->update_color_attachment) { for (uint32_t i = 0; i < Vulkan::MAX_COLOR_ATTACHMENTS; i++) vk_fbo->color_attachment_image_views[i].Destroy(); - + for (int32_t i = 0; i < Vulkan::MAX_COLOR_ATTACHMENTS; i++) { gl_texture* vk_tex = gl_texture::get(vk_fbo->color_attachments[i], true, true); if (vk_tex && vk_tex->get_level_count() > 0) { @@ -1386,7 +1386,6 @@ namespace Vulkan { return false; } - memmove(dst_data, src_data, texture_get_size(internal_format, width, height)); return true; } @@ -3636,7 +3635,6 @@ namespace Vulkan { staging_buffer.ReadMemory(staging_buffer.GetOffset(), size, temp); } - if (!gl_texture_data::tex_data::convert(internal_format, width, height, format, _type, type, temp, pixels, gl_wrap_manager_ptr->pack_alignment, false)) { free_def(temp); diff --git a/src/CRE/mdl/disp_manager.cpp b/src/CRE/mdl/disp_manager.cpp index f5b55d74..c8ab270f 100644 --- a/src/CRE/mdl/disp_manager.cpp +++ b/src/CRE/mdl/disp_manager.cpp @@ -3160,17 +3160,17 @@ namespace mdl { switch (compare_func) { case 0: - list.sort([](ObjData* left, ObjData* right) { + list.sort([](const ObjData* left, const ObjData* right) { return left->view_z > right->view_z; }); break; case 1: - list.sort([](ObjData* left, ObjData* right) { + list.sort([](const ObjData* left, const ObjData* right) { return left->view_z < right->view_z; }); break; case 2: - list.sort([](ObjData* left, ObjData* right) { + list.sort([](const ObjData* left, const ObjData* right) { return left->radius > right->radius; }); break; @@ -3360,7 +3360,6 @@ static void sub_140436760() { continue; } - if (i->args.sub_mesh.material->material.attrib.m.src_blend_factor == OBJ_MATERIAL_BLEND_ZERO && i->args.sub_mesh.material->material.attrib.m.dst_blend_factor == OBJ_MATERIAL_BLEND_ONE && aabb->size.y > 2.0f && aabb->size.y < 2.5f) { diff --git a/src/CRE/render_manager.cpp b/src/CRE/render_manager.cpp index 38206612..f4f8ed95 100644 --- a/src/CRE/render_manager.cpp +++ b/src/CRE/render_manager.cpp @@ -145,7 +145,7 @@ namespace rndr { reflect_refract_resolution_mode RenderManager::get_reflect_resolution_mode() { return (reflect_refract_resolution_mode)tex_index[0]; } - + reflect_refract_resolution_mode RenderManager::get_refract_resolution_mode() { return (reflect_refract_resolution_mode)tex_index[1]; } @@ -2343,7 +2343,6 @@ static void blur_filter_apply(render_context* rctx, RenderTexture* dst, RenderTe static void render_manager_free_render_textures() { rndr::RenderManager& render_manager = *rctx_ptr->render_manager; - #ifdef USE_OPENGL if (!Vulkan::use) { if (render_manager.multisample_renderbuffer) { diff --git a/src/KKdLib/enbaya.cpp b/src/KKdLib/enbaya.cpp index 80c5712b..3baaae52 100644 --- a/src/KKdLib/enbaya.cpp +++ b/src/KKdLib/enbaya.cpp @@ -512,7 +512,6 @@ static void enb_track_init(enb_anim_context* anim_ctx, anim_ctx->data.current_sample = 0; } - static void enb_track_step_forward(enb_anim_context* anim_ctx, const int32_t track_count, enb_anim_track_data_decoder* track_data) { // 0x08A08E7C in ULJM05681 enb_track* track = anim_ctx->data.track; @@ -553,7 +552,6 @@ static void enb_track_step_forward(enb_anim_context* anim_ctx, } } - static void enb_track_step_backward(enb_anim_context* anim_ctx, const int32_t track_count, enb_anim_track_data_decoder* track_data) { // 0x08A090A0 in ULJM05681 enb_track* track = anim_ctx->data.track; diff --git a/src/KKdLib/f2/header.hpp b/src/KKdLib/f2/header.hpp index c49371b7..8faec25c 100644 --- a/src/KKdLib/f2/header.hpp +++ b/src/KKdLib/f2/header.hpp @@ -36,11 +36,11 @@ union f2_header_attrib { inline bool get_aes() const { return !!m.aes; } - + inline bool get_align() const { return !!m.align; } - + inline bool get_big_endian() const { return !!m.big_endian; } @@ -48,35 +48,35 @@ union f2_header_attrib { inline bool get_crc() const { return !!m.crc; } - + inline bool get_gzip() const { return !!m.gzip; } - + inline uint32_t get_type() const { return m.type; } - + inline uint32_t get_xor_data() const { return m.xor_data; } - + inline void set_aes(bool value) { m.aes = value ? 0x01 : 0x00; } - + inline void set_align(bool value) { m.align = value ? 0x01 : 0x00; } - + inline void set_big_endian(bool value) { m.big_endian = value ? 0x01 : 0x00; } - + inline void set_crc(bool value) { m.crc = value ? 0x01 : 0x00; } - + inline void set_gzip(bool value) { m.gzip = value ? 0x01 : 0x00; } diff --git a/src/ReDIVA/data_test/misc_test.cpp b/src/ReDIVA/data_test/misc_test.cpp index 2877a594..1fb52db6 100644 --- a/src/ReDIVA/data_test/misc_test.cpp +++ b/src/ReDIVA/data_test/misc_test.cpp @@ -94,7 +94,6 @@ void TaskDataTestMisc::disp() { print_work.SetResolutionMode(RESOLUTION_MODE_WXGA); print_work.PrintText(app::TEXT_FLAG_ALIGN_FLAG_RIGHT, u8"WXGA画面右隅に右詰め\n"); - /*__int64 v3[2]; sub_1402BCBE0((__int64)v3, *color_blue_ptr); sub_1402BCD40((__int64)v3, 640.0, 600.0); diff --git a/src/ReDIVA/dw.hpp b/src/ReDIVA/dw.hpp index d4066801..d7f313f8 100644 --- a/src/ReDIVA/dw.hpp +++ b/src/ReDIVA/dw.hpp @@ -204,7 +204,7 @@ namespace dw { inline void SetCallbackData(void* data) { callback_data.v64 = data; } - + inline void SetText(std::wstring&& str) { SetText(str); } @@ -818,7 +818,7 @@ namespace dw { inline void SetFormat(const char* value) { format = value; } - + inline void SetMax(float_t value) { scroll_bar->SetMax(value); }