Skip to content

Add checkbox in menu to sort animations in alphabetical order #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sliim wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add checkbox in menu to sort animations in alphabetical order #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/AnimationWallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ AnimationWallet::AnimationWallet()
this->not_initialized = true;
}

AnimationWallet::AnimationWallet(std::string dolphin_path)
AnimationWallet::AnimationWallet(std::string dolphin_path, bool sort_anims)
{
this->dolphin_path = dolphin_path;
this->not_initialized = false;
this->load_animations();
this->load_animations(sort_anims);
}

void AnimationWallet::load_animations()
void AnimationWallet::load_animations(bool sort_anims)
{
std::string dolphin_path = this->dolphin_path;

Expand Down Expand Up @@ -68,6 +68,9 @@ void AnimationWallet::load_animations()
}
}

if (sort_anims)
std::sort(this->animations_names_temp.begin(), this->animations_names_temp.end());

this->total_animations__loading = this->animations_names_temp.size();

if(dolphin_path.at(dolphin_path.size() - 1) == '/' || dolphin_path.at(dolphin_path.size() - 1) == '\\')
Expand Down
4 changes: 2 additions & 2 deletions src/AnimationWallet.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ class AnimationWallet

public:
AnimationWallet();
AnimationWallet(std::string dolphin_path);
AnimationWallet(std::string dolphin_path, bool sort_anims);
~AnimationWallet();
void load_animations();
void load_animations(bool sort_anims);
void add_animation(std::string anim_folder, std::string anim_name);
void parse_manifest();
bool get_is_folder_correct();
Expand Down
21 changes: 15 additions & 6 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ int main(int argc, char* argv[])
SDL_SetWindowMinimumSize(window, 1280, 720);
SDL_GL_SetSwapInterval(1); // Enable vsync

bool sort_anims = false;

AnimationWallet* animations_wallet;

char current_animations_folder[1024] = {0};
Expand All @@ -78,7 +80,7 @@ int main(int argc, char* argv[])
if(strlen(argv[1]) <= 1024)
{
strcpy(current_animations_folder, argv[1]);
animations_wallet = new AnimationWallet(current_animations_folder);
animations_wallet = new AnimationWallet(current_animations_folder, sort_anims);
}
else
animations_wallet = new AnimationWallet();
Expand Down Expand Up @@ -421,10 +423,17 @@ int main(int argc, char* argv[])
{
ImGui::Checkbox("Minimal UI Mode", &theater_mode);

if(ImGui::Checkbox("Sort animations", &sort_anims))
{
animation_wallet_loaded = false;
delete(animations_wallet);
animations_wallet = new AnimationWallet(current_animations_folder, sort_anims);
}

ImGui::MenuItem("About");
if(ImGui::IsItemClicked())
ImGui::OpenPopup("About");

ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(20, 20));
ImGui::SetNextWindowSize(ImVec2(500, 350));
if(ImGui::BeginPopupModal("About", NULL, ImGuiWindowFlags_NoResize))
Expand Down Expand Up @@ -649,7 +658,7 @@ int main(int argc, char* argv[])
{
animation_wallet_loaded = false;
delete(animations_wallet);
animations_wallet = new AnimationWallet(current_animations_folder);
animations_wallet = new AnimationWallet(current_animations_folder, sort_anims);
}
if(!animation_wallet_loaded)
{
Expand Down Expand Up @@ -689,20 +698,20 @@ int main(int argc, char* argv[])
ImGui::SetWindowFontScale(default_font_size);
ImGui::EndPopup();
}

if(file_dialog.showFileDialog("Select Folder", imgui_addons::ImGuiFileBrowser::DialogMode::SELECT, ImVec2(700, 510)))
{
animation_wallet_loaded = false;
strcpy(current_animations_folder, file_dialog.selected_path.c_str());
delete(animations_wallet);
animations_wallet = new AnimationWallet(current_animations_folder);
animations_wallet = new AnimationWallet(current_animations_folder, sort_anims);
}

if(ImGui::Button("Load"))
{
animation_wallet_loaded = false;
delete(animations_wallet);
animations_wallet = new AnimationWallet(current_animations_folder);
animations_wallet = new AnimationWallet(current_animations_folder, sort_anims);
}
if(animations_wallet->get_is_folder_correct())
{
Expand Down