From bac08d7c7fc46266667dece9972a48fb06250759 Mon Sep 17 00:00:00 2001 From: korenkonder Date: Wed, 3 Apr 2024 21:05:08 +0300 Subject: [PATCH] Fixed formatting --- src/CRE/Glitter/curve.cpp | 4 ++-- src/CRE/Glitter/effect_inst.cpp | 4 ++-- src/CRE/Glitter/file_reader.cpp | 2 +- src/CRE/Glitter/file_writer.cpp | 1 - src/CRE/auth_3d.cpp | 2 +- src/CRE/mdl/disp_manager.cpp | 2 +- src/CRE/object.cpp | 4 ++-- src/CRE/render_manager.cpp | 2 +- src/CRE/rob/skin_param.cpp | 18 +++++++++--------- src/KKdLib/hash.hpp | 2 +- src/ReDIVA/game_state.cpp | 2 +- src/ReDIVA/glitter_editor.cpp | 2 +- src/ReDIVA/x_pv_game.cpp | 15 +++++++-------- 13 files changed, 29 insertions(+), 31 deletions(-) diff --git a/src/CRE/Glitter/curve.cpp b/src/CRE/Glitter/curve.cpp index d1dc2a28..059c5214 100644 --- a/src/CRE/Glitter/curve.cpp +++ b/src/CRE/Glitter/curve.cpp @@ -242,7 +242,7 @@ namespace Glitter { dst.random_range = 0.0; } } - + void Curve::FitKeysIntoCurve(GLT) { keys_rev.clear(); @@ -509,7 +509,7 @@ namespace Glitter { dst.min_value = (float_t)src.value; } } - + void Curve::Recalculate(GLT) { keys.clear(); diff --git a/src/CRE/Glitter/effect_inst.cpp b/src/CRE/Glitter/effect_inst.cpp index 1db016d9..22447c08 100644 --- a/src/CRE/Glitter/effect_inst.cpp +++ b/src/CRE/Glitter/effect_inst.cpp @@ -161,7 +161,7 @@ namespace Glitter { if (emitter) emitters.push_back(emitter); } - + if (!init) ResetInit(GPM_VAL, GLT_VAL, sc); } @@ -1115,7 +1115,7 @@ namespace Glitter { } } } - + bool XEffectInst::ResetInit(GPM, Scene* sc, float_t* a3) { if (data.start_time < 1) return false; diff --git a/src/CRE/Glitter/file_reader.cpp b/src/CRE/Glitter/file_reader.cpp index 82777b2c..af4b2999 100644 --- a/src/CRE/Glitter/file_reader.cpp +++ b/src/CRE/Glitter/file_reader.cpp @@ -2085,7 +2085,7 @@ namespace Glitter { if (effect.read_bool("use_emission")) { enum_or(eff->data.flags, EFFECT_EMISSION); - + for (Emitter*& k : eff->emitters) if (k) for (Particle*& l : k->particles) diff --git a/src/CRE/Glitter/file_writer.cpp b/src/CRE/Glitter/file_writer.cpp index 4c77179f..56f050c8 100644 --- a/src/CRE/Glitter/file_writer.cpp +++ b/src/CRE/Glitter/file_writer.cpp @@ -124,7 +124,6 @@ namespace Glitter { add_key = add_f2_key_no_random_range; get_size = get_f2_size_no_random_range; } - KeyType key_type = c->keys.front().type; diff --git a/src/CRE/auth_3d.cpp b/src/CRE/auth_3d.cpp index 0db0ff9e..8d726542 100644 --- a/src/CRE/auth_3d.cpp +++ b/src/CRE/auth_3d.cpp @@ -4280,7 +4280,7 @@ static void auth_3d_dof_set(auth_3d_dof* d, render_context* rctx) { float_t focus = vec3::distance(d->model_transform.translation_value, view_point); rctx->render.set_dof_enable(fabsf(d->model_transform.translation_value.x) > 0.000001f); - rctx->render.set_dof_data(focus, d->model_transform.scale_value.x, + rctx->render.set_dof_data(focus, d->model_transform.scale_value.x, d->model_transform.rotation_value.x, d->model_transform.rotation_value.y); } diff --git a/src/CRE/mdl/disp_manager.cpp b/src/CRE/mdl/disp_manager.cpp index 54380820..5a79c205 100644 --- a/src/CRE/mdl/disp_manager.cpp +++ b/src/CRE/mdl/disp_manager.cpp @@ -1204,7 +1204,7 @@ namespace mdl { data.push_back(0.0f); data.push_back(1.0f); data.push_back(0.0f); - + data.push_back(-1.0f); data.push_back(0.0f); data.push_back(-1.0f); diff --git a/src/CRE/object.cpp b/src/CRE/object.cpp index 3c85b7e7..a40e4dfb 100644 --- a/src/CRE/object.cpp +++ b/src/CRE/object.cpp @@ -945,7 +945,7 @@ void object_material_msgpack_read(const char* path, const char* set_name, msgpack* b = color_mult->read("b"); if (b) _color_mult.z = b->read_float_t(); - + obj_vertex_data* vtx = mesh.vertex_array; uint32_t num_vertex = mesh.num_vertex; for (uint32_t i = num_vertex; i; i--, vtx++) @@ -1532,7 +1532,7 @@ inline obj* object_storage_get_obj(object_info obj_info) { obj_set* set = elem_modern->second.obj_set; if (!set) return 0; - + auto elem_obj = elem_modern->second.obj_id_data.find(obj_info.id); if (elem_obj != elem_modern->second.obj_id_data.end()) return set->obj_data[elem_obj->second]; diff --git a/src/CRE/render_manager.cpp b/src/CRE/render_manager.cpp index 85abd2e6..d046542a 100644 --- a/src/CRE/render_manager.cpp +++ b/src/CRE/render_manager.cpp @@ -211,7 +211,7 @@ namespace rndr { void RenderManager::set_clear(bool value) { clear = value; } - + void RenderManager::set_effect_texture(texture* value) { effect_texture = value; } diff --git a/src/CRE/rob/skin_param.cpp b/src/CRE/rob/skin_param.cpp index 7a513df4..a8f58f74 100644 --- a/src/CRE/rob/skin_param.cpp +++ b/src/CRE/rob/skin_param.cpp @@ -433,17 +433,17 @@ void skin_param_osage_root_parse(void* kv, const char* name, const char* bone1_name; if (_kv->read("bone.1.name", bone1_name)) { c->node_idx[1] = bone_data->get_skeleton_object_bone_index( -bone_database_skeleton_type_to_string(BONE_DATABASE_SKELETON_COMMON), bone1_name); + bone_database_skeleton_type_to_string(BONE_DATABASE_SKELETON_COMMON), bone1_name); -vec3 bone1_pos = 0.0f; -if (!_kv->read("bone.1.posx", bone1_pos.x) - || !_kv->read("bone.1.posy", bone1_pos.y) - || !_kv->read("bone.1.posz", bone1_pos.z)) { - _kv->close_scope(); - break; -} + vec3 bone1_pos = 0.0f; + if (!_kv->read("bone.1.posx", bone1_pos.x) + || !_kv->read("bone.1.posy", bone1_pos.y) + || !_kv->read("bone.1.posz", bone1_pos.z)) { + _kv->close_scope(); + break; + } -c->pos[1] = bone1_pos; + c->pos[1] = bone1_pos; } _kv->close_scope(); } diff --git a/src/KKdLib/hash.hpp b/src/KKdLib/hash.hpp index e1dd228a..643bb0d7 100644 --- a/src/KKdLib/hash.hpp +++ b/src/KKdLib/hash.hpp @@ -108,7 +108,7 @@ struct string_hash { inline const char* c_str() const { return str.c_str(); } - + inline size_t size() const { return str.size(); } diff --git a/src/ReDIVA/game_state.cpp b/src/ReDIVA/game_state.cpp index c3ce3643..ccf37a12 100644 --- a/src/ReDIVA/game_state.cpp +++ b/src/ReDIVA/game_state.cpp @@ -1393,7 +1393,7 @@ bool SubGameState::Selector::Dest() { sel->del(); return false; } - + x_pv_game_selector_free(); #endif #endif diff --git a/src/ReDIVA/glitter_editor.cpp b/src/ReDIVA/glitter_editor.cpp index e76f320b..45c6086e 100644 --- a/src/ReDIVA/glitter_editor.cpp +++ b/src/ReDIVA/glitter_editor.cpp @@ -4432,7 +4432,7 @@ static void glitter_editor_property_particle(GlitterEditor* glt_edt) { ObjsetInfo* set_info = object_storage_get_objset_info(set_id); ssize_t object_set_count = object_storage_get_obj_set_count(); - extern std::map object_storage_data_modern; + extern std::map object_storage_data_modern; ImGui::StartPropertyColumn("Object Set"); if (ImGui::BeginCombo("##Object Set", set_info ? set_info->name.c_str() : "None", 0)) { ImGui::PushID(-1); diff --git a/src/ReDIVA/x_pv_game.cpp b/src/ReDIVA/x_pv_game.cpp index cac89fd6..555b3d8c 100644 --- a/src/ReDIVA/x_pv_game.cpp +++ b/src/ReDIVA/x_pv_game.cpp @@ -7220,7 +7220,7 @@ bool x_pv_game::ctrl() { char category[0x40]; sprintf_s(category, sizeof(category), "CAMPV%03d", pv_data.pv_id); replace_names(category); - + char name[0x40]; sprintf_s(name, sizeof(name), "CAMPV%03d_BASE", pv_data.pv_id); replace_names(name); @@ -7299,7 +7299,7 @@ bool x_pv_game::ctrl() { object_database x_pack_obj_db; x_pack_obj_db.add(&baker->obj_db); - + texture_database x_pack_tex_db; x_pack_tex_db.add(&baker->tex_db); @@ -7770,7 +7770,7 @@ bool x_pv_game::ctrl() { if (focus_range.joinable()) focus_range.join(); - + //if (focus.joinable()) // focus.join(); @@ -8712,10 +8712,10 @@ pv_tit_spr_set_ids(), pv_tit_aet_ids(), pv_tit_init(), start(), exit(), next() { for (uint32_t& i : pv_tit_aet_set_ids) i = hash_murmurhash_empty; - + for (uint32_t& i : pv_tit_spr_set_ids) i = hash_murmurhash_empty; - + for (uint32_t& i : pv_tit_aet_ids) i = hash_murmurhash_empty; @@ -9799,16 +9799,15 @@ static bool x_pv_game_write_auth_3d(farc* f, auth_3d* auth, replace_names(i.parent_name); replace_names(i.uid_name); } - + for (std::string& i : a.object_hrc_list) replace_names(i); - for (std::string& i : a.object_list) replace_names(i); bool own_farc = !f; - + if (own_farc) f = new farc;