Cleanup code and includes

This commit is contained in:
Bruno
2021-03-03 22:39:17 +01:00
parent d6d1ab5099
commit 2ccedd42e4
4 changed files with 12 additions and 24 deletions

View File

@@ -1,14 +1,8 @@
#include "FileDialog.h"
#include "ImGuiToolkit.h"
#include <fstream>
#include <iostream>
#include <cstring>
#include <sstream>
#include <cstdlib>
#include <algorithm>
#include <iostream>
#include <stb_image.h>
#include <glad/glad.h>
#ifdef WIN32
@@ -29,8 +23,8 @@
#endif
#include "imgui_internal.h"
#include <stb_image.h>
#include "ImGuiToolkit.h"
#include "FileDialog.h"
static std::string s_fs_root(1u, PATH_SEP);
static std::string currentFileDialog;

View File

@@ -6,15 +6,8 @@
#include <vector>
#include <string>
#include <map>
#include <future>
#include <functional>
#include <thread>
#include <atomic>
#include <mutex>
#include <string>
#include <vector>
#include <list>
#define MAX_FILE_DIALOG_NAME_BUFFER 1024
@@ -78,8 +71,8 @@ public:
protected:
FileDialog(); // Prevent construction
FileDialog(const FileDialog&) {}; // Prevent construction by copying
FileDialog& operator =(const FileDialog&) { return *this; }; // Prevent assignment
FileDialog(const FileDialog&) {} // Prevent construction by copying
FileDialog& operator =(const FileDialog&) { return *this; } // Prevent assignment
~FileDialog(); // Prevent unwanted destruction
public:

View File

@@ -8,7 +8,6 @@
#include "imgui.h"
#include "ImGuiToolkit.h"
// memmove
#include <string>
#include <iomanip>
@@ -98,8 +97,10 @@ void LayerView::draw()
// special action of Mixing view
if (candidate_flatten_group){
if (ImGui::Selectable( ICON_FA_DOWNLOAD " Flatten" ))
if (ImGui::Selectable( ICON_FA_DOWNLOAD " Flatten" )) {
Mixer::manager().groupSelection();
}
}
else {
ImGui::TextDisabled( ICON_FA_DOWNLOAD " Flatten" );

View File

@@ -5,15 +5,15 @@
#include <glm/gtc/matrix_access.hpp>
#include <glm/gtx/vector_angle.hpp>
#include "imgui.h"
#include "ImGuiToolkit.h"
#include <string>
#include <sstream>
#include <iomanip>
#include "Mixer.h"
#include "imgui.h"
#include "ImGuiToolkit.h"
#include "defines.h"
#include "Mixer.h"
#include "Settings.h"
#include "Resource.h"
#include "PickingVisitor.h"