From 560ed0b678288a5684e2573d52febb63bdf55b0d Mon Sep 17 00:00:00 2001 From: korenkonder Date: Fri, 1 Nov 2024 20:26:25 +0300 Subject: [PATCH] ... --- src/CRE/object.cpp | 8 ++++---- src/CRE/object.hpp | 4 ++-- src/ReDIVA/app.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/CRE/object.cpp b/src/CRE/object.cpp index dad17103..e5cd8785 100644 --- a/src/CRE/object.cpp +++ b/src/CRE/object.cpp @@ -696,7 +696,7 @@ void obj_skin_set_matrix_buffer(const obj_skin* s, const mat4* matrices, } void object_material_msgpack_read(const char* path, const char* set_name, - obj_set* obj_set, object_database* obj_db) { + obj_set* obj_set) { if (!path_check_directory_exists(path)) return; @@ -995,7 +995,7 @@ void object_material_msgpack_read(const char* path, const char* set_name, msgpack* bump_depth = material.read("bump_depth"); if (bump_depth) - mat.radius = bump_depth->read_float_t(); + mat.bump_depth = bump_depth->read_float_t(); msgpack* reserved = material.read_array("reserved"); if (reserved) { @@ -1281,7 +1281,7 @@ void object_material_msgpack_read(const char* path, const char* set_name, } void object_material_msgpack_write(const char* path, const char* set_name, uint32_t set_id, - obj_set* obj_set, txp_set* txp_set, object_database* obj_db, texture_database* tex_db) { + obj_set* obj_set, txp_set* txp_set, texture_database* tex_db) { if (!path_check_directory_exists(path) && !path_create_directory(path)) return; @@ -2247,7 +2247,7 @@ bool objset_info_storage_load_obj_set_check_not_read(uint32_t set_id, if (!set->ready) return false; - object_material_msgpack_read("patch\\AFT\\objset", file.c_str(), set, obj_db); + object_material_msgpack_read("patch\\AFT\\objset", file.c_str(), set); info->obj_file_handler.reset(); info->obj_id_data.reserve(set->obj_num); diff --git a/src/CRE/object.hpp b/src/CRE/object.hpp index 01289dea..018d2fb1 100644 --- a/src/CRE/object.hpp +++ b/src/CRE/object.hpp @@ -114,11 +114,11 @@ extern void obj_skin_set_matrix_buffer(const obj_skin* s, const mat4* matrices, const mat4* ex_data_matrices, mat4* matrix_buffer, const mat4* mat, const mat4* global_mat); extern void object_material_msgpack_read(const char* path, const char* set_name, - obj_set* obj_set, object_database* obj_db); + obj_set* obj_set); extern void object_material_msgpack_read(const char* path, const char* set_name, txp_set* txp_set, texture_database* tex_db, ObjsetInfo* info); extern void object_material_msgpack_write(const char* path, const char* set_name, uint32_t set_id, - obj_set* obj_set, txp_set* txp_set, object_database* obj_db, texture_database* tex_db); + obj_set* obj_set, txp_set* txp_set, texture_database* tex_db); extern void objset_info_storage_init(const object_database* obj_db); extern obj* objset_info_storage_get_obj(object_info obj_info); diff --git a/src/ReDIVA/app.cpp b/src/ReDIVA/app.cpp index a88b814d..e6af9a76 100644 --- a/src/ReDIVA/app.cpp +++ b/src/ReDIVA/app.cpp @@ -894,7 +894,7 @@ static render_context* render_context_load() { continue; object_material_msgpack_write("patch\\AFT_orig\\objset", obj_set_id_name[i].c_str(), - i, &obj_set, &txp_set, aft_obj_db, aft_tex_db); + i, &obj_set, &txp_set, aft_tex_db); } } } @@ -983,7 +983,7 @@ static render_context* render_context_load() { continue; object_material_msgpack_write("patch\\MMp_orig\\objset", obj_set_id_name[i].c_str(), - i, &obj_set, &txp_set, &obj_db, &tex_db); + i, &obj_set, &txp_set, &tex_db); } } } @@ -1092,7 +1092,7 @@ static render_context* render_context_load() { tex_db.add(&tex_db_file); object_material_msgpack_write("patch\\X_orig\\objset", obj_set_id_name[i].c_str(), - i, &obj_set, &txp_set, &obj_db, &tex_db); + i, &obj_set, &txp_set, &tex_db); } } } @@ -1201,7 +1201,7 @@ static render_context* render_context_load() { tex_db.add(&tex_db_file); object_material_msgpack_write("patch\\XHD_orig\\objset", obj_set_id_name[i].c_str(), - i, &obj_set, &txp_set, &obj_db, &tex_db); + i, &obj_set, &txp_set, &tex_db); } obj_set_ids.clear();