From 555414bf8d1dfd9b2b756e61404a15543aa808a9 Mon Sep 17 00:00:00 2001 From: korenkonder Date: Sun, 10 Dec 2023 20:51:25 +0300 Subject: [PATCH] Renamed app::TaskInterface's functions names to lower case --- src/CRE/Glitter/glitter.hpp | 10 +- src/CRE/Glitter/particle_manager.cpp | 18 +- src/CRE/auth_2d.cpp | 34 +- src/CRE/auth_3d.cpp | 24 +- src/CRE/frame_rate_control.cpp | 6 +- src/CRE/frame_rate_control.hpp | 6 +- src/CRE/light_param/wind.cpp | 12 +- src/CRE/light_param/wind.hpp | 8 +- src/CRE/mdata_manager.cpp | 14 +- src/CRE/mdata_manager.hpp | 10 +- src/CRE/mdl/disp_manager.cpp | 2 +- src/CRE/pv_db.cpp | 10 +- src/CRE/pv_db.hpp | 6 +- src/CRE/pv_param.cpp | 16 +- src/CRE/render.cpp | 2 +- src/CRE/render_context.cpp | 6 +- src/CRE/rob/rob.cpp | 410 ++++---- src/CRE/rob/skin_param.cpp | 24 +- src/CRE/stage.cpp | 18 +- src/CRE/stage.hpp | 8 +- src/CRE/stage_modern.cpp | 20 +- src/CRE/stage_modern.hpp | 8 +- src/CRE/task.cpp | 136 +-- src/CRE/task.hpp | 66 +- src/CRE/task_effect.cpp | 1041 +++++++++----------- src/ReDIVA/classes/data_view/draw_task.cpp | 2 +- src/ReDIVA/classes/information/task.cpp | 6 +- src/ReDIVA/data_edit.cpp | 24 +- src/ReDIVA/data_edit.hpp | 14 +- src/ReDIVA/data_initialize.cpp | 12 +- src/ReDIVA/data_initialize.hpp | 8 +- src/ReDIVA/data_test/auth_2d_test.cpp | 16 +- src/ReDIVA/data_test/auth_2d_test.hpp | 10 +- src/ReDIVA/data_test/auth_3d_test.cpp | 8 +- src/ReDIVA/data_test/auth_3d_test.hpp | 8 +- src/ReDIVA/data_test/equip_test.cpp | 14 +- src/ReDIVA/data_test/equip_test.hpp | 10 +- src/ReDIVA/data_test/glitter_test.cpp | 18 +- src/ReDIVA/data_test/glitter_test.hpp | 8 +- src/ReDIVA/data_test/motion_test.cpp | 78 +- src/ReDIVA/data_test/motion_test.hpp | 32 +- src/ReDIVA/data_test/selector.cpp | 10 +- src/ReDIVA/data_test/selector.hpp | 8 +- src/ReDIVA/data_test/stage_test.cpp | 14 +- src/ReDIVA/data_test/stage_test.hpp | 6 +- src/ReDIVA/game_state.cpp | 52 +- src/ReDIVA/glitter_editor.cpp | 362 +++---- src/ReDIVA/glitter_editor.hpp | 14 +- src/ReDIVA/pv_game/game_2d.cpp | 32 +- src/ReDIVA/pv_game/game_2d.hpp | 18 +- src/ReDIVA/pv_game/pv_game.cpp | 82 +- src/ReDIVA/pv_game/pv_game.hpp | 26 +- src/ReDIVA/pv_game/pv_game_pv_data.cpp | 10 +- src/ReDIVA/render.cpp | 14 +- src/ReDIVA/system_startup.cpp | 16 +- src/ReDIVA/system_startup.hpp | 8 +- src/ReDIVA/task_window.cpp | 26 +- src/ReDIVA/task_window.hpp | 12 +- src/ReDIVA/x_pv_game.cpp | 75 +- src/ReDIVA/x_pv_game.hpp | 35 +- 60 files changed, 1432 insertions(+), 1571 deletions(-) diff --git a/src/CRE/Glitter/glitter.hpp b/src/CRE/Glitter/glitter.hpp index 32efed9d..80f5e4aa 100644 --- a/src/CRE/Glitter/glitter.hpp +++ b/src/CRE/Glitter/glitter.hpp @@ -1579,11 +1579,11 @@ namespace Glitter { GltParticleManager(); virtual ~GltParticleManager() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; - virtual void Basic() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; + virtual void basic() override; bool AppendEffectGroup(uint64_t hash, EffectGroup* eff_group, FileReader* file_read); void BasicEffectGroups(); diff --git a/src/CRE/Glitter/particle_manager.cpp b/src/CRE/Glitter/particle_manager.cpp index a92c70b0..59f06dea 100644 --- a/src/CRE/Glitter/particle_manager.cpp +++ b/src/CRE/Glitter/particle_manager.cpp @@ -33,12 +33,12 @@ namespace Glitter { FreeEffects(); } - bool GltParticleManager::Init() { + bool GltParticleManager::init() { frame_rate = get_sys_frame_rate(); return true; } - bool GltParticleManager::Ctrl() { + bool GltParticleManager::ctrl() { if (flags & PARTICLE_MANAGER_READ_FILES) { for (std::vector::iterator i = file_readers.begin(); i != file_readers.end();) if (!*i || (*i)->ReadFarc(this)) { @@ -54,7 +54,7 @@ namespace Glitter { if (!(flags & PARTICLE_MANAGER_PAUSE)) { if (frame_rate) - delta_frame = frame_rate->GetDeltaFrame(); + delta_frame = frame_rate->get_delta_frame(); else delta_frame = get_delta_frame(); @@ -63,11 +63,11 @@ namespace Glitter { return false; } - bool GltParticleManager::Dest() { + bool GltParticleManager::dest() { return true; } - void GltParticleManager::Disp() { + void GltParticleManager::disp() { if (flags & PARTICLE_MANAGER_NOT_DISP) return; @@ -76,7 +76,7 @@ namespace Glitter { i->CalcDisp(this); } - void GltParticleManager::Basic() { + void GltParticleManager::basic() { BasicEffectGroups(); } @@ -250,7 +250,7 @@ namespace Glitter { || !(scene->flags & SCENE_EDITOR)) { float_t delta_frame; if (scene->frame_rate) - delta_frame = scene->frame_rate->GetDeltaFrame(); + delta_frame = scene->frame_rate->get_delta_frame(); else delta_frame = this->delta_frame; scene->Ctrl(this, delta_frame); @@ -981,11 +981,11 @@ namespace Glitter { } bool glt_particle_manager_add_task() { - return app::TaskWork::AddTask(glt_particle_manager, "GLITTER_TASK", 2); + return app::TaskWork::add_task(glt_particle_manager, "GLITTER_TASK", 2); } bool glt_particle_manager_del_task() { - return glt_particle_manager->DelTask(); + return glt_particle_manager->del(); } void glt_particle_manager_free() { diff --git a/src/CRE/auth_2d.cpp b/src/CRE/auth_2d.cpp index 95787b06..7ec0996a 100644 --- a/src/CRE/auth_2d.cpp +++ b/src/CRE/auth_2d.cpp @@ -155,11 +155,11 @@ public: AetMgr(); virtual ~AetMgr(); - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; - virtual void Basic() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; + virtual void basic() override; uint32_t AddSetModern(); void AddAetSets(const aet_database* aet_db); @@ -315,15 +315,15 @@ void aet_manager_add_aet_sets(const aet_database* aet_db) { } bool aet_manager_add_task() { - return app::TaskWork::AddTask(aet_manager, "2DAUTH_TASK", 2); + return app::TaskWork::add_task(aet_manager, "2DAUTH_TASK", 2); } bool aet_manager_check_task_ready() { - return app::TaskWork::CheckTaskReady(aet_manager); + return app::TaskWork::check_task_ready(aet_manager); } bool aet_manager_del_task() { - return aet_manager->DelTask(); + return aet_manager->del(); } void aet_manager_free_aet_object(uint32_t id) { @@ -730,7 +730,7 @@ bool AetObj::StepFrame() { float_t delta_frame = 1.0f; if (frame_rate_control) - delta_frame = frame_rate_control->GetDeltaFrame(); + delta_frame = frame_rate_control->get_delta_frame(); delta_frame = delta_frame * frame_speed * scene->fps * (float_t)(1.0 / 60.0); if (flags & AET_REVERSE) @@ -1499,13 +1499,13 @@ AetMgr::~AetMgr() { } -bool AetMgr::Init() { +bool AetMgr::init() { objects.clear(); load_counter = 0; return true; } -bool AetMgr::Ctrl() { +bool AetMgr::ctrl() { for (auto& i : free_objects) objects.erase(i); free_objects.clear(); @@ -1515,18 +1515,18 @@ bool AetMgr::Ctrl() { return false; } -bool AetMgr::Dest() { +bool AetMgr::dest() { objects.clear(); load_counter = 0; return true; } -void AetMgr::Disp() { +void AetMgr::disp() { for (auto& i : objects) i.second.Disp(); } -void AetMgr::Basic() { +void AetMgr::basic() { auto i = objects.begin(); auto i_end = objects.end(); while (i != i_end) { @@ -1610,7 +1610,7 @@ AetObj* AetMgr::GetObj(uint32_t id) { } bool AetMgr::GetObjEnd(uint32_t id) { - if (app::TaskWork::CheckTaskReady(this)) { + if (app::TaskWork::check_task_ready(this)) { AetObj* obj = AetMgr::GetObj(id); if (obj) return obj->GetEnd(); @@ -1619,7 +1619,7 @@ bool AetMgr::GetObjEnd(uint32_t id) { } float_t AetMgr::GetObjFrame(uint32_t id) { - if (app::TaskWork::CheckTaskReady(this)) { + if (app::TaskWork::check_task_ready(this)) { AetObj* obj = AetMgr::GetObj(id); if (obj) return obj->GetFrame(); @@ -1628,7 +1628,7 @@ float_t AetMgr::GetObjFrame(uint32_t id) { } bool AetMgr::GetObjVisible(uint32_t id) { - if (app::TaskWork::CheckTaskReady(this)) { + if (app::TaskWork::check_task_ready(this)) { AetObj* obj = AetMgr::GetObj(id); if (obj) return obj->GetVisible(); diff --git a/src/CRE/auth_3d.cpp b/src/CRE/auth_3d.cpp index 0062e2c7..35a73eb2 100644 --- a/src/CRE/auth_3d.cpp +++ b/src/CRE/auth_3d.cpp @@ -28,9 +28,9 @@ namespace auth_3d_detail { TaskAuth3d(); virtual ~TaskAuth3d() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual void disp() override; }; class FrameRateTimeStop : public FrameRateControl { @@ -38,7 +38,7 @@ namespace auth_3d_detail { FrameRateTimeStop(); virtual ~FrameRateTimeStop() override; - virtual float_t GetDeltaFrame() override; + virtual float_t get_delta_frame() override; }; } @@ -319,7 +319,7 @@ void auth_3d::ctrl(render_context* rctx) { } else if (!paused) { event_flags |= 0x01; - frame += frame_rate->GetDeltaFrame(); + frame += frame_rate->get_delta_frame(); if (max_frame >= 0.0f && frame > max_frame) frame = max_frame; } @@ -3014,15 +3014,15 @@ void task_auth_3d_init() { } bool task_auth_3d_add_task() { - return app::TaskWork::AddTask(task_auth_3d, "AUTH_3D"); + return app::TaskWork::add_task(task_auth_3d, "AUTH_3D"); } bool task_auth_3d_check_task_ready() { - return app::TaskWork::CheckTaskReady(task_auth_3d); + return app::TaskWork::check_task_ready(task_auth_3d); } bool task_auth_3d_del_task() { - return task_auth_3d->DelTask(); + return task_auth_3d->del(); } void task_auth_3d_free() { @@ -3041,15 +3041,15 @@ namespace auth_3d_detail { } - bool TaskAuth3d::Init() { + bool TaskAuth3d::init() { return auth_3d_data_struct_init(auth_3d_data, rctx_ptr); } - bool TaskAuth3d::Ctrl() { + bool TaskAuth3d::ctrl() { return auth_3d_data_struct_ctrl(auth_3d_data, rctx_ptr); } - void TaskAuth3d::Disp() { + void TaskAuth3d::disp() { auth_3d_data_struct_disp(auth_3d_data, rctx_ptr); } @@ -3061,7 +3061,7 @@ namespace auth_3d_detail { } - float_t FrameRateTimeStop::GetDeltaFrame() { + float_t FrameRateTimeStop::get_delta_frame() { return 0.0f; } } diff --git a/src/CRE/frame_rate_control.cpp b/src/CRE/frame_rate_control.cpp index 048f42a5..07a7fe86 100644 --- a/src/CRE/frame_rate_control.cpp +++ b/src/CRE/frame_rate_control.cpp @@ -16,8 +16,8 @@ FrameRateControl::~FrameRateControl() { } -void FrameRateControl::SetFrameSpeed(float_t frame_speed) { - this->frame_speed = frame_speed; +void FrameRateControl::set_frame_speed(float_t value) { + frame_speed = value; } SysFrameRate::SysFrameRate() { @@ -28,7 +28,7 @@ SysFrameRate::~SysFrameRate() { } -float_t SysFrameRate::GetDeltaFrame() { +float_t SysFrameRate::get_delta_frame() { return get_delta_frame() * get_anim_frame_speed() * frame_speed; } diff --git a/src/CRE/frame_rate_control.hpp b/src/CRE/frame_rate_control.hpp index 79997807..7c7787ce 100644 --- a/src/CRE/frame_rate_control.hpp +++ b/src/CRE/frame_rate_control.hpp @@ -14,8 +14,8 @@ public: FrameRateControl(); virtual ~FrameRateControl(); - virtual float_t GetDeltaFrame() = 0; - virtual void SetFrameSpeed(float_t frame_speed); + virtual float_t get_delta_frame() = 0; + virtual void set_frame_speed(float_t value); }; class SysFrameRate : public FrameRateControl { @@ -23,7 +23,7 @@ public: SysFrameRate(); virtual ~SysFrameRate() override; - virtual float_t GetDeltaFrame() override; + virtual float_t get_delta_frame() override; }; extern FrameRateControl* get_sys_frame_rate(); diff --git a/src/CRE/light_param/wind.cpp b/src/CRE/light_param/wind.cpp index 57dbb2d8..8e1b891c 100644 --- a/src/CRE/light_param/wind.cpp +++ b/src/CRE/light_param/wind.cpp @@ -114,22 +114,22 @@ TaskWind:: ~TaskWind() { delete ptr; } -bool TaskWind::Init() { +bool TaskWind::init() { return true; } -bool TaskWind::Ctrl() { +bool TaskWind::ctrl() { if (!pv_osage_manager_array_get_disp()) wind_ctrl(ptr); return false; } -bool TaskWind::Dest() { +bool TaskWind::dest() { ptr->reset(); return true; } -void TaskWind::Disp() { +void TaskWind::disp() { pv_osage_manager_array_get_disp(); } @@ -139,11 +139,11 @@ void task_wind_init() { bool task_wind_hide_task() { task_wind->ptr->reset(); - return task_wind->HideTask(); + return task_wind->hide(); } bool task_wind_run_task() { - return task_wind->RunTask(); + return task_wind->run(); } void task_wind_free() { diff --git a/src/CRE/light_param/wind.hpp b/src/CRE/light_param/wind.hpp index a897fa99..b4ae6cfd 100644 --- a/src/CRE/light_param/wind.hpp +++ b/src/CRE/light_param/wind.hpp @@ -53,10 +53,10 @@ public: TaskWind(); virtual ~TaskWind() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; }; extern TaskWind* task_wind; diff --git a/src/CRE/mdata_manager.cpp b/src/CRE/mdata_manager.cpp index 8a6a9c76..8a43c4de 100644 --- a/src/CRE/mdata_manager.cpp +++ b/src/CRE/mdata_manager.cpp @@ -17,12 +17,12 @@ MdataMgr::~MdataMgr() { } -bool MdataMgr::Init() { +bool MdataMgr::init() { state = 0; return true; } -bool MdataMgr::Ctrl() { +bool MdataMgr::ctrl() { switch (state) { case 0: state = 1; @@ -59,15 +59,15 @@ bool MdataMgr::Ctrl() { return false; } -bool MdataMgr::Dest() { +bool MdataMgr::dest() { return true; } -void MdataMgr::Disp() { +void MdataMgr::disp() { } -void MdataMgr::Basic() { +void MdataMgr::basic() { } @@ -86,11 +86,11 @@ const std::list& MdataMgr::GetPrefixes() { } bool mdata_manager_add_task() { - return app::TaskWork::AddTask(mdata_manager_get(), 0, "M_DATA_MANAGER"); + return app::TaskWork::add_task(mdata_manager_get(), 0, "M_DATA_MANAGER"); } bool mdata_manager_del_task() { - return mdata_manager_get()->DelTask(); + return mdata_manager_get()->del(); } MdataMgr* mdata_manager_get() { diff --git a/src/CRE/mdata_manager.hpp b/src/CRE/mdata_manager.hpp index 5438a1fa..10b3b5d7 100644 --- a/src/CRE/mdata_manager.hpp +++ b/src/CRE/mdata_manager.hpp @@ -19,11 +19,11 @@ public: MdataMgr(); virtual ~MdataMgr() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; - virtual void Basic() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; + virtual void basic() override; void Log(const char* fmt, ...); const std::list& GetPrefixes(); diff --git a/src/CRE/mdl/disp_manager.cpp b/src/CRE/mdl/disp_manager.cpp index e0cd9f9d..0395d705 100644 --- a/src/CRE/mdl/disp_manager.cpp +++ b/src/CRE/mdl/disp_manager.cpp @@ -195,7 +195,7 @@ namespace mdl { UserArgs::UserArgs() : func(), data() { } - + ObjTranslucentArgs::ObjTranslucentArgs() : count(), sub_mesh() { } diff --git a/src/CRE/pv_db.cpp b/src/CRE/pv_db.cpp index 13f45470..1ba722dc 100644 --- a/src/CRE/pv_db.cpp +++ b/src/CRE/pv_db.cpp @@ -884,7 +884,7 @@ namespace pv_db { } - bool TaskPvDB::Init() { + bool TaskPvDB::init() { reset = false; field_99 = false; InitPerformerTypes(); @@ -894,7 +894,7 @@ namespace pv_db { return true; } - bool TaskPvDB::Ctrl() { + bool TaskPvDB::ctrl() { switch (state) { case 1: { if (reset) { @@ -962,7 +962,7 @@ namespace pv_db { return false; } - bool TaskPvDB::Dest() { + bool TaskPvDB::dest() { return true; } @@ -2287,7 +2287,7 @@ void task_pv_db_add_paths() { } bool task_pv_db_add_task() { - return app::TaskWork::AddTask(task_pv_db_get(), "PV DB"); + return app::TaskWork::add_task(task_pv_db_get(), "PV DB"); } void task_pv_db_free_pv_data() { @@ -2295,7 +2295,7 @@ void task_pv_db_free_pv_data() { } bool task_pv_db_del_task() { - return task_pv_db_get()->DelTask(); + return task_pv_db_get()->del(); } pv_db::TaskPvDB* task_pv_db_get() { diff --git a/src/CRE/pv_db.hpp b/src/CRE/pv_db.hpp index a2d7fc7d..500fd942 100644 --- a/src/CRE/pv_db.hpp +++ b/src/CRE/pv_db.hpp @@ -535,9 +535,9 @@ namespace pv_db { TaskPvDB(); virtual ~TaskPvDB() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; void InitChrEffDataTypes(); void InitMovieSurfaces(); diff --git a/src/CRE/pv_param.cpp b/src/CRE/pv_param.cpp index e6d23153..a39a2274 100644 --- a/src/CRE/pv_param.cpp +++ b/src/CRE/pv_param.cpp @@ -783,15 +783,15 @@ namespace pv_param_task { PostProcessTask(); virtual ~PostProcessTask() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; }; PostProcessTask post_process_task; bool post_process_task_add_task() { - return app::TaskWork::AddTask(&post_process_task, "PV POST PROCESS TASK"); + return app::TaskWork::add_task(&post_process_task, "PV POST PROCESS TASK"); } void post_process_task_set_bloom_data( @@ -843,7 +843,7 @@ namespace pv_param_task { } bool post_process_task_del_task() { - return post_process_task.DelTask(); + return post_process_task.del(); } PostProcessCtrl::PostProcessCtrl() { @@ -1265,7 +1265,7 @@ namespace pv_param_task { } - bool PostProcessTask::Init() { + bool PostProcessTask::init() { dof.Reset(); cc.Reset(); bloom.Reset(); @@ -1274,7 +1274,7 @@ namespace pv_param_task { return true; } - bool PostProcessTask::Ctrl() { + bool PostProcessTask::ctrl() { dof.Set(); cc.Set(); bloom.Set(); @@ -1283,7 +1283,7 @@ namespace pv_param_task { return false; } - bool PostProcessTask::Dest() { + bool PostProcessTask::dest() { dof.Reset(); cc.Reset(); bloom.Reset(); diff --git a/src/CRE/render.cpp b/src/CRE/render.cpp index c6483e20..178cebe8 100644 --- a/src/CRE/render.cpp +++ b/src/CRE/render.cpp @@ -1357,7 +1357,7 @@ namespace rndr { * (float_t)inner_width / (float_t)width * (1.0f / round_val)) * round_val); render_height[0] = (int32_t)(prj::ceilf((float_t)screen_height * (float_t)inner_height / (float_t)height * (1.0f / round_val)) * round_val);*/ - + render_width[0] = (int32_t)prj::ceilf((float_t)screen_width * (float_t)inner_width / (float_t)width); render_height[0] = (int32_t)prj::ceilf((float_t)screen_height diff --git a/src/CRE/render_context.cpp b/src/CRE/render_context.cpp index 523e8396..47b6def0 100644 --- a/src/CRE/render_context.cpp +++ b/src/CRE/render_context.cpp @@ -609,7 +609,7 @@ void render_context::ctrl() { delta_frame_history_int++; rctx_ptr = this; - app::TaskWork::Ctrl(); + app::TaskWork::ctrl(); sound_ctrl(); file_handler_storage_ctrl(); } @@ -620,7 +620,7 @@ void render_context::disp() { sprite_manager_reset_req_list(); draw_state->stats_prev = draw_state->stats; draw_state->stats.reset(); - app::TaskWork::Disp(); + app::TaskWork::disp(); shadow_ptr_get()->Ctrl(); int32_t sprite_index = sprite_manager_get_index(); //sprite_manager_set_index(3); @@ -633,7 +633,7 @@ void render_context::disp() { render.lens_flare_texture = 0; render.aet_back = 0; render_manager->field_31C = false; - app::TaskWork::Basic(); + app::TaskWork::basic(); } void render_context::free() { diff --git a/src/CRE/rob/rob.cpp b/src/CRE/rob/rob.cpp index bc638f05..90388ec9 100644 --- a/src/CRE/rob/rob.cpp +++ b/src/CRE/rob/rob.cpp @@ -103,12 +103,12 @@ struct OpdMakeWorker : public app::Task { OpdMakeWorker(); virtual ~OpdMakeWorker() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; - bool AddTask(bool a2); + bool add(bool a2); }; struct osage_play_data_init_header { @@ -158,12 +158,12 @@ public: OsagePlayDataManager(); virtual ~OsagePlayDataManager() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; - bool AddTask(); + bool add(); void AppendCharaMotionId(rob_chara* rob_chr, const std::vector& motion_ids); bool CheckTaskReady(); void GetOpdFileData(object_info obj_info, @@ -262,12 +262,12 @@ struct OpdMakeManager : app::Task { OpdMakeManager(); virtual ~OpdMakeManager() override; - bool Init() override; - bool Ctrl() override; - bool Dest() override; - void Disp() override; + bool init() override; + bool ctrl() override; + bool dest() override; + void disp() override; - bool DelTask(); + bool del(); }; struct struc_380 { @@ -501,29 +501,29 @@ public: std::map reset_frames_list; std::thread* thread; std::condition_variable cnd; - bool disp; + bool display; bool not_reset; bool exit; int32_t field_D4; std::mutex mtx; - std::mutex disp_mtx; + std::mutex display_mtx; std::mutex not_reset_mtx; std::mutex exit_mtx; PvOsageManager(); virtual ~PvOsageManager() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; void AddMotionFrameResetData(int32_t stage_index, uint32_t motion_id, float_t frame, int32_t iterations); bool CheckResetFrameNotFound(uint32_t motion_id, float_t frame); - bool GetDisp(); + bool GetDisplay(); bool GetNotReset(); void Reset(); - void SetDisp(bool value); + void SetDisplay(bool value); void SetNotReset(bool value); void SetPvId(int32_t pv_id, int32_t chara_id, bool reset); void SetPvSetMotion(const std::vector& set_motion); @@ -593,9 +593,9 @@ public: TaskRobLoad(); virtual ~TaskRobLoad() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; bool AppendFreeReqData(chara_index chara_index); bool AppendFreeReqDataObj(chara_index chara_index, const item_cos_data* cos); @@ -639,13 +639,13 @@ public: RobImplTask(); virtual ~RobImplTask() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; - virtual bool CheckType(rob_chara_type type) = 0; - virtual bool IsFrameDependent() = 0; + virtual bool check_type(rob_chara_type type) = 0; + virtual bool is_frame_dependent() = 0; void AppendList(rob_chara* rob_chr, std::list* list); void AppendCtrlCharaList(rob_chara* rob_chr); @@ -663,12 +663,12 @@ public: TaskRobPrepareControl(); virtual ~TaskRobPrepareControl() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; - virtual bool CheckType(rob_chara_type type) override; - virtual bool IsFrameDependent() override; + virtual bool check_type(rob_chara_type type) override; + virtual bool is_frame_dependent() override; }; class TaskRobPrepareAction : public RobImplTask { @@ -676,12 +676,12 @@ public: TaskRobPrepareAction(); virtual ~TaskRobPrepareAction() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; - virtual bool CheckType(rob_chara_type type) override; - virtual bool IsFrameDependent() override; + virtual bool check_type(rob_chara_type type) override; + virtual bool is_frame_dependent() override; }; class TaskRobBase : public RobImplTask { @@ -689,23 +689,25 @@ public: TaskRobBase(); virtual ~TaskRobBase() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; - virtual bool CheckType(rob_chara_type type) override; - virtual bool IsFrameDependent() override; + virtual bool check_type(rob_chara_type type) override; + virtual bool is_frame_dependent() override; }; class TaskRobCollision : public RobImplTask { public: TaskRobCollision(); virtual ~TaskRobCollision() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual bool CheckType(rob_chara_type type) override; - virtual bool IsFrameDependent() override; + + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + + virtual bool check_type(rob_chara_type type) override; + virtual bool is_frame_dependent() override; }; class TaskRobInfo : public RobImplTask { @@ -713,12 +715,12 @@ public: TaskRobInfo(); virtual ~TaskRobInfo() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; - virtual bool CheckType(rob_chara_type type) override; - virtual bool IsFrameDependent() override; + virtual bool check_type(rob_chara_type type) override; + virtual bool is_frame_dependent() override; }; class TaskRobMotionModifier : public RobImplTask { @@ -726,12 +728,12 @@ public: TaskRobMotionModifier(); virtual ~TaskRobMotionModifier() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; - virtual bool CheckType(rob_chara_type type) override; - virtual bool IsFrameDependent() override; + virtual bool check_type(rob_chara_type type) override; + virtual bool is_frame_dependent() override; }; class TaskRobDisp : public RobImplTask { @@ -739,26 +741,26 @@ public: TaskRobDisp(); virtual ~TaskRobDisp() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; - virtual bool CheckType(rob_chara_type type) override; - virtual bool IsFrameDependent() override; + virtual bool check_type(rob_chara_type type) override; + virtual bool is_frame_dependent() override; }; class TaskRobManager : public app::Task { public: int32_t ctrl_state; int32_t dest_state; - TaskRobPrepareControl prepare_control; - TaskRobPrepareAction prepare_action; - TaskRobBase base; - TaskRobCollision collision; - TaskRobInfo info; - TaskRobMotionModifier motion_modifier; - TaskRobDisp disp; + TaskRobPrepareControl rob_prepare_control; + TaskRobPrepareAction rob_prepare_action; + TaskRobBase rob_base; + TaskRobCollision rob_collision; + TaskRobInfo rob_info; + TaskRobMotionModifier rob_motion_modifier; + TaskRobDisp rob_disp; std::list init_chara; std::list load_chara; std::list free_chara; @@ -767,10 +769,10 @@ public: TaskRobManager(); virtual ~TaskRobManager() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; void AppendFreeCharaList(rob_chara* rob_chr); void AppendInitCharaList(rob_chara* rob_chr); @@ -2233,11 +2235,11 @@ void motion_set_unload_mothead(uint32_t set) { } bool opd_make_manager_del_task() { - return opd_make_manager->DelTask(); + return opd_make_manager->del(); } bool osage_play_data_manager_add_task() { - return osage_play_data_manager->AddTask(); + return osage_play_data_manager->add(); } void osage_play_data_manager_append_chara_motion_id(rob_chara* rob_chr, uint32_t motion_id) { @@ -7445,7 +7447,7 @@ static bool opd_decode_data(const void* data, float_t** opd_decod_buf, osage_pla } static bool pv_osage_manager_array_get_disp(int32_t* chara_id) { - return pv_osage_manager_array_get(*chara_id)->GetDisp(); + return pv_osage_manager_array_get(*chara_id)->GetDisplay(); } static PvOsageManager* pv_osage_manager_array_get(int32_t chara_id) { @@ -11169,7 +11171,7 @@ static void rob_cmn_mottbl_read(void* a1, const void* data, size_t size) { static rob_manager_rob_impl* rob_manager_rob_impls1_get(TaskRobManager* rob_mgr) { if (!rob_manager_rob_impls1_init) { rob_manager_rob_impls1_init = true; - rob_manager_rob_impls1[0].task = &rob_mgr->prepare_control; + rob_manager_rob_impls1[0].task = &rob_mgr->rob_prepare_control; rob_manager_rob_impls1[0].name = "ROB_PREPARE_CONTROL"; rob_manager_rob_impls1[1].task = 0; rob_manager_rob_impls1[1].name = ""; @@ -11180,17 +11182,17 @@ static rob_manager_rob_impl* rob_manager_rob_impls1_get(TaskRobManager* rob_mgr) static rob_manager_rob_impl* rob_manager_rob_impls2_get(TaskRobManager* rob_mgr) { if (!rob_manager_rob_impls2_init) { rob_manager_rob_impls2_init = true; - rob_manager_rob_impls2[0].task = &rob_mgr->prepare_action; + rob_manager_rob_impls2[0].task = &rob_mgr->rob_prepare_action; rob_manager_rob_impls2[0].name = "ROB_PREPARE_ACTION"; - rob_manager_rob_impls2[1].task = &rob_mgr->base; + rob_manager_rob_impls2[1].task = &rob_mgr->rob_base; rob_manager_rob_impls2[1].name = "ROB_BASE"; - rob_manager_rob_impls2[2].task = &rob_mgr->motion_modifier; + rob_manager_rob_impls2[2].task = &rob_mgr->rob_motion_modifier; rob_manager_rob_impls2[2].name = "ROB_MOTION_MODIFIER"; - rob_manager_rob_impls2[3].task = &rob_mgr->collision; + rob_manager_rob_impls2[3].task = &rob_mgr->rob_collision; rob_manager_rob_impls2[3].name = "ROB_COLLISION"; - rob_manager_rob_impls2[4].task = &rob_mgr->info; + rob_manager_rob_impls2[4].task = &rob_mgr->rob_info; rob_manager_rob_impls2[4].name = "ROB_INFO"; - rob_manager_rob_impls2[5].task = &rob_mgr->disp; + rob_manager_rob_impls2[5].task = &rob_mgr->rob_disp; rob_manager_rob_impls2[5].name = "ROB_DISP"; rob_manager_rob_impls2[6].task = 0; rob_manager_rob_impls2[6].name = ""; @@ -11296,7 +11298,7 @@ rob_chara_item_equip* rob_chara_array_get_item_equip(int32_t chara_id) { int32_t rob_chara_array_init_chara_index(chara_index chara_index, const rob_chara_pv_data& pv_data, int32_t cos_id, bool can_set_default) { - if (!app::TaskWork::CheckTaskReady(task_rob_manager) + if (!app::TaskWork::check_task_ready(task_rob_manager) || pv_data.type < ROB_CHARA_TYPE_0|| pv_data.type > ROB_CHARA_TYPE_3) return -1; @@ -11355,12 +11357,12 @@ void rob_chara_array_set_visibility(int32_t chara_id, bool value) { bool pv_osage_manager_array_get_disp() { bool disp = false; for (int32_t i = 0; i < ROB_CHARA_COUNT; i++) - disp |= pv_osage_manager_array_get(i)->GetDisp(); + disp |= pv_osage_manager_array_get(i)->GetDisplay(); return disp; } bool pv_osage_manager_array_get_disp(int32_t chara_id) { - return pv_osage_manager_array_get(chara_id)->GetDisp(); + return pv_osage_manager_array_get(chara_id)->GetDisplay(); } void pv_osage_manager_array_set_motion_ids( @@ -11407,7 +11409,7 @@ void rob_sleeve_handler_data_read() { } bool task_rob_load_add_task() { - return app::TaskWork::AddTask(task_rob_load, 0, "ROB LOAD", 0); + return app::TaskWork::add_task(task_rob_load, 0, "ROB LOAD", 0); } bool task_rob_load_append_free_req_data(chara_index chara_index) { @@ -11433,12 +11435,12 @@ bool task_rob_load_check_load_req_data() { } bool task_rob_load_del_task() { - task_rob_load->DelTask(); + task_rob_load->del(); return true; } bool task_rob_manager_add_task() { - return app::TaskWork::AddTask(task_rob_manager, "ROB_MANAGER TASK"); + return app::TaskWork::add_task(task_rob_manager, "ROB_MANAGER TASK"); } bool task_rob_manager_check_chara_loaded(int32_t chara_id) { @@ -11448,11 +11450,11 @@ bool task_rob_manager_check_chara_loaded(int32_t chara_id) { } bool task_rob_manager_check_task_ready() { - return app::TaskWork::CheckTaskReady(task_rob_manager); + return app::TaskWork::check_task_ready(task_rob_manager); } bool task_rob_manager_hide_task() { - return task_rob_manager->HideTask(); + return task_rob_manager->hide(); } bool task_rob_manager_get_wait(int32_t chara_id) { @@ -11463,14 +11465,14 @@ bool task_rob_manager_get_wait(int32_t chara_id) { } bool task_rob_manager_run_task() { - return task_rob_manager->RunTask(); + return task_rob_manager->run(); } bool task_rob_manager_del_task() { - if (!app::TaskWork::CheckTaskReady(task_rob_manager)) + if (!app::TaskWork::check_task_ready(task_rob_manager)) return true; - task_rob_manager->DelTask(); + task_rob_manager->del(); return false; } @@ -16586,7 +16588,7 @@ OpdMakeWorker::~OpdMakeWorker() { } -bool OpdMakeWorker::Init() { +bool OpdMakeWorker::init() { data.Reset(); this->state = field_D4 ? 8 : 1; return true; @@ -16654,7 +16656,7 @@ static bool sub_140479090(struc_655& a1, chara_index chara_index) { return true; } -bool OpdMakeWorker::Ctrl() { +bool OpdMakeWorker::ctrl() { data_struct* aft_data = &data_list[DATA_AFT]; bone_database* aft_bone_data = &aft_data->data_ft.bone_data; motion_database* aft_mot_db = &aft_data->data_ft.mot_db; @@ -16801,7 +16803,7 @@ bool OpdMakeWorker::Ctrl() { return false; } -bool OpdMakeWorker::Dest() { +bool OpdMakeWorker::dest() { if (opd_maker_array[chara_id].IsWaiting()) { opd_maker_array[chara_id].sub_140475AE0(); return false; @@ -16812,7 +16814,7 @@ bool OpdMakeWorker::Dest() { } } -void OpdMakeWorker::Disp() { +void OpdMakeWorker::disp() { } @@ -16839,13 +16841,13 @@ OsagePlayDataManager::~OsagePlayDataManager() { } -bool OsagePlayDataManager::Init() { +bool OsagePlayDataManager::init() { LoadOpdFileList(); state = 0; return true; } -bool OsagePlayDataManager::Ctrl() { +bool OsagePlayDataManager::ctrl() { if (state) return false; @@ -16861,24 +16863,24 @@ bool OsagePlayDataManager::Ctrl() { return !file_handlers.size(); } -bool OsagePlayDataManager::Dest() { +bool OsagePlayDataManager::dest() { return true; } -void OsagePlayDataManager::Disp() { +void OsagePlayDataManager::disp() { } -bool OpdMakeWorker::AddTask(bool a2) { +bool OpdMakeWorker::add(bool a2) { if (!task_rob_manager_check_chara_loaded(chara_id)) return false; field_D4 = a2; - return app::TaskWork::AddTask(this, "OPD_MAKE_WORKER"); + return app::TaskWork::add_task(this, "OPD_MAKE_WORKER"); } -bool OsagePlayDataManager::AddTask() { - return app::TaskWork::AddTask(this, "OSAGE_PLAY_DATA_MANAGER"); +bool OsagePlayDataManager::add() { + return app::TaskWork::add_task(this, "OSAGE_PLAY_DATA_MANAGER"); } void OsagePlayDataManager::AppendCharaMotionId(rob_chara* rob_chr, const std::vector& motion_ids) { @@ -16898,7 +16900,7 @@ void OsagePlayDataManager::AppendCharaMotionId(rob_chara* rob_chr, const std::ve } bool OsagePlayDataManager::CheckTaskReady() { - return app::TaskWork::CheckTaskReady(this); + return app::TaskWork::check_task_ready(this); } void OsagePlayDataManager::GetOpdFileData(object_info obj_info, @@ -17050,7 +17052,7 @@ OpdMakeManager::~OpdMakeManager() { } -bool OpdMakeManager::Init() { +bool OpdMakeManager::init() { mode = 1; rctx_ptr->render_manager->set_pass_sw(rndr::RND_PASSID_3D, false); @@ -17060,7 +17062,7 @@ bool OpdMakeManager::Init() { CreateDirectoryA("ram/osage_play_data", 0); - if (field_1888 || !app::TaskWork::CheckTaskReady(task_rob_manager)) { + if (field_1888 || !app::TaskWork::check_task_ready(task_rob_manager)) { task_rob_manager_add_task(); return true; } @@ -17070,7 +17072,7 @@ bool OpdMakeManager::Init() { } } -bool OpdMakeManager::Ctrl() { +bool OpdMakeManager::ctrl() { data_struct* aft_data = &data_list[DATA_AFT]; motion_database* aft_mot_db = &aft_data->data_ft.mot_db; @@ -17135,7 +17137,7 @@ bool OpdMakeManager::Ctrl() { v11 = true; if (!v11) { - task_rob_manager->HideTask(); + task_rob_manager->hide(); mode = 7; } } break; @@ -17143,13 +17145,13 @@ bool OpdMakeManager::Ctrl() { int32_t j = 0; for (OpdMakeWorker*& i : workers) if (rob_chara_array_get(j++)) - i->AddTask(field_1888); + i->add(field_1888); mode = 8; } break; case 8: { bool v18 = false; for (OpdMakeWorker*& i : workers) - if (app::TaskWork::CheckTaskReady(i)) + if (app::TaskWork::check_task_ready(i)) v18 = true; if (!v18) @@ -17158,7 +17160,7 @@ bool OpdMakeManager::Ctrl() { case 9: for (int32_t i = 0; i < 4; i++) rob_chara_array_free_chara_id(i); - task_rob_manager->RunTask(); + task_rob_manager->run(); mode = 10; break; case 10: @@ -17184,9 +17186,9 @@ bool OpdMakeManager::Ctrl() { return ret; } -bool OpdMakeManager::Dest() { +bool OpdMakeManager::dest() { for (OpdMakeWorker*& i : workers) - if (app::TaskWork::CheckTaskReady(i)) + if (app::TaskWork::check_task_ready(i)) return false; if (!field_1888) { @@ -17212,14 +17214,14 @@ bool OpdMakeManager::Dest() { return true; } -void OpdMakeManager::Disp() { +void OpdMakeManager::disp() { } -bool OpdMakeManager::DelTask() { +bool OpdMakeManager::del() { for (OpdMakeWorker*& i : workers) - i->DelTask(); - return app::Task::DelTask(); + i->del(); + return app::Task::del(); } ReqData::ReqData() : chara_index(), count() { @@ -18050,12 +18052,12 @@ y(y), z(z), rotation(rotation) { } PvOsageManager::PvOsageManager() : state(), chara_id(), reset(), field_74(), -motion_index(), pv(), thread(), disp(), not_reset(), exit(), field_D4() { +motion_index(), pv(), thread(), display(), not_reset(), exit(), field_D4() { Reset(); { - std::unique_lock u_lock(disp_mtx); - disp = false; + std::unique_lock u_lock(display_mtx); + display = false; } { @@ -18088,12 +18090,12 @@ PvOsageManager::~PvOsageManager() { thread = 0; } -bool PvOsageManager::Init() { +bool PvOsageManager::init() { state = 0; return true; } -bool PvOsageManager::Ctrl() { +bool PvOsageManager::ctrl() { if (!state) { sub_1404F8AA0(); if (sub_1404F7AF0()) @@ -18106,11 +18108,11 @@ bool PvOsageManager::Ctrl() { return true; } -bool PvOsageManager::Dest() { +bool PvOsageManager::dest() { return true; } -void PvOsageManager::Disp() { +void PvOsageManager::disp() { } @@ -18147,9 +18149,9 @@ bool PvOsageManager::CheckResetFrameNotFound(uint32_t motion_id, float_t frame) return reset_frames_list.find(frame) == reset_frames_list.end(); } -bool PvOsageManager::GetDisp() { - std::unique_lock u_lock(disp_mtx); - return disp; +bool PvOsageManager::GetDisplay() { + std::unique_lock u_lock(display_mtx); + return display; } bool PvOsageManager::GetNotReset() { @@ -18157,9 +18159,9 @@ bool PvOsageManager::GetNotReset() { return not_reset; } -void PvOsageManager::SetDisp(bool value) { - std::unique_lock u_lock(disp_mtx); - disp = value; +void PvOsageManager::SetDisplay(bool value) { + std::unique_lock u_lock(display_mtx); + display = value; } void PvOsageManager::SetNotReset(bool value) { @@ -18172,12 +18174,12 @@ void PvOsageManager::SetPvId(int32_t pv_id, int32_t chara_id, bool reset) { return; waitable_timer timer; - while (GetDisp()) { + while (GetDisplay()) { SetNotReset(true); timer.sleep(1); } - SetDisp(true); + SetDisplay(true); SetNotReset(false); this->reset = reset; this->chara_id = chara_id; @@ -18495,14 +18497,14 @@ void PvOsageManager::ThreadMain(PvOsageManager* pv_osg_mgr) { } { - std::unique_lock u_lock(pv_osg_mgr->disp_mtx); - pv_osg_mgr->disp = false; + std::unique_lock u_lock(pv_osg_mgr->display_mtx); + pv_osg_mgr->display = false; } } { - std::unique_lock u_lock(pv_osg_mgr->disp_mtx); - pv_osg_mgr->disp = false; + std::unique_lock u_lock(pv_osg_mgr->display_mtx); + pv_osg_mgr->display = false; } } @@ -18610,19 +18612,19 @@ RobImplTask::~RobImplTask() { } -bool RobImplTask::Init() { +bool RobImplTask::init() { return true; } -bool RobImplTask::Ctrl() { +bool RobImplTask::ctrl() { return false; } -bool RobImplTask::Dest() { +bool RobImplTask::dest() { return true; } -void RobImplTask::Disp() { +void RobImplTask::disp() { } @@ -18692,11 +18694,11 @@ TaskRobBase::~TaskRobBase() { } -bool TaskRobBase::Init() { +bool TaskRobBase::init() { return true; } -bool TaskRobBase::Ctrl() { +bool TaskRobBase::ctrl() { if (pv_osage_manager_array_get_disp()) return false; @@ -18724,7 +18726,7 @@ bool TaskRobBase::Ctrl() { return false; } -bool TaskRobBase::Dest() { +bool TaskRobBase::dest() { if (pv_osage_manager_array_get_disp()) { pv_osage_manager_array_set_not_reset_true(); return false; @@ -18744,11 +18746,11 @@ bool TaskRobBase::Dest() { return true; } -bool TaskRobBase::CheckType(rob_chara_type type) { +bool TaskRobBase::check_type(rob_chara_type type) { return type >= ROB_CHARA_TYPE_0 && type <= ROB_CHARA_TYPE_2; } -bool TaskRobBase::IsFrameDependent() { +bool TaskRobBase::is_frame_dependent() { return true; } @@ -18760,11 +18762,11 @@ TaskRobCollision::~TaskRobCollision() { } -bool TaskRobCollision::Init() { +bool TaskRobCollision::init() { return true; } -bool TaskRobCollision::Ctrl() { +bool TaskRobCollision::ctrl() { for (rob_chara*& i : init_chara) AppendCtrlCharaList(i); init_chara.clear(); @@ -18785,16 +18787,16 @@ bool TaskRobCollision::Ctrl() { return false; } -bool TaskRobCollision::Dest() { +bool TaskRobCollision::dest() { FreeCharaLists(); return true; } -bool TaskRobCollision::CheckType(rob_chara_type type) { +bool TaskRobCollision::check_type(rob_chara_type type) { return type >= ROB_CHARA_TYPE_0 && type <= ROB_CHARA_TYPE_2; } -bool TaskRobCollision::IsFrameDependent() { +bool TaskRobCollision::is_frame_dependent() { return true; } @@ -18806,11 +18808,11 @@ TaskRobDisp::~TaskRobDisp() { } -bool TaskRobDisp::Init() { +bool TaskRobDisp::init() { return true; } -bool TaskRobDisp::Ctrl() { +bool TaskRobDisp::ctrl() { if (pv_osage_manager_array_get_disp()) return false; @@ -18840,7 +18842,7 @@ bool TaskRobDisp::Ctrl() { return false; } -bool TaskRobDisp::Dest() { +bool TaskRobDisp::dest() { if (pv_osage_manager_array_get_disp()) { pv_osage_manager_array_set_not_reset_true(); return false; @@ -18864,7 +18866,7 @@ bool TaskRobDisp::Dest() { return true; } -void TaskRobDisp::Disp() { +void TaskRobDisp::disp() { for (rob_chara*& i : ctrl_chara) { if (!i) continue; @@ -18878,11 +18880,11 @@ void TaskRobDisp::Disp() { } } -bool TaskRobDisp::CheckType(rob_chara_type type) { +bool TaskRobDisp::check_type(rob_chara_type type) { return type >= ROB_CHARA_TYPE_0 && type <= ROB_CHARA_TYPE_3; } -bool TaskRobDisp::IsFrameDependent() { +bool TaskRobDisp::is_frame_dependent() { return false; } @@ -18894,11 +18896,11 @@ TaskRobInfo::~TaskRobInfo() { } -bool TaskRobInfo::Init() { +bool TaskRobInfo::init() { return true; } -bool TaskRobInfo::Ctrl() { +bool TaskRobInfo::ctrl() { for (rob_chara*& i : init_chara) AppendCtrlCharaList(i); init_chara.clear(); @@ -18911,16 +18913,16 @@ bool TaskRobInfo::Ctrl() { return false; } -bool TaskRobInfo::Dest() { +bool TaskRobInfo::dest() { FreeCharaLists(); return true; } -bool TaskRobInfo::CheckType(rob_chara_type type) { +bool TaskRobInfo::check_type(rob_chara_type type) { return type >= ROB_CHARA_TYPE_0 && type <= ROB_CHARA_TYPE_2; } -bool TaskRobInfo::IsFrameDependent() { +bool TaskRobInfo::is_frame_dependent() { return true; } @@ -18932,12 +18934,12 @@ TaskRobLoad::~TaskRobLoad() { } -bool TaskRobLoad::Init() { +bool TaskRobLoad::init() { field_F0 = 0; return true; } -bool TaskRobLoad::Ctrl() { +bool TaskRobLoad::ctrl() { int32_t v0 = field_F0; while (v0 != -1) { field_F0 = v0; @@ -18959,7 +18961,7 @@ bool TaskRobLoad::Ctrl() { return false; } -bool TaskRobLoad::Dest() { +bool TaskRobLoad::dest() { if (pv_osage_manager_array_get_disp()) { pv_osage_manager_array_set_not_reset_true(); return false; @@ -19322,21 +19324,21 @@ TaskRobManager::~TaskRobManager() { } -bool TaskRobManager::Init() { +bool TaskRobManager::init() { task_rob_load_add_task(); rob_manager_rob_impl* rob_impls1 = rob_manager_rob_impls1_get(this); for (; rob_impls1->task; rob_impls1++) { RobImplTask* task = rob_impls1->task; - app::TaskWork::AddTask(task, rob_impls1->name); - task->is_frame_dependent = task->IsFrameDependent(); + app::TaskWork::add_task(task, rob_impls1->name); + task->frame_dependent = task->is_frame_dependent(); task->FreeCharaLists(); } rob_manager_rob_impl* rob_impls2 = rob_manager_rob_impls2_get(this); for (; rob_impls2->task; rob_impls2++) { RobImplTask* task = rob_impls2->task; - app::TaskWork::AddTask(task, rob_impls2->name); - task->is_frame_dependent = task->IsFrameDependent(); + app::TaskWork::add_task(task, rob_impls2->name); + task->frame_dependent = task->is_frame_dependent(); task->FreeCharaLists(); } @@ -19345,7 +19347,7 @@ bool TaskRobManager::Init() { return true; } -bool TaskRobManager::Ctrl() { +bool TaskRobManager::ctrl() { if (!ctrl_state) { if (task_rob_load_check_load_req_data()) return false; @@ -19376,7 +19378,7 @@ bool TaskRobManager::Ctrl() { for (rob_chara*& i : free_chara) { rob_chara_type type = i->type; for (rob_manager_rob_impl* j = rob_manager_rob_impls1_get(this); j->task; j++) { - if (!j->task->CheckType(type)) + if (!j->task->check_type(type)) continue; j->task->FreeInitCharaList(&i->chara_id); @@ -19385,7 +19387,7 @@ bool TaskRobManager::Ctrl() { } for (rob_manager_rob_impl* j = rob_manager_rob_impls2_get(this); j->task; j++) { - if (!j->task->CheckType(type)) + if (!j->task->check_type(type)) continue; j->task->FreeInitCharaList(&i->chara_id); @@ -19411,16 +19413,16 @@ bool TaskRobManager::Ctrl() { return false; } -bool TaskRobManager::Dest() { +bool TaskRobManager::dest() { switch (dest_state) { case 0: { rob_manager_rob_impl* rob_impls1 = rob_manager_rob_impls1_get(this); for (; rob_impls1->task; rob_impls1++) - rob_impls1->task->DelTask(); + rob_impls1->task->del(); rob_manager_rob_impl* rob_impls2 = rob_manager_rob_impls2_get(this); for (; rob_impls2->task; rob_impls2++) - rob_impls2->task->DelTask(); + rob_impls2->task->del(); init_chara.clear(); load_chara.clear(); @@ -19439,7 +19441,7 @@ bool TaskRobManager::Dest() { } } -void TaskRobManager::Disp() { +void TaskRobManager::disp() { } @@ -19534,7 +19536,7 @@ void TaskRobManager::AppendLoadedCharaList(rob_chara* rob_chr) { } bool TaskRobManager::CheckCharaLoaded(rob_chara* rob_chr) { - if (!app::TaskWork::CheckTaskReady(this) + if (!app::TaskWork::check_task_ready(this) || rob_chr->chara_id < 0 || rob_chr->chara_id >= ROB_CHARA_COUNT) return false; @@ -19567,14 +19569,14 @@ void TaskRobManager::CheckTypeAppendInitCharaLists(std::list* rob_ch rob_manager_rob_impl* rob_impls1 = rob_manager_rob_impls1_get(this); for (; rob_impls1->task; rob_impls1++) { RobImplTask* task = rob_impls1->task; - if (task->CheckType(type)) + if (task->check_type(type)) task->AppendInitCharaList(i); } rob_manager_rob_impl* rob_impls2 = rob_manager_rob_impls2_get(this); for (; rob_impls2->task; rob_impls2++) { RobImplTask* task = rob_impls2->task; - if (task->CheckType(type)) + if (task->check_type(type)) task->AppendInitCharaList(i); } } @@ -19594,7 +19596,7 @@ void TaskRobManager::FreeLoadedCharaList(int8_t* chara_id) { } bool TaskRobManager::GetWait(rob_chara* rob_chr) { - if (!app::TaskWork::CheckTaskReady(this)) + if (!app::TaskWork::check_task_ready(this)) return false; int32_t chara_id = rob_chr->chara_id; @@ -19628,7 +19630,7 @@ TaskRobMotionModifier::~TaskRobMotionModifier() { } -bool TaskRobMotionModifier::Init() { +bool TaskRobMotionModifier::init() { return true; } @@ -19698,7 +19700,7 @@ static void sub_1405484A0(rob_chara* rob_chr) { return; } -bool TaskRobMotionModifier::Ctrl() { +bool TaskRobMotionModifier::ctrl() { if (pv_osage_manager_array_get_disp()) return false; @@ -19719,16 +19721,16 @@ bool TaskRobMotionModifier::Ctrl() { return false; } -bool TaskRobMotionModifier::Dest() { +bool TaskRobMotionModifier::dest() { FreeCharaLists(); return true; } -bool TaskRobMotionModifier::CheckType(rob_chara_type type) { +bool TaskRobMotionModifier::check_type(rob_chara_type type) { return type >= ROB_CHARA_TYPE_0 && type <= ROB_CHARA_TYPE_2; } -bool TaskRobMotionModifier::IsFrameDependent() { +bool TaskRobMotionModifier::is_frame_dependent() { return true; } @@ -19740,24 +19742,24 @@ TaskRobPrepareAction::~TaskRobPrepareAction() { } -bool TaskRobPrepareAction::Init() { +bool TaskRobPrepareAction::init() { return true; } -bool TaskRobPrepareAction::Ctrl() { +bool TaskRobPrepareAction::ctrl() { return false; } -bool TaskRobPrepareAction::Dest() { +bool TaskRobPrepareAction::dest() { FreeCharaLists(); return true; } -bool TaskRobPrepareAction::CheckType(rob_chara_type type) { +bool TaskRobPrepareAction::check_type(rob_chara_type type) { return type >= ROB_CHARA_TYPE_0 && type <= ROB_CHARA_TYPE_2; } -bool TaskRobPrepareAction::IsFrameDependent() { +bool TaskRobPrepareAction::is_frame_dependent() { return true; } @@ -19769,7 +19771,7 @@ TaskRobPrepareControl::~TaskRobPrepareControl() { } -bool TaskRobPrepareControl::Init() { +bool TaskRobPrepareControl::init() { return true; } @@ -19867,7 +19869,7 @@ static void sub_140548460(rob_chara* rob_chr) { rob_chr->data.field_2 &= ~0x08; } -bool TaskRobPrepareControl::Ctrl() { +bool TaskRobPrepareControl::ctrl() { if (pv_osage_manager_array_get_disp()) return false; @@ -19890,15 +19892,15 @@ bool TaskRobPrepareControl::Ctrl() { return false; } -bool TaskRobPrepareControl::Dest() { +bool TaskRobPrepareControl::dest() { FreeCharaLists(); return true; } -bool TaskRobPrepareControl::CheckType(rob_chara_type type) { +bool TaskRobPrepareControl::check_type(rob_chara_type type) { return type >= ROB_CHARA_TYPE_0 && type <= ROB_CHARA_TYPE_2; } -bool TaskRobPrepareControl::IsFrameDependent() { +bool TaskRobPrepareControl::is_frame_dependent() { return true; } diff --git a/src/CRE/rob/skin_param.cpp b/src/CRE/rob/skin_param.cpp index 548bde3b..633104ee 100644 --- a/src/CRE/rob/skin_param.cpp +++ b/src/CRE/rob/skin_param.cpp @@ -50,10 +50,10 @@ struct SkinParamManager : public app::Task { SkinParamManager(); virtual ~SkinParamManager() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; void AddFiles(); bool AddTask(std::vector& vec); @@ -225,7 +225,7 @@ void skin_param_data_free() { bool skin_param_manager_array_check_task_ready() { bool ret = false; for (int32_t i = 0; i < ROB_CHARA_COUNT; i++) - ret |= app::TaskWork::CheckTaskReady(&skin_param_manager[i]); + ret |= app::TaskWork::check_task_ready(&skin_param_manager[i]); return ret; } @@ -234,7 +234,7 @@ bool skin_param_manager_add_task(int32_t chara_id, std::vector& } bool skin_param_manager_check_task_ready(int32_t chara_id) { - return app::TaskWork::CheckTaskReady(skin_param_manager_get(chara_id)); + return app::TaskWork::check_task_ready(skin_param_manager_get(chara_id)); } std::vector* skin_param_manager_get_skin_param_file_data( @@ -683,13 +683,13 @@ SkinParamManager::~SkinParamManager() { Reset(); } -bool SkinParamManager::Init() { +bool SkinParamManager::init() { state = 0; AddFiles(); return true; } -bool SkinParamManager::Ctrl() { +bool SkinParamManager::ctrl() { switch (state) { case 0: if (CtrlFiles()) @@ -703,11 +703,11 @@ bool SkinParamManager::Ctrl() { } } -bool SkinParamManager::Dest() { +bool SkinParamManager::dest() { return true; } -void SkinParamManager::Disp() { +void SkinParamManager::disp() { } @@ -852,7 +852,7 @@ void SkinParamManager::AddFiles() { } bool SkinParamManager::AddTask(std::vector& vec) { - if (app::TaskWork::CheckTaskReady(this) || !app::TaskWork::AddTask(this, "SKIN_PARAM_MANAGER")) + if (app::TaskWork::check_task_ready(this) || !app::TaskWork::add_task(this, "SKIN_PARAM_MANAGER")) return false; osage_init.assign(vec.begin(), vec.end()); @@ -1035,7 +1035,7 @@ void SkinParamManager::Reset() { } files.clear(); - DelTask(); + del(); } sp_skp_db::sp_skp_db() : farc_list_count() { diff --git a/src/CRE/stage.cpp b/src/CRE/stage.cpp index be701602..36e60b66 100644 --- a/src/CRE/stage.cpp +++ b/src/CRE/stage.cpp @@ -67,11 +67,11 @@ stage_detail::TaskStage:: ~TaskStage() { } -bool stage_detail::TaskStage::Init() { +bool stage_detail::TaskStage::init() { return true; } -bool stage_detail::TaskStage::Ctrl() { +bool stage_detail::TaskStage::ctrl() { stage_detail::TaskStage_CtrlInner(this); for (int32_t i = 0; i < TASK_STAGE_STAGE_COUNT; i++) @@ -80,7 +80,7 @@ bool stage_detail::TaskStage::Ctrl() { return false; } -bool stage_detail::TaskStage::Dest() { +bool stage_detail::TaskStage::dest() { stage_detail::TaskStage_Unload(this); if (state) return false; @@ -88,7 +88,7 @@ bool stage_detail::TaskStage::Dest() { return true; } -void stage_detail::TaskStage::Disp() { +void stage_detail::TaskStage::disp() { if (state != 6 || !stage_display) return; @@ -236,7 +236,7 @@ void task_stage_set_stage_indices(const std::vector& stage_indices) { } bool task_stage_unload_task() { - return task_stage->DelTask(); + return task_stage->del(); } void task_stage_free() { @@ -345,14 +345,14 @@ static void stage_detail::TaskStage_Load(stage_detail::TaskStage* a1) { } static bool stage_detail::TaskStage_LoadTask(stage_detail::TaskStage* a1, const char* name) { - if (app::TaskWork::AddTask(a1, name)) { + if (app::TaskWork::add_task(a1, name)) { stage_detail::TaskStage_Reset(a1); stage_detail::TaskStage_TaskWindAppend(a1); return false; } else { - if (!app::TaskWork::HasTaskDest(a1)) - a1->DelTask(); + if (!app::TaskWork::has_task_dest(a1)) + a1->del(); return true; } } @@ -382,7 +382,7 @@ static void stage_detail::TaskStage_SetStage(stage_detail::TaskStage* a1, const } static void stage_detail::TaskStage_TaskWindAppend(stage_detail::TaskStage* a1) { - app::TaskWork::AddTask(task_wind, a1, "CHARA WIND"); + app::TaskWork::add_task(task_wind, a1, "CHARA WIND"); } static void stage_detail::TaskStage_Unload(stage_detail::TaskStage* a1) { diff --git a/src/CRE/stage.hpp b/src/CRE/stage.hpp index cd42928e..2917a894 100644 --- a/src/CRE/stage.hpp +++ b/src/CRE/stage.hpp @@ -51,10 +51,10 @@ namespace stage_detail { TaskStage(); virtual ~TaskStage() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; }; } diff --git a/src/CRE/stage_modern.cpp b/src/CRE/stage_modern.cpp index 64820976..d152535a 100644 --- a/src/CRE/stage_modern.cpp +++ b/src/CRE/stage_modern.cpp @@ -72,11 +72,11 @@ stage_detail::TaskStageModern:: ~TaskStageModern() { } -bool stage_detail::TaskStageModern::Init() { +bool stage_detail::TaskStageModern::init() { return true; } -bool stage_detail::TaskStageModern::Ctrl() { +bool stage_detail::TaskStageModern::ctrl() { stage_detail::TaskStageModern_CtrlInner(this); for (int32_t i = 0; i < TASK_STAGE_STAGE_COUNT; i++) @@ -86,7 +86,7 @@ bool stage_detail::TaskStageModern::Ctrl() { return false; } -bool stage_detail::TaskStageModern::Dest() { +bool stage_detail::TaskStageModern::dest() { stage_detail::TaskStageModern_Unload(this); if (state) return false; @@ -94,7 +94,7 @@ bool stage_detail::TaskStageModern::Dest() { return true; } -void stage_detail::TaskStageModern::Disp() { +void stage_detail::TaskStageModern::disp() { if (state != 6 || !stage_display) return; @@ -158,7 +158,7 @@ bool task_stage_modern_check_not_loaded() { } bool task_stage_modern_check_task_ready() { - return app::TaskWork::CheckTaskReady(task_stage_modern); + return app::TaskWork::check_task_ready(task_stage_modern); } void task_stage_modern_current_set_ground(bool value) { @@ -244,7 +244,7 @@ void task_stage_modern_set_stage_hashes(std::vector& stage_hashes, } bool task_stage_modern_unload_task() { - return task_stage_modern->DelTask(); + return task_stage_modern->del(); } void task_stage_modern_free() { @@ -359,14 +359,14 @@ static void stage_detail::TaskStageModern_Load(stage_detail::TaskStageModern* a1 } static bool stage_detail::TaskStageModern_LoadTask(stage_detail::TaskStageModern* a1, const char* name) { - if (app::TaskWork::AddTask(a1, name)) { + if (app::TaskWork::add_task(a1, name)) { stage_detail::TaskStageModern_Reset(a1); stage_detail::TaskStageModern_TaskWindAppend(a1); return false; } else { - if (!app::TaskWork::HasTaskDest(a1)) - a1->DelTask(); + if (!app::TaskWork::has_task_dest(a1)) + a1->del(); return true; } } @@ -398,7 +398,7 @@ static void stage_detail::TaskStageModern_SetStage( } static void stage_detail::TaskStageModern_TaskWindAppend(stage_detail::TaskStageModern* a1) { - app::TaskWork::AddTask(task_wind, a1, "CHARA WIND"); + app::TaskWork::add_task(task_wind, a1, "CHARA WIND"); } static void stage_detail::TaskStageModern_Unload(stage_detail::TaskStageModern* a1) { diff --git a/src/CRE/stage_modern.hpp b/src/CRE/stage_modern.hpp index 91b8d50b..8f7f33d1 100644 --- a/src/CRE/stage_modern.hpp +++ b/src/CRE/stage_modern.hpp @@ -55,10 +55,10 @@ namespace stage_detail { TaskStageModern(); virtual ~TaskStageModern() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; }; } diff --git a/src/CRE/task.cpp b/src/CRE/task.cpp index 1f878f48..b00092f5 100644 --- a/src/CRE/task.cpp +++ b/src/CRE/task.cpp @@ -31,27 +31,27 @@ namespace app { } - TaskInterface:: ~TaskInterface() { + TaskInterface::~TaskInterface() { } - bool TaskInterface::Init() { + bool TaskInterface::init() { return true; } - bool TaskInterface::Ctrl() { + bool TaskInterface::ctrl() { return false; } - bool TaskInterface::Dest() { + bool TaskInterface::dest() { return true; } - void TaskInterface::Disp() { + void TaskInterface::disp() { } - void TaskInterface::Basic() { + void TaskInterface::basic() { } @@ -64,8 +64,8 @@ namespace app { next_op = Task::Op::None; next_state = Task::State::None; field_2C = false; - is_frame_dependent = false; - SetName("(unknown)"); + frame_dependent = false; + set_name("(unknown)"); base_calc_time = 0; calc_time = 0; calc_time_max = 0; @@ -77,59 +77,59 @@ namespace app { } - uint32_t Task::GetCalcTime() { + uint32_t Task::get_calc_time() { return calc_time; } - uint32_t Task::GetCalcTimeMax() { + uint32_t Task::get_calc_time_max() { return calc_time_max; } - uint32_t Task::GetDispTime() { + uint32_t Task::get_disp_time() { return disp_time; } - uint32_t Task::GetDispTimeMax() { + uint32_t Task::get_disp_time_max() { return disp_time_max; } - char* Task::GetName() { + const char* Task::get_name() { return name; } - bool Task::DelTask() { - if (!TaskWork::HasTask(this) || !Task_check_request(this, Task::Request::Dest)) + bool Task::del() { + if (!TaskWork::has_task(this) || !Task_check_request(this, Task::Request::Dest)) return false; Task_set_request(this, Task::Request::Dest); return true; } - bool Task::HideTask() { - if (!TaskWork::HasTask(this) || !Task_check_request(this, Task::Request::Hide)) + bool Task::hide() { + if (!TaskWork::has_task(this) || !Task_check_request(this, Task::Request::Hide)) return false; Task_set_request(this, Task::Request::Hide); return true; } - bool Task::RunTask() { - if (!TaskWork::HasTask(this) || !Task_check_request(this, Task::Request::Run)) + bool Task::run() { + if (!TaskWork::has_task(this) || !Task_check_request(this, Task::Request::Run)) return false; Task_set_request(this, Task::Request::Run); return true; } - bool Task::SuspendTask() { - if (!TaskWork::HasTask(this) || !Task_check_request(this, Task::Request::Suspend)) + bool Task::suspend() { + if (!TaskWork::has_task(this) || !Task_check_request(this, Task::Request::Suspend)) return false; Task_set_request(this, Task::Request::Suspend); return true; } - void Task::SetName(const char* name) { + void Task::set_name(const char* name) { if (!name) { this->name[0] = 0; return; @@ -141,62 +141,62 @@ namespace app { this->name[len] = 0; } - void Task::SetPriority(int32_t priority) { + void Task::set_priority(int32_t priority) { this->priority = priority; } - TaskWork::TaskWork() : current(), disp() { + TaskWork::TaskWork() : current_task(), disp_task() { } TaskWork::~TaskWork() { for (Task* i : tasks) - i->DelTask(); + i->del(); while (tasks.size()) { - Ctrl(); - Basic(); + ctrl(); + basic(); } } - bool TaskWork::AddTask(Task* t, const char* name, int32_t priority) { - return TaskWork::AddTask(t, task_work->current, name, priority); + bool TaskWork::add_task(Task* t, const char* name, int32_t priority) { + return TaskWork::add_task(t, task_work->current_task, name, priority); } - bool TaskWork::AddTask(Task* t, Task* parent_task, const char* name, int32_t priority) { + bool TaskWork::add_task(Task* t, Task* parent_task, const char* name, int32_t priority) { Task_set_request(t, Task::Request::None); - if (TaskWork::HasTask(t) || !Task_check_request(t, Task::Request::Init)) + if (TaskWork::has_task(t) || !Task_check_request(t, Task::Request::Init)) return false; - t->SetPriority(priority); + t->set_priority(priority); t->parent_task = parent_task; t->op = Task::Op::None; t->state = Task::State::None; t->next_op = Task::Op::None; t->next_state = Task::State::None; - t->SetName(name); + t->set_name(name); Task_set_request(t, Task::Request::Init); Task_update_op_state(t); task_work->tasks.push_back(t); return true; } - void TaskWork::Basic() { + void TaskWork::basic() { for (int32_t i = 0; i < 3; i++) for (Task*& j : task_work->tasks) if (j->priority == i) Task_do_basic(j); } - bool TaskWork::CheckTaskCtrl(Task* t) { - return t && app::TaskWork::HasTask(t) && t->state == Task::State::Running && t->op == Task::Op::Ctrl; + bool TaskWork::check_task_ctrl(Task* t) { + return t && app::TaskWork::has_task(t) && t->state == Task::State::Running && t->op == Task::Op::Ctrl; } - bool TaskWork::CheckTaskReady(Task* t) { - return t && TaskWork::HasTask(t) && (t->op == Task::Op::None || t->state != Task::State::None); + bool TaskWork::check_task_ready(Task* t) { + return t && TaskWork::has_task(t) && (t->op == Task::Op::None || t->state != Task::State::None); } - void TaskWork::Ctrl() { + void TaskWork::ctrl() { for (Task*& i : task_work->tasks) { Task_update_op_state(i); Task_set_base_calc_time(i, 0); @@ -206,18 +206,18 @@ namespace app { for (std::list::iterator j = task_work->tasks.end(); j != task_work->tasks.begin(); ) { --j; Task* tsk = *j; - if (tsk->priority != i || !HasTaskDest(tsk)) + if (tsk->priority != i || !has_task_dest(tsk)) continue; time_struct t; - task_work->current = tsk; + task_work->current_task = tsk; Task_do_ctrl(tsk); - task_work->current = 0; + task_work->current_task = 0; Task_add_base_calc_time(tsk, (uint32_t)(t.calc_time() * 1000.0)); } for (std::list::iterator i = task_work->tasks.begin(); i != task_work->tasks.end(); ) { - if (TaskWork::CheckTaskReady(*i)) { + if (TaskWork::check_task_ready(*i)) { i++; continue; } @@ -235,13 +235,13 @@ namespace app { Task_set_calc_time(i); } - void TaskWork::Dest() { + void TaskWork::dest() { for (Task*& i : task_work->tasks) - i->DelTask(); + i->del(); } - void TaskWork::Disp() { - task_work->disp = true; + void TaskWork::disp() { + task_work->disp_task = true; for (int32_t i = 0; i < 3; i++) for (Task*& j : task_work->tasks) { Task* tsk = j; @@ -252,10 +252,10 @@ namespace app { Task_do_disp(tsk); Task_set_disp_time(tsk, (uint32_t)(t.calc_time() * 1000.0)); } - task_work->disp = false; + task_work->disp_task = false; } - Task* TaskWork::GetTaskByIndex(int32_t index) { + Task* TaskWork::get_task_by_index(int32_t index) { int32_t k = 0; for (int32_t i = 0; i < 3; i++) for (Task*& j : task_work->tasks) @@ -265,7 +265,7 @@ namespace app { return 0; } - bool TaskWork::HasTask(Task* t) { + bool TaskWork::has_task(Task* t) { if (!task_work->tasks.size()) return false; @@ -275,30 +275,30 @@ namespace app { return false; } - bool TaskWork::HasTaskInit(Task* t) { - if (t && TaskWork::HasTask(t)) + bool TaskWork::has_task_init(Task* t) { + if (t && TaskWork::has_task(t)) return t->op == Task::Op::Init; else return false; } - bool TaskWork::HasTaskCtrl(Task* t) { - if (t && TaskWork::HasTask(t)) + bool TaskWork::has_task_ctrl(Task* t) { + if (t && TaskWork::has_task(t)) return t->op == Task::Op::Ctrl; else return false; } - bool TaskWork::HasTaskDest(Task* t) { - if (t && TaskWork::HasTask(t)) + bool TaskWork::has_task_dest(Task* t) { + if (t && TaskWork::has_task(t)) return t->op == Task::Op::Dest; else return false; } - bool TaskWork::HasTasksDest() { + bool TaskWork::has_tasks_dest() { for (Task*& i : task_work->tasks) - if (TaskWork::HasTaskDest(i)) + if (TaskWork::has_task_dest(i)) return true; return false; } @@ -318,24 +318,24 @@ namespace app { static void Task_do_basic(Task* t) { if ((t->state == Task::State::Running || t->state == Task::State::Suspended) && t->op != Task::Op::Init && t->op != Task::Op::Dest) - t->Basic(); + t->basic(); } static void Task_do_ctrl(Task* t) { if (t->state != Task::State::Running) return; - if (t->op == Task::Op::Init && t->Init()) { + if (t->op == Task::Op::Init && t->init()) { t->next_op = Task::Op::Ctrl; t->op = Task::Op::Ctrl; } - if (t->op == Task::Op::Ctrl && t->Ctrl()) { + if (t->op == Task::Op::Ctrl && t->ctrl()) { t->next_op = Task::Op::Dest; t->op = Task::Op::Dest; } - if (t->op == Task::Op::Dest && t->Dest()) { + if (t->op == Task::Op::Dest && t->dest()) { t->next_state = Task::State::None; t->next_op = Task::Op::Max; t->request = Task::Request::None; @@ -347,9 +347,9 @@ namespace app { for (int32_t i = 0; i < 3; i++) for (Task*& j : task_work->tasks) { Task* tsk = j; - if (tsk->priority != i || TaskWork::HasTaskDest(tsk)) + if (tsk->priority != i || TaskWork::has_task_dest(tsk)) continue; - else if (tsk->is_frame_dependent) { + else if (tsk->frame_dependent) { if (frames <= 0) continue; } @@ -357,9 +357,9 @@ namespace app { continue; time_struct t; - task_work->current = tsk; + task_work->current_task = tsk; Task_do_ctrl(tsk); - task_work->current = 0; + task_work->current_task = 0; Task_add_base_calc_time(tsk, (uint32_t)(t.calc_time() * 1000.0)); } } @@ -367,7 +367,7 @@ namespace app { static void Task_do_disp(Task* t) { if ((t->state == Task::State::Running || t->state == Task::State::Suspended) && t->op != Task::Op::Init && t->op != Task::Op::Dest) - t->Disp(); + t->disp(); } static void Task_set_base_calc_time(Task* t, uint32_t value) { @@ -391,7 +391,7 @@ namespace app { } static bool Task_check_request(Task* t, Task::Request request) { - if (task_work->disp) + if (task_work->disp_task) return false; switch (request) { diff --git a/src/CRE/task.hpp b/src/CRE/task.hpp index 2734e646..ac57a2f9 100644 --- a/src/CRE/task.hpp +++ b/src/CRE/task.hpp @@ -14,11 +14,11 @@ namespace app { TaskInterface(); virtual ~TaskInterface(); - virtual bool Init(); - virtual bool Ctrl(); - virtual bool Dest(); - virtual void Disp(); - virtual void Basic(); + virtual bool init(); + virtual bool ctrl(); + virtual bool dest(); + virtual void disp(); + virtual void basic(); }; class Task : public TaskInterface { @@ -55,7 +55,7 @@ namespace app { Op next_op; State next_state; bool field_2C; - bool is_frame_dependent; + bool frame_dependent; char name[32]; uint32_t base_calc_time; uint32_t calc_time; @@ -66,19 +66,19 @@ namespace app { Task(); virtual ~Task() override; - uint32_t GetCalcTime(); - uint32_t GetCalcTimeMax(); - uint32_t GetDispTime(); - uint32_t GetDispTimeMax(); - char* GetName(); + uint32_t get_calc_time(); + uint32_t get_calc_time_max(); + uint32_t get_disp_time(); + uint32_t get_disp_time_max(); + const char* get_name(); - bool DelTask(); - bool HideTask(); - bool RunTask(); - bool SuspendTask(); + bool del(); + bool hide(); + bool run(); + bool suspend(); - void SetName(const char* name); - void SetPriority(int32_t priority); + void set_name(const char* name); + void set_priority(int32_t priority); }; struct TaskWork; @@ -87,28 +87,28 @@ namespace app { struct TaskWork { std::list tasks; - Task* current; - bool disp; + Task* current_task; + bool disp_task; TaskWork(); ~TaskWork(); - static bool AddTask(Task* t, + static bool add_task(Task* t, const char* name = "(unknown)", int32_t priority = 1); - static bool AddTask(Task* t, Task* parent_task, + static bool add_task(Task* t, Task* parent_task, const char* name = "(unknown)", int32_t priority = 1); - static void Basic(); - static bool CheckTaskCtrl(Task* t); - static bool CheckTaskReady(Task* t); - static void Ctrl(); - static void Dest(); - static void Disp(); - static Task* GetTaskByIndex(int32_t index); - static bool HasTask(Task* t); - static bool HasTaskInit(Task* t); - static bool HasTaskCtrl(Task* t); - static bool HasTaskDest(Task* t); - static bool HasTasksDest(); + static void basic(); + static bool check_task_ctrl(Task* t); + static bool check_task_ready(Task* t); + static void ctrl(); + static void dest(); + static void disp(); + static Task* get_task_by_index(int32_t index); + static bool has_task(Task* t); + static bool has_task_init(Task* t); + static bool has_task_ctrl(Task* t); + static bool has_task_dest(Task* t); + static bool has_tasks_dest(); }; extern void task_work_init(); diff --git a/src/CRE/task_effect.cpp b/src/CRE/task_effect.cpp index 65d033c6..1cc2b1bc 100644 --- a/src/CRE/task_effect.cpp +++ b/src/CRE/task_effect.cpp @@ -29,25 +29,25 @@ public: TaskEffect(); virtual ~TaskEffect() override; - virtual void PreInit(int32_t stage_index); - virtual void SetStageHashes(std::vector& stage_hashes, void* data, + virtual void pre_init(int32_t stage_index); + virtual void set_stage_hashes(std::vector& stage_hashes, void* data, object_database* obj_db, texture_database* tex_db, stage_database* stage_data); // Added - virtual void SetStageIndices(std::vector& stage_indices); - virtual void SetFrame(int32_t value); - virtual void Field_48(); - virtual void SetEnable(bool value); - virtual void SetCurrentStageHash(uint32_t value); // Added - virtual void SetCurrentStageIndex(int32_t value); - virtual void SetFrameRateControl(FrameRateControl* value = 0); - virtual void Field_68(); - virtual void Reset(); - virtual void Event(int32_t event_type, void* data); - virtual void Field_80(); - virtual void Field_88(); - virtual void Field_90(); - virtual void Field_98(int32_t a2, int32_t* a3); - virtual void Field_A0(int32_t a2, int32_t* a3); - virtual void Field_A8(int32_t a2, int8_t* a3); + virtual void set_stage_indices(std::vector& stage_indices); + virtual void set_frame(int32_t value); + virtual void field_48(); + virtual void set_enable(bool value); + virtual void set_current_stage_hash(uint32_t value); // Added + virtual void set_current_stage_index(int32_t value); + virtual void set_frame_rate_control(FrameRateControl* value = 0); + virtual void field_68(); + virtual void reset(); + virtual void event(int32_t event_type, void* data); + virtual void field_80(); + virtual void field_88(); + virtual void field_90(); + virtual void field_98(int32_t a2, int32_t* a3); + virtual void field_A0(int32_t a2, int32_t* a3); + virtual void field_A8(int32_t a2, int8_t* a3); }; struct struc_621 { @@ -84,24 +84,24 @@ public: TaskEffectAuth3D(); virtual ~TaskEffectAuth3D() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; - virtual void PreInit(int32_t stage_index) override; - virtual void SetStageHashes(std::vector& stage_hashes, void* data, + virtual void pre_init(int32_t stage_index) override; + virtual void set_stage_hashes(std::vector& stage_hashes, void* data, object_database* obj_db, texture_database* tex_db, stage_database* stage_data) override; // Added - virtual void SetStageIndices(std::vector& stage_indices) override; - virtual void SetFrame(int32_t value) override; - virtual void SetEnable(bool value) override; - virtual void SetCurrentStageHash(uint32_t value) override; // Added - virtual void SetCurrentStageIndex(int32_t value) override; - virtual void SetFrameRateControl(FrameRateControl* value = 0) override; - virtual void Reset() override; + virtual void set_stage_indices(std::vector& stage_indices) override; + virtual void set_frame(int32_t value) override; + virtual void set_enable(bool value) override; + virtual void set_current_stage_hash(uint32_t value) override; // Added + virtual void set_current_stage_index(int32_t value) override; + virtual void set_frame_rate_control(FrameRateControl* value = 0) override; + virtual void reset() override; - void ResetData(); - void SetVisibility(bool value); + void reset_data(); + void set_visibility(bool value); }; struct TaskEffectFogAnim : public TaskEffect { @@ -120,20 +120,20 @@ public: Data(); - void Ctrl(); - void Reset(); + void ctrl(); + void reset(); } data; TaskEffectFogAnim(); virtual ~TaskEffectFogAnim() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; - virtual void PreInit(int32_t stage_index) override; - virtual void Reset() override; + virtual void pre_init(int32_t stage_index) override; + virtual void reset() override; }; struct fog_ring_data { @@ -192,7 +192,7 @@ public: struc_371 field_128[10]; int8_t field_2B8; int8_t field_2B9; - bool disp; + bool display; int32_t current_stage_index; std::vector stage_indices; FrameRateControl* frame_rate_control; @@ -201,19 +201,19 @@ public: Data(); ~Data(); - void CalcPtcl(float_t delta_time); - void CalcVert(); - void Ctrl(); - void CtrlInner(float_t delta_time); - void Dest(); - void Disp(); - void Draw(); - void InitParticleData(); - void Reset(); - void SetStageIndices(std::vector& stage_indices); + void calc_ptcl(float_t delta_time); + void calc_vert(); + void ctrl(); + void ctrl_inner(float_t delta_time); + void dest(); + void disp(); + void draw(); + void init_particle_data(); + void reset(); + void set_stage_indices(std::vector& stage_indices); - static void DrawStatic(void* data); - static float_t PtclRandom(float_t value); + static void draw_static(void* data); + static float_t ptcl_random(float_t value); void sub_140347B40(float_t delta_time); @@ -223,17 +223,17 @@ public: TaskEffectFogRing(); virtual ~TaskEffectFogRing() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; - virtual void PreInit(int32_t stage_index) override; - virtual void SetStageIndices(std::vector& stage_indices) override; - virtual void SetEnable(bool value) override; - virtual void SetCurrentStageIndex(int32_t value) override; - virtual void SetFrameRateControl(FrameRateControl* value = 0) override; - virtual void Reset() override; + virtual void pre_init(int32_t stage_index) override; + virtual void set_stage_indices(std::vector& stage_indices) override; + virtual void set_enable(bool value) override; + virtual void set_current_stage_index(int32_t value) override; + virtual void set_frame_rate_control(FrameRateControl* value = 0) override; + virtual void reset() override; }; struct TaskEffectLeaf : public TaskEffect { @@ -246,17 +246,17 @@ public: TaskEffectLeaf(); virtual ~TaskEffectLeaf() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; - virtual void PreInit(int32_t stage_index) override; - virtual void SetStageIndices(std::vector& stage_indices) override; - virtual void SetEnable(bool value) override; - virtual void SetCurrentStageIndex(int32_t value) override; - virtual void SetFrameRateControl(FrameRateControl* value = 0) override; - virtual void Reset() override; + virtual void pre_init(int32_t stage_index) override; + virtual void set_stage_indices(std::vector& stage_indices) override; + virtual void set_enable(bool value) override; + virtual void set_current_stage_index(int32_t value) override; + virtual void set_frame_rate_control(FrameRateControl* value = 0) override; + virtual void reset() override; }; struct TaskEffectLitproj : public TaskEffect { @@ -271,16 +271,16 @@ public: TaskEffectLitproj(); virtual ~TaskEffectLitproj() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; - virtual void PreInit(int32_t stage_index) override; - virtual void SetStageIndices(std::vector& stage_indices) override; - virtual void SetEnable(bool value) override; - virtual void SetCurrentStageIndex(int32_t value) override; - virtual void Reset() override; + virtual void pre_init(int32_t stage_index) override; + virtual void set_stage_indices(std::vector& stage_indices) override; + virtual void set_enable(bool value) override; + virtual void set_current_stage_index(int32_t value) override; + virtual void reset() override; }; struct TaskEffectParticle : public TaskEffect { @@ -291,16 +291,16 @@ public: TaskEffectParticle(); virtual ~TaskEffectParticle() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; - virtual void PreInit(int32_t stage_index) override; - virtual void SetEnable(bool value) override; - virtual void SetFrameRateControl(FrameRateControl* value = 0) override; - virtual void Reset() override; - virtual void Event(int32_t event_type, void* data) override; + virtual void pre_init(int32_t stage_index) override; + virtual void set_enable(bool value) override; + virtual void set_frame_rate_control(FrameRateControl* value = 0) override; + virtual void reset() override; + virtual void event(int32_t event_type, void* data) override; }; struct TaskEffectRain : public TaskEffect { @@ -312,20 +312,20 @@ public: TaskEffectRain(); virtual ~TaskEffectRain() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; - virtual void PreInit(int32_t stage_index) override; - virtual void SetStageIndices(std::vector& stage_indices) override; - virtual void SetEnable(bool value) override; - virtual void SetCurrentStageIndex(int32_t value) override; - virtual void SetFrameRateControl(FrameRateControl* value = 0) override; - virtual void Reset() override; + virtual void pre_init(int32_t stage_index) override; + virtual void set_stage_indices(std::vector& stage_indices) override; + virtual void set_enable(bool value) override; + virtual void set_current_stage_index(int32_t value) override; + virtual void set_frame_rate_control(FrameRateControl* value = 0) override; + virtual void reset() override; }; -struct struc_101 { +struct ripple_struct { int32_t ripple_uniform; int32_t ripple_emit_uniform; int32_t count; @@ -336,7 +336,7 @@ struct struc_101 { }; struct ripple_emit_draw_data { - struc_101 data; + ripple_struct data; vec3 vertex[16]; color4u8 color[16]; @@ -402,7 +402,7 @@ struct ripple_emit { ripple_emit(); ~ripple_emit(); - void add_draw_ripple_emit(struc_101* data); + void add_draw_ripple_emit(ripple_struct* data); void clear_tex(); void ctrl(); void dest(); @@ -417,7 +417,7 @@ struct ripple_emit { void sub_1403584A0(RenderTexture* rt); void sub_140358690(); - void sub_1403587C0(const vec3 a2, const vec3 a3, float_t a4, struc_101& a5, struc_101& a6); + void sub_1403587C0(const vec3 a2, const vec3 a3, float_t a4, ripple_struct& a5, ripple_struct& a6); void sub_14035AAE0(); void sub_14035AED0(); }; @@ -431,16 +431,16 @@ public: TaskEffectRipple(); virtual ~TaskEffectRipple() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; - virtual void PreInit(int32_t stage_index) override; - virtual void SetStageIndices(std::vector& stage_indices) override; - virtual void SetCurrentStageIndex(int32_t value) override; - virtual void SetFrameRateControl(FrameRateControl* value = 0) override; - virtual void Reset() override; + virtual void pre_init(int32_t stage_index) override; + virtual void set_stage_indices(std::vector& stage_indices) override; + virtual void set_current_stage_index(int32_t value) override; + virtual void set_frame_rate_control(FrameRateControl* value = 0) override; + virtual void reset() override; }; struct TaskEffectSnow : public TaskEffect { @@ -452,46 +452,56 @@ public: TaskEffectSnow(); virtual ~TaskEffectSnow() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; - virtual void Basic() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; + virtual void basic() override; - virtual void PreInit(int32_t stage_index) override; - virtual void SetStageIndices(std::vector& stage_indices) override; - virtual void SetEnable(bool value) override; - virtual void SetCurrentStageIndex(int32_t value) override; - virtual void SetFrameRateControl(FrameRateControl* value = 0) override; - virtual void Reset() override; + virtual void pre_init(int32_t stage_index) override; + virtual void set_stage_indices(std::vector& stage_indices) override; + virtual void set_enable(bool value) override; + virtual void set_current_stage_index(int32_t value) override; + virtual void set_frame_rate_control(FrameRateControl* value = 0) override; + virtual void reset() override; }; -struct struc_180 { - uint32_t count; - int32_t field_4; - int64_t field_8; - int64_t field_10; - int64_t field_18; - int32_t field_20; - int64_t field_28; - int64_t field_30; - int64_t field_38; +struct splash_particle_data { + vec3 position; + vec3 direction; + float_t field_18; + float_t life_time; + float_t field_20; + int32_t index; + int32_t field_28; + float_t field_2C; +}; + +struct splash_particle { + int32_t count; + int32_t alive; + std::vector data; + int32_t dead; + std::vector available; + + splash_particle(); + ~splash_particle(); }; struct ParticleEmitter { - struc_180* field_8; - int64_t field_10; - int64_t field_18; + splash_particle* splash; + vec3 trans; + int field_1C; float_t field_20; - int32_t field_24; + int field_24; float_t field_28; float_t particle_size; ParticleEmitter(); virtual ~ParticleEmitter(); - virtual bool Field_8(); - virtual bool Field_10(); + virtual bool field_8(); + virtual bool field_10(); }; struct ParticleEmitterRob : ParticleEmitter { @@ -515,16 +525,17 @@ struct ParticleEmitterRob : ParticleEmitter { }; struct water_particle { - struc_180* field_0; + splash_particle* splash; vec4 color; float_t particle_size; - std::vector field_20; + int32_t splash_count; + std::vector ptcl_data; int32_t count; int32_t tex_id; bool blink; - std::vector field_48; - std::vector field_60; - struc_101 field_78; + std::vector position_data; + std::vector color_data; + ripple_struct ripple; float_t ripple_emission; water_particle(); @@ -532,8 +543,8 @@ struct water_particle { }; struct ParticleDispObj { - struc_180* field_8; - object_info object; + splash_particle* splash; + object_info obj_info; std::vector instances_mat; ParticleDispObj(); @@ -547,13 +558,13 @@ public: struct Data { struct Sub { int32_t field_0; - struc_180* field_8; + splash_particle* field_8; int32_t field_10; ParticleEmitterRob* field_18; int32_t field_20; water_particle* field_28; int8_t field_30; - struc_180 field_38; + splash_particle field_38; int32_t field_78; ParticleEmitterRob* field_80; ParticleDispObj field_88; @@ -589,27 +600,27 @@ public: TaskEffectSplash(); virtual ~TaskEffectSplash() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; - virtual void Basic() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; + virtual void basic() override; - virtual void PreInit(int32_t stage_index) override; - virtual void SetStageIndices(std::vector& stage_indices) override; - virtual void SetFrame(int32_t value) override; - virtual void Field_48() override; - virtual void SetEnable(bool value) override; - virtual void SetCurrentStageIndex(int32_t value) override; - virtual void SetFrameRateControl(FrameRateControl* value = 0) override; - virtual void Field_68() override; - virtual void Reset() override; - virtual void Field_80() override; - virtual void Field_88() override; - virtual void Field_90() override; - virtual void Field_98(int32_t a2, int32_t* a3) override; - virtual void Field_A0(int32_t a2, int32_t* a3) override; - virtual void Field_A8(int32_t a2, int8_t* a3) override; + virtual void pre_init(int32_t stage_index) override; + virtual void set_stage_indices(std::vector& stage_indices) override; + virtual void set_frame(int32_t value) override; + virtual void field_48() override; + virtual void set_enable(bool value) override; + virtual void set_current_stage_index(int32_t value) override; + virtual void set_frame_rate_control(FrameRateControl* value = 0) override; + virtual void field_68() override; + virtual void reset() override; + virtual void field_80() override; + virtual void field_88() override; + virtual void field_90() override; + virtual void field_98(int32_t a2, int32_t* a3) override; + virtual void field_A0(int32_t a2, int32_t* a3) override; + virtual void field_A8(int32_t a2, int8_t* a3) override; }; struct TaskEffectStar : public TaskEffect { @@ -622,16 +633,16 @@ public: TaskEffectStar(); virtual ~TaskEffectStar() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; - virtual void SetStageIndices(std::vector& stage_indices) override; - virtual void SetEnable(bool value) override; - virtual void SetCurrentStageIndex(int32_t value) override; - virtual void SetFrameRateControl(FrameRateControl* value = 0) override; - virtual void Reset() override; + virtual void set_stage_indices(std::vector& stage_indices) override; + virtual void set_enable(bool value) override; + virtual void set_current_stage_index(int32_t value) override; + virtual void set_frame_rate_control(FrameRateControl* value = 0) override; + virtual void reset() override; }; struct for_ring_vertex_data { @@ -874,21 +885,21 @@ struct TaskEffectParent { TaskEffectParent(); virtual ~TaskEffectParent(); - std::pair AddTaskEffectTypePtr(TaskEffectType type); - int32_t CheckTaskEffectTypeLoaded(TaskEffectType type); - void Event(TaskEffectType type, int32_t event_type, void* data); - void Dest(); - bool Load(); - void Reset(); - void ResetData(); - void SetCurrentStageHash(uint32_t stage_hash); // Added - void SetCurrentStageIndex(int32_t stage_index); - void SetEnable(bool value); - void SetFrame(int32_t value); - void SetFrameRateControl(FrameRateControl* value); - void SetStageHashes(std::vector& stage_hashes); // Added - void SetStageIndices(std::vector& stage_indices); - bool Unload(); + std::pair add_effect(TaskEffectType type); + int32_t check_effect_loaded(TaskEffectType type); + void event(TaskEffectType type, int32_t event_type, void* data); + void dest(); + bool load(); + void reset(); + void reset_data(); + void set_current_stage_hash(uint32_t stage_hash); // Added + void set_current_stage_index(int32_t stage_index); + void set_enable(bool value); + void set_frame(int32_t value); + void set_frame_rate_control(FrameRateControl* value); + void set_stage_hashes(std::vector& stage_hashes); // Added + void set_stage_indices(std::vector& stage_indices); + bool unload(); }; static TaskEffectAuth3D* task_effect_auth_3d; @@ -1053,7 +1064,7 @@ static bool task_effect_array_parse_stage_param_data_star(stage_param_star* star static void draw_fog_particle(render_context* rctx, TaskEffectFogRing::Data* data); -static void draw_ripple_emit(render_context* rctx, struc_101* data); +static void draw_ripple_emit(render_context* rctx, ripple_struct* data); static void leaf_particle_init(bool change_stage = false); static void leaf_particle_ctrl(); @@ -1459,27 +1470,27 @@ void task_effect_free() { } void task_effect_parent_event(TaskEffectType type, int32_t event_type, void* data) { - task_effect_parent->Event(type, event_type, data); + task_effect_parent->event(type, event_type, data); } void task_effect_parent_dest() { - task_effect_parent->Dest(); + task_effect_parent->dest(); } bool task_effect_parent_load() { - return task_effect_parent->Load(); + return task_effect_parent->load(); } void task_effect_parent_reset() { - task_effect_parent->Reset(); + task_effect_parent->reset(); } void task_effect_parent_set_current_stage_hash(uint32_t stage_hash) { - task_effect_parent->SetCurrentStageHash(stage_hash); + task_effect_parent->set_current_stage_hash(stage_hash); } void task_effect_parent_set_current_stage_index(int32_t stage_index) { - task_effect_parent->SetCurrentStageIndex(stage_index); + task_effect_parent->set_current_stage_index(stage_index); } void task_effect_parent_set_data(void* data, @@ -1491,27 +1502,27 @@ void task_effect_parent_set_data(void* data, } void task_effect_parent_set_enable(bool value) { - task_effect_parent->SetEnable(value); + task_effect_parent->set_enable(value); } void task_effect_parent_set_frame(int32_t value) { - task_effect_parent->SetFrame(value); + task_effect_parent->set_frame(value); } void task_effect_parent_set_frame_rate_control(FrameRateControl* value) { - task_effect_parent->SetFrameRateControl(value); + task_effect_parent->set_frame_rate_control(value); } void task_effect_parent_set_stage_hashes(std::vector& stage_hashes) { - task_effect_parent->SetStageHashes(stage_hashes); + task_effect_parent->set_stage_hashes(stage_hashes); } void task_effect_parent_set_stage_indices(std::vector& stage_indices) { - task_effect_parent->SetStageIndices(stage_indices); + task_effect_parent->set_stage_indices(stage_indices); } bool task_effect_parent_unload() { - return task_effect_parent->Unload(); + return task_effect_parent->unload(); } TaskEffect::TaskEffect() { @@ -1522,78 +1533,78 @@ TaskEffect::~TaskEffect() { } -void TaskEffect::PreInit(int32_t stage_index) { +void TaskEffect::pre_init(int32_t stage_index) { } -void TaskEffect::SetStageHashes(std::vector& stage_hashes, void* data, +void TaskEffect::set_stage_hashes(std::vector& stage_hashes, void* data, object_database* obj_db, texture_database* tex_db, stage_database* stage_data) { } -void TaskEffect::SetStageIndices(std::vector& stage_indices) { - PreInit(stage_indices[0]); +void TaskEffect::set_stage_indices(std::vector& stage_indices) { + pre_init(stage_indices[0]); } -void TaskEffect::SetFrame(int32_t value) { +void TaskEffect::set_frame(int32_t value) { } -void TaskEffect::Field_48() { +void TaskEffect::field_48() { } -void TaskEffect::SetEnable(bool value) { +void TaskEffect::set_enable(bool value) { } -void TaskEffect::SetCurrentStageHash(uint32_t value) { +void TaskEffect::set_current_stage_hash(uint32_t value) { } -void TaskEffect::SetCurrentStageIndex(int32_t value) { +void TaskEffect::set_current_stage_index(int32_t value) { } -void TaskEffect::SetFrameRateControl(FrameRateControl* value) { +void TaskEffect::set_frame_rate_control(FrameRateControl* value) { } -void TaskEffect::Field_68() { +void TaskEffect::field_68() { } -void TaskEffect::Reset() { +void TaskEffect::reset() { } -void TaskEffect::Event(int32_t event_type, void* data) { +void TaskEffect::event(int32_t event_type, void* data) { } -void TaskEffect::Field_80() { +void TaskEffect::field_80() { } -void TaskEffect::Field_88() { +void TaskEffect::field_88() { } -void TaskEffect::Field_90() { +void TaskEffect::field_90() { } -void TaskEffect::Field_98(int32_t a2, int32_t* a3) { +void TaskEffect::field_98(int32_t a2, int32_t* a3) { if (a3) *a3 = 0; } -void TaskEffect::Field_A0(int32_t a2, int32_t* a3) { +void TaskEffect::field_A0(int32_t a2, int32_t* a3) { if (a3) *a3 = 0; } -void TaskEffect::Field_A8(int32_t a2, int8_t* a3) { +void TaskEffect::field_A8(int32_t a2, int8_t* a3) { if (a3) *a3 = 0; } @@ -1625,9 +1636,9 @@ TaskEffectAuth3D::~TaskEffectAuth3D() { } -bool TaskEffectAuth3D::Init() { +bool TaskEffectAuth3D::init() { if (!task_auth_3d_check_task_ready()) { - DelTask(); + del(); return true; } @@ -1649,7 +1660,7 @@ bool TaskEffectAuth3D::Init() { return true; } -bool TaskEffectAuth3D::Ctrl() { +bool TaskEffectAuth3D::ctrl() { if (field_158 && field_15C > 0) field_15C = 0; @@ -1675,22 +1686,22 @@ bool TaskEffectAuth3D::Ctrl() { return false; } -bool TaskEffectAuth3D::Dest() { +bool TaskEffectAuth3D::dest() { //if (field_158) // sub_14036D1E0(2, (__int64)sub_140345B70, (__int64)this); - ResetData(); + reset_data(); return true; } -void TaskEffectAuth3D::Disp() { +void TaskEffectAuth3D::disp() { } -void TaskEffectAuth3D::PreInit(int32_t stage_index) { +void TaskEffectAuth3D::pre_init(int32_t stage_index) { } -void TaskEffectAuth3D::SetStageHashes(std::vector& stage_hashes, void* data, +void TaskEffectAuth3D::set_stage_hashes(std::vector& stage_hashes, void* data, object_database* obj_db, texture_database* tex_db, stage_database* stage_data) { this->stage_hashes.assign(stage_hashes.begin(), stage_hashes.end()); stage_indices.clear(); @@ -1722,7 +1733,7 @@ void TaskEffectAuth3D::SetStageHashes(std::vector& stage_hashes, void* } } -void TaskEffectAuth3D::SetStageIndices(std::vector& stage_indices) { +void TaskEffectAuth3D::set_stage_indices(std::vector& stage_indices) { stage_hashes.clear(); this->stage_indices.assign(stage_indices.begin(), stage_indices.end()); for (int32_t i : this->stage_indices) { @@ -1757,7 +1768,7 @@ void TaskEffectAuth3D::SetStageIndices(std::vector& stage_indices) { } } -void TaskEffectAuth3D::SetFrame(int32_t value) { +void TaskEffectAuth3D::set_frame(int32_t value) { double_t frame = (double_t)value; for (int32_t i = 0; i < stage.count; i++) { auth_3d_id& id = stage.auth_3d_ids_ptr[i]; @@ -1771,32 +1782,32 @@ void TaskEffectAuth3D::SetFrame(int32_t value) { } } -void TaskEffectAuth3D::SetCurrentStageHash(uint32_t value) { +void TaskEffectAuth3D::set_current_stage_hash(uint32_t value) { if (current_stage_hash == value) return; - SetVisibility(false); + set_visibility(false); current_stage_hash = value; - SetVisibility(enable); + set_visibility(enable); } -void TaskEffectAuth3D::SetCurrentStageIndex(int32_t value) { +void TaskEffectAuth3D::set_current_stage_index(int32_t value) { if (current_stage_index == value) return; - SetVisibility(false); + set_visibility(false); current_stage_index = value; - SetVisibility(enable); + set_visibility(enable); } -void TaskEffectAuth3D::SetFrameRateControl(FrameRateControl* value) { +void TaskEffectAuth3D::set_frame_rate_control(FrameRateControl* value) { for (int32_t i = 0; i < stage.count; i++) { auth_3d_id& id = stage.auth_3d_ids_ptr[i]; id.set_frame_rate(value); } } -void TaskEffectAuth3D::Reset() { +void TaskEffectAuth3D::reset() { for (int32_t i = 0; i < stage.count; i++) { auth_3d_id& id = stage.auth_3d_ids_ptr[i]; id.set_enable(true); @@ -1805,7 +1816,7 @@ void TaskEffectAuth3D::Reset() { } } -void TaskEffectAuth3D::ResetData() { +void TaskEffectAuth3D::reset_data() { for (int32_t i = 0; i < stage.count; i++) { auth_3d_id& id = stage.auth_3d_ids_ptr[i]; id.unload(rctx_ptr); @@ -1823,7 +1834,7 @@ void TaskEffectAuth3D::ResetData() { frame = -1.0f; } -void TaskEffectAuth3D::SetVisibility(bool value) { +void TaskEffectAuth3D::set_visibility(bool value) { if (current_stage_index != -1) for (struc_621& i : field_120) { if (i.stage_index != current_stage_index) @@ -1845,17 +1856,17 @@ void TaskEffectAuth3D::SetVisibility(bool value) { } } -void TaskEffectAuth3D::SetEnable(bool value) { +void TaskEffectAuth3D::set_enable(bool value) { enable = value; - SetVisibility(value); + set_visibility(value); } TaskEffectFogAnim::Data::Data() : field_0(), field_4(), field_8(), field_C(), field_18(), field_24(), field_28(), field_2C(), field_30(), field_34() { - Reset(); + reset(); } -void TaskEffectFogAnim::Data::Ctrl() { +void TaskEffectFogAnim::Data::ctrl() { if (!field_0 || !field_8) return; @@ -1891,7 +1902,7 @@ void TaskEffectFogAnim::Data::Ctrl() { light_set.lights[LIGHT_STAGE].set_specular(color); } -void TaskEffectFogAnim::Data::Reset() { +void TaskEffectFogAnim::Data::reset() { field_0 = 0; field_4 = -1; field_8 = 1; @@ -1916,34 +1927,34 @@ TaskEffectFogAnim::~TaskEffectFogAnim() { } -bool TaskEffectFogAnim::Init() { +bool TaskEffectFogAnim::init() { //sub_1400DE640("TaskEffectFogAnim::init()\n"); return true; } -bool TaskEffectFogAnim::Ctrl() { - data.Ctrl(); +bool TaskEffectFogAnim::ctrl() { + data.ctrl(); return false; } -bool TaskEffectFogAnim::Dest() { - data.Reset(); +bool TaskEffectFogAnim::dest() { + data.reset(); task_effect_fog_anim_data = 0; //sub_1400DE640("TaskEffectFogAnim::dest()\n"); return true; } -void TaskEffectFogAnim::Disp() { +void TaskEffectFogAnim::disp() { } -void TaskEffectFogAnim::PreInit(int32_t) { - data.Reset(); +void TaskEffectFogAnim::pre_init(int32_t) { + data.reset(); task_effect_fog_anim_data = &data; //sub_1400DE640("TaskEffectFogAnim::pre_init()\n"); } -void TaskEffectFogAnim::Reset() { +void TaskEffectFogAnim::reset() { if (data.field_0) { data.field_C[0] = 0.0f; data.field_C[1] = 0.0f; @@ -1965,7 +1976,7 @@ struc_573::struc_573() : chara_index(), bone_index() { TaskEffectFogRing::Data::Data() : enable(), delta_frame(), field_8(), ring_size(), tex_id(), ptcl_size(), max_ptcls(), num_ptcls(), density(), density_offset(), ptcl_data(), num_vtx(), -field_124(), field_2B8(), field_2B9(), disp(), frame_rate_control() { +field_124(), field_2B8(), field_2B9(), display(), frame_rate_control() { current_stage_index = -1; } @@ -1973,7 +1984,7 @@ TaskEffectFogRing::Data::~Data() { } -void TaskEffectFogRing::Data::CalcPtcl(float_t delta_time) { +void TaskEffectFogRing::Data::calc_ptcl(float_t delta_time) { float_t delta_time1 = 1.0f * delta_time; float_t delta_time2 = 2.0f * delta_time; float_t delta_time3 = 3.0f * delta_time; @@ -2035,7 +2046,7 @@ void TaskEffectFogRing::Data::CalcPtcl(float_t delta_time) { } } -void TaskEffectFogRing::Data::CalcVert() { +void TaskEffectFogRing::Data::calc_vert() { float_t density = this->density; fog_ring_data* ptcl_data = this->ptcl_data; @@ -2064,24 +2075,24 @@ void TaskEffectFogRing::Data::CalcVert() { num_vtx = (int32_t)(num_ptcls * 6LL); } -void TaskEffectFogRing::Data::Ctrl() { - if (!disp) +void TaskEffectFogRing::Data::ctrl() { + if (!display) return; - CtrlInner(delta_frame * (float_t)(1.0 / 60.0)); - CalcVert(); + ctrl_inner(delta_frame * (float_t)(1.0 / 60.0)); + calc_vert(); field_8 = 0; } -void TaskEffectFogRing::Data::CtrlInner(float_t delta_time) { +void TaskEffectFogRing::Data::ctrl_inner(float_t delta_time) { if (fabsf(delta_time) <= 0.000001f) return; sub_140347B40(delta_time); - CalcPtcl(delta_time); + calc_ptcl(delta_time); } -void TaskEffectFogRing::Data::Dest() { +void TaskEffectFogRing::Data::dest() { stage_param_data_fog_ring_storage_clear(); if (ptcl_data) { @@ -2096,17 +2107,17 @@ void TaskEffectFogRing::Data::Dest() { rctx_ptr->draw_state->set_fog_height(false); } -void TaskEffectFogRing::Data::Disp() { - if (enable && disp) +void TaskEffectFogRing::Data::disp() { + if (enable && display) rctx_ptr->disp_manager->entry_obj_user(&mat4_identity, (mdl::UserArgsFunc)draw_fog_particle, this, mdl::OBJ_TYPE_USER); } -void TaskEffectFogRing::Data::Draw() { +void TaskEffectFogRing::Data::draw() { render_context* rctx = rctx_ptr; rctx->draw_state->set_fog_height(false); - if (!enable || !disp) + if (!enable || !display) return; rctx->draw_state->set_fog_height(true); @@ -2124,7 +2135,7 @@ void TaskEffectFogRing::Data::Draw() { gl_state_get_error(); } -void TaskEffectFogRing::Data::InitParticleData() { +void TaskEffectFogRing::Data::init_particle_data() { fog_ring_data* ptcl_data = this->ptcl_data; if (!ptcl_data) return; @@ -2134,11 +2145,11 @@ void TaskEffectFogRing::Data::InitParticleData() { float_t wind_dir_x = wind_dir.x; float_t wind_dir_z = wind_dir.z; for (int32_t i = max_ptcls; i > 0; i--, ptcl_data++) { - float_t pos_x = PtclRandom(ring_size); - float_t pos_z = PtclRandom(ring_size); - float_t dir_x = PtclRandom(0.5f) + wind_dir_x; - float_t dir_z = PtclRandom(0.5f) + wind_dir_z; - float_t size = PtclRandom(3.0f); + float_t pos_x = ptcl_random(ring_size); + float_t pos_z = ptcl_random(ring_size); + float_t dir_x = ptcl_random(0.5f) + wind_dir_x; + float_t dir_z = ptcl_random(0.5f) + wind_dir_z; + float_t size = ptcl_random(3.0f); ptcl_data->position.x = pos_x; ptcl_data->position.y = 0.5f; @@ -2151,7 +2162,7 @@ void TaskEffectFogRing::Data::InitParticleData() { } } -void TaskEffectFogRing::Data::Reset() { +void TaskEffectFogRing::Data::reset() { struc_573(*v2)[5] = field_5C; for (int32_t i = 0; i < 2; i++, v2++) { struc_573* v3 = *v2; @@ -2161,14 +2172,14 @@ void TaskEffectFogRing::Data::Reset() { } } - InitParticleData(); + init_particle_data(); field_8 = true; } -void TaskEffectFogRing::Data::SetStageIndices(std::vector& stage_indices) { +void TaskEffectFogRing::Data::set_stage_indices(std::vector& stage_indices) { rctx_ptr->render_manager->clear_pre_process(0); rctx_ptr->render_manager->set_pass_sw(rndr::RND_PASSID_PRE_PROCESS, false); - disp = false; + display = false; current_stage_index = -1; this->stage_indices.clear(); stage_param_data_fog_ring_storage_clear(); @@ -2197,7 +2208,7 @@ void TaskEffectFogRing::Data::SetStageIndices(std::vector& stage_indice if (!fog_ring) return; - disp = true; + display = true; enable = true; ring_size = fog_ring->ring_size; wind_dir = fog_ring->wind_dir; @@ -2247,17 +2258,17 @@ void TaskEffectFogRing::Data::SetStageIndices(std::vector& stage_indice ssbo.Create(sizeof(for_ring_vertex_data) * max_ptcls); - InitParticleData(); + init_particle_data(); rctx_ptr->render_manager->set_pass_sw(rndr::RND_PASSID_PRE_PROCESS, true); - rctx_ptr->render_manager->add_pre_process(0, TaskEffectFogRing::Data::DrawStatic, this); + rctx_ptr->render_manager->add_pre_process(0, TaskEffectFogRing::Data::draw_static, this); } -void TaskEffectFogRing::Data::DrawStatic(void* data) { - ((TaskEffectFogRing::Data*)data)->Draw(); +void TaskEffectFogRing::Data::draw_static(void* data) { + ((TaskEffectFogRing::Data*)data)->draw(); } -float_t TaskEffectFogRing::Data::PtclRandom(float_t value) { +float_t TaskEffectFogRing::Data::ptcl_random(float_t value) { return (float_t)(rand_state_array_get_int(4) % 10000) * 0.0001f * value * 2.0f - value; } @@ -2365,43 +2376,43 @@ TaskEffectFogRing::~TaskEffectFogRing() { } -bool TaskEffectFogRing::Init() { +bool TaskEffectFogRing::init() { //sub_1400DE640("TaskEffectFogRing::init()\n"); return true; } -bool TaskEffectFogRing::Ctrl() { - data.delta_frame = data.frame_rate_control->GetDeltaFrame(); - data.Ctrl(); +bool TaskEffectFogRing::ctrl() { + data.delta_frame = data.frame_rate_control->get_delta_frame(); + data.ctrl(); return 0; } -bool TaskEffectFogRing::Dest() { - data.Dest(); +bool TaskEffectFogRing::dest() { + data.dest(); task_effect_fog_ring_data = 0; //sub_1400DE640("TaskEffectFogRing::dest()\n"); return 1; } -void TaskEffectFogRing::Disp() { - data.Disp(); +void TaskEffectFogRing::disp() { + data.disp(); } -void TaskEffectFogRing::PreInit(int32_t stage_index) { +void TaskEffectFogRing::pre_init(int32_t stage_index) { } -void TaskEffectFogRing::SetStageIndices(std::vector& stage_indices) { - SetFrameRateControl(); +void TaskEffectFogRing::set_stage_indices(std::vector& stage_indices) { + set_frame_rate_control(); task_effect_fog_ring_data = &data; - data.SetStageIndices(stage_indices); + data.set_stage_indices(stage_indices); } -void TaskEffectFogRing::SetEnable(bool value) { +void TaskEffectFogRing::set_enable(bool value) { data.enable = value; } -void TaskEffectFogRing::SetCurrentStageIndex(int32_t value) { +void TaskEffectFogRing::set_current_stage_index(int32_t value) { if (data.current_stage_index == value) return; @@ -2409,22 +2420,22 @@ void TaskEffectFogRing::SetCurrentStageIndex(int32_t value) { if (value != -1) { for (int32_t& i : data.stage_indices) if (i == value) { - data.disp = true; + data.display = true; return; } } - data.disp = false; + data.display = false; } -void TaskEffectFogRing::SetFrameRateControl(FrameRateControl* value) { +void TaskEffectFogRing::set_frame_rate_control(FrameRateControl* value) { if (value) data.frame_rate_control = value; else data.frame_rate_control = get_sys_frame_rate(); } -void TaskEffectFogRing::Reset() { - data.Reset(); +void TaskEffectFogRing::reset() { + data.reset(); } TaskEffectLeaf::TaskEffectLeaf() : frame_rate_control(), wait_frames() { @@ -2435,20 +2446,20 @@ TaskEffectLeaf:: ~TaskEffectLeaf() { } -bool TaskEffectLeaf::Init() { +bool TaskEffectLeaf::init() { if (stage_param_data_leaf_current) { leaf_particle_init(); wait_frames = 2; - SetFrameRateControl(); + set_frame_rate_control(); } return true; } -bool TaskEffectLeaf::Ctrl() { +bool TaskEffectLeaf::ctrl() { if (!stage_param_data_leaf_current) return false; - leaf_particle_delta_frame = frame_rate_control->GetDeltaFrame(); + leaf_particle_delta_frame = frame_rate_control->get_delta_frame(); if (wait_frames > 0) { wait_frames--; return false; @@ -2457,24 +2468,24 @@ bool TaskEffectLeaf::Ctrl() { return false; } -bool TaskEffectLeaf::Dest() { +bool TaskEffectLeaf::dest() { leaf_particle_free(); stage_param_data_leaf_current = 0; stage_param_data_leaf_storage_clear(); return true; } -void TaskEffectLeaf::Disp() { +void TaskEffectLeaf::disp() { } -void TaskEffectLeaf::PreInit(int32_t stage_index) { +void TaskEffectLeaf::pre_init(int32_t stage_index) { } -void TaskEffectLeaf::SetStageIndices(std::vector& stage_indices) { +void TaskEffectLeaf::set_stage_indices(std::vector& stage_indices) { if (stage_param_data_leaf_current) - Dest(); + dest(); stage_param_data_leaf_set = 0; current_stage_index = -1; @@ -2511,11 +2522,11 @@ void TaskEffectLeaf::SetStageIndices(std::vector& stage_indices) { } } -void TaskEffectLeaf::SetEnable(bool value) { +void TaskEffectLeaf::set_enable(bool value) { leaf_particle_enable = value; } -void TaskEffectLeaf::SetCurrentStageIndex(int32_t value) { +void TaskEffectLeaf::set_current_stage_index(int32_t value) { if (current_stage_index == value) return; @@ -2536,14 +2547,14 @@ void TaskEffectLeaf::SetCurrentStageIndex(int32_t value) { } } -void TaskEffectLeaf::SetFrameRateControl(FrameRateControl* value) { +void TaskEffectLeaf::set_frame_rate_control(FrameRateControl* value) { if (value) frame_rate_control = value; else frame_rate_control = get_sys_frame_rate(); } -void TaskEffectLeaf::Reset() { +void TaskEffectLeaf::reset() { if (stage_param_data_leaf_current) { leaf_particle_init(); wait_frames = 2; @@ -2558,7 +2569,7 @@ TaskEffectLitproj:: ~TaskEffectLitproj() { } -bool TaskEffectLitproj::Init() { +bool TaskEffectLitproj::init() { if (stage_param_data_litproj_current) { wait_frames = 10; frame = 0; @@ -2566,7 +2577,7 @@ bool TaskEffectLitproj::Init() { return true; } -bool TaskEffectLitproj::Ctrl() { +bool TaskEffectLitproj::ctrl() { if (!stage_param_data_litproj_current) return false; @@ -2592,7 +2603,7 @@ bool TaskEffectLitproj::Ctrl() { return false; } -bool TaskEffectLitproj::Dest() { +bool TaskEffectLitproj::dest() { delete rctx_ptr->litproj; rctx_ptr->litproj = 0; stage_param_data_litproj_current = 0; @@ -2600,17 +2611,17 @@ bool TaskEffectLitproj::Dest() { return true; } -void TaskEffectLitproj::Disp() { +void TaskEffectLitproj::disp() { } -void TaskEffectLitproj::PreInit(int32_t stage_index) { +void TaskEffectLitproj::pre_init(int32_t stage_index) { } -void TaskEffectLitproj::SetStageIndices(std::vector& stage_indices) { +void TaskEffectLitproj::set_stage_indices(std::vector& stage_indices) { if (stage_param_data_litproj_current) - Dest(); + dest(); stage_param_data_litproj_set = 0; current_stage_index = -1; @@ -2646,11 +2657,11 @@ void TaskEffectLitproj::SetStageIndices(std::vector& stage_indices) { } } -void TaskEffectLitproj::SetEnable(bool value) { +void TaskEffectLitproj::set_enable(bool value) { light_proj_enable = value; } -void TaskEffectLitproj::SetCurrentStageIndex(int32_t value) { +void TaskEffectLitproj::set_current_stage_index(int32_t value) { if (current_stage_index == value) return; @@ -2668,7 +2679,7 @@ void TaskEffectLitproj::SetCurrentStageIndex(int32_t value) { stage_param_data_litproj_current = stage_param_data_litproj_storage_get_value(value); } -void TaskEffectLitproj::Reset() { +void TaskEffectLitproj::reset() { wait_frames = 10; frame = 0; } @@ -2681,50 +2692,50 @@ TaskEffectParticle::~TaskEffectParticle() { } -bool TaskEffectParticle::Init() { - SetFrameRateControl(); +bool TaskEffectParticle::init() { + set_frame_rate_control(); return true; } -bool TaskEffectParticle::Ctrl() { - particle_delta_time = frame_rate_control->GetDeltaFrame() * (float_t)(1.0 / 60.0); +bool TaskEffectParticle::ctrl() { + particle_delta_time = frame_rate_control->get_delta_frame() * (float_t)(1.0 / 60.0); if (particle_count > 0) particle_ctrl(); return false; } -bool TaskEffectParticle::Dest() { +bool TaskEffectParticle::dest() { particle_free(); return true; } -void TaskEffectParticle::Disp() { +void TaskEffectParticle::disp() { } -void TaskEffectParticle::PreInit(int32_t stage_index) { +void TaskEffectParticle::pre_init(int32_t stage_index) { current_stage_index = stage_index; //field_74 = 0; particle_init(0); } -void TaskEffectParticle::SetEnable(bool value) { +void TaskEffectParticle::set_enable(bool value) { particle_enable = value; } -void TaskEffectParticle::SetFrameRateControl(FrameRateControl* value) { +void TaskEffectParticle::set_frame_rate_control(FrameRateControl* value) { if (value) frame_rate_control = value; else frame_rate_control = get_sys_frame_rate(); } -void TaskEffectParticle::Reset() { +void TaskEffectParticle::reset() { if (ptcl_data) particle_init(0); } -void TaskEffectParticle::Event(int32_t event_type, void* data) { +void TaskEffectParticle::event(int32_t event_type, void* data) { if (event_type == 1) particle_event((particle_event_data*)data); } @@ -2737,23 +2748,23 @@ TaskEffectRain:: ~TaskEffectRain() { } -bool TaskEffectRain::Init() { +bool TaskEffectRain::init() { if (stage_param_data_rain_current) { rain_particle_init(); - SetFrameRateControl(); + set_frame_rate_control(); } return true; } -bool TaskEffectRain::Ctrl() { +bool TaskEffectRain::ctrl() { if (stage_param_data_rain_current) { - rain_particle_delta_frame = frame_rate_control->GetDeltaFrame(); + rain_particle_delta_frame = frame_rate_control->get_delta_frame(); rain_particle_ctrl(); } return false; } -bool TaskEffectRain::Dest() { +bool TaskEffectRain::dest() { if (stage_param_data_rain_current) { rain_particle_free(); stage_param_data_rain_current = 0; @@ -2765,17 +2776,17 @@ bool TaskEffectRain::Dest() { return true; } -void TaskEffectRain::Disp() { +void TaskEffectRain::disp() { } -void TaskEffectRain::PreInit(int32_t stage_index) { +void TaskEffectRain::pre_init(int32_t stage_index) { } -void TaskEffectRain::SetStageIndices(std::vector& stage_indices) { +void TaskEffectRain::set_stage_indices(std::vector& stage_indices) { if (stage_param_data_rain_current) - Dest(); + dest(); stage_param_data_rain_set = false; current_stage_index = -1; @@ -2812,11 +2823,11 @@ void TaskEffectRain::SetStageIndices(std::vector& stage_indices) { } } -void TaskEffectRain::SetEnable(bool value) { +void TaskEffectRain::set_enable(bool value) { rain_particle_enable = value; } -void TaskEffectRain::SetCurrentStageIndex(int32_t value) { +void TaskEffectRain::set_current_stage_index(int32_t value) { if (current_stage_index == value) return; @@ -2836,17 +2847,17 @@ void TaskEffectRain::SetCurrentStageIndex(int32_t value) { } } -void TaskEffectRain::SetFrameRateControl(FrameRateControl* value) { +void TaskEffectRain::set_frame_rate_control(FrameRateControl* value) { if (value) frame_rate_control = value; else frame_rate_control = get_sys_frame_rate(); } -void TaskEffectRain::Reset() { +void TaskEffectRain::reset() { if (stage_param_data_rain_current) { rain_particle_init(); - SetFrameRateControl(); + set_frame_rate_control(); } } @@ -2882,7 +2893,7 @@ ripple_emit::~ripple_emit() { ground_y = -1001.0f; } -void ripple_emit::add_draw_ripple_emit(struc_101* data) { +void ripple_emit::add_draw_ripple_emit(ripple_struct* data) { if (data->count > 0) rctx_ptr->disp_manager->entry_obj_user(&mat4_identity, (mdl::UserArgsFunc)draw_ripple_emit, data, mdl::OBJ_TYPE_USER); @@ -3149,7 +3160,7 @@ void ripple_emit::sub_140358690() { add_draw_ripple_emit(&v1.data); } -void ripple_emit::sub_1403587C0(const vec3 a2, const vec3 a3, float_t a4, struc_101& a5, struc_101& a6) { +void ripple_emit::sub_1403587C0(const vec3 a2, const vec3 a3, float_t a4, ripple_struct& a5, ripple_struct& a6) { vec3 v34 = a3 - a2; float_t v17 = ground_y - (a2.y - a4); @@ -3325,51 +3336,51 @@ TaskEffectRipple::~TaskEffectRipple() { } -bool TaskEffectRipple::Init() { +bool TaskEffectRipple::init() { ripple_emit_init(); //sub_1400DE640("TaskEffectRipple::init()\n"); return true; } -bool TaskEffectRipple::Ctrl() { - emit->delta_frame = frame_rate_control->GetDeltaFrame(); +bool TaskEffectRipple::ctrl() { + emit->delta_frame = frame_rate_control->get_delta_frame(); emit->ctrl(); return false; } -bool TaskEffectRipple::Dest() { +bool TaskEffectRipple::dest() { emit->dest(); //sub_1400DE640("TaskEffectRipple::dest()\n"); ripple_emit_free(); return true; } -void TaskEffectRipple::Disp() { +void TaskEffectRipple::disp() { emit->disp(); } -void TaskEffectRipple::PreInit(int32_t stage_index) { +void TaskEffectRipple::pre_init(int32_t stage_index) { } -void TaskEffectRipple::SetStageIndices(std::vector& stage_indices) { - SetFrameRateControl(); +void TaskEffectRipple::set_stage_indices(std::vector& stage_indices) { + set_frame_rate_control(); emit = ripple_emit_data; emit->set_stage_indices(stage_indices); } -void TaskEffectRipple::SetCurrentStageIndex(int32_t value) { +void TaskEffectRipple::set_current_stage_index(int32_t value) { emit->set_stage_index(value); } -void TaskEffectRipple::SetFrameRateControl(FrameRateControl* value) { +void TaskEffectRipple::set_frame_rate_control(FrameRateControl* value) { if (value) frame_rate_control = value; else frame_rate_control = get_sys_frame_rate(); } -void TaskEffectRipple::Reset() { +void TaskEffectRipple::reset() { if (!emit->use_float_ripplemap) ripple_emit_data->clear_tex(); ripple_emit_data->reset(); @@ -3383,23 +3394,23 @@ TaskEffectSnow::~TaskEffectSnow() { } -bool TaskEffectSnow::Init() { +bool TaskEffectSnow::init() { if (stage_param_data_snow_current) { snow_particle_init(); - SetFrameRateControl(); + set_frame_rate_control(); } return true; } -bool TaskEffectSnow::Ctrl() { +bool TaskEffectSnow::ctrl() { if (stage_param_data_snow_current) { - snow_particle_delta_frame = frame_rate_control->GetDeltaFrame(); + snow_particle_delta_frame = frame_rate_control->get_delta_frame(); snow_particle_ctrl(); } return false; } -bool TaskEffectSnow::Dest() { +bool TaskEffectSnow::dest() { snow_particle_data_free(); snow_particle_free(); @@ -3411,21 +3422,21 @@ bool TaskEffectSnow::Dest() { return 1; } -void TaskEffectSnow::Disp() { +void TaskEffectSnow::disp() { } -void TaskEffectSnow::Basic() { +void TaskEffectSnow::basic() { } -void TaskEffectSnow::PreInit(int32_t stage_index) { +void TaskEffectSnow::pre_init(int32_t stage_index) { } -void TaskEffectSnow::SetStageIndices(std::vector& stage_indices) { +void TaskEffectSnow::set_stage_indices(std::vector& stage_indices) { if (stage_param_data_snow_current) - Dest(); + dest(); stage_param_data_snow_set = 0; current_stage_index = -1; @@ -3462,11 +3473,11 @@ void TaskEffectSnow::SetStageIndices(std::vector& stage_indices) { } } -void TaskEffectSnow::SetEnable(bool value) { +void TaskEffectSnow::set_enable(bool value) { snow_particle_enable = value; } -void TaskEffectSnow::SetCurrentStageIndex(int32_t value) { +void TaskEffectSnow::set_current_stage_index(int32_t value) { if (current_stage_index == value) return; @@ -3486,168 +3497,20 @@ void TaskEffectSnow::SetCurrentStageIndex(int32_t value) { } } -void TaskEffectSnow::SetFrameRateControl(FrameRateControl* value) { +void TaskEffectSnow::set_frame_rate_control(FrameRateControl* value) { if (value) frame_rate_control = value; else frame_rate_control = get_sys_frame_rate(); } -void TaskEffectSnow::Reset() { +void TaskEffectSnow::reset() { if (stage_param_data_snow_current) { snow_particle_init(); - SetFrameRateControl(); + set_frame_rate_control(); } } -/* -struct struc_180 { - uint32_t count; - int32_t field_4; - int64_t field_8; - int64_t field_10; - int64_t field_18; - int32_t field_20; - int64_t field_28; - int64_t field_30; - int64_t field_38; -}; - -struct ParticleEmitter { - struc_180* field_8; - int64_t field_10; - int64_t field_18; - float_t field_20; - int32_t field_24; - float_t field_28; - float_t particle_size; - - ParticleEmitter(); - virtual ~ParticleEmitter(); - - virtual bool Field_8(); - virtual bool Field_10(); -}; - -struct ParticleEmitterRob : ParticleEmitter { - int32_t field_30; - int32_t field_34; - int32_t field_38; - int32_t field_3C; - int32_t field_40; - int32_t field_44; - int32_t field_48; - int32_t field_4C; - int32_t field_50; - int32_t field_54; - int32_t field_58; - int32_t emit_num; - int32_t field_60; - float_t emission_ratio_attn; - float_t emission_velocity_scale; - bool in_water; - int8_t field_6D; -}; - -struct water_particle { - struc_180* field_0; - vec4 color; - float_t particle_size; - std::vector field_20; - int32_t count; - int32_t tex_id; - bool blink; - std::vector field_48; - std::vector field_60; - struc_101 field_78; - float_t ripple_emission; - - water_particle(); - ~water_particle(); -}; - -struct ParticleDispObj { - struc_180* field_8; - object_info object; - std::vector instances_mat; - - ParticleDispObj(); - virtual ~ParticleDispObj(); - - void Disp(); -}; - -struct TaskEffectSplash : public TaskEffect { -public: - struct Data { - struct Sub { - int32_t field_0; - struc_180* field_8; - int32_t field_10; - ParticleEmitterRob* field_18; - int32_t field_20; - water_particle* field_28; - int8_t field_30; - struc_180 field_38; - int32_t field_78; - ParticleEmitterRob* field_80; - ParticleDispObj field_88; - vec4 color; - float_t particle_size; - int32_t emit_num; - float_t ripple_emission; - float_t emission_ratio_attn; - float_t emission_velocity_scale; - int32_t splash_tex_id; - object_info splash_obj_id; - int8_t in_water; - int8_t blink; - int64_t field_E8; - int64_t field_F0; - int64_t field_F8; - }; - - int8_t field_0; - int32_t field_4; - int8_t field_8; - Sub field_10; - int8_t field_110; - int32_t current_stage_index; - std::vector stage_indices; - FrameRateControl* frame_rate_control; - int64_t field_138; - }; - - bool enable; - Data data; - - TaskEffectSplash(); - virtual ~TaskEffectSplash() override; - - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; - virtual void Basic() override; - - virtual void PreInit(int32_t stage_index) override; - virtual void SetStageIndices(std::vector& stage_indices) override; - virtual void SetFrame(int32_t value) override; - virtual void Field_48() override; - virtual void SetEnable(bool value) override; - virtual void SetCurrentStageIndex(int32_t value) override; - virtual void SetFrameRateControl(FrameRateControl* value) override; - virtual void Field_68() override; - virtual void Reset() override; - virtual void Field_80() override; - virtual void Field_88() override; - virtual void Field_90() override; - virtual void Field_98(int32_t a2, int32_t* a3) override; - virtual void Field_A0(int32_t a2, int32_t* a3) override; - virtual void Field_A8(int32_t a2, int8_t* a3) override; -}; -*/ - TaskEffectStar::TaskEffectStar() : frame_rate_control(), delta_frame() { current_stage_index = -1; } @@ -3656,35 +3519,35 @@ TaskEffectStar::~TaskEffectStar() { } -bool TaskEffectStar::Init() { +bool TaskEffectStar::init() { if (!star_catalog_data.stage_param_data_ptr) return true; else if (!star_catalog_data.init()) return false; - SetFrameRateControl(0); + set_frame_rate_control(0); return true; } -bool TaskEffectStar::Ctrl() { +bool TaskEffectStar::ctrl() { if (star_catalog_data.stage_param_data_ptr) - delta_frame = frame_rate_control->GetDeltaFrame(); + delta_frame = frame_rate_control->get_delta_frame(); return false; } -bool TaskEffectStar::Dest() { +bool TaskEffectStar::dest() { star_catalog_data.free(); stage_param_data_star_storage_clear(); return true; } -void TaskEffectStar::Disp() { +void TaskEffectStar::disp() { } -void TaskEffectStar::SetStageIndices(std::vector& stage_indices) { +void TaskEffectStar::set_stage_indices(std::vector& stage_indices) { if (star_catalog_data.stage_param_data_ptr) - Dest(); + dest(); current_stage_index = -1; this->stage_indices.clear(); @@ -3723,11 +3586,11 @@ void TaskEffectStar::SetStageIndices(std::vector& stage_indices) { } } -void TaskEffectStar::SetEnable(bool value) { +void TaskEffectStar::set_enable(bool value) { star_catalog_data.enable = value; } -void TaskEffectStar::SetCurrentStageIndex(int32_t value) { +void TaskEffectStar::set_current_stage_index(int32_t value) { if (current_stage_index == value) return; @@ -3748,14 +3611,14 @@ void TaskEffectStar::SetCurrentStageIndex(int32_t value) { star_catalog_data.set_stage_param_data(stage_param_data_star_storage_get_value(value)); } -void TaskEffectStar::SetFrameRateControl(FrameRateControl* value) { +void TaskEffectStar::set_frame_rate_control(FrameRateControl* value) { if (value) frame_rate_control = value; else frame_rate_control = get_sys_frame_rate(); } -void TaskEffectStar::Reset() { +void TaskEffectStar::reset() { } @@ -4350,12 +4213,12 @@ TaskEffectParent::~TaskEffectParent() { } -std::pair TaskEffectParent::AddTaskEffectTypePtr(TaskEffectType type) { - if (CheckTaskEffectTypeLoaded(type) < 0) { +std::pair TaskEffectParent::add_effect(TaskEffectType type) { + if (check_effect_loaded(type) < 0) { const char* name = 0; TaskEffect* t = task_effect_array_get(type, &name); if (t) { - app::TaskWork::AddTask(t, name); + app::TaskWork::add_task(t, name); return { type, t }; } } @@ -4363,25 +4226,25 @@ std::pair TaskEffectParent::AddTaskEffectTypePtr(Ta return { TASK_EFFECT_INVALID, 0 }; } -int32_t TaskEffectParent::CheckTaskEffectTypeLoaded(TaskEffectType type) { +int32_t TaskEffectParent::check_effect_loaded(TaskEffectType type) { for (std::pair& i : effects) if (i.first == type) return 0; return -1; } -void TaskEffectParent::Event(TaskEffectType type, int32_t event_type, void* data) { +void TaskEffectParent::event(TaskEffectType type, int32_t event_type, void* data) { for (std::pair& i : effects) if (i.first == type) - i.second->Event(event_type, data); + i.second->event(event_type, data); } -void TaskEffectParent::Dest() { +void TaskEffectParent::dest() { if (state == 1) state = 4; else if (state >= 2 && state <= 3) { for (std::pair& i : effects) - i.second->DelTask(); + i.second->del(); state = 4; } } @@ -4392,7 +4255,7 @@ static const TaskEffectType dword_1409E3440[16] = { TASK_EFFECT_INVALID, }; -bool TaskEffectParent::Load() { +bool TaskEffectParent::load() { if (state == 1) { if (!modern) { bool wait_load = false; @@ -4407,10 +4270,10 @@ bool TaskEffectParent::Load() { if (i == TASK_EFFECT_INVALID) break; - std::pair v57 = AddTaskEffectTypePtr(i); + std::pair v57 = add_effect(i); if (v57.second) { - v57.second->SetStageIndices(stage_indices); - v57.second->SetEnable(enable); + v57.second->set_stage_indices(stage_indices); + v57.second->set_enable(enable); effects.push_back(v57); field_50.push_back(v57); } @@ -4422,10 +4285,10 @@ bool TaskEffectParent::Load() { if (j == TASK_EFFECT_INVALID) break; - std::pair v57 = AddTaskEffectTypePtr((TaskEffectType)j); + std::pair v57 = add_effect((TaskEffectType)j); if (v57.second) { - v57.second->SetStageIndices(stage_indices); - v57.second->SetEnable(enable); + v57.second->set_stage_indices(stage_indices); + v57.second->set_enable(enable); effects.push_back(v57); i.second.field_10.push_back(v57); } @@ -4450,10 +4313,10 @@ bool TaskEffectParent::Load() { if (i == TASK_EFFECT_INVALID) break; - std::pair v57 = AddTaskEffectTypePtr(i); + std::pair v57 = add_effect(i); if (v57.second) { - v57.second->SetStageHashes(stage_hashes, data, obj_db, tex_db, stage_data); - v57.second->SetEnable(enable); + v57.second->set_stage_hashes(stage_hashes, data, obj_db, tex_db, stage_data); + v57.second->set_enable(enable); effects.push_back(v57); field_50.push_back(v57); } @@ -4465,10 +4328,10 @@ bool TaskEffectParent::Load() { if (j == TASK_EFFECT_INVALID) break; - std::pair v57 = AddTaskEffectTypePtr((TaskEffectType)j); + std::pair v57 = add_effect((TaskEffectType)j); if (v57.second) { - v57.second->SetStageHashes(stage_hashes, data, obj_db, tex_db, stage_data); - v57.second->SetEnable(enable); + v57.second->set_stage_hashes(stage_hashes, data, obj_db, tex_db, stage_data); + v57.second->set_enable(enable); effects.push_back(v57); i.second.field_10.push_back(v57); } @@ -4483,14 +4346,14 @@ bool TaskEffectParent::Load() { bool wait_load = false; for (std::pair& i : effects) - if (!app::TaskWork::CheckTaskCtrl(i.second)) { + if (!app::TaskWork::check_task_ctrl(i.second)) { wait_load = true; break; } if (!wait_load) { for (std::pair& i : effects) - i.second->SetEnable(enable); + i.second->set_enable(enable); state = 3; return false; @@ -4498,12 +4361,12 @@ bool TaskEffectParent::Load() { return true; } -void TaskEffectParent::Reset() { +void TaskEffectParent::reset() { for (std::pair& i : effects) - i.second->Reset(); + i.second->reset(); } -void TaskEffectParent::ResetData() { +void TaskEffectParent::reset_data() { current_stage_hash = hash_murmurhash_empty; current_stage_index = -1; this->current_stage_index = -1; @@ -4516,38 +4379,38 @@ void TaskEffectParent::ResetData() { state = 0; } -void TaskEffectParent::SetCurrentStageHash(uint32_t stage_hash) { +void TaskEffectParent::set_current_stage_hash(uint32_t stage_hash) { if (current_stage_hash != stage_hash) { for (std::pair& i : effects) - i.second->SetCurrentStageHash(stage_hash); + i.second->set_current_stage_hash(stage_hash); current_stage_hash = stage_hash; } } -void TaskEffectParent::SetCurrentStageIndex(int32_t stage_index) { +void TaskEffectParent::set_current_stage_index(int32_t stage_index) { if (current_stage_index != stage_index) { for (std::pair& i : effects) - i.second->SetCurrentStageIndex(stage_index); + i.second->set_current_stage_index(stage_index); current_stage_index = stage_index; } } -void TaskEffectParent::SetEnable(bool value) { +void TaskEffectParent::set_enable(bool value) { for (std::pair& i : effects) - i.second->SetEnable(value); + i.second->set_enable(value); } -void TaskEffectParent::SetFrame(int32_t value) { +void TaskEffectParent::set_frame(int32_t value) { for (std::pair& i : effects) - i.second->SetFrame(value); + i.second->set_frame(value); } -void TaskEffectParent::SetFrameRateControl(FrameRateControl* value) { +void TaskEffectParent::set_frame_rate_control(FrameRateControl* value) { for (std::pair& i : effects) - i.second->SetFrameRateControl(value); + i.second->set_frame_rate_control(value); } -void TaskEffectParent::SetStageHashes(std::vector& stage_hashes) { +void TaskEffectParent::set_stage_hashes(std::vector& stage_hashes) { this->stage_indices.clear(); this->stage_hashes.assign(stage_hashes.begin(), stage_hashes.end()); obj_set_ids.clear(); @@ -4577,7 +4440,7 @@ void TaskEffectParent::SetStageHashes(std::vector& stage_hashes) { state = 1; } -void TaskEffectParent::SetStageIndices(std::vector& stage_indices) { +void TaskEffectParent::set_stage_indices(std::vector& stage_indices) { this->stage_indices.assign(stage_indices.begin(), stage_indices.end()); this->stage_hashes.clear(); obj_set_ids.clear(); @@ -4613,20 +4476,20 @@ void TaskEffectParent::SetStageIndices(std::vector& stage_indices) { state = 1; } -bool TaskEffectParent::Unload() { +bool TaskEffectParent::unload() { if (state != 4) { - ResetData(); + reset_data(); return false; } for (std::pair& i : effects) - if (app::TaskWork::CheckTaskReady(i.second)) + if (app::TaskWork::check_task_ready(i.second)) return true; for (uint32_t& i : obj_set_ids) object_storage_unload_set(i); - ResetData(); + reset_data(); return false; } @@ -4645,7 +4508,7 @@ static void draw_fog_particle(render_context* rctx, TaskEffectFogRing::Data* dat gl_state_disable_blend(); } -static void draw_ripple_emit(render_context* rctx, struc_101* data) { +static void draw_ripple_emit(render_context* rctx, ripple_struct* data) { gl_state_set_color_mask(GL_FALSE, GL_FALSE, GL_FALSE, GL_TRUE); { diff --git a/src/ReDIVA/classes/data_view/draw_task.cpp b/src/ReDIVA/classes/data_view/draw_task.cpp index 91dfc30f..8cd9badd 100644 --- a/src/ReDIVA/classes/data_view/draw_task.cpp +++ b/src/ReDIVA/classes/data_view/draw_task.cpp @@ -181,7 +181,7 @@ void data_view_draw_task_imgui(class_data* data) { } break; case mdl::OBJ_KIND_TRANSLUCENT: { mdl::ObjTranslucentArgs* translucent = &data->args.translucent; - for (uint32_t l = 0; l < 40 && l < translucent->count; l++) { + for (int32_t l = 0; l < 40 && l < translucent->count; l++) { ImGui::PushID(l); if (ImGui::TreeNodeEx("", ImGuiTreeNodeFlags_DefaultOpen, "Data %2d", l)) { data_view_draw_task_imgui_sub_mesh_args(translucent->sub_mesh[l]); diff --git a/src/ReDIVA/classes/information/task.cpp b/src/ReDIVA/classes/information/task.cpp index 7448357b..e27244d5 100644 --- a/src/ReDIVA/classes/information/task.cpp +++ b/src/ReDIVA/classes/information/task.cpp @@ -60,7 +60,7 @@ void information_task_imgui(class_data* data) { std::vector vec; for (int32_t i = 0; ; i++) { - app::Task* t = app::TaskWork::GetTaskByIndex(i); + app::Task* t = app::TaskWork::get_task_by_index(i); if (!t) break; @@ -86,13 +86,13 @@ void information_task_imgui(class_data* data) { if (show_priority) for (app::Task*& i : vec) { sprintf_s(buf, sizeof(buf), "%1d %-30s % 7d(% 7d) % 7d(% 7d)", i->priority, - i->GetName(), i->GetCalcTime(), i->GetCalcTimeMax(), i->GetDispTime(), i->GetDispTimeMax()); + i->get_name(), i->get_calc_time(), i->get_calc_time_max(), i->get_disp_time(), i->get_disp_time_max()); ImGui::Selectable(buf); } else for (app::Task*& i : vec) { sprintf_s(buf, sizeof(buf), "%-32s % 7d(% 7d) % 7d(% 7d)", - i->GetName(), i->GetCalcTime(), i->GetCalcTimeMax(), i->GetDispTime(), i->GetDispTimeMax()); + i->get_name(), i->get_calc_time(), i->get_calc_time_max(), i->get_disp_time(), i->get_disp_time_max()); ImGui::Selectable(buf); } ImGui::EndListBox(); diff --git a/src/ReDIVA/data_edit.cpp b/src/ReDIVA/data_edit.cpp index ca8cec8d..6f8b6445 100644 --- a/src/ReDIVA/data_edit.cpp +++ b/src/ReDIVA/data_edit.cpp @@ -45,7 +45,7 @@ inline static void set_data(auth_3d_object_model_transform& mt, set_data(mt.visibility, visibility); } -void DataEdit::Auth3D::Patch() { +void DataEdit::Auth3D::patch() { ::auth_3d* auth = id.get_auth_3d(); auth_3d_object_hrc* objhrc = &auth->object_hrc[0]; auth_3d_object_node* nodes = objhrc->node.data(); @@ -338,7 +338,7 @@ void DataEdit::Auth3D::Patch() { objhrc->interpolate(0.0f); } -void DataEdit::Auth3D::Reset() { +void DataEdit::Auth3D::reset() { auth_3d_data_unload_category(category.hash_murmurhash); id.unload(rctx_ptr); object_storage_unload_set(object_set.hash_murmurhash); @@ -362,13 +362,13 @@ DataEdit::~DataEdit() { } -bool DataEdit::Init() { - Reset(); +bool DataEdit::init() { + reset(); task_rob_manager_add_task(); return true; } -bool DataEdit::Ctrl() { +bool DataEdit::ctrl() { data_struct* aft_data = &data_list[DATA_AFT]; bone_database* aft_bone_data = &aft_data->data_ft.bone_data; motion_database* aft_mot_db = &aft_data->data_ft.mot_db; @@ -433,7 +433,7 @@ bool DataEdit::Ctrl() { auth_3d.id.set_repeat(false); auth_3d.id.set_req_frame(0.0f); auth_3d.id.set_visibility(true); - auth_3d.Patch(); + auth_3d.patch(); rob_chara* rob_chr = rob_chara_array_get(chara_id); rob_chr->set_motion_id(motion_id, 0.0f, 0.0f, true, false, @@ -486,14 +486,14 @@ bool DataEdit::Ctrl() { return false; } -bool DataEdit::Dest() { +bool DataEdit::dest() { rob_chara_array_free_chara_id(chara_id); task_rob_manager_del_task(); - Reset(); + reset(); return true; } -void DataEdit::Window() { +void DataEdit::window() { ImGuiIO& io = ImGui::GetIO(); ImGuiStyle& style = ImGui::GetStyle(); ImFont* font = ImGui::GetFont(); @@ -511,7 +511,7 @@ void DataEdit::Window() { ImGuiWindowFlags window_flags = 0; window_flags |= ImGuiWindowFlags_NoResize; - window_focus = false; + focus = false; bool open = true; if (!ImGui::Begin("Data Edit", &open, window_flags)) { ImGui::End(); @@ -529,14 +529,14 @@ void DataEdit::Window() { ImGui::End(); } -void DataEdit::Reset() { +void DataEdit::reset() { motion_set_unload_motion(mot_set_id); chara_id = -1; state = 0; mot_set_id = -1; motion_id = -1; - auth_3d.Reset(); + auth_3d.reset(); ogg_path.clear(); ogg_path.shrink_to_fit(); play = false; diff --git a/src/ReDIVA/data_edit.hpp b/src/ReDIVA/data_edit.hpp index 5da7e31b..ba7d1603 100644 --- a/src/ReDIVA/data_edit.hpp +++ b/src/ReDIVA/data_edit.hpp @@ -28,8 +28,8 @@ public: Auth3D(); ~Auth3D(); - void Patch(); - void Reset(); + void patch(); + void reset(); }; int32_t chara_id; @@ -46,12 +46,12 @@ public: DataEdit(); virtual ~DataEdit() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Window() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void window() override; - void Reset(); + void reset(); }; extern DataEdit data_edit; diff --git a/src/ReDIVA/data_initialize.cpp b/src/ReDIVA/data_initialize.cpp index 55ba1d37..52e07a08 100644 --- a/src/ReDIVA/data_initialize.cpp +++ b/src/ReDIVA/data_initialize.cpp @@ -29,13 +29,13 @@ TaskDataInit::~TaskDataInit() { } -bool TaskDataInit::Init() { +bool TaskDataInit::init() { state = 0; field_6C = !test_mode_get(); return true; } -bool TaskDataInit::Ctrl() { +bool TaskDataInit::ctrl() { data_struct* aft_data = &data_list[DATA_AFT]; aet_database* aft_aet_db = &aft_data->data_ft.aet_db; object_database* aft_obj_db = &aft_data->data_ft.obj_db; @@ -170,16 +170,16 @@ bool TaskDataInit::Ctrl() { return false; } -bool TaskDataInit::Dest() { +bool TaskDataInit::dest() { return true; } -void TaskDataInit::Disp() { +void TaskDataInit::disp() { } bool task_data_init_add_task() { - return app::TaskWork::AddTask(&task_data_init, "DATA_INITIALIZE"); + return app::TaskWork::add_task(&task_data_init, "DATA_INITIALIZE"); } bool task_data_init_check_state() { @@ -187,5 +187,5 @@ bool task_data_init_check_state() { } bool task_data_init_del_task() { - return task_data_init.DelTask(); + return task_data_init.del(); } diff --git a/src/ReDIVA/data_initialize.hpp b/src/ReDIVA/data_initialize.hpp index efaf8fc7..27a35a3c 100644 --- a/src/ReDIVA/data_initialize.hpp +++ b/src/ReDIVA/data_initialize.hpp @@ -18,10 +18,10 @@ public: TaskDataInit(); virtual ~TaskDataInit() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; }; extern bool task_data_init_add_task(); diff --git a/src/ReDIVA/data_test/auth_2d_test.cpp b/src/ReDIVA/data_test/auth_2d_test.cpp index 8f4c452c..3f1d5b8e 100644 --- a/src/ReDIVA/data_test/auth_2d_test.cpp +++ b/src/ReDIVA/data_test/auth_2d_test.cpp @@ -58,7 +58,7 @@ DtmAet::~DtmAet() { } -bool DtmAet::Init() { +bool DtmAet::init() { data_struct* aft_data = &data_list[DATA_AFT]; aet_database* aft_aet_db = &aft_data->data_ft.aet_db; sprite_database* aft_spr_db = &aft_data->data_ft.spr_db; @@ -73,7 +73,7 @@ bool DtmAet::Init() { return true; } -bool DtmAet::Ctrl() { +bool DtmAet::ctrl() { data_struct* aft_data = &data_list[DATA_AFT]; aet_database* aft_aet_db = &aft_data->data_ft.aet_db; sprite_database* aft_spr_db = &aft_data->data_ft.spr_db; @@ -238,7 +238,7 @@ bool DtmAet::Ctrl() { return false; } -bool DtmAet::Dest() { +bool DtmAet::dest() { data_struct* aft_data = &data_list[DATA_AFT]; aet_database* aft_aet_db = &aft_data->data_ft.aet_db; sprite_database* aft_spr_db = &aft_data->data_ft.spr_db; @@ -254,7 +254,7 @@ bool DtmAet::Dest() { return true; } -void DtmAet::Disp() { +void DtmAet::disp() { if (state != 7 || !type) return; @@ -300,7 +300,7 @@ void DtmAet::Disp() { } } -void DtmAet::Basic() { +void DtmAet::basic() { if (state != 7) return; @@ -394,10 +394,10 @@ void dtm_aet_init() { } void dtm_aet_load() { - if (app::TaskWork::CheckTaskReady(dtm_aet)) + if (app::TaskWork::check_task_ready(dtm_aet)) return; - app::TaskWork::AddTask(dtm_aet, "DATA_TEST_AET_MANAGER"); + app::TaskWork::add_task(dtm_aet, "DATA_TEST_AET_MANAGER"); if (!dtw_aet) { dtw_aet = new DtwAet; @@ -408,7 +408,7 @@ void dtm_aet_load() { } void dtm_aet_unload() { - dtm_aet->DelTask(); + dtm_aet->del(); dtw_aet->Hide(); } diff --git a/src/ReDIVA/data_test/auth_2d_test.hpp b/src/ReDIVA/data_test/auth_2d_test.hpp index d3c12e8e..efc51605 100644 --- a/src/ReDIVA/data_test/auth_2d_test.hpp +++ b/src/ReDIVA/data_test/auth_2d_test.hpp @@ -36,11 +36,11 @@ public: DtmAet(); virtual ~DtmAet() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; - virtual void Basic() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; + virtual void basic() override; virtual void GetSoundFarcs(); virtual void SetSetIndex(int32_t value); diff --git a/src/ReDIVA/data_test/auth_3d_test.cpp b/src/ReDIVA/data_test/auth_3d_test.cpp index 1d185e3b..4dc8709b 100644 --- a/src/ReDIVA/data_test/auth_3d_test.cpp +++ b/src/ReDIVA/data_test/auth_3d_test.cpp @@ -360,7 +360,7 @@ Auth3dTestTask:: ~Auth3dTestTask() { } -bool Auth3dTestTask::Init() { +bool Auth3dTestTask::init() { data_struct* aft_data = &data_list[DATA_AFT]; object_database* aft_obj_db = &aft_data->data_ft.obj_db; @@ -403,7 +403,7 @@ bool Auth3dTestTask::Init() { return true; } -bool Auth3dTestTask::Ctrl() { +bool Auth3dTestTask::ctrl() { InputState* input_state = input_state_get(0); if (auth_3d_test_task->auth_3d_id.check_not_empty() && input_state->CheckTapped(29)) auth_3d_test_task->auth_3d_id.set_paused( @@ -450,7 +450,7 @@ bool Auth3dTestTask::Ctrl() { return false; } -bool Auth3dTestTask::Dest() { +bool Auth3dTestTask::dest() { auth_3d_id.unload(rctx_ptr); object_storage_unload_set(effcmn_obj_set); task_stage_unload_task(); @@ -470,7 +470,7 @@ bool Auth3dTestTask::Dest() { return true; } -void Auth3dTestTask::Disp() { +void Auth3dTestTask::disp() { if (plane_above_floor) { mat4 mat; mat4_translate_y(0.25f, &mat); diff --git a/src/ReDIVA/data_test/auth_3d_test.hpp b/src/ReDIVA/data_test/auth_3d_test.hpp index 91a3e4f6..abac701e 100644 --- a/src/ReDIVA/data_test/auth_3d_test.hpp +++ b/src/ReDIVA/data_test/auth_3d_test.hpp @@ -60,10 +60,10 @@ public: Auth3dTestTask(); virtual ~Auth3dTestTask() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; void DispAuth3dChara(::auth_3d_id& id); void DispChara(); diff --git a/src/ReDIVA/data_test/equip_test.cpp b/src/ReDIVA/data_test/equip_test.cpp index c208d9c3..7809c90e 100644 --- a/src/ReDIVA/data_test/equip_test.cpp +++ b/src/ReDIVA/data_test/equip_test.cpp @@ -149,12 +149,12 @@ DtmEqVs::~DtmEqVs() { } -bool DtmEqVs::Init() { +bool DtmEqVs::init() { state = 0; return true; } -bool DtmEqVs::Ctrl() { +bool DtmEqVs::ctrl() { rob_chara_item_cos_data* item_cos_data = rob_chara_array_get_item_cos_data(chara_id); rob_chara* rob_chr = rob_chara_array_get(chara_id); switch (state) { @@ -229,11 +229,11 @@ bool DtmEqVs::Ctrl() { return false; } -bool DtmEqVs::Dest() { +bool DtmEqVs::dest() { return true; } -bool DtmEqVs::AddTask(int32_t chara_id, ::chara_index chara_index) { +bool DtmEqVs::add_task(int32_t chara_id, ::chara_index chara_index) { this->chara_id = chara_id; this->chara_index = chara_index; this->curr_chara_index = chara_index; @@ -242,11 +242,11 @@ bool DtmEqVs::AddTask(int32_t chara_id, ::chara_index chara_index) { disp_parts = 0; data_test_equip_dw_set_chara_index(chara_id, chara_index); data_test_equip_dw_set_cos_id(chara_id, cos_id); - return app::TaskWork::AddTask(this, "DATA TEST EQUIP MANAGER FOR VS"); + return app::TaskWork::add_task(this, "DATA TEST EQUIP MANAGER FOR VS"); } -bool DtmEqVs::DelTask() { - return app::Task::DelTask(); +bool DtmEqVs::del_task() { + return app::Task::del(); } void DtmEqVs::SetCharaIndexCosId(::chara_index chara_index, int32_t cos_id) { diff --git a/src/ReDIVA/data_test/equip_test.hpp b/src/ReDIVA/data_test/equip_test.hpp index 226397a6..607e9b70 100644 --- a/src/ReDIVA/data_test/equip_test.hpp +++ b/src/ReDIVA/data_test/equip_test.hpp @@ -22,12 +22,12 @@ public: DtmEqVs(); virtual ~DtmEqVs() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; - virtual bool AddTask(int32_t chara_id, ::chara_index chara_index); - virtual bool DelTask(); + virtual bool add_task(int32_t chara_id, ::chara_index chara_index); + virtual bool del_task(); void SetCharaIndexCosId(::chara_index chara_index, int32_t cos_id); diff --git a/src/ReDIVA/data_test/glitter_test.cpp b/src/ReDIVA/data_test/glitter_test.cpp index 10aec5b7..5d35938e 100644 --- a/src/ReDIVA/data_test/glitter_test.cpp +++ b/src/ReDIVA/data_test/glitter_test.cpp @@ -65,7 +65,7 @@ TaskDataTestGlitterParticle::~TaskDataTestGlitterParticle() { } -bool TaskDataTestGlitterParticle::Init() { +bool TaskDataTestGlitterParticle::init() { LARGE_INTEGER time; QueryPerformanceCounter(&time); Glitter::glt_particle_manager->counter = (uint32_t)(time.LowPart * hash_murmurhash_empty); @@ -94,7 +94,7 @@ bool TaskDataTestGlitterParticle::Init() { return true; } -bool TaskDataTestGlitterParticle::Ctrl() { +bool TaskDataTestGlitterParticle::ctrl() { InputState* input_state = input_state_get(0); if (input_state) { if (input_state->CheckTapped(43)) @@ -131,7 +131,7 @@ bool TaskDataTestGlitterParticle::Ctrl() { if (Glitter::glt_particle_manager->SceneHasNotEnded(scene_counter) && !Glitter::glt_particle_manager->GetPause()) - frame += get_sys_frame_rate()->GetDeltaFrame(); + frame += get_sys_frame_rate()->get_delta_frame(); if (reload || auto_and_repeat && !Glitter::glt_particle_manager->SceneHasNotEnded(scene_counter)) { Glitter::glt_particle_manager->FreeSceneEffect(scene_counter); @@ -157,7 +157,7 @@ bool TaskDataTestGlitterParticle::Ctrl() { return false; } -bool TaskDataTestGlitterParticle::Dest() { +bool TaskDataTestGlitterParticle::dest() { clear_color = color_black; Glitter::glt_particle_manager->FreeScenes(); Glitter::glt_particle_manager->FreeEffects(); @@ -170,7 +170,7 @@ bool TaskDataTestGlitterParticle::Dest() { return true; } -void TaskDataTestGlitterParticle::Disp() { +void TaskDataTestGlitterParticle::disp() { if (show_grid) { mdl::EtcObj etc(mdl::ETC_OBJ_GRID); etc.color = 0xFF000000; @@ -350,12 +350,12 @@ void DataTestGlitterParticleDw::CharaCallback(dw::Widget* data) { if (button) if (dynamic_cast(button->parent_shell)) if (button->value) { - /*if (!app::TaskWork::CheckTaskReady(&data_test_chr)) - app::TaskWork::AddTask(&data_test_chr, "DATA_TEST_CHR");*/ + /*if (!app::TaskWork::check_task_ready(&data_test_chr)) + app::TaskWork::add_task(&data_test_chr, "DATA_TEST_CHR");*/ } else { - /*if (app::TaskWork::CheckTaskReady(&data_test_chr)) - data_test_chr.DelTask();*/ + /*if (app::TaskWork::check_task_ready(&data_test_chr)) + data_test_chr.del();*/ } } diff --git a/src/ReDIVA/data_test/glitter_test.hpp b/src/ReDIVA/data_test/glitter_test.hpp index 3bcd8d0b..34484e51 100644 --- a/src/ReDIVA/data_test/glitter_test.hpp +++ b/src/ReDIVA/data_test/glitter_test.hpp @@ -26,10 +26,10 @@ public: TaskDataTestGlitterParticle(); virtual ~TaskDataTestGlitterParticle() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; void LoadFile(const char* file); void SceneFree(); diff --git a/src/ReDIVA/data_test/motion_test.cpp b/src/ReDIVA/data_test/motion_test.cpp index 87acfb11..0c1d7fc3 100644 --- a/src/ReDIVA/data_test/motion_test.cpp +++ b/src/ReDIVA/data_test/motion_test.cpp @@ -423,7 +423,7 @@ DataTestMot::~DataTestMot() { } -bool DataTestMot::Init() { +bool DataTestMot::init() { clear_color = 0xFF606060; set_clear_color = true; @@ -438,13 +438,13 @@ bool DataTestMot::Init() { data_test_mot_a3d_dw_init(); data.reset_cam = true; data.field_A8 = true; - dtm_eq_vs_array[0].AddTask(0, data.chara_index[0]); - dtm_eq_vs_array[1].AddTask(1, data.chara_index[1]); + dtm_eq_vs_array[0].add_task(0, data.chara_index[0]); + dtm_eq_vs_array[1].add_task(1, data.chara_index[1]); motion_test_objset_load(); return true; } -bool DataTestMot::Ctrl() { +bool DataTestMot::ctrl() { data_struct* aft_data = &data_list[DATA_AFT]; motion_database* aft_mot_db = &aft_data->data_ft.mot_db; @@ -599,15 +599,15 @@ bool DataTestMot::Ctrl() { } if (v3) - dtm_mot_array[0].DelTask(); + dtm_mot_array[0].del_task(); else - dtm_mot_array[0].AddTask(data.chara_index[0], + dtm_mot_array[0].add_task(data.chara_index[0], data.cos_id[0], data.motion_set_index[0], data.motion_index[0]); if (v2) - dtm_mot_array[1].DelTask(); + dtm_mot_array[1].del_task(); else - dtm_mot_array[1].AddTask(data.chara_index[1], + dtm_mot_array[1].add_task(data.chara_index[1], data.cos_id[1], data.motion_set_index[1], data.motion_index[1]); if (data.reset_cam) { @@ -650,25 +650,25 @@ bool DataTestMot::Ctrl() { return false; } -bool DataTestMot::Dest() { +bool DataTestMot::dest() { clear_color = 0xFF000000; set_clear_color = true; - dtm_mot_array[0].DelTask(); - dtm_mot_array[1].DelTask(); + dtm_mot_array[0].del(); + dtm_mot_array[1].del(); data_test_mot_dw_array_get(0)->Hide(); data_test_mot_dw_array_get(1)->Hide(); data_test_mot_ctrl_dw_get()->Hide(); data_test_mot_a3d_dw_get()->Hide(); data_test_face_mot_dw_array_unload(); - dtm_eq_vs_array[0].DelTask(); - dtm_eq_vs_array[1].DelTask(); + dtm_eq_vs_array[0].del_task(); + dtm_eq_vs_array[1].del_task(); motion_test_objset_unload(); - data_test_mot_a3d_get()->DelTask(); + data_test_mot_a3d_get()->del(); return true; } -void DataTestMot::Disp() { +void DataTestMot::disp() { } @@ -689,14 +689,14 @@ DataTestMotA3d::~DataTestMotA3d() { } -bool DataTestMotA3d::Init() { +bool DataTestMotA3d::init() { Reset(); auth_3d.clear(); state = 0; return true; } -bool DataTestMotA3d::Ctrl() { +bool DataTestMotA3d::ctrl() { switch (state) { case 0: state = 1; @@ -771,17 +771,17 @@ bool DataTestMotA3d::Ctrl() { return false; } -bool DataTestMotA3d::Dest() { +bool DataTestMotA3d::dest() { Reset(); camera = false; return true; } -void DataTestMotA3d::Disp() { +void DataTestMotA3d::disp() { } -void DataTestMotA3d::Basic() { +void DataTestMotA3d::basic() { } @@ -912,7 +912,7 @@ DtmMot::~DtmMot() { } -bool DtmMot::Init() { +bool DtmMot::init() { frame = 0.0f; delta_frame = 1.0f; state = 1; @@ -947,11 +947,7 @@ bool DtmMot::Init() { return true; } -void DtmMot::sub_1402922C0(bool value) { - this->field_100 = value; -} - -bool DtmMot::Ctrl() { +bool DtmMot::ctrl() { data_struct* aft_data = &data_list[DATA_AFT]; bone_database* aft_bone_data = &aft_data->data_ft.bone_data; motion_database* aft_mot_db = &aft_data->data_ft.mot_db; @@ -1256,7 +1252,7 @@ bool DtmMot::Ctrl() { return false; } -bool DtmMot::Dest() { +bool DtmMot::dest() { if (!state) return true; @@ -1284,7 +1280,7 @@ bool DtmMot::Dest() { return true; } -void DtmMot::Basic() { +void DtmMot::basic() { if (state != 13) return; @@ -1336,9 +1332,9 @@ void DtmMot::Basic() { this->frame = frame; } -bool DtmMot::AddTask(::chara_index chara_index, +bool DtmMot::add_task(::chara_index chara_index, int32_t cos_id, uint32_t motion_set_index, uint32_t motion_index) { - if (app::TaskWork::HasTask(this) || app::TaskWork::CheckTaskReady(this)) + if (app::TaskWork::has_task(this) || app::TaskWork::check_task_ready(this)) return true; this->chara_index = chara_index; @@ -1346,12 +1342,12 @@ bool DtmMot::AddTask(::chara_index chara_index, this->motion_index = motion_index; this->motion_set_index = motion_set_index; type = 0; - return app::TaskWork::AddTask(this, "DATA_TEST_MOTION_MANAGER", 0); + return app::TaskWork::add_task(this, "DATA_TEST_MOTION_MANAGER", 0); } -bool DtmMot::AddTask(::chara_index chara_index, +bool DtmMot::add_task(::chara_index chara_index, int32_t cos_id, uint32_t motion_id) { - if (app::TaskWork::HasTask(this) || app::TaskWork::CheckTaskReady(this)) + if (app::TaskWork::has_task(this) || app::TaskWork::check_task_ready(this)) return true; data_struct* aft_data = &data_list[DATA_AFT]; @@ -1362,12 +1358,12 @@ bool DtmMot::AddTask(::chara_index chara_index, this->motion_id = motion_id; this->motion_set_id = aft_mot_db->get_motion_set_id_by_motion_id(motion_id); type = 1; - return app::TaskWork::AddTask(this, "DATA_TEST_MOTION_MANAGER", 0); + return app::TaskWork::add_task(this, "DATA_TEST_MOTION_MANAGER", 0); } -bool DtmMot::DelTask() { - if (app::TaskWork::CheckTaskReady(this)) - return app::Task::DelTask(); +bool DtmMot::del_task() { + if (app::TaskWork::check_task_ready(this)) + return del(); return false; } @@ -1594,6 +1590,10 @@ int32_t DtmMot::ConvertMotionSetNameToPVID(const char* set_name) { return pv_id; } +void DtmMot::sub_1402922C0(bool value) { + field_100 = value; +} + void motion_test_init() { if (!data_test_mot) data_test_mot = new DataTestMot; @@ -2903,11 +2903,11 @@ static DataTestMot::Data* data_test_mot_data_get() { } static bool data_test_mot_a3d_add_task() { - return app::TaskWork::AddTask(data_test_mot_a3d_get(), "DATA_TEST_MOT_A3D", 0); + return app::TaskWork::add_task(data_test_mot_a3d_get(), "DATA_TEST_MOT_A3D", 0); } static bool data_test_mot_a3d_del_task() { - return data_test_mot_a3d_get()->DelTask(); + return data_test_mot_a3d_get()->del(); } static const char* data_test_mot_a3d_get_state_text() { diff --git a/src/ReDIVA/data_test/motion_test.hpp b/src/ReDIVA/data_test/motion_test.hpp index 54bce2bd..f3b42b4b 100644 --- a/src/ReDIVA/data_test/motion_test.hpp +++ b/src/ReDIVA/data_test/motion_test.hpp @@ -68,10 +68,10 @@ public: DataTestMot(); virtual ~DataTestMot() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; void sub_140286280(); }; @@ -88,11 +88,11 @@ public: DataTestMotA3d(); virtual ~DataTestMotA3d() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; - virtual void Basic() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; + virtual void basic() override; const char* GetStateText(); void LoadAuth3d(std::string&& name); @@ -150,16 +150,16 @@ public: DtmMot(); virtual ~DtmMot() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Basic() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void basic() override; - virtual bool AddTask(::chara_index chara_index, + virtual bool add_task(::chara_index chara_index, int32_t cos_id, uint32_t motion_set_index, uint32_t motion_index); - virtual bool AddTask(::chara_index chara_index, + virtual bool add_task(::chara_index chara_index, int32_t cos_id, uint32_t motion_id); - virtual bool DelTask(); + virtual bool del_task(); bool CheckFirstFrame(); void CtrlFaceMot(); diff --git a/src/ReDIVA/data_test/selector.cpp b/src/ReDIVA/data_test/selector.cpp index 7e917c6b..5b047762 100644 --- a/src/ReDIVA/data_test/selector.cpp +++ b/src/ReDIVA/data_test/selector.cpp @@ -38,20 +38,20 @@ static const int32_t data_test_sel_data_count = sizeof(data_test_sel_data) / siz DataTestSel* data_test_sel; DataTestSel::DataTestSel() : selected_index(), item_index() { - Init(); + init(); } DataTestSel::~DataTestSel() { } -bool DataTestSel::Init() { +bool DataTestSel::init() { selected_index = -1; item_index = 0; return true; } -bool DataTestSel::Ctrl() { +bool DataTestSel::ctrl() { InputState* input_state = input_state_get(0); if (input_state->CheckTapped(91)) item_index--; @@ -69,11 +69,11 @@ bool DataTestSel::Ctrl() { return false; } -bool DataTestSel::Dest() { +bool DataTestSel::dest() { return true; } -void DataTestSel::Disp() { +void DataTestSel::disp() { PrintWork print_work; font_info font(16); print_work.SetFont(&font); diff --git a/src/ReDIVA/data_test/selector.hpp b/src/ReDIVA/data_test/selector.hpp index bf76db03..ce8efdc1 100644 --- a/src/ReDIVA/data_test/selector.hpp +++ b/src/ReDIVA/data_test/selector.hpp @@ -17,10 +17,10 @@ public: DataTestSel(); ~DataTestSel(); - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; }; extern DataTestSel* data_test_sel; diff --git a/src/ReDIVA/data_test/stage_test.cpp b/src/ReDIVA/data_test/stage_test.cpp index 2754a4df..537d6802 100644 --- a/src/ReDIVA/data_test/stage_test.cpp +++ b/src/ReDIVA/data_test/stage_test.cpp @@ -62,13 +62,13 @@ DtmStg::~DtmStg() { } -bool DtmStg::Init() { +bool DtmStg::init() { task_stage_load_task("DATA_TEST_STG_STAGE"); task_stage_set_stage_index(stage_index); return true; } -bool DtmStg::Ctrl() { +bool DtmStg::ctrl() { if (task_stage_check_not_loaded()) return false; @@ -86,7 +86,7 @@ bool DtmStg::Ctrl() { return false; } -bool DtmStg::Dest() { +bool DtmStg::dest() { task_stage_unload_task(); return true; } @@ -96,18 +96,18 @@ void dtm_stg_init() { } void dtm_stg_load(int32_t stage_index) { - if (app::TaskWork::CheckTaskReady(dtm_stg)) + if (app::TaskWork::check_task_ready(dtm_stg)) return; - if (app::TaskWork::CheckTaskReady(dtm_stg)) { + if (app::TaskWork::check_task_ready(dtm_stg)) { dtm_stg->stage_index = stage_index; dtm_stg->load_stage_index = stage_index; } - app::TaskWork::AddTask(dtm_stg, "DATA_TEST_STAGE"); + app::TaskWork::add_task(dtm_stg, "DATA_TEST_STAGE"); } bool dtm_stg_unload() { - return dtm_stg->DelTask(); + return dtm_stg->del(); } void dtm_stg_free() { diff --git a/src/ReDIVA/data_test/stage_test.hpp b/src/ReDIVA/data_test/stage_test.hpp index c4e9b698..8affdd8b 100644 --- a/src/ReDIVA/data_test/stage_test.hpp +++ b/src/ReDIVA/data_test/stage_test.hpp @@ -25,9 +25,9 @@ public: DtmStg(); virtual ~DtmStg() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; }; extern DtmStg* dtm_stg; diff --git a/src/ReDIVA/game_state.cpp b/src/ReDIVA/game_state.cpp index 5e605011..966b8fe2 100644 --- a/src/ReDIVA/game_state.cpp +++ b/src/ReDIVA/game_state.cpp @@ -1215,12 +1215,12 @@ bool SubGameState::Selector::Init() { #if PV_DEBUG if (!pv_x) { pv_game_selector_init(); - app::TaskWork::AddTask(pv_game_selector_get(), "PVGAME SELECTOR", 0); + app::TaskWork::add_task(pv_game_selector_get(), "PVGAME SELECTOR", 0); return true; } #endif x_pv_game_selector_init(); - app::TaskWork::AddTask(x_pv_game_selector_get(), "X PVGAME SELECTOR", 0); + app::TaskWork::add_task(x_pv_game_selector_get(), "X PVGAME SELECTOR", 0); return true; } @@ -1270,8 +1270,8 @@ bool SubGameState::Selector::Ctrl() { XPVGameSelector* sel = x_pv_game_selector_get(); if (sel->exit) { if (sel->start && x_pv_game_init()) { - app::TaskWork::AddTask(x_pv_game_get(), "PVGAME", 0); - x_pv_game_get()->Load(sel->pv_id, sel->stage_id, sel->charas, sel->modules); + app::TaskWork::add_task(x_pv_game_get(), "PVGAME", 0); + x_pv_game_get()->load(sel->pv_id, sel->stage_id, sel->charas, sel->modules); game_state_set_sub_game_state_next(SUB_GAME_STATE_GAME_MAIN); } else @@ -1285,22 +1285,22 @@ bool SubGameState::Selector::Dest() { #if PV_DEBUG if (!pv_x) { PVGameSelector* sel = pv_game_selector_get(); - if (!app::TaskWork::CheckTaskReady(sel)) { + if (!app::TaskWork::check_task_ready(sel)) { pv_game_selector_free(); return true; } - sel->DelTask(); + sel->del(); return false; } #endif XPVGameSelector* sel = x_pv_game_selector_get(); - if (!app::TaskWork::CheckTaskReady(sel)) { + if (!app::TaskWork::check_task_ready(sel)) { x_pv_game_selector_free(); return true; } - sel->DelTask(); + sel->del(); return false; } @@ -1316,7 +1316,7 @@ bool SubGameState::GameMain::Ctrl() { return false; } #endif - if (!app::TaskWork::CheckTaskReady(x_pv_game_get())) + if (!app::TaskWork::check_task_ready(x_pv_game_get())) return true; return false; } @@ -1395,7 +1395,7 @@ bool SubGameState::GameOver::Dest() { } bool SubGameState::DataTestMain::Init() { - app::TaskWork::AddTask(data_test_sel, "DATA_TEST_MAIN"); + app::TaskWork::add_task(data_test_sel, "DATA_TEST_MAIN"); return true; } @@ -1407,7 +1407,7 @@ bool SubGameState::DataTestMain::Ctrl() { } bool SubGameState::DataTestMain::Dest() { - data_test_sel->DelTask(); + data_test_sel->del(); return true; } @@ -1443,7 +1443,7 @@ bool SubGameState::DataTestStg::Init() { cam->set_view_point({ 0.0f, 0.88f, 4.3f }); cam->set_interest({ 0.0f, 1.0f, 0.0f }); - app::TaskWork::AddTask(dtm_stg, "DATA_TEST_STAGE"); + app::TaskWork::add_task(dtm_stg, "DATA_TEST_STAGE"); dtw_stg_init(); return true; } @@ -1461,7 +1461,7 @@ bool SubGameState::DataTestStg::Dest() { } bool SubGameState::DataTestMot::Init() { - app::TaskWork::AddTask(data_test_mot, "TASK_DATA_TEST_MOT"); + app::TaskWork::add_task(data_test_mot, "TASK_DATA_TEST_MOT"); dtm_stg_load(0); dtw_stg_load(true); return true; @@ -1472,7 +1472,7 @@ bool SubGameState::DataTestMot::Ctrl() { } bool SubGameState::DataTestMot::Dest() { - data_test_mot->DelTask(); + data_test_mot->del(); dtm_stg_unload(); dtw_stg_unload(); return true; @@ -1519,7 +1519,7 @@ bool SubGameState::DataTestAet::Dest() { } bool SubGameState::DataTestAuth3d::Init() { - app::TaskWork::AddTask(auth_3d_test_task, "AUTH3DTEST"); + app::TaskWork::add_task(auth_3d_test_task, "AUTH3DTEST"); return true; } @@ -1528,7 +1528,7 @@ bool SubGameState::DataTestAuth3d::Ctrl() { } bool SubGameState::DataTestAuth3d::Dest() { - auth_3d_test_task->DelTask(); + auth_3d_test_task->del(); return true; } @@ -1629,7 +1629,7 @@ bool SubGameState::DataTestSlider::Dest() { } bool SubGameState::DataTestGlitter::Init() { - app::TaskWork::AddTask(task_data_test_glitter_particle, "DATA_TEST_PARTICLE"); + app::TaskWork::add_task(task_data_test_glitter_particle, "DATA_TEST_PARTICLE"); dtm_stg_load(0); dtw_stg_load(true); return true; @@ -1642,9 +1642,9 @@ bool SubGameState::DataTestGlitter::Ctrl() { bool SubGameState::DataTestGlitter::Dest() { dtw_stg_unload(); dtm_stg_unload(); - //if (data_test_chr->CheckTaskReady()) - // data_test_chr->DelTask(); - task_data_test_glitter_particle->DelTask(); + //if (data_test_chr->check_task_ready()) + // data_test_chr->del(); + task_data_test_glitter_particle->del(); return true; } @@ -1691,7 +1691,7 @@ bool SubGameState::GlitterEditor::Init() { // Added cam->set_view_point({ 0.0f, 1.4f, 1.0f }); cam->set_interest({ 0.0f, 1.4f, 0.0f }); - app::TaskWork::AddTask(&glitter_editor, "GLITTER EDITOR", 0); + app::TaskWork::add_task(&glitter_editor, "GLITTER EDITOR", 0); return true; } @@ -1700,13 +1700,13 @@ bool SubGameState::GlitterEditor::Ctrl() { // Added } bool SubGameState::GlitterEditor::Dest() { // Added - glitter_editor.DelTask(); + glitter_editor.del(); return true; } #if DATA_EDIT bool SubGameState::DataEdit::Init() { // Added - app::TaskWork::AddTask(&data_edit, "DATA EDIT", 0); + app::TaskWork::add_task(&data_edit, "DATA EDIT", 0); return true; } @@ -1715,7 +1715,7 @@ bool SubGameState::DataEdit::Ctrl() { // Added } bool SubGameState::DataEdit::Dest() { // Added - data_edit.DelTask(); + data_edit.del(); return true; } #endif @@ -1741,7 +1741,7 @@ void game_state_ctrl() { GameState* game_state = game_state_get(); if (!game_state->set_game_state_next) { if (game_state->set_sub_game_state_next && game_state->next_game_state) { - if (app::TaskWork::HasTasksDest()) { + if (app::TaskWork::has_tasks_dest()) { game_state->call_count++; return; } @@ -1753,7 +1753,7 @@ void game_state_ctrl() { } else { if (game_state->next_sub_game_state && game_state->next_game_state) { - if (app::TaskWork::HasTasksDest()) { + if (app::TaskWork::has_tasks_dest()) { game_state->call_count++; return; } diff --git a/src/ReDIVA/glitter_editor.cpp b/src/ReDIVA/glitter_editor.cpp index f72d6134..228f4cc0 100644 --- a/src/ReDIVA/glitter_editor.cpp +++ b/src/ReDIVA/glitter_editor.cpp @@ -188,7 +188,171 @@ static bool glitter_editor_hash_input(GlitterEditor* glt_edt, GlitterEditor glitter_editor; -bool GlitterEditor::Init() { +GlitterEditor::CurveEditor::CurveEditor() : type(), type_flags(), animation(), list(), +key(), frame_width(), zoom_time(), prev_zoom_time(), zoom_value(), key_radius_in(), +key_radius_out(), height_offset(), frame(), draw_list(), io(), timeline_pos(), +range(), offset(), add_key(), del_key(), add_curve(), del_curve(), key_edit() { + +} + +void GlitterEditor::CurveEditor::ResetCurves() { + memset(&list, 0, sizeof(list)); + animation = 0; + key = {}; +} + +void GlitterEditor::CurveEditor::ResetState(Glitter::CurveType type) { + this->type = type; + + if (type != -1) + type_flags = (Glitter::CurveTypeFlags)(1 << type); + else + type_flags = (Glitter::CurveTypeFlags)0; + + frame_width = 16; + zoom_time = 1.0f; + prev_zoom_time = 1.0f; + zoom_value = 1.0f; + key_radius_in = 6.0f; + key_radius_out = 8.0f; + height_offset = 20.0f; + frame = 0; + + timeline_pos = -curve_editor_timeline_base_pos; + + switch (type) { + case Glitter::CURVE_TRANSLATION_X: + case Glitter::CURVE_TRANSLATION_Y: + case Glitter::CURVE_TRANSLATION_Z: + range = 25.0f; + break; + case Glitter::CURVE_ROTATION_X: + case Glitter::CURVE_ROTATION_Y: + case Glitter::CURVE_ROTATION_Z: + range = 360.0f; + break; + case Glitter::CURVE_SCALE_X: + case Glitter::CURVE_SCALE_Y: + case Glitter::CURVE_SCALE_Z: + case Glitter::CURVE_SCALE_ALL: + range = 5.0f; + break; + case Glitter::CURVE_COLOR_R: + case Glitter::CURVE_COLOR_G: + case Glitter::CURVE_COLOR_B: + case Glitter::CURVE_COLOR_A: + case Glitter::CURVE_COLOR_RGB_SCALE: + case Glitter::CURVE_COLOR_R_2ND: + case Glitter::CURVE_COLOR_G_2ND: + case Glitter::CURVE_COLOR_B_2ND: + case Glitter::CURVE_COLOR_A_2ND: + case Glitter::CURVE_COLOR_RGB_SCALE_2ND: + range = 255.0f; + break; + case Glitter::CURVE_EMISSION_INTERVAL: + range = 20.0f; + break; + case Glitter::CURVE_PARTICLES_PER_EMISSION: + range = 50.0f; + break; + case Glitter::CURVE_U_SCROLL: + case Glitter::CURVE_V_SCROLL: + case Glitter::CURVE_U_SCROLL_ALPHA: + case Glitter::CURVE_V_SCROLL_ALPHA: + case Glitter::CURVE_U_SCROLL_2ND: + case Glitter::CURVE_V_SCROLL_2ND: + case Glitter::CURVE_U_SCROLL_ALPHA_2ND: + case Glitter::CURVE_V_SCROLL_ALPHA_2ND: + range = 1.0f; + break; + default: + range = 1.0f; + break; + } + + offset = 0.0f; + + add_key = false; + del_key = false; +} + +void GlitterEditor::CurveEditor::SetFlag(const Glitter::CurveTypeFlags type_flag) { + switch (type) { + case Glitter::CURVE_TRANSLATION_X: + case Glitter::CURVE_TRANSLATION_Y: + case Glitter::CURVE_TRANSLATION_Z: + if (type_flag & Glitter::CURVE_TYPE_TRANSLATION_XYZ) + enum_xor(type_flags, type_flag); + break; + case Glitter::CURVE_ROTATION_X: + case Glitter::CURVE_ROTATION_Y: + case Glitter::CURVE_ROTATION_Z: + if (type_flag & Glitter::CURVE_TYPE_ROTATION_XYZ) + enum_xor(type_flags, type_flag); + break; + case Glitter::CURVE_SCALE_X: + case Glitter::CURVE_SCALE_Y: + case Glitter::CURVE_SCALE_Z: + case Glitter::CURVE_SCALE_ALL: + if (type_flag & (Glitter::CURVE_TYPE_SCALE_XYZ | Glitter::CURVE_TYPE_SCALE_ALL)) + enum_xor(type_flags, type_flag); + break; + case Glitter::CURVE_COLOR_R: + case Glitter::CURVE_COLOR_G: + case Glitter::CURVE_COLOR_B: + case Glitter::CURVE_COLOR_A: + case Glitter::CURVE_COLOR_RGB_SCALE: + if (type_flag & (Glitter::CURVE_TYPE_COLOR_RGBA | Glitter::CURVE_TYPE_COLOR_RGB_SCALE)) + enum_xor(type_flags, type_flag); + break; + case Glitter::CURVE_COLOR_R_2ND: + case Glitter::CURVE_COLOR_G_2ND: + case Glitter::CURVE_COLOR_B_2ND: + case Glitter::CURVE_COLOR_A_2ND: + case Glitter::CURVE_COLOR_RGB_SCALE_2ND: + if (type_flag & (Glitter::CURVE_TYPE_COLOR_RGBA_2ND | Glitter::CURVE_TYPE_COLOR_RGB_SCALE_2ND)) + enum_xor(type_flags, type_flag); + break; + case Glitter::CURVE_U_SCROLL: + case Glitter::CURVE_V_SCROLL: + if (type_flag & Glitter::CURVE_TYPE_UV_SCROLL) + enum_xor(type_flags, type_flag); + break; + case Glitter::CURVE_U_SCROLL_ALPHA: + case Glitter::CURVE_V_SCROLL_ALPHA: + if (type_flag & Glitter::CURVE_TYPE_UV_SCROLL_ALPHA) + enum_xor(type_flags, type_flag); + break; + case Glitter::CURVE_U_SCROLL_2ND: + case Glitter::CURVE_V_SCROLL_2ND: + if (type_flag & Glitter::CURVE_TYPE_UV_SCROLL_2ND) + enum_xor(type_flags, type_flag); + break; + case Glitter::CURVE_U_SCROLL_ALPHA_2ND: + case Glitter::CURVE_V_SCROLL_ALPHA_2ND: + if (type_flag & Glitter::CURVE_TYPE_UV_SCROLL_ALPHA_2ND) + enum_xor(type_flags, type_flag); + break; + } + enum_or(type_flags, (1 << type)); +} + +GlitterEditor::GlitterEditor() : test(), create_popup(), load(), load_wait(), load_data(), load_data_wait(), +load_popup(), load_data_popup(), load_error_list_popup(), save(), save_popup(), save_compress(), save_encrypt(), +close(), close_editor(), input_play(), input_reload(), input_pause(), input_pause_temp(), input_reset(), +effect_group_add(), draw_flags(), resource_flags(), effect_flags(), emitter_flags(), particle_flags(), +load_glt_type(), save_glt_type(), load_data_type(), frame_counter(), old_frame_counter(), +start_frame(), end_frame(), counter(), effect_group(), scene(), hash(), selected_type(), +selected_resource(), selected_effect(), selected_emitter(), selected_particle(), +selected_edit_resource(), selected_edit_effect(), selected_edit_emitter(), selected_edit_particle() { + +} + +GlitterEditor::~GlitterEditor() { + +} + +bool GlitterEditor::init() { LARGE_INTEGER time; QueryPerformanceCounter(&time); Glitter::glt_particle_manager->random.value = (uint32_t)(time.LowPart * hash_fnv1a64m_empty); @@ -202,7 +366,7 @@ bool GlitterEditor::Init() { Glitter::glt_particle_manager->draw_all_mesh = true; draw_grid_3d = true; - Reset(); + reset(); dtm_stg_load(0); dtw_stg_load(true); @@ -452,7 +616,7 @@ bool GlitterEditor::Init() { return true; } -bool GlitterEditor::Ctrl() { +bool GlitterEditor::ctrl() { int32_t sel_rsrc = selected_resource; Glitter::Effect* sel_efct = selected_effect; Glitter::Emitter* sel_emit = selected_emitter; @@ -461,7 +625,7 @@ bool GlitterEditor::Ctrl() { if (effect_group_add) { Glitter::glt_particle_manager->UnloadEffectGroup(hash); - GlitterEditor::ResetDisp(); + GlitterEditor::reset_disp(); LARGE_INTEGER time; QueryPerformanceCounter(&time); @@ -924,7 +1088,7 @@ bool GlitterEditor::Ctrl() { Glitter::glt_particle_manager->FreeSceneEffect(scene_counter); Glitter::glt_particle_manager->UnloadEffectGroup(hash); - GlitterEditor::ResetDisp(); + GlitterEditor::reset_disp(); effect_group = 0; scene = 0; hash = 0; @@ -989,7 +1153,7 @@ bool GlitterEditor::Ctrl() { rob_frame = frame_counter; if (!effect_group) { - GlitterEditor::ResetDisp(); + GlitterEditor::reset_disp(); return close_editor; } @@ -997,7 +1161,7 @@ bool GlitterEditor::Ctrl() { return close_editor; } -bool GlitterEditor::Dest() { +bool GlitterEditor::dest() { dtw_stg_unload(); dtm_stg_unload(); Glitter::glt_particle_manager->FreeSceneEffect(scene_counter); @@ -1007,7 +1171,7 @@ bool GlitterEditor::Dest() { return true; } -void GlitterEditor::Disp() { +void GlitterEditor::disp() { //if (glt_edt->draw_flags & GLITTER_EDITOR_DISP_WIREFRAME) //glitter_editor_disp_wireframe(this); @@ -1015,7 +1179,7 @@ void GlitterEditor::Disp() { glitter_editor_draw_emitter_type(this); } -void GlitterEditor::Window() { +void GlitterEditor::window() { if (Input::IsKeyTapped(GLFW_KEY_O, GLFW_MOD_CONTROL)) glitter_editor_open_window(this); else if (Input::IsKeyTapped(GLFW_KEY_F4, GLFW_MOD_CONTROL)) @@ -1049,171 +1213,7 @@ void GlitterEditor::Window() { } } -GlitterEditor::CurveEditor::CurveEditor() : type(), type_flags(), animation(), list(), -key(), frame_width(), zoom_time(), prev_zoom_time(), zoom_value(), key_radius_in(), -key_radius_out(), height_offset(), frame(), draw_list(), io(), timeline_pos(), -range(), offset(), add_key(), del_key(), add_curve(), del_curve(), key_edit() { - -} - -void GlitterEditor::CurveEditor::ResetCurves() { - memset(&list, 0, sizeof(list)); - animation = 0; - key = {}; -} - -void GlitterEditor::CurveEditor::ResetState(Glitter::CurveType type) { - this->type = type; - - if (type != -1) - type_flags = (Glitter::CurveTypeFlags)(1 << type); - else - type_flags = (Glitter::CurveTypeFlags)0; - - frame_width = 16; - zoom_time = 1.0f; - prev_zoom_time = 1.0f; - zoom_value = 1.0f; - key_radius_in = 6.0f; - key_radius_out = 8.0f; - height_offset = 20.0f; - frame = 0; - - timeline_pos = -curve_editor_timeline_base_pos; - - switch (type) { - case Glitter::CURVE_TRANSLATION_X: - case Glitter::CURVE_TRANSLATION_Y: - case Glitter::CURVE_TRANSLATION_Z: - range = 25.0f; - break; - case Glitter::CURVE_ROTATION_X: - case Glitter::CURVE_ROTATION_Y: - case Glitter::CURVE_ROTATION_Z: - range = 360.0f; - break; - case Glitter::CURVE_SCALE_X: - case Glitter::CURVE_SCALE_Y: - case Glitter::CURVE_SCALE_Z: - case Glitter::CURVE_SCALE_ALL: - range = 5.0f; - break; - case Glitter::CURVE_COLOR_R: - case Glitter::CURVE_COLOR_G: - case Glitter::CURVE_COLOR_B: - case Glitter::CURVE_COLOR_A: - case Glitter::CURVE_COLOR_RGB_SCALE: - case Glitter::CURVE_COLOR_R_2ND: - case Glitter::CURVE_COLOR_G_2ND: - case Glitter::CURVE_COLOR_B_2ND: - case Glitter::CURVE_COLOR_A_2ND: - case Glitter::CURVE_COLOR_RGB_SCALE_2ND: - range = 255.0f; - break; - case Glitter::CURVE_EMISSION_INTERVAL: - range = 20.0f; - break; - case Glitter::CURVE_PARTICLES_PER_EMISSION: - range = 50.0f; - break; - case Glitter::CURVE_U_SCROLL: - case Glitter::CURVE_V_SCROLL: - case Glitter::CURVE_U_SCROLL_ALPHA: - case Glitter::CURVE_V_SCROLL_ALPHA: - case Glitter::CURVE_U_SCROLL_2ND: - case Glitter::CURVE_V_SCROLL_2ND: - case Glitter::CURVE_U_SCROLL_ALPHA_2ND: - case Glitter::CURVE_V_SCROLL_ALPHA_2ND: - range = 1.0f; - break; - default: - range = 1.0f; - break; - } - - offset = 0.0f; - - add_key = false; - del_key = false; -} - -void GlitterEditor::CurveEditor::SetFlag(const Glitter::CurveTypeFlags type_flag) { - switch (type) { - case Glitter::CURVE_TRANSLATION_X: - case Glitter::CURVE_TRANSLATION_Y: - case Glitter::CURVE_TRANSLATION_Z: - if (type_flag & Glitter::CURVE_TYPE_TRANSLATION_XYZ) - enum_xor(type_flags, type_flag); - break; - case Glitter::CURVE_ROTATION_X: - case Glitter::CURVE_ROTATION_Y: - case Glitter::CURVE_ROTATION_Z: - if (type_flag & Glitter::CURVE_TYPE_ROTATION_XYZ) - enum_xor(type_flags, type_flag); - break; - case Glitter::CURVE_SCALE_X: - case Glitter::CURVE_SCALE_Y: - case Glitter::CURVE_SCALE_Z: - case Glitter::CURVE_SCALE_ALL: - if (type_flag & (Glitter::CURVE_TYPE_SCALE_XYZ | Glitter::CURVE_TYPE_SCALE_ALL)) - enum_xor(type_flags, type_flag); - break; - case Glitter::CURVE_COLOR_R: - case Glitter::CURVE_COLOR_G: - case Glitter::CURVE_COLOR_B: - case Glitter::CURVE_COLOR_A: - case Glitter::CURVE_COLOR_RGB_SCALE: - if (type_flag & (Glitter::CURVE_TYPE_COLOR_RGBA | Glitter::CURVE_TYPE_COLOR_RGB_SCALE)) - enum_xor(type_flags, type_flag); - break; - case Glitter::CURVE_COLOR_R_2ND: - case Glitter::CURVE_COLOR_G_2ND: - case Glitter::CURVE_COLOR_B_2ND: - case Glitter::CURVE_COLOR_A_2ND: - case Glitter::CURVE_COLOR_RGB_SCALE_2ND: - if (type_flag & (Glitter::CURVE_TYPE_COLOR_RGBA_2ND | Glitter::CURVE_TYPE_COLOR_RGB_SCALE_2ND)) - enum_xor(type_flags, type_flag); - break; - case Glitter::CURVE_U_SCROLL: - case Glitter::CURVE_V_SCROLL: - if (type_flag & Glitter::CURVE_TYPE_UV_SCROLL) - enum_xor(type_flags, type_flag); - break; - case Glitter::CURVE_U_SCROLL_ALPHA: - case Glitter::CURVE_V_SCROLL_ALPHA: - if (type_flag & Glitter::CURVE_TYPE_UV_SCROLL_ALPHA) - enum_xor(type_flags, type_flag); - break; - case Glitter::CURVE_U_SCROLL_2ND: - case Glitter::CURVE_V_SCROLL_2ND: - if (type_flag & Glitter::CURVE_TYPE_UV_SCROLL_2ND) - enum_xor(type_flags, type_flag); - break; - case Glitter::CURVE_U_SCROLL_ALPHA_2ND: - case Glitter::CURVE_V_SCROLL_ALPHA_2ND: - if (type_flag & Glitter::CURVE_TYPE_UV_SCROLL_ALPHA_2ND) - enum_xor(type_flags, type_flag); - break; - } - enum_or(type_flags, (1 << type)); -} - -GlitterEditor::GlitterEditor() : test(), create_popup(), load(), load_wait(), load_data(), load_data_wait(), -load_popup(), load_data_popup(), load_error_list_popup(), save(), save_popup(), save_compress(), save_encrypt(), -close(), close_editor(), input_play(), input_reload(), input_pause(), input_pause_temp(), input_reset(), -effect_group_add(), draw_flags(), resource_flags(), effect_flags(), emitter_flags(), particle_flags(), -load_glt_type(), save_glt_type(), load_data_type(), frame_counter(), old_frame_counter(), -start_frame(), end_frame(), counter(), effect_group(), scene(), hash(), selected_type(), -selected_resource(), selected_effect(), selected_emitter(), selected_particle(), -selected_edit_resource(), selected_edit_effect(), selected_edit_emitter(), selected_edit_particle() { - -} - -GlitterEditor::~GlitterEditor() { - -} - -void GlitterEditor::Reset() { +void GlitterEditor::reset() { selected_type = GLITTER_EDITOR_SELECTED_NONE; selected_resource = -1; selected_effect = 0; @@ -1227,7 +1227,7 @@ void GlitterEditor::Reset() { curve_editor.ResetCurves(); } -void GlitterEditor::ResetDisp() { +void GlitterEditor::reset_disp() { Glitter::glt_particle_manager->selected_scene = 0; Glitter::glt_particle_manager->selected_effect = 0; Glitter::glt_particle_manager->selected_emitter = 0; @@ -1695,7 +1695,7 @@ static void glitter_editor_load_file(GlitterEditor* glt_edt, const char* path, c Glitter::glt_particle_manager->FreeSceneEffect(glt_edt->scene_counter); Glitter::glt_particle_manager->UnloadEffectGroup(glt_edt->hash); - GlitterEditor::ResetDisp(); + GlitterEditor::reset_disp(); glt_edt->effect_group = 0; glt_edt->scene = 0; @@ -1747,7 +1747,7 @@ static void glitter_editor_load_file(GlitterEditor* glt_edt, const char* path, c } } - GlitterEditor::ResetDisp(); + GlitterEditor::reset_disp(); Glitter::glt_particle_manager->GetSceneStartEndFrame( &glt_edt->start_frame, &glt_edt->end_frame, glt_edt->scene_counter); @@ -1764,7 +1764,7 @@ static void glitter_editor_load_file(GlitterEditor* glt_edt, const char* path, c glt_edt->load_data_wait = false; } - glt_edt->Reset(); + glt_edt->reset(); } static void glitter_editor_save_file(GlitterEditor* glt_edt, const char* path, const char* file) { @@ -2878,7 +2878,7 @@ End: case GLITTER_EDITOR_SELECTED_EFFECT: if (glt_edt->selected_type != type || glt_edt->selected_effect != effect) - glt_edt->Reset(); + glt_edt->reset(); glt_edt->selected_effect = effect; glt_edt->selected_emitter = 0; glt_edt->selected_particle = 0; @@ -2886,7 +2886,7 @@ End: case GLITTER_EDITOR_SELECTED_EMITTER: if (glt_edt->selected_type != type || glt_edt->selected_emitter != emitter) - glt_edt->Reset(); + glt_edt->reset(); glt_edt->selected_effect = effect; glt_edt->selected_emitter = emitter; glt_edt->selected_particle = 0; @@ -2894,7 +2894,7 @@ End: case GLITTER_EDITOR_SELECTED_PARTICLE: if (glt_edt->selected_type != type || glt_edt->selected_particle != particle) - glt_edt->Reset(); + glt_edt->reset(); glt_edt->selected_effect = effect; glt_edt->selected_emitter = emitter; glt_edt->selected_particle = particle; diff --git a/src/ReDIVA/glitter_editor.hpp b/src/ReDIVA/glitter_editor.hpp index d893ea3c..aaefe0fe 100644 --- a/src/ReDIVA/glitter_editor.hpp +++ b/src/ReDIVA/glitter_editor.hpp @@ -127,15 +127,15 @@ public: GlitterEditor(); virtual ~GlitterEditor() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; - virtual void Window() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; + virtual void window() override; - void Reset(); + void reset(); - static void ResetDisp(); + static void reset_disp(); }; extern GlitterEditor glitter_editor; diff --git a/src/ReDIVA/pv_game/game_2d.cpp b/src/ReDIVA/pv_game/game_2d.cpp index 7de404ad..8c5292e2 100644 --- a/src/ReDIVA/pv_game/game_2d.cpp +++ b/src/ReDIVA/pv_game/game_2d.cpp @@ -38,7 +38,7 @@ Game2dEnergyUnit::~Game2dEnergyUnit() { } -void Game2dEnergyUnit::Init() { +void Game2dEnergyUnit::init() { data_struct* aft_data = &data_list[DATA_AFT]; aet_database* aft_aet_db = &aft_data->data_ft.aet_db; sprite_database* aft_spr_db = &aft_data->data_ft.spr_db; @@ -122,7 +122,7 @@ void Game2dEnergyUnit::Init() { life_gauge_bonus = 0; } -void Game2dEnergyUnit::Ctrl() { +void Game2dEnergyUnit::ctrl() { data_struct* aft_data = &data_list[DATA_AFT]; aet_database* aft_aet_db = &aft_data->data_ft.aet_db; sprite_database* aft_spr_db = &aft_data->data_ft.spr_db; @@ -219,7 +219,7 @@ void Game2dEnergyUnit::Ctrl() { this->life_gauge = life_gauge; } -void Game2dEnergyUnit::Dest() { +void Game2dEnergyUnit::dest() { for (int32_t i = 0; i < 5; i++) { if (field_1B8[i]) { aet_manager_free_aet_object(field_1B8[i]); @@ -230,11 +230,11 @@ void Game2dEnergyUnit::Dest() { } } -void Game2dEnergyUnit::Disp() { - DispInner(); +void Game2dEnergyUnit::disp() { + disp_inner(); } -void Game2dEnergyUnit::DispInner() { +void Game2dEnergyUnit::disp_inner() { data_struct* aft_data = &data_list[DATA_AFT]; aet_database* aft_aet_db = &aft_data->data_ft.aet_db; sprite_database* aft_spr_db = &aft_data->data_ft.spr_db; @@ -468,32 +468,32 @@ TaskGame2d::~TaskGame2d() { } -bool TaskGame2d::Init() { +bool TaskGame2d::init() { energy_unit_init = false; - energy_unit.Init(); + energy_unit.init(); energy_unit_init = true; return true; } -bool TaskGame2d::Ctrl() { +bool TaskGame2d::ctrl() { if (energy_unit_init) - energy_unit.Ctrl(); + energy_unit.ctrl(); return false; } -bool TaskGame2d::Dest() { +bool TaskGame2d::dest() { energy_unit_init = false; - energy_unit.Dest(); + energy_unit.dest(); return true; } -void TaskGame2d::Disp() { +void TaskGame2d::disp() { if (energy_unit_init) - energy_unit.Disp(); + energy_unit.disp(); } bool task_game_2d_add_task() { - return app::TaskWork::AddTask(&task_game_2d, 0, "GAME_2D", 0); + return app::TaskWork::add_task(&task_game_2d, 0, "GAME_2D", 0); } void task_game_2d_set_energy_unit_no_fail(bool value) { @@ -509,5 +509,5 @@ void task_game_2d_sub_1403726D0(int32_t value) { } bool task_game_2d_del_task() { - return task_game_2d.DelTask(); + return task_game_2d.del(); } diff --git a/src/ReDIVA/pv_game/game_2d.hpp b/src/ReDIVA/pv_game/game_2d.hpp index f532f6d1..13a0c4ef 100644 --- a/src/ReDIVA/pv_game/game_2d.hpp +++ b/src/ReDIVA/pv_game/game_2d.hpp @@ -41,11 +41,11 @@ public: Game2dEnergyUnit(); virtual ~Game2dEnergyUnit(); - virtual void Init(); - virtual void Ctrl(); - virtual void Dest(); - virtual void Disp(); - virtual void DispInner(); + virtual void init(); + virtual void ctrl(); + virtual void dest(); + virtual void disp(); + virtual void disp_inner(); }; class TaskGame2d : public app::Task { @@ -56,10 +56,10 @@ public: TaskGame2d(); virtual ~TaskGame2d() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; }; extern bool task_game_2d_add_task(); diff --git a/src/ReDIVA/pv_game/pv_game.cpp b/src/ReDIVA/pv_game/pv_game.cpp index 43312b05..b2af151b 100644 --- a/src/ReDIVA/pv_game/pv_game.cpp +++ b/src/ReDIVA/pv_game/pv_game.cpp @@ -29,7 +29,7 @@ public: DivaPvFrameRate(); virtual ~DivaPvFrameRate() override; - virtual float_t GetDeltaFrame() override; + virtual float_t get_delta_frame() override; }; struct pv_game_parent { @@ -1537,7 +1537,7 @@ int32_t pv_game::ctrl(float_t delta_time, int64_t curr_time) { data.pv_data.ctrl(delta_time, curr_time, false); /*else for (int32_t i = 0; i < 2; i++) - if (app::TaskWork::CheckTaskReady(task_movie_get(i))) + if (app::TaskWork::check_task_ready(task_movie_get(i))) task_movie_get(i)->sub_14041F4E0();*/ if (!sub_14013C8C0()->sub_1400E7920()) { @@ -2668,7 +2668,7 @@ bool pv_game::load() { const pv_db_pv_difficulty* diff = get_pv_db_pv()->get_difficulty( sub_14013C8C0()->difficulty, sub_14013C8C0()->edition); /*for (pv_db_pv_movie& i : diff->movie_list) - if (app::TaskWork::CheckTaskReady(task_movie_get(i.index)) + if (app::TaskWork::check_task_ready(task_movie_get(i.index)) && !task_movie_get(i.index)->sub_14041F0E0()) return false;*/ @@ -3491,7 +3491,7 @@ bool pv_game::load() { frame_texture_slot++; } - /*if (app::TaskWork::CheckTaskReady(sel_main_get())) + /*if (app::TaskWork::check_task_ready(sel_main_get())) return false; if (sub_14013C8C0()->sub_1400E7910() != 3 && get_pv_db_pv()->id != 999) @@ -4446,7 +4446,7 @@ bool pv_game::unload() { pv_game_music_get()->stop(); /*for (int32_t i = 0; i < 2; i++) - if (app::TaskWork::CheckTaskReady(task_movie_get())) + if (app::TaskWork::check_task_ready(task_movie_get())) sub_14041F4E0(task_movie_get());*/ std::string effect_se_file_name = get_effect_se_file_name(); @@ -4627,7 +4627,7 @@ bool pv_game::unload() { data.effect_rs_list_hashes.clear(); /*for (int32_t i = 0; i < 2; i++) { - if (!app::TaskWork::CheckTaskReady(task_movie_get(i))) + if (!app::TaskWork::check_task_ready(task_movie_get(i))) continue; task_movie_get(i)->sub_14041F4E0(); @@ -4847,7 +4847,7 @@ void pv_game::sub_140106640() { } /*for (int32_t i = 0; i < 2; i++) { - if (!app::TaskWork::CheckTaskReady(task_movie_get(i))) + if (!app::TaskWork::check_task_ready(task_movie_get(i))) continue; task_movie_get(i)->sub_14041F4E0(); @@ -5032,7 +5032,7 @@ void pv_game::sub_140115C90(int32_t chara_id, bool disp, int32_t index, float_t id.set_last_frame(id.get_play_control_size() - 1.0f); FrameRateControl* sys_frame_rate = sys_frame_rate_get(chara_id); - sys_frame_rate->SetFrameSpeed(frame_speed); + sys_frame_rate->set_frame_speed(frame_speed); id.set_frame_rate(sys_frame_rate); } } @@ -5277,24 +5277,24 @@ TaskPvGame::~TaskPvGame() { } -bool TaskPvGame::Init() { +bool TaskPvGame::init() { #if PV_DEBUG pause = data.init_data.pv_id != 999; step_frame = false; is_paused = false; #endif - Load(data); + load(data); //touch_util::touch_reaction_set_enable(false); return true; } -bool TaskPvGame::Ctrl() { +bool TaskPvGame::ctrl() { return !pv_game_parent_ctrl(); } -bool TaskPvGame::Dest() { - if (!Unload()) +bool TaskPvGame::dest() { + if (!unload()) return false; extern float_t frame_speed; @@ -5304,12 +5304,12 @@ bool TaskPvGame::Dest() { return true; } -void TaskPvGame::Disp() { +void TaskPvGame::disp() { pv_game_parent_disp(); } #if PV_DEBUG -void TaskPvGame::Window() { +void TaskPvGame::window() { if (data.type != 2 || pv_game_parent_data.pv_state != 1) return; @@ -5387,7 +5387,7 @@ void TaskPvGame::Window() { ImGui::End(); } -void TaskPvGame::Basic() { +void TaskPvGame::basic() { if (data.type != 2 || pv_game_parent_data.pv_state != 1 || pv_game_parent_data.init_time) return; @@ -5422,7 +5422,7 @@ void TaskPvGame::Basic() { } #endif -void TaskPvGame::Load(TaskPvGame::Data& data) { +void TaskPvGame::load(TaskPvGame::Data& data) { pv_game_init(); pv_game_parent_data.update_func = pv_game_parent::ctrl; @@ -5471,7 +5471,7 @@ void TaskPvGame::Load(TaskPvGame::Data& data) { pv_game_parent_state = 0; } -bool TaskPvGame::Unload() { +bool TaskPvGame::unload() { switch (pv_game_parent_state) { case 0: pv_game_parent_data.state = 0; @@ -5502,28 +5502,28 @@ PVGameSelector::PVGameSelector() : charas(), modules(), start(), exit() { edition = 0; success = true; - ResetChara(); + reset_chara(); } PVGameSelector::~PVGameSelector() { } -bool PVGameSelector::Init() { +bool PVGameSelector::init() { start = false; exit = false; return true; } -bool PVGameSelector::Ctrl() { +bool PVGameSelector::ctrl() { return false; } -bool PVGameSelector::Dest() { +bool PVGameSelector::dest() { return true; } -void PVGameSelector::Window() { +void PVGameSelector::window() { static const char* difficulty_names[] = { "EASY", "NORMAL", @@ -5549,7 +5549,7 @@ void PVGameSelector::Window() { ImGuiWindowFlags window_flags = 0; window_flags |= ImGuiWindowFlags_NoResize; - window_focus = false; + focus = false; bool open = true; if (!ImGui::Begin("PV Game Selector", &open, window_flags)) { ImGui::End(); @@ -5583,7 +5583,7 @@ void PVGameSelector::Window() { edition = 0; success = true; - ResetChara(); + reset_chara(); } ImGui::PopID(); @@ -5591,7 +5591,7 @@ void PVGameSelector::Window() { ImGui::SetItemDefaultFocus(); } - window_focus |= true; + focus |= true; ImGui::EndCombo(); } if (imgui_font_arial) @@ -5611,14 +5611,14 @@ void PVGameSelector::Window() { edition = 0; success = true; - ResetChara(); + reset_chara(); } if (difficulty == i) ImGui::SetItemDefaultFocus(); } - window_focus |= true; + focus |= true; ImGui::EndCombo(); } ImGui::EndPropertyColumn(); @@ -5637,7 +5637,7 @@ void PVGameSelector::Window() { edition = i.edition; success = true; - ResetChara(); + reset_chara(); } ImGui::PopID(); @@ -5645,7 +5645,7 @@ void PVGameSelector::Window() { ImGui::SetItemDefaultFocus(); } - window_focus |= true; + focus |= true; ImGui::EndCombo(); } ImGui::EndPropertyColumn(); @@ -5663,12 +5663,12 @@ void PVGameSelector::Window() { const char* items = ""; int32_t index = 0; ImGui::DisableElementPush(false); - ImGui::ColumnComboBox(buf, &items, 1, &index, 0, false, &window_focus); + ImGui::ColumnComboBox(buf, &items, 1, &index, 0, false, &focus); ImGui::DisableElementPop(false); } else ImGui::ColumnComboBox(buf, chara_full_names, CHARA_MAX, - (int32_t*)&charas[i], 0, false, &window_focus); + (int32_t*)&charas[i], 0, false, &focus); if (chara_old != charas[i]) { modules[i] = 0; @@ -5711,7 +5711,7 @@ void PVGameSelector::Window() { ImGui::SetItemDefaultFocus(); } - window_focus |= true; + focus |= true; ImGui::EndCombo(); } ImGui::DisableElementPop(enable); @@ -5729,7 +5729,7 @@ void PVGameSelector::Window() { ImGui::End(); } -void PVGameSelector::ResetChara() { +void PVGameSelector::reset_chara() { for (int32_t i = 0; i < ROB_CHARA_COUNT; i++) { charas[i] = pv->get_performer_chara(i); this->modules[i] = 0; @@ -5818,23 +5818,23 @@ bool task_pv_game_add_task(TaskPvGame::Args& args) { task_pv_game->data.option = args.option; if (args.test_pv) - return app::TaskWork::AddTask(task_pv_game, "PVGAME", 0); + return app::TaskWork::add_task(task_pv_game, "PVGAME", 0); else - return app::TaskWork::AddTask(task_pv_game, 0, "PVGAME", 0); + return app::TaskWork::add_task(task_pv_game, 0, "PVGAME", 0); } bool task_pv_game_check_task_ready() { - return app::TaskWork::CheckTaskReady(task_pv_game); + return app::TaskWork::check_task_ready(task_pv_game); } bool task_pv_game_del_task() { - if (!app::TaskWork::CheckTaskReady(task_pv_game)) { + if (!app::TaskWork::check_task_ready(task_pv_game)) { delete task_pv_game; task_pv_game = 0; return true; } - task_pv_game->DelTask(); + task_pv_game->del(); return false; } @@ -5975,7 +5975,7 @@ bool task_pv_game_init_demo_pv(int32_t pv_id, pv_difficulty difficulty, bool mus task_pv_game->data.option = 0; - return app::TaskWork::AddTask(task_pv_game, 0, "PVGAMEDEMO", 0); + return app::TaskWork::add_task(task_pv_game, 0, "PVGAMEDEMO", 0); } void task_pv_game_init_test_pv() { @@ -6035,7 +6035,7 @@ DivaPvFrameRate::~DivaPvFrameRate() { } -float_t DivaPvFrameRate::GetDeltaFrame() { +float_t DivaPvFrameRate::get_delta_frame() { return get_delta_frame() * get_anim_frame_speed() * frame_speed; } diff --git a/src/ReDIVA/pv_game/pv_game.hpp b/src/ReDIVA/pv_game/pv_game.hpp index d5485345..69f36744 100644 --- a/src/ReDIVA/pv_game/pv_game.hpp +++ b/src/ReDIVA/pv_game/pv_game.hpp @@ -837,17 +837,17 @@ public: TaskPvGame(); virtual ~TaskPvGame() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; #if PV_DEBUG - virtual void Basic() override; - virtual void Window() override; + virtual void basic() override; + virtual void window() override; #endif - void Load(TaskPvGame::Data& data); - bool Unload(); + void load(TaskPvGame::Data& data); + bool unload(); }; #if PV_DEBUG @@ -867,12 +867,12 @@ public: PVGameSelector(); virtual ~PVGameSelector() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Window() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void window() override; - void ResetChara(); + void reset_chara(); }; #endif diff --git a/src/ReDIVA/pv_game/pv_game_pv_data.cpp b/src/ReDIVA/pv_game/pv_game_pv_data.cpp index c6377627..59eef78d 100644 --- a/src/ReDIVA/pv_game/pv_game_pv_data.cpp +++ b/src/ReDIVA/pv_game/pv_game_pv_data.cpp @@ -360,7 +360,7 @@ int64_t pv_game_pv_data::ctrl(float_t delta_time, int64_t curr_time, bool a4) { curr_time_float = (float_t)((double_t)this->curr_time * 0.000000001); /*for (int32_t i = 0; i < 2; i++) - if (app::TaskWork::CheckTaskReady(task_movie_get(i))) { + if (app::TaskWork::check_task_ready(task_movie_get(i))) { if (pv_game_get()->loaded) sub_14041F1B0(this->curr_time); break; @@ -1709,7 +1709,7 @@ bool pv_game_pv_data::dsc_ctrl(float_t delta_time, int64_t curr_time, case DSC_FT_MOVIE_PLAY: { int32_t v408 = data[0]; - /*if (pv_game_get()->loaded && v408 && app::TaskWork::CheckTaskReady(task_movie_get(0))) { + /*if (pv_game_get()->loaded && v408 && app::TaskWork::check_task_ready(task_movie_get(0))) { v410 = task_movie_get(0); task_movie_get(0)->sub_14041EF10(); pv_game_get()->data.field_2D0C0 = 0; @@ -1722,7 +1722,7 @@ bool pv_game_pv_data::dsc_ctrl(float_t delta_time, int64_t curr_time, break; /*for (int32_t i = 0; i < 2; i++) { - if (!app::TaskWork::CheckTaskReady(task_movie_get(i))) + if (!app::TaskWork::check_task_ready(task_movie_get(i))) continue; int32_t v415 = 0; @@ -1976,10 +1976,10 @@ bool pv_game_pv_data::dsc_ctrl(float_t delta_time, int64_t curr_time, if (pv_game_get()->loaded) { for (int32_t m = 0; m < 2; m++) - if (app::TaskWork::CheckTaskReady(task_movie_get(m))) + if (app::TaskWork::check_task_ready(task_movie_get(m))) task_movie_get(m)->field_88 = 0; - if (v486 != -1 && app::TaskWork::CheckTaskReady(task_movie_get(v486))) { + if (v486 != -1 && app::TaskWork::check_task_ready(task_movie_get(v486))) { task_movie_get(v486)->sub_14041EF10((__int64)v492); pv_game_get()->data.field_2D0C0 = v486; //sub_14041F210(curr_time); diff --git a/src/ReDIVA/render.cpp b/src/ReDIVA/render.cpp index 9ce0ff34..7e42c8a8 100644 --- a/src/ReDIVA/render.cpp +++ b/src/ReDIVA/render.cpp @@ -953,10 +953,10 @@ static render_context* render_context_load() { render_timer->start_of_cycle(); lock_lock(render_lock); game_state_ctrl(); - app::TaskWork::Ctrl(); + app::TaskWork::ctrl(); sound_ctrl(); file_handler_storage_ctrl(); - app::TaskWork::Basic(); + app::TaskWork::basic(); lock_unlock(render_lock); render_timer->end_of_cycle(); } @@ -1042,7 +1042,7 @@ static void render_context_ctrl(render_context* rctx) { global_context_menu = true; lock_lock(imgui_context_lock); ImGui::SetCurrentContext(imgui_context); - app::TaskWork_Window(); + app::TaskWork_window(); classes_process_imgui(classes, classes_count); lock_unlock(imgui_context_lock); @@ -1221,7 +1221,7 @@ static void render_context_dispose(render_context* rctx) { aet_manager_del_task(); task_pv_db_del_task(); - app::TaskWork::Dest(); + app::TaskWork::dest(); sound_work_unload_farc("rom/sound/se.farc"); sound_work_unload_farc("rom/sound/button.farc"); @@ -1259,10 +1259,10 @@ static void render_context_dispose(render_context* rctx) { render_timer->start_of_cycle(); lock_lock(render_lock); game_state_ctrl(); - app::TaskWork::Ctrl(); + app::TaskWork::ctrl(); sound_ctrl(); file_handler_storage_ctrl(); - app::TaskWork::Basic(); + app::TaskWork::basic(); lock_unlock(render_lock); render_timer->end_of_cycle(); } @@ -1383,7 +1383,7 @@ static void render_drop_glfw(GLFWwindow* window, int32_t count, char** paths) { classes_process_drop(classes, classes_count, count, paths); #if ReDIVA_DEV - if (app::TaskWork::HasTask(&glitter_editor)) { + if (app::TaskWork::has_task(&glitter_editor)) { glitter_editor.file.assign(paths[0]); glitter_editor.load_popup = true; } diff --git a/src/ReDIVA/system_startup.cpp b/src/ReDIVA/system_startup.cpp index 2477ec80..aa8bbbba 100644 --- a/src/ReDIVA/system_startup.cpp +++ b/src/ReDIVA/system_startup.cpp @@ -35,14 +35,14 @@ namespace system_startup_detail { } - bool TaskSystemStartup::Init() { + bool TaskSystemStartup::init() { system_startup.state = 0; system_startup.wait = 0; system_startup.ready = false; return true; } - bool TaskSystemStartup::Ctrl() { + bool TaskSystemStartup::ctrl() { system_startup_ready = 0; switch (system_startup.state) { case 0: @@ -55,7 +55,7 @@ namespace system_startup_detail { system_startup.state = 3; break; case 3: - if (!app::TaskWork::CheckTaskReady(mdata_manager_get())) + if (!app::TaskWork::check_task_ready(mdata_manager_get())) system_startup.state = 4; break; case 4: @@ -83,7 +83,7 @@ namespace system_startup_detail { return false; } - bool TaskSystemStartup::Dest() { + bool TaskSystemStartup::dest() { if (task_pv_game_check_task_ready() && !system_startup_check_ready()) return false; @@ -92,7 +92,7 @@ namespace system_startup_detail { return true; } - void TaskSystemStartup::Disp() { + void TaskSystemStartup::disp() { resolution_struct* res_wind = res_window_get(); spr::put_sprite_rect({ 0.0f, 0.0f, (float_t)res_wind->width, (float_t)res_wind->height }, res_wind->resolution_mode, spr::SPR_PRIO_25, color_black, 0); @@ -103,17 +103,17 @@ bool task_system_startup_add_task() { if (!task_system_startup) task_system_startup = new system_startup_detail::TaskSystemStartup; - return app::TaskWork::AddTask(task_system_startup, "SYSTEM_STARTUP"); + return app::TaskWork::add_task(task_system_startup, "SYSTEM_STARTUP"); } bool task_system_startup_del_task() { - if (!app::TaskWork::CheckTaskReady(task_system_startup)) { + if (!app::TaskWork::check_task_ready(task_system_startup)) { delete task_system_startup; task_system_startup = 0; return true; } - task_system_startup->DelTask(); + task_system_startup->del(); return false; } diff --git a/src/ReDIVA/system_startup.hpp b/src/ReDIVA/system_startup.hpp index fb9d1d98..872ea50f 100644 --- a/src/ReDIVA/system_startup.hpp +++ b/src/ReDIVA/system_startup.hpp @@ -16,10 +16,10 @@ namespace system_startup_detail { TaskSystemStartup(); virtual ~TaskSystemStartup() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; }; } diff --git a/src/ReDIVA/task_window.cpp b/src/ReDIVA/task_window.cpp index fc93563d..a2d59dcf 100644 --- a/src/ReDIVA/task_window.cpp +++ b/src/ReDIVA/task_window.cpp @@ -10,8 +10,8 @@ extern bool input_locked; namespace app { static void TaskWindow_do_disp(TaskWindow* t); - TaskWindow::TaskWindow() : window_focus() { - show_window = true; + TaskWindow::TaskWindow() : focus() { + show = true; first_show = true; } @@ -19,36 +19,36 @@ namespace app { } - void TaskWindow::Window() { + void TaskWindow::window() { } - void TaskWindow::HideWindow() { - show_window = false; + void TaskWindow::hide_window() { + show = false; } - void TaskWindow::ShowWindow() { - show_window = true; + void TaskWindow::show_window() { + show = true; } - void TaskWork_Window() { - task_work->disp = true; + void TaskWork_window() { + task_work->disp_task = true; for (int32_t i = 0; i < 3; i++) for (Task*& j : task_work->tasks) { Task* tsk = j; TaskWindow* tsk_w = dynamic_cast(tsk); - if (tsk_w && tsk_w->priority == i && tsk_w->show_window) { + if (tsk_w && tsk_w->priority == i && tsk_w->show) { TaskWindow_do_disp(tsk_w); - input_locked |= tsk_w->window_focus; + input_locked |= tsk_w->focus; } } - task_work->disp = false; + task_work->disp_task = false; } static void TaskWindow_do_disp(TaskWindow* t) { if ((t->state == Task::State::Running || t->state == Task::State::Suspended) && t->op != Task::Op::Init && t->op != Task::Op::Dest) { - t->Window(); + t->window(); t->first_show = false; } } diff --git a/src/ReDIVA/task_window.hpp b/src/ReDIVA/task_window.hpp index 24a5bd98..4f200374 100644 --- a/src/ReDIVA/task_window.hpp +++ b/src/ReDIVA/task_window.hpp @@ -16,17 +16,17 @@ namespace app { class TaskWindow : public Task { public: - bool show_window; - bool window_focus; + bool show; + bool focus; bool first_show; TaskWindow(); ~TaskWindow(); - virtual void Window() = 0; + virtual void window() = 0; - void HideWindow(); - void ShowWindow(); + void hide_window(); + void show_window(); }; - extern void TaskWork_Window(); + extern void TaskWork_window(); } diff --git a/src/ReDIVA/x_pv_game.cpp b/src/ReDIVA/x_pv_game.cpp index 21cc8828..fb0f8dee 100644 --- a/src/ReDIVA/x_pv_game.cpp +++ b/src/ReDIVA/x_pv_game.cpp @@ -531,15 +531,15 @@ BPMFrameRateControl::~BPMFrameRateControl() { } -float_t BPMFrameRateControl::GetDeltaFrame() { +float_t BPMFrameRateControl::get_delta_frame() { if (bar_beat) return bar_beat->get_delta_frame(); return 0.0f; } -void BPMFrameRateControl::Reset() { +void BPMFrameRateControl::reset() { bar_beat = 0; - SetFrameSpeed(1.0f); + set_frame_speed(1.0f); } XPVFrameRateControl::XPVFrameRateControl() { @@ -550,11 +550,11 @@ XPVFrameRateControl::~XPVFrameRateControl() { } -float_t XPVFrameRateControl::GetDeltaFrame() { +float_t XPVFrameRateControl::get_delta_frame() { return get_delta_frame() * frame_speed; } -void XPVFrameRateControl::Reset() { +void XPVFrameRateControl::reset() { frame_speed = 1.0f; } @@ -3870,7 +3870,7 @@ PVStageFrameRateControl::~PVStageFrameRateControl() { } -float_t PVStageFrameRateControl::GetDeltaFrame() { +float_t PVStageFrameRateControl::get_delta_frame() { return delta_frame; } @@ -5014,7 +5014,7 @@ void x_pv_game_stage::reset() { delete stage_resource; stage_resource = 0; } - bpm_frame_rate_control.Reset(); + bpm_frame_rate_control.reset(); stage_auth_3d.clear(); stage_auth_3d.shrink_to_fit(); stage_glitter.clear(); @@ -5388,7 +5388,7 @@ x_pv_game::~x_pv_game() { } -bool x_pv_game::Init() { +bool x_pv_game::init() { task_rob_manager_add_task(); return true; } @@ -5458,7 +5458,7 @@ static void a3da_key_rev(a3da_key& k, std::vector& values_src) { static int32_t frame_prev = -1; #endif -bool x_pv_game::Ctrl() { +bool x_pv_game::ctrl() { #if BAKE_VIDEO auto write_frame = [&](int32_t idx) { int32_t res = 0; @@ -6603,7 +6603,11 @@ bool x_pv_game::Ctrl() { } #endif - unload(); + for (int32_t i = 0; i < pv_count; i++) + data[i].unload(); + stage_data.unload(); + state = 50; + state_old = 22; } break; case 22: { @@ -6612,14 +6616,14 @@ bool x_pv_game::Ctrl() { Glitter::glt_particle_manager->FreeScenes(); - DelTask(); + del(); } break; } return false; } -bool x_pv_game::Dest() { - if (!Unload()) +bool x_pv_game::dest() { + if (!unload()) return false; task_rob_manager_del_task(); @@ -6633,13 +6637,13 @@ bool x_pv_game::Dest() { return true; } -void x_pv_game::Disp() { +void x_pv_game::disp() { if (state_old != 20) return; } -void x_pv_game::Basic() { +void x_pv_game::basic() { if (state_old != 20 && state_old != 21) return; @@ -6733,7 +6737,7 @@ void x_pv_game::Basic() { #endif } -void x_pv_game::Window() { +void x_pv_game::window() { if (state_old != 20) return; @@ -6748,7 +6752,7 @@ void x_pv_game::Window() { } if (!pause) { - Basic(); + basic(); return; } @@ -6810,10 +6814,10 @@ void x_pv_game::Window() { input_locked |= ImGui::IsWindowFocused(); ImGui::End(); - Basic(); + basic(); } -void x_pv_game::Load(int32_t pv_id, int32_t stage_id, chara_index charas[6], int32_t modules[6]) { +void x_pv_game::load(int32_t pv_id, int32_t stage_id, chara_index charas[6], int32_t modules[6]) { data_struct* aft_data = &data_list[DATA_AFT]; motion_database* aft_mot_db = &aft_data->data_ft.mot_db; @@ -7234,7 +7238,7 @@ static void mot_write_motion_set(x_pv_game* xpvgm) { } #endif -bool x_pv_game::Unload() { +bool x_pv_game::unload() { pv_osage_manager_array_set_not_reset_true(); if (pv_osage_manager_array_get_disp()) return false; @@ -7483,15 +7487,8 @@ void x_pv_game::stop_current_pv() { return; data[pv_index].stop(); - field_7198C.Reset(); - field_71994.Reset(); -} - -void x_pv_game::unload() { - for (int32_t i = 0; i < pv_count; i++) - data[i].unload(); - stage_data.unload(); - state = 50; + field_7198C.reset(); + field_71994.reset(); } XPVGameSelector::XPVGameSelector() : charas(), modules(), start(), exit() { @@ -7553,21 +7550,21 @@ XPVGameSelector::~XPVGameSelector() { } -bool XPVGameSelector::Init() { +bool XPVGameSelector::init() { start = false; exit = false; return true; } -bool XPVGameSelector::Ctrl() { +bool XPVGameSelector::ctrl() { return false; } -bool XPVGameSelector::Dest() { +bool XPVGameSelector::dest() { return true; } -void XPVGameSelector::Window() { +void XPVGameSelector::window() { static const char* pv_names[] = { u8"801. Strangers", u8"802. Ai Dee", @@ -7655,7 +7652,7 @@ void XPVGameSelector::Window() { ImGuiWindowFlags window_flags = 0; window_flags |= ImGuiWindowFlags_NoResize; - window_focus = false; + focus = false; bool open = true; if (!ImGui::Begin("X PV Game Selector", &open, window_flags)) { ImGui::End(); @@ -7670,12 +7667,12 @@ void XPVGameSelector::Window() { pv_id -= 801; pv_id = max_def(pv_id, 0); - ImGui::ColumnComboBox("PV", pv_names, 32, &pv_id, 0, false, &window_focus); + ImGui::ColumnComboBox("PV", pv_names, 32, &pv_id, 0, false, &focus); pv_id += 801; stage_id--; stage_id = max_def(stage_id, 0); - ImGui::ColumnComboBox("Stage", stage_names, 32, &stage_id, 0, false, &window_focus); + ImGui::ColumnComboBox("Stage", stage_names, 32, &stage_id, 0, false, &focus); stage_id++; char buf[0x200]; @@ -7684,7 +7681,7 @@ void XPVGameSelector::Window() { sprintf_s(buf, sizeof(buf), "Chara %dP", i + 1); ImGui::ColumnComboBox(buf, chara_full_names, CHARA_MAX, - (int32_t*)&charas[i], 0, false, &window_focus); + (int32_t*)&charas[i], 0, false, &focus); if (chara_old != charas[i]) { modules[i] = 0; @@ -7723,7 +7720,7 @@ void XPVGameSelector::Window() { ImGui::SetItemDefaultFocus(); } - window_focus |= true; + focus |= true; ImGui::EndCombo(); } if (imgui_font_arial) @@ -7762,7 +7759,7 @@ bool x_pv_game_free() { return false; } - if (app::TaskWork::HasTask(x_pv_game_ptr)) + if (app::TaskWork::has_task(x_pv_game_ptr)) return false; delete x_pv_game_ptr; diff --git a/src/ReDIVA/x_pv_game.hpp b/src/ReDIVA/x_pv_game.hpp index 60e19db0..749c9b78 100644 --- a/src/ReDIVA/x_pv_game.hpp +++ b/src/ReDIVA/x_pv_game.hpp @@ -92,9 +92,9 @@ public: BPMFrameRateControl(); virtual ~BPMFrameRateControl() override; - virtual float_t GetDeltaFrame() override; + virtual float_t get_delta_frame() override; - void Reset(); + void reset(); }; class XPVFrameRateControl : public FrameRateControl { @@ -102,9 +102,9 @@ public: XPVFrameRateControl(); virtual ~XPVFrameRateControl() override; - virtual float_t GetDeltaFrame() override; + virtual float_t get_delta_frame() override; - void Reset(); + void reset(); }; struct x_pv_play_data_set_motion { @@ -547,7 +547,7 @@ public: PVStageFrameRateControl(); virtual ~PVStageFrameRateControl() override; - virtual float_t GetDeltaFrame() override; + virtual float_t get_delta_frame() override; }; struct aet_obj_data { @@ -786,19 +786,18 @@ public: x_pv_game(); virtual ~x_pv_game() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Disp() override; - virtual void Basic() override; - virtual void Window() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void disp() override; + virtual void basic() override; + virtual void window() override; - void Load(int32_t pv_id, int32_t stage_id, chara_index charas[6], int32_t modules[6]); - bool Unload(); + void load(int32_t pv_id, int32_t stage_id, chara_index charas[6], int32_t modules[6]); + bool unload(); void ctrl(float_t curr_time, float_t delta_time); void stop_current_pv(); - void unload(); inline x_pv_game_data& get_data() { return data[pv_index]; @@ -819,10 +818,10 @@ public: XPVGameSelector(); virtual ~XPVGameSelector() override; - virtual bool Init() override; - virtual bool Ctrl() override; - virtual bool Dest() override; - virtual void Window() override; + virtual bool init() override; + virtual bool ctrl() override; + virtual bool dest() override; + virtual void window() override; }; extern bool x_pv_game_init();