From bb63f4959a634b4db502e91a8f7bd20461b6db5c Mon Sep 17 00:00:00 2001 From: korenkonder Date: Thu, 30 Nov 2023 19:26:12 +0300 Subject: [PATCH] Continuation of `13cb59b` --- src/CRE/draw_object.cpp | 12 ++++++------ src/CRE/object.cpp | 10 +++++----- src/CRE/object.hpp | 6 +++--- src/CRE/post_process.cpp | 6 +++--- src/CRE/post_process.hpp | 6 +++--- src/CRE/post_process/tone_map.cpp | 4 ++-- src/CRE/render_context.cpp | 8 ++++---- src/CRE/render_context.hpp | 8 ++++---- src/CRE/rob/ex_block.cpp | 2 +- src/CRE/rob/rob.cpp | 4 ++-- src/ReDIVA/x_pv_game.cpp | 14 +++++++------- 11 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/CRE/draw_object.cpp b/src/CRE/draw_object.cpp index f3252760..576700d9 100644 --- a/src/CRE/draw_object.cpp +++ b/src/CRE/draw_object.cpp @@ -410,7 +410,7 @@ namespace mdl { void draw_sub_mesh_translucent(render_context* rctx, const ObjSubMeshArgs* args) { const obj_material_data* material = args->material; - const std::vector* textures = args->textures; + const std::vector* textures = args->textures; if (rctx->draw_state.shader_index != -1) { rctx->obj_batch.g_material_state_emission = args->emission; draw_object_material_set_uniform(material, false); @@ -461,7 +461,7 @@ namespace mdl { } if (tex_id == -1) - tex_id = (*textures)[texdata->texture_index]->tex; + tex_id = (*textures)[texdata->texture_index]; if (tex_id == -1) tex_id = 0; @@ -659,7 +659,7 @@ static void draw_object_material_reset_reflect(render_context* rctx) { } static void draw_object_material_set_default(render_context* rctx, const mdl::ObjSubMeshArgs* args, bool use_shader) { - const std::vector* textures = args->textures; + const std::vector* textures = args->textures; const obj_material_data* material = args->material; obj_material_shader_lighting_type lighting_type = material->material.shader_info.get_lighting_type(); @@ -691,7 +691,7 @@ static void draw_object_material_set_default(render_context* rctx, const mdl::Ob } if (tex_id == -1) - tex_id = (*textures)[texdata->texture_index]->tex; + tex_id = (*textures)[texdata->texture_index]; if (tex_id == -1) continue; @@ -904,7 +904,7 @@ static void draw_object_material_set_parameter(render_context* rctx, const obj_m static void draw_object_material_set_reflect(render_context* rctx, const mdl::ObjSubMeshArgs* args) { const obj_material_data* material = args->material; - const std::vector* textures = args->textures; + const std::vector* textures = args->textures; if (material->material.attrib.m.double_sided) gl_state_disable_cull_face(); @@ -924,7 +924,7 @@ static void draw_object_material_set_reflect(render_context* rctx, const mdl::Ob } if (tex_id == -1) - tex_id = (*textures)[texdata->texture_index]->tex; + tex_id = (*textures)[texdata->texture_index]; if (tex_id == -1) tex_id = 0; diff --git a/src/CRE/object.cpp b/src/CRE/object.cpp index 75476956..aebd8604 100644 --- a/src/CRE/object.cpp +++ b/src/CRE/object.cpp @@ -1743,8 +1743,8 @@ inline obj_mesh_vertex_buffer* object_storage_get_obj_mesh_vertex_buffer(object_ return 0; } -texture* obj_database_get_obj_set_texture(int32_t set, uint32_t tex_id) { - std::vector* textures = object_storage_get_obj_set_textures(set); +GLuint obj_database_get_obj_set_texture(int32_t set, uint32_t tex_id) { + std::vector* textures = object_storage_get_obj_set_textures(set); if (!textures) return 0; @@ -1758,7 +1758,7 @@ texture* obj_database_get_obj_set_texture(int32_t set, uint32_t tex_id) { return 0; } -inline std::vector* object_storage_get_obj_set_textures(int32_t set) { +inline std::vector* object_storage_get_obj_set_textures(int32_t set) { obj_set_handler* handler = object_storage_get_obj_set_handler(set); if (handler) return &handler->gentex; @@ -2221,7 +2221,7 @@ static bool obj_set_handler_load_textures(obj_set_handler* handler, const void* texture** tex_data = handler->tex_data; for (uint32_t i = 0; i < tex_num; i++) { handler->tex_id_data.push_back(tex_id_data[i], i); - handler->gentex.push_back(tex_data[i]); + handler->gentex.push_back(tex_data[i]->tex); } handler->tex_id_data.sort(); return false; @@ -2250,7 +2250,7 @@ static bool obj_set_handler_load_textures_modern(obj_set_handler* handler, texture** tex_data = handler->tex_data; for (uint32_t i = 0; i < tex_num; i++) { handler->tex_id_data.push_back(tex_id_data[i], i); - handler->gentex.push_back(tex_data[i]); + handler->gentex.push_back(tex_data[i]->tex); } handler->tex_id_data.sort(); return false; diff --git a/src/CRE/object.hpp b/src/CRE/object.hpp index 70b51173..a5f30e11 100644 --- a/src/CRE/object.hpp +++ b/src/CRE/object.hpp @@ -91,7 +91,7 @@ struct obj_set_handler { obj_set* obj_set; prj::vector_pair obj_id_data; uint32_t tex_num; - std::vector gentex; + std::vector gentex; prj::vector_pair tex_id_data; texture** tex_data; int32_t set_id; @@ -139,8 +139,8 @@ extern obj_index_buffer* object_storage_get_obj_index_buffers(uint32_t set_id); extern obj_mesh_index_buffer* object_storage_get_obj_mesh_index_buffer(object_info obj_info); extern obj_vertex_buffer* object_storage_get_obj_vertex_buffers(uint32_t set_id); extern obj_mesh_vertex_buffer* object_storage_get_obj_mesh_vertex_buffer(object_info obj_info); -extern texture* obj_database_get_obj_set_texture(int32_t set, uint32_t tex_id); -extern std::vector* object_storage_get_obj_set_textures(int32_t set); +extern GLuint obj_database_get_obj_set_texture(int32_t set, uint32_t tex_id); +extern std::vector* object_storage_get_obj_set_textures(int32_t set); extern int32_t object_storage_load_set(void* data, const object_database* obj_db, const char* name); extern int32_t object_storage_load_set(void* data, const object_database* obj_db, uint32_t set_id); extern int32_t object_storage_load_set_hash(void* data, uint32_t hash); diff --git a/src/CRE/post_process.cpp b/src/CRE/post_process.cpp index 0992f61a..d05d86c3 100644 --- a/src/CRE/post_process.cpp +++ b/src/CRE/post_process.cpp @@ -353,7 +353,7 @@ void post_process::draw_lens_flare(camera* cam) { if (!lens_flare_texture) return; - texture* tex = obj_database_get_obj_set_texture(5, 4549); + GLuint tex = obj_database_get_obj_set_texture(5, 4549); if (!tex) return; @@ -407,7 +407,7 @@ void post_process::draw_lens_flare(camera* cam) { sun_quad_shader_data shader_data = {}; shader_data.g_emission = emission; - gl_state_active_bind_texture_2d(0, tex->tex); + gl_state_active_bind_texture_2d(0, tex); shaders_ft.set(SHADER_FT_SUN); gl_state_bind_vertex_array(query_vao); sun_quad_ubo.Bind(0); @@ -664,7 +664,7 @@ void post_process::draw_lens_ghost(RenderTexture* rt) { uniform_value[U_REDUCE] = 4; shaders_ft.set(SHADER_FT_REDUCE); - gl_state_active_bind_texture_2d(0, lens_ghost_texture->tex); + gl_state_active_bind_texture_2d(0, lens_ghost_texture); gl_state_bind_vertex_array(lens_ghost_vao); shaders_ft.draw_arrays(GL_TRIANGLES, 0, (GLsizei)(lens_ghost_count * 6LL)); gl_state_bind_vertex_array(0); diff --git a/src/CRE/post_process.hpp b/src/CRE/post_process.hpp index b3238725..5e3e54ac 100644 --- a/src/CRE/post_process.hpp +++ b/src/CRE/post_process.hpp @@ -90,9 +90,9 @@ struct post_process { GLuint lens_shaft_query_data[3]; GLuint lens_flare_query_data[3]; int32_t lens_flare_query_index; - texture* lens_flare_texture; - texture* lens_shaft_texture; - texture* lens_ghost_texture; + GLuint lens_flare_texture; + GLuint lens_shaft_texture; + GLuint lens_ghost_texture; int32_t lens_ghost_count; vec3 lens_flare_pos; float_t lens_shaft_scale; diff --git a/src/CRE/post_process/tone_map.cpp b/src/CRE/post_process/tone_map.cpp index cfc3cfa9..aef4daee 100644 --- a/src/CRE/post_process/tone_map.cpp +++ b/src/CRE/post_process/tone_map.cpp @@ -116,7 +116,7 @@ void post_process_tone_map::apply(RenderTexture* in_tex, texture* light_proj_tex const float_t aspect = (float_t)pp->render_height / (float_t)pp->render_width; uniform_value[U_FLARE] = 1; - gl_state_active_bind_texture_2d(4, pp->lens_flare_texture->tex); + gl_state_active_bind_texture_2d(4, pp->lens_flare_texture); gl_state_bind_sampler(4, pp->samplers[2]); mat4 mat; mat4_translate(0.5f, 0.5f, 0.0f, &mat); @@ -133,7 +133,7 @@ void post_process_tone_map::apply(RenderTexture* in_tex, texture* light_proj_tex if (pp->lens_shaft_scale < 50.0f) { uniform_value[U_FLARE] = 2; - gl_state_active_bind_texture_2d(5, pp->lens_shaft_texture->tex); + gl_state_active_bind_texture_2d(5, pp->lens_shaft_texture); gl_state_bind_sampler(5, pp->samplers[2]); mat4_translate(0.5f, 0.5f, 0.0f, &mat); mat4_scale_rot(&mat, pp->lens_shaft_scale, pp->lens_shaft_scale, 1.0f, &mat); diff --git a/src/CRE/render_context.cpp b/src/CRE/render_context.cpp index 2d172440..c93a6812 100644 --- a/src/CRE/render_context.cpp +++ b/src/CRE/render_context.cpp @@ -283,7 +283,7 @@ namespace mdl { } void ObjData::init_sub_mesh(DispManager* disp_manager, const mat4* mat, float_t radius, - obj_sub_mesh* sub_mesh, obj_mesh* mesh, obj_material_data* material, std::vector* textures, + obj_sub_mesh* sub_mesh, obj_mesh* mesh, obj_material_data* material, std::vector* textures, int32_t mat_count, mat4* mats, /*GLuint vertex_buffer, GLuint index_buffer,*/ obj_mesh_vertex_buffer* vertex_buffer, obj_mesh_index_buffer* index_buffer, vec4* blend_color, vec4* emission, /*GLuint morph_vertex_buffer,*/ obj_mesh_vertex_buffer* morph_vertex_buffer, @@ -2488,7 +2488,7 @@ namespace mdl { bool DispManager::entry_obj(::obj* object, obj_mesh_vertex_buffer* obj_vertex_buf, obj_mesh_index_buffer* obj_index_buf, const mat4* mat, - std::vector* textures, vec4* blend_color, mat4* bone_mat, ::obj* object_morph, + std::vector* textures, vec4* blend_color, mat4* bone_mat, ::obj* object_morph, obj_mesh_vertex_buffer* obj_morph_vertex_buf, int32_t instances_count, mat4* instances_mat, void(*func)(const ObjSubMeshArgs*), bool enable_bone_mat, bool local) { if (!obj_vertex_buf || !obj_index_buf) { @@ -2863,7 +2863,7 @@ namespace mdl { } void DispManager::entry_obj_by_obj(const mat4* mat, - ::obj* obj, std::vector* textures, obj_mesh_vertex_buffer* obj_vert_buf, + ::obj* obj, std::vector* textures, obj_mesh_vertex_buffer* obj_vert_buf, obj_mesh_index_buffer* obj_index_buf, mat4* bone_mat, float_t alpha) { if (!obj) return; @@ -2890,7 +2890,7 @@ namespace mdl { if (!object) return false; - std::vector* textures = object_storage_get_obj_set_textures(obj_info.set_id); + std::vector* textures = object_storage_get_obj_set_textures(obj_info.set_id); obj_mesh_vertex_buffer* obj_vertex_buffer = object_storage_get_obj_mesh_vertex_buffer(obj_info); obj_mesh_index_buffer* obj_index_buffer = object_storage_get_obj_mesh_index_buffer(obj_info); diff --git a/src/CRE/render_context.hpp b/src/CRE/render_context.hpp index 6d7f877b..923cac52 100644 --- a/src/CRE/render_context.hpp +++ b/src/CRE/render_context.hpp @@ -267,7 +267,7 @@ namespace mdl { const obj_sub_mesh* sub_mesh; const obj_mesh* mesh; const obj_material_data* material; - const std::vector* textures; + const std::vector* textures; int32_t mat_count; const mat4* mats; //GLuint vertex_buffer; @@ -444,7 +444,7 @@ namespace mdl { void init_etc(DispManager* disp_manager, const mat4* mat, mdl::EtcObj* etc); void init_sub_mesh(DispManager* disp_manager, const mat4* mat, float_t radius, - obj_sub_mesh* sub_mesh, obj_mesh* mesh, obj_material_data* material, std::vector* textures, + obj_sub_mesh* sub_mesh, obj_mesh* mesh, obj_material_data* material, std::vector* textures, int32_t mat_count, mat4* mats, /*GLuint vertex_buffer, GLuint index_buffer,*/ obj_mesh_vertex_buffer* vertex_buffer, obj_mesh_index_buffer* index_buffer, vec4* blend_color, vec4* emission, /*GLuint morph_vertex_buffer,*/ obj_mesh_vertex_buffer* morph_vertex_buffer, @@ -581,11 +581,11 @@ namespace mdl { void entry_list(ObjType type, ObjData* data); bool entry_obj(::obj* object, obj_mesh_vertex_buffer* obj_vertex_buf, obj_mesh_index_buffer* obj_index_buf, const mat4* mat, - std::vector* textures, vec4* blend_color, mat4* bone_mat, ::obj* object_morph, + std::vector* textures, vec4* blend_color, mat4* bone_mat, ::obj* object_morph, obj_mesh_vertex_buffer* obj_morph_vertex_buf, int32_t instances_count, mat4* instances_mat, void(*func)(const mdl::ObjSubMeshArgs*), bool enable_bone_mat, bool local = false); void entry_obj_by_obj(const mat4* mat, - ::obj* obj, std::vector* textures, obj_mesh_vertex_buffer* obj_vert_buf, + ::obj* obj, std::vector* textures, obj_mesh_vertex_buffer* obj_vert_buf, obj_mesh_index_buffer* obj_index_buf, mat4* bone_mat, float_t alpha); bool entry_obj_by_object_info(const mat4* mat, object_info obj_info, mat4* bone_mat = 0); bool entry_obj_by_object_info(const mat4* mat, object_info obj_info, diff --git a/src/CRE/rob/ex_block.cpp b/src/CRE/rob/ex_block.cpp index 96205d93..41d0895f 100644 --- a/src/CRE/rob/ex_block.cpp +++ b/src/CRE/rob/ex_block.cpp @@ -976,7 +976,7 @@ void RobCloth::Disp(const mat4* mat, render_context* rctx) { if (!obj) return; - std::vector* tex = object_storage_get_obj_set_textures(itm_eq_obj->obj_info.set_id); + std::vector* tex = object_storage_get_obj_set_textures(itm_eq_obj->obj_info.set_id); vec3 center = (nodes.data()[0].trans + nodes.data()[root_count * nodes_count - 1].trans) * 0.5f; diff --git a/src/CRE/rob/rob.cpp b/src/CRE/rob/rob.cpp index 9bc6ebef..44348099 100644 --- a/src/CRE/rob/rob.cpp +++ b/src/CRE/rob/rob.cpp @@ -397,7 +397,7 @@ struct rob_chara_age_age_object { bool npr, bool reflect, const vec3& a5, bool chara_color); bool get_obj_set_handler_object_index(object_info obj_info); ::obj* get_obj_set_obj(); - std::vector& get_obj_set_texture(); + std::vector& get_obj_set_texture(); void load(object_info obj_info, int32_t count); void reset(); void update(rob_chara_age_age_data* data, int32_t count, float_t alpha); @@ -17392,7 +17392,7 @@ return true; return obj_set_handler->obj_set->obj_data[obj_index]; } -std::vector& rob_chara_age_age_object::get_obj_set_texture() { +std::vector& rob_chara_age_age_object::get_obj_set_texture() { return obj_set_handler->gentex; } diff --git a/src/ReDIVA/x_pv_game.cpp b/src/ReDIVA/x_pv_game.cpp index 9ed2732c..faed4c1f 100644 --- a/src/ReDIVA/x_pv_game.cpp +++ b/src/ReDIVA/x_pv_game.cpp @@ -8356,22 +8356,22 @@ static void x_pv_game_write_object_set(obj_set_handler* handler) { strcat_s(buf, sizeof(buf), "_tex.bin"); uint32_t tex_num = handler->tex_num; - texture** gentex = handler->gentex.data(); + texture** tex_data = handler->tex_data; txp_set txp; txp.textures.resize(tex_num); for (uint32_t j = 0; j < tex_num; j++) - texture_txp_store(gentex[j], &txp.textures[j]); + texture_txp_store(tex_data[j], &txp.textures[j]); - void* tex_data = 0; - size_t tex_length = 0; - txp.pack_file(&tex_data, &tex_length, false); + void* txp_data = 0; + size_t txp_length = 0; + txp.pack_file(&txp_data, &txp_length, false); s.open(buf, "wb"); - s.write(tex_data, tex_length); + s.write(txp_data, txp_length); s.close(); - free_def(tex_data); + free_def(txp_data); } static void print_dsc_command(dsc& dsc, dsc_data* dsc_data_ptr, int64_t time) {