From f1cfc9ed09b3103df52fe0f22384f0c7278f822b Mon Sep 17 00:00:00 2001 From: korenkonder Date: Sun, 4 Aug 2024 00:44:53 +0300 Subject: [PATCH] Added type def `mdl::ObjList` for ` std::list` --- src/CRE/mdl/disp_manager.hpp | 4 +++- src/CRE/render_manager.cpp | 2 +- src/ReDIVA/classes/data_view/draw_task.cpp | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/CRE/mdl/disp_manager.hpp b/src/CRE/mdl/disp_manager.hpp index 56840183..c68fac30 100644 --- a/src/CRE/mdl/disp_manager.hpp +++ b/src/CRE/mdl/disp_manager.hpp @@ -355,6 +355,8 @@ namespace mdl { void init_user(const mat4* mat, UserArgsFunc func, void* data); }; + typedef std::list ObjList; + struct CullingCheck { struct Info { int32_t objects; @@ -408,7 +410,7 @@ namespace mdl { shadow_type_enum shadow_type; int32_t field_8; int32_t field_C; - std::list obj[mdl::OBJ_TYPE_MAX]; + mdl::ObjList obj[mdl::OBJ_TYPE_MAX]; mdl::CullingCheck culling; int32_t put_index; bool show_alpha_center; diff --git a/src/CRE/render_manager.cpp b/src/CRE/render_manager.cpp index 184651c7..c2981957 100644 --- a/src/CRE/render_manager.cpp +++ b/src/CRE/render_manager.cpp @@ -1753,7 +1753,7 @@ static int32_t draw_pass_3d_translucent_count_layers(render_context* rctx, static void draw_pass_3d_translucent_has_objects(render_context* rctx, bool* arr, mdl::ObjType type) { rctx->disp_manager->calc_obj_radius(&rctx->view_mat, type); - std::list& vec = rctx->disp_manager->obj[type]; + mdl::ObjList& vec = rctx->disp_manager->obj[type]; for (mdl::ObjData*& i : vec) switch (i->kind) { case mdl::OBJ_KIND_NORMAL: { diff --git a/src/ReDIVA/classes/data_view/draw_task.cpp b/src/ReDIVA/classes/data_view/draw_task.cpp index 77f55c89..4ba24e47 100644 --- a/src/ReDIVA/classes/data_view/draw_task.cpp +++ b/src/ReDIVA/classes/data_view/draw_task.cpp @@ -109,7 +109,7 @@ void data_view_draw_task_imgui(class_data* data) { } render_context* rctx = data_view->rctx; - std::list* obj = rctx->disp_manager->obj; + mdl::ObjList* obj = rctx->disp_manager->obj; auto& obj_data = data_view->obj_data; ImGuiTreeNodeFlags tree_node_base_flags = 0; @@ -123,7 +123,7 @@ void data_view_draw_task_imgui(class_data* data) { tree_node_flags = tree_node_base_flags; ImGui::PushID(i); - std::list& draw_tasks = obj[i]; + mdl::ObjList& draw_tasks = obj[i]; size_t count = draw_tasks.size(); bool enable = count > 0; ImGui::DisableElementPush(enable);