Max/korenkonder_ReDIVA
1
0
Fork 0
mirror of https://github.com/korenkonder/ReDIVA.git synced 2026-10-12 00:58:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
korenkonder
2024-11-01 20:26:25 +03:00
parent 55482f9fce
commit 560ed0b678
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CRE/object.cpp
+4 -4
View File
@@ -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);
src/CRE/object.hpp
+2 -2
View File
@@ -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);
src/ReDIVA/app.cpp
+4 -4
View File
@@ -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();