Max/korenkonder_AFTMods
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 41 Wiki Activity

Properly named objset_info_storage functions

Browse Source
This commit is contained in:
korenkonder
2024-06-08 22:13:59 +03:00
parent 576ab1978b
commit 0667955311
11 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/DivaGL/Glitter/effect_group.cpp
+1 -1
View File
@@ -18,7 +18,7 @@ namespace Glitter {
EffectGroupX::~EffectGroupX() {
for (MeshX& i : meshes)
if (i.object_set != -1) {
object_database_unload_set(i.object_set);
objset_info_storage_unload_set(i.object_set);
i.load = false;
}
src/DivaGL/Glitter/effect_inst.cpp
+2 -2
View File
@@ -455,7 +455,7 @@ namespace Glitter {
if (ext_anim->mesh_name) {
if (ext_anim->mesh_index == -1)
ext_anim->mesh_index = object_info_get_mesh_index(ext_anim->object, ext_anim->mesh_name);
ext_anim->mesh_index = objset_info_storage_get_obj_mesh_index(ext_anim->object, ext_anim->mesh_name);
if (ext_anim->mesh_index != -1) {
obj_mesh* mesh = object_info_get_mesh_by_index(ext_anim->object, ext_anim->mesh_index);
@@ -474,7 +474,7 @@ namespace Glitter {
if (!ext_anim->mesh_name)
return;
ext_anim->mesh_index = object_info_get_mesh_index(ext_anim->object, ext_anim->mesh_name);
ext_anim->mesh_index = objset_info_storage_get_obj_mesh_index(ext_anim->object, ext_anim->mesh_name);
}
if (ext_anim->mesh_index != -1) {
src/DivaGL/Glitter/file_reader.cpp
+2 -2
View File
@@ -65,7 +65,7 @@ namespace Glitter {
for (MeshX& i : effect_group->meshes)
if (!i.ready && i.object_set != -1)
if (object_database_load_obj_set_check_not_read(i.object_set))
if (objset_info_storage_load_obj_set_check_not_read(i.object_set))
ret = true;
else
i.ready = true;
@@ -209,7 +209,7 @@ namespace Glitter {
else if (GPMX_VAL->AppendEffectGroup(hash, eff_group, this)) {
for (MeshX& i : eff_group->meshes)
if (i.object_set != -1) {
object_database_load_set(i.object_set);
objset_info_storage_load_set(i.object_set);
i.load = true;
}
src/DivaGL/Glitter/render_scene.cpp
+1 -1
View File
@@ -1366,7 +1366,7 @@ namespace Glitter {
ParticleX* particle = rend_group->particle->data.particle;
obj* obj = object_info_get_object(rend_group->object);
obj* obj = objset_info_storage_get_object(rend_group->object);
if (!obj)
return;
src/DivaGL/data_test/rob_osage_test.cpp
+2 -2
View File
@@ -467,7 +467,7 @@ bool RobOsageTest::ctrl() {
for (int32_t i = 0; i < ITEM_MAX; i++) {
rob_chara_item_equip_object* itm_eq_obj = rob_itm_equip->get_item_equip_object((::item_id)i);
::obj* obj = object_info_get_object(itm_eq_obj->obj_info);
::obj* obj = objset_info_storage_get_object(itm_eq_obj->obj_info);
if (!obj || !itm_eq_obj->osage_blocks.size() && !itm_eq_obj->cloth_blocks.size())
continue;
@@ -647,7 +647,7 @@ bool RobOsageTest::ctrl() {
for (int32_t i = 0; i < ITEM_MAX; i++) {
rob_chara_item_equip_object* itm_eq_obj = rob_itm_equip->get_item_equip_object((::item_id)i);
::obj* obj = object_info_get_object(itm_eq_obj->obj_info);
::obj* obj = objset_info_storage_get_object(itm_eq_obj->obj_info);
if (!obj || !itm_eq_obj->osage_blocks.size() && !itm_eq_obj->cloth_blocks.size())
continue;
src/DivaGL/mdl/disp_manager.cpp
+8 -8
View File
@@ -2766,19 +2766,19 @@ namespace mdl {
if (obj_info.id == (uint16_t)-1 && obj_info.set_id == (uint16_t)-1)
return false;
::obj* object = object_info_get_object(obj_info);
::obj* object = objset_info_storage_get_object(obj_info);
if (!object)
return false;
prj::vector<GLuint>* textures = object_database_get_set_gentex(obj_info.set_id);
obj_mesh_vertex_buffer* obj_vertex_buffer = object_info_get_mesh_vertex_buffer(obj_info, 0);
obj_mesh_index_buffer* obj_index_buffer = object_info_get_mesh_index_buffer(obj_info, 0);
prj::vector<GLuint>* textures = objset_info_storage_get_set_gentex(obj_info.set_id);
obj_mesh_vertex_buffer* obj_vertex_buffer = objset_info_storage_get_obj_mesh_vertex_buffer(obj_info, 0);
obj_mesh_index_buffer* obj_index_buffer = objset_info_storage_get_obj_mesh_index_buffer(obj_info, 0);
::obj* obj_morph = 0;
obj_mesh_vertex_buffer* obj_morph_vertex_buffer = 0;
if (morph.object.set_id != (uint16_t)-1) {
obj_morph = object_info_get_object(morph.object);
obj_morph_vertex_buffer = object_info_get_mesh_vertex_buffer(morph.object, 0);
obj_morph = objset_info_storage_get_object(morph.object);
obj_morph_vertex_buffer = objset_info_storage_get_obj_mesh_vertex_buffer(morph.object, 0);
}
return entry_obj(object, obj_vertex_buffer, obj_index_buffer,
@@ -2807,7 +2807,7 @@ namespace mdl {
void DispManager::entry_obj_by_object_info_object_skin(object_info obj_info,
prj::vector<texture_pattern_struct>* texture_pattern, texture_data_struct* texture_data, float_t alpha,
mat4* matrices, mat4* ex_data_matrices, const mat4* mat, const mat4* global_mat) {
obj_skin* skin = object_database_get_object_skin(obj_info);
obj_skin* skin = objset_info_storage_get_obj_skin(obj_info);
if (!skin)
return;
@@ -3243,7 +3243,7 @@ namespace mdl {
return;
int32_t set_id = object_database_get_set_id(*(int32_t*)(a1 + 0x68));
int32_t id = object_database_get_set_obj_id(*(int32_t*)(a1 + 0x68), *(int32_t*)(a1 + 0x74));
int32_t id = objset_info_storage_get_set_obj_id(*(int32_t*)(a1 + 0x68), *(int32_t*)(a1 + 0x74));
disp_manager->set_obj_flags((mdl::ObjFlags)(*(int32_t*)(a1 + 0x84) | mdl::OBJ_40 | mdl::OBJ_20));
mat4 mat;
src/DivaGL/object.cpp
+27 -27
View File
@@ -49,37 +49,37 @@ struct ObjsetInfo {
static_assert(sizeof(ObjsetInfo) == 0xD8, "\"ObjsetInfo\" struct should have a size of 0xD8");
void (FASTCALL* object_database_unload_set)(int32_t set)
void (FASTCALL* objset_info_storage_unload_set)(int32_t set)
= (void (FASTCALL*)(int32_t set))0x00000001404599B0;
obj_mesh* (FASTCALL* object_info_get_mesh_by_index)(object_info object, int32_t mesh_index)
= (obj_mesh * (FASTCALL*)(object_info object, int32_t mesh_index))0x0000000140459D40;
int32_t(FASTCALL* object_info_get_mesh_index)(object_info object, const char* mesh_name)
int32_t(FASTCALL* objset_info_storage_get_obj_mesh_index)(object_info object, const char* mesh_name)
= (int32_t(FASTCALL*)(object_info object, const char* mesh_name))0x0000000140459DE0;
const char* (FASTCALL* object_database_get_object_name)(object_info obj_info)
= (const char* (FASTCALL*)(object_info obj_info))0x0000000140459F20;
uint32_t(FASTCALL* object_database_get_object_info)(const char* name)
= (uint32_t(FASTCALL*)(const char* name))0x0000000140459F80;
obj* (FASTCALL* object_info_get_object)(object_info obj_info)
obj* (FASTCALL* objset_info_storage_get_object)(object_info obj_info)
= (obj * (FASTCALL*)(object_info obj_info))0x000000014045A140;
obj_mesh_index_buffer* (FASTCALL* object_info_get_mesh_index_buffer)(object_info obj_info, int32_t a2)
obj_mesh_index_buffer* (FASTCALL* objset_info_storage_get_obj_mesh_index_buffer)(object_info obj_info, int32_t a2)
= (obj_mesh_index_buffer * (FASTCALL*)(object_info obj_info, int32_t a2))0x000000014045A250;
obj_skin* (FASTCALL* object_database_get_object_skin)(object_info obj_info)
obj_skin* (FASTCALL* objset_info_storage_get_obj_skin)(object_info obj_info)
= (obj_skin * (FASTCALL*)(object_info obj_info))0x000000014045A3E0;
obj_mesh_vertex_buffer* (FASTCALL* object_info_get_mesh_vertex_buffer)(object_info obj_info, int32_t a2)
obj_mesh_vertex_buffer* (FASTCALL* objset_info_storage_get_obj_mesh_vertex_buffer)(object_info obj_info, int32_t a2)
= (obj_mesh_vertex_buffer * (FASTCALL*)(object_info obj_info, int32_t a2))0x000000014045A480;
int32_t(FASTCALL* object_database_get_set_obj_id)(int32_t set_index, int32_t obj_index)
int32_t(FASTCALL* objset_info_storage_get_set_obj_id)(int32_t set_index, int32_t obj_index)
= (int32_t(FASTCALL*)(int32_t set_index, int32_t obj_index))0x000000014045A750;
GLuint(FASTCALL* object_database_get_set_texture)(int32_t set, int32_t tex_id)
GLuint(FASTCALL* objset_info_storage_get_set_texture)(int32_t set, int32_t tex_id)
= (GLuint(FASTCALL*)(int32_t set, int32_t tex_id))0x000000014045A8F0;
prj::vector<GLuint>* (FASTCALL* object_database_get_set_gentex)(int32_t set)
prj::vector<GLuint>* (FASTCALL* objset_info_storage_get_set_gentex)(int32_t set)
= (prj::vector<GLuint> * (FASTCALL*)(int32_t set))0x000000014045A9E0;
int32_t(FASTCALL* object_database_get_set_id)(int32_t set_index)
= (int32_t(FASTCALL*)(int32_t set_index))0x000000014045AA10;
int32_t(FASTCALL* object_database_get_object_set_id)(const char* name)
= (int32_t(FASTCALL*)(const char* name))0x000000014045AA60;
int32_t(FASTCALL* object_database_load_set)(int32_t set)
int32_t(FASTCALL* objset_info_storage_load_set)(int32_t set)
= (int32_t(FASTCALL*)(int32_t set))0x000000014045C6A0;
bool (FASTCALL* object_database_load_obj_set_check_not_read)(int32_t set)
bool (FASTCALL* objset_info_storage_load_obj_set_check_not_read)(int32_t set)
= (bool(FASTCALL*)(int32_t set))0x000000014045DA60;
static BufObjMgr& bufobj_mgr = *(BufObjMgr*)0x00000001411A34D0;
@@ -982,22 +982,22 @@ HOOK(void, FASTCALL, ObjsetInfo__vertex_buffer_free, 0x0000000140459C70, ObjsetI
info->vertex_buffer_free();
}
HOOK(obj_mesh_index_buffer*, FASTCALL, object_info_get_mesh_index_buffer, 0x000000014045A250, object_info obj_info, int32_t a2) {
bool(FASTCALL * object_database_check_set)(int32_t set)
HOOK(obj_mesh_index_buffer*, FASTCALL, objset_info_storage_get_obj_mesh_index_buffer, 0x000000014045A250, object_info obj_info, int32_t a2) {
bool(FASTCALL * objset_info_storage_check_set)(int32_t set)
= (bool(FASTCALL*)(int32_t set))0x00000001404577D0;
int32_t(FASTCALL * object_database_get_object_index)(int32_t set, uint32_t object_id)
int32_t(FASTCALL * objset_info_storage_get_object_index)(int32_t set, uint32_t object_id)
= (int32_t(FASTCALL*)(int32_t set, uint32_t object_id))0x000000014045A7A0;
ObjsetInfo* (FASTCALL * object_database_get_objset_info)(int32_t set)
ObjsetInfo* (FASTCALL * objset_info_storage_get_objset_info)(int32_t set)
= (ObjsetInfo * (FASTCALL*)(int32_t set))0x000000014045AC00;
if (object_database_check_set(obj_info.set_id))
if (objset_info_storage_check_set(obj_info.set_id))
return 0;
ObjsetInfo* info = object_database_get_objset_info(obj_info.set_id);
ObjsetInfo* info = objset_info_storage_get_objset_info(obj_info.set_id);
if (!info || !info->objvb)
return 0;
int32_t object_index = object_database_get_object_index(obj_info.set_id, obj_info.id);
int32_t object_index = objset_info_storage_get_object_index(obj_info.set_id, obj_info.id);
if (object_index >= 0) {
if (!a2)
return info->objib[object_index].mesh_data;
@@ -1007,22 +1007,22 @@ HOOK(obj_mesh_index_buffer*, FASTCALL, object_info_get_mesh_index_buffer, 0x0000
return 0;
}
HOOK(obj_mesh_vertex_buffer*, FASTCALL, object_info_get_mesh_vertex_buffer, 0x000000014045A480, object_info obj_info, int32_t a2) {
bool(FASTCALL * object_database_check_set)(int32_t set)
HOOK(obj_mesh_vertex_buffer*, FASTCALL, objset_info_storage_get_obj_mesh_vertex_buffer, 0x000000014045A480, object_info obj_info, int32_t a2) {
bool(FASTCALL * objset_info_storage_check_set)(int32_t set)
= (bool(FASTCALL*)(int32_t set))0x00000001404577D0;
int32_t(FASTCALL * object_database_get_object_index)(int32_t set, uint32_t object_id)
int32_t(FASTCALL * objset_info_storage_get_object_index)(int32_t set, uint32_t object_id)
= (int32_t(FASTCALL*)(int32_t set, uint32_t object_id))0x000000014045A7A0;
ObjsetInfo* (FASTCALL * object_database_get_objset_info)(int32_t set)
ObjsetInfo* (FASTCALL * objset_info_storage_get_objset_info)(int32_t set)
= (ObjsetInfo * (FASTCALL*)(int32_t set))0x000000014045AC00;
if (object_database_check_set(obj_info.set_id))
if (objset_info_storage_check_set(obj_info.set_id))
return 0;
ObjsetInfo* info = object_database_get_objset_info(obj_info.set_id);
ObjsetInfo* info = objset_info_storage_get_objset_info(obj_info.set_id);
if (!info || !info->objvb)
return 0;
int32_t object_index = object_database_get_object_index(obj_info.set_id, obj_info.id);
int32_t object_index = objset_info_storage_get_object_index(obj_info.set_id, obj_info.id);
if (object_index >= 0) {
if (!a2)
return info->objvb[object_index].mesh_data;
@@ -1046,8 +1046,8 @@ void object_patch() {
INSTALL_HOOK(ObjsetInfo__vertex_buffer_load);
INSTALL_HOOK(ObjsetInfo__index_buffer_free);
INSTALL_HOOK(ObjsetInfo__vertex_buffer_free);
INSTALL_HOOK(object_info_get_mesh_index_buffer);
INSTALL_HOOK(object_info_get_mesh_vertex_buffer);
INSTALL_HOOK(objset_info_storage_get_obj_mesh_index_buffer);
INSTALL_HOOK(objset_info_storage_get_obj_mesh_vertex_buffer);
INSTALL_HOOK(obj_mesh_vertex_buffer__unload);
}
src/DivaGL/object.hpp
+11 -11
View File
@@ -582,22 +582,22 @@ struct obj_vertex_buffer {
static_assert(sizeof(obj_vertex_buffer) == 0x10, "\"obj_vertex_buffer\" struct should have a size of 0x10");
#endif
extern void (FASTCALL* object_database_unload_set)(int32_t set);
extern void (FASTCALL* objset_info_storage_unload_set)(int32_t set);
extern obj_mesh* (FASTCALL* object_info_get_mesh_by_index)(object_info object, int32_t mesh_index);
extern int32_t(FASTCALL* object_info_get_mesh_index)(object_info object, const char* mesh_name);
extern int32_t(FASTCALL* objset_info_storage_get_obj_mesh_index)(object_info object, const char* mesh_name);
extern const char* (FASTCALL* object_database_get_object_name)(object_info obj_info);
extern uint32_t(FASTCALL* object_database_get_object_info)(const char* name);
extern obj* (FASTCALL* object_info_get_object)(object_info obj_info);
extern obj_mesh_index_buffer* (FASTCALL* object_info_get_mesh_index_buffer)(object_info obj_info, int32_t a2);
extern obj_skin* (FASTCALL* object_database_get_object_skin)(object_info obj_info);
extern obj_mesh_vertex_buffer* (FASTCALL* object_info_get_mesh_vertex_buffer)(object_info obj_info, int32_t a2);
extern int32_t(FASTCALL* object_database_get_set_obj_id)(int32_t set_index, int32_t obj_index);
extern GLuint(FASTCALL* object_database_get_set_texture)(int32_t set, int32_t tex_id);
extern prj::vector<GLuint>* (FASTCALL* object_database_get_set_gentex)(int32_t set);
extern obj* (FASTCALL* objset_info_storage_get_object)(object_info obj_info);
extern obj_mesh_index_buffer* (FASTCALL* objset_info_storage_get_obj_mesh_index_buffer)(object_info obj_info, int32_t a2);
extern obj_skin* (FASTCALL* objset_info_storage_get_obj_skin)(object_info obj_info);
extern obj_mesh_vertex_buffer* (FASTCALL* objset_info_storage_get_obj_mesh_vertex_buffer)(object_info obj_info, int32_t a2);
extern int32_t(FASTCALL* objset_info_storage_get_set_obj_id)(int32_t set_index, int32_t obj_index);
extern GLuint(FASTCALL* objset_info_storage_get_set_texture)(int32_t set, int32_t tex_id);
extern prj::vector<GLuint>* (FASTCALL* objset_info_storage_get_set_gentex)(int32_t set);
extern int32_t(FASTCALL* object_database_get_set_id)(int32_t set_index);
extern int32_t(FASTCALL* object_database_get_object_set_id)(const char* name);
extern int32_t(FASTCALL* object_database_load_set)(int32_t set);
extern bool (FASTCALL* object_database_load_obj_set_check_not_read)(int32_t set);
extern int32_t(FASTCALL* objset_info_storage_load_set)(int32_t set);
extern bool (FASTCALL* objset_info_storage_load_obj_set_check_not_read)(int32_t set);
extern int32_t obj_material_texture_type_get_texcoord_index(
obj_material_texture_type type, int32_t index);
src/DivaGL/pv_game/pv_game.cpp
+9 -9
View File
@@ -655,7 +655,7 @@ void pv_game_load_state_4_tail_impl(size_t pv_game) {
bool pv_game_load_state_6_head_impl() {
if (task_pv_game_x->use) {
int32_t objhrc_set = task_pv_game_x->stage_data.objhrc_set;
if (objhrc_set != -1 && object_database_load_obj_set_check_not_read(objhrc_set))
if (objhrc_set != -1 && objset_info_storage_load_obj_set_check_not_read(objhrc_set))
return true;
}
return false;
@@ -1201,7 +1201,7 @@ void x_pv_game_chara_effect::ctrl() {
if (!auth_3d_data_check_category_loaded(j.category.c_str()))
wait_load |= true;
if (object_database_load_obj_set_check_not_read(j.object_set))
if (objset_info_storage_load_obj_set_check_not_read(j.object_set))
wait_load |= true;
}
@@ -1347,7 +1347,7 @@ void x_pv_game_chara_effect::load_data() {
continue;
auth_3d_data_load_category(j.category.c_str());
object_database_load_set(j.object_set);
objset_info_storage_load_set(j.object_set);
}
state = 20;
@@ -1466,7 +1466,7 @@ void x_pv_game_chara_effect::unload() {
j.id.unload();
auth_3d_data_unload_category(j.category.c_str());
object_database_unload_set(j.object_set);
objset_info_storage_unload_set(j.object_set);
}
state = 10;
}
@@ -1498,7 +1498,7 @@ void x_pv_game_effect::ctrl() {
wait_load |= true;
for (int32_t& i : pv_obj_set)
if (object_database_load_obj_set_check_not_read(i))
if (objset_info_storage_load_obj_set_check_not_read(i))
wait_load |= true;
if (wait_load)
@@ -1623,7 +1623,7 @@ void x_pv_game_effect::load_data(int32_t pv_id) {
return;
for (int32_t& i : pv_obj_set)
object_database_load_set(i);
objset_info_storage_load_set(i);
for (prj::string& i : pv_auth_3d)
auth_3d_data_load_category(i.c_str());
@@ -1825,7 +1825,7 @@ void x_pv_game_effect::unload() {
auth_3d_data_unload_category(i.c_str());
for (int32_t& i : pv_obj_set)
object_database_unload_set(i);
objset_info_storage_unload_set(i);
for (uint32_t& i : pv_glitter)
Glitter::glt_particle_manager_x->UnloadEffectGroup(i);
@@ -3367,7 +3367,7 @@ void x_pv_game_stage::load(int32_t pv_id, bool a4) {
char buf[0x40];
sprintf_s(buf, sizeof(buf), "STGPV%03dHRC", pv_id);
objhrc_set = object_database_get_object_set_id(buf);
object_database_load_set(objhrc_set);
objset_info_storage_load_set(objhrc_set);
}
void x_pv_game_stage::load_change_effect(int32_t curr_stage_effect, int32_t next_stage_effect) {
@@ -3797,7 +3797,7 @@ void x_pv_game_stage::unload() {
env.unload();
object_database_unload_set(objhrc_set);
objset_info_storage_unload_set(objhrc_set);
objhrc_set = -1;
pv_id = 0;
src/DivaGL/render.cpp
+1 -1
View File
@@ -381,7 +381,7 @@ namespace rndr {
if (!lens_flare_texture)
return;
GLuint tex = object_database_get_set_texture(5, 4549);
GLuint tex = objset_info_storage_get_set_texture(5, 4549);
if (!tex)
return;
src/DivaGL/stage.cpp
+3 -3
View File
@@ -126,12 +126,12 @@ HOOK(void, FASTCALL, stage__disp, 0x0000000140649560, stage* s) {
if (s->stage_data->lens_flare_texture != -1 && s->lens_flare) {
int32_t object_set_id = s->stage_data->object_set_id;
rndr::Render* rend = render_get();
rend->lens_flare_texture = object_database_get_set_texture(
rend->lens_flare_texture = objset_info_storage_get_set_texture(
object_set_id, s->stage_data->lens_flare_texture);
if (rend->lens_flare_texture) {
rend->lens_shaft_texture = object_database_get_set_texture(
rend->lens_shaft_texture = objset_info_storage_get_set_texture(
object_set_id, s->stage_data->lens_shaft_texture);
rend->lens_ghost_texture = object_database_get_set_texture(
rend->lens_ghost_texture = objset_info_storage_get_set_texture(
object_set_id, s->stage_data->lens_ghost_texture);
rend->lens_ghost_count = 16;
rend->lens_shaft_inv_scale = s->stage_data->lens_shaft_inv_scale;