Persson-dev/Tower-Defense
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

fix: compiler warnings

Browse Source
This commit is contained in:
Simon Pribylski
2021-09-02 10:48:14 +02:00
parent fe86bffc2e
commit 04d1e3c0bf
22 changed files with 74 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/render/gui/TowerGui.cpp
View File

@@ -161,12 +161,13 @@ void renderMainMenu(){
ImVec4 getImGuiTeamColor(td::game::TeamColor color){
switch (color){
case td::game::TeamColor::None:
return ImVec4(1, 1, 1, 1);
break;
case td::game::TeamColor::Red:
return ImVec4(1, 0, 0, 1);
case td::game::TeamColor::Blue:
return ImVec4(0, 0, 1, 1);
}
return ImVec4(1, 1, 1, 1);
}
void showPlayers(){

34
src/render/gui/imgui/imgui_filebrowser.cpp
View File

@@ -227,7 +227,7 @@ namespace imgui_addons
ImGui::BeginChild("##NavigationWindow", nw_size, true, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoScrollbar);
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.882f, 0.745f, 0.078f,1.0f));
for(int i = 0; i < current_dirlist.size(); i++)
for(std::size_t i = 0; i < current_dirlist.size(); i++)
{
if( ImGui::Button(current_dirlist[i].c_str()) )
{
@@ -259,7 +259,7 @@ namespace imgui_addons
if(ImGui::ListBoxHeader("##NavBarDropBox", ImVec2(0, list_item_height* 5)))
{
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.882f, 0.745f, 0.078f,1.0f));
for(int j = i+1; j < current_dirlist.size(); j++)
for(std::size_t j = i+1; j < current_dirlist.size(); j++)
{
if(ImGui::Selectable(current_dirlist[j].c_str(), false) && j != current_dirlist.size() - 1)
{
@@ -345,12 +345,12 @@ namespace imgui_addons
//Output directories in yellow
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.882f, 0.745f, 0.078f,1.0f));
int items = 0;
for (int i = 0; i < filtered_dirs.size(); i++)
for (std::size_t i = 0; i < filtered_dirs.size(); i++)
{
if(!filtered_dirs[i]->is_hidden || show_hidden)
{
items++;
if(ImGui::Selectable(filtered_dirs[i]->name.c_str(), selected_idx == i && is_dir, ImGuiSelectableFlags_AllowDoubleClick))
if(ImGui::Selectable(filtered_dirs[i]->name.c_str(), selected_idx == (int) i && is_dir, ImGuiSelectableFlags_AllowDoubleClick))
{
selected_idx = i;
is_dir = true;
@@ -372,14 +372,13 @@ namespace imgui_addons
ImGui::PopStyleColor(1);
//Output files
for (int i = 0; i < filtered_files.size(); i++)
for (std::size_t i = 0; i < filtered_files.size(); i++)
{
if(!filtered_files[i]->is_hidden || show_hidden)
{
items++;
if(ImGui::Selectable(filtered_files[i]->name.c_str(), selected_idx == i && !is_dir, ImGuiSelectableFlags_AllowDoubleClick))
if(ImGui::Selectable(filtered_files[i]->name.c_str(), selected_idx == (int) i && !is_dir, ImGuiSelectableFlags_AllowDoubleClick))
{
int len = filtered_files[i]->name.length();
selected_idx = i;
is_dir = false;
@@ -406,7 +405,6 @@ namespace imgui_addons
{
std::string label = (dialog_mode == DialogMode::SAVE) ? "Save As:" : "Open:";
ImGuiStyle& style = ImGui::GetStyle();
ImGuiIO& io = ImGui::GetIO();
ImVec2 pw_pos = ImGui::GetWindowPos();
ImVec2 pw_content_sz = ImGui::GetWindowSize() - style.WindowPadding * 2.0;
@@ -452,7 +450,7 @@ namespace imgui_addons
if(dialog_mode == DialogMode::OPEN || dialog_mode == DialogMode::SAVE)
{
inputcb_filter_files.clear();
for(int i = 0; i < subfiles.size(); i++)
for(std::size_t i = 0; i < subfiles.size(); i++)
{
if(ImStristr(subfiles[i].name.c_str(), nullptr, input_fn, nullptr) != nullptr)
inputcb_filter_files.push_back(std::ref(subfiles[i].name));
@@ -463,7 +461,7 @@ namespace imgui_addons
else if(dialog_mode == DialogMode::SELECT)
{
inputcb_filter_files.clear();
for(int i = 0; i < subdirs.size(); i++)
for(std::size_t i = 0; i < subdirs.size(); i++)
{
if(ImStristr(subdirs[i].name.c_str(), nullptr, input_fn, nullptr) != nullptr)
inputcb_filter_files.push_back(std::ref(subdirs[i].name));
@@ -642,7 +640,7 @@ namespace imgui_addons
ImGui::PushItemWidth(ext_box_width);
if(ImGui::BeginCombo("##FileTypes", valid_exts[selected_ext_idx].c_str()))
{
for(int i = 0; i < valid_exts.size(); i++)
for(std::size_t i = 0; i < valid_exts.size(); i++)
{
if(ImGui::Selectable(valid_exts[i].c_str(), selected_ext_idx == i))
{
@@ -653,7 +651,7 @@ namespace imgui_addons
size_t idx = name.find_last_of(".");
if(idx == std::string::npos)
idx = strlen(input_fn);
for(int j = 0; j < valid_exts[selected_ext_idx].size(); j++)
for(std::size_t j = 0; j < valid_exts[selected_ext_idx].size(); j++)
input_fn[idx++] = valid_exts[selected_ext_idx][j];
input_fn[idx++] = '\0';
}
@@ -910,8 +908,6 @@ namespace imgui_addons
bool ret_val = false;
if (ImGui::BeginPopupModal(repfile_modal_id.c_str(), nullptr, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoResize))
{
float frame_height = ImGui::GetFrameHeightWithSpacing();
std::string text = "A file with the following filename already exists. Are you sure you want to replace the existing file?";
ImGui::TextWrapped("%s", text.c_str());
@@ -942,9 +938,7 @@ namespace imgui_addons
void ImGuiFileBrowser::showInvalidFileModal()
{
ImGuiStyle& style = ImGui::GetStyle();
std::string text = "Selected file either doesn't exist or is not supported. Please select a file with the following extensions...";
ImVec2 text_size = ImGui::CalcTextSize(text.c_str(), nullptr, true, 350 - style.WindowPadding.x * 2.0);
ImVec2 button_size = getButtonSize("OK");
float frame_height = ImGui::GetFrameHeightWithSpacing();
@@ -958,7 +952,7 @@ namespace imgui_addons
ImGui::TextWrapped("%s", text.c_str());
ImGui::BeginChild("##SupportedExts", ImVec2(0, cw_height), true);
for(int i = 0; i < valid_exts.size(); i++)
for(std::size_t i = 0; i < valid_exts.size(); i++)
ImGui::BulletText("%s", valid_exts[i].c_str());
ImGui::EndChild();
@@ -1010,7 +1004,7 @@ namespace imgui_addons
{
if(dialog_mode == DialogMode::SELECT)
{
for(int i = 0; i < subdirs.size(); i++)
for(std::size_t i = 0; i < subdirs.size(); i++)
{
if(subdirs[i].name == selected_fn)
{
@@ -1022,7 +1016,7 @@ namespace imgui_addons
}
else
{
for(int i = 0; i < subfiles.size(); i++)
for(std::size_t i = 0; i < subfiles.size(); i++)
{
if(subfiles[i].name == selected_fn)
{
@@ -1051,7 +1045,7 @@ namespace imgui_addons
if(ext == "*.*")
return true;
}
int idx = selected_fn.find_last_of('.');
auto idx = selected_fn.find_last_of('.');
std::string file_ext = idx == std::string::npos ? "" : selected_fn.substr(idx, selected_fn.length() - idx);
return (std::find(valid_exts.begin(), valid_exts.end(), file_ext) != valid_exts.end());
}

3
src/render/gui/imgui/imgui_filebrowser.h
View File

@@ -99,7 +99,8 @@ namespace imgui_addons
ImVec2 min_size, max_size, input_combobox_pos, input_combobox_sz;
DialogMode dialog_mode;
int filter_mode, col_items_limit, selected_idx, selected_ext_idx;
std::size_t filter_mode, col_items_limit, selected_ext_idx;
int selected_idx;
float col_width, ext_box_width;
bool show_hidden, show_inputbar_combobox, is_dir, is_appearing, filter_dirty, validate_file;
char input_fn[256];