mirror of
https://github.com/brunoherbelin/vimix.git
synced 2025-12-13 11:19:58 +01:00
Cleanup code and includes
This commit is contained in:
@@ -1,14 +1,8 @@
|
|||||||
#include "FileDialog.h"
|
|
||||||
#include "ImGuiToolkit.h"
|
|
||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <cstring>
|
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <cstdlib>
|
|
||||||
#include <algorithm>
|
|
||||||
#include <iostream>
|
|
||||||
|
|
||||||
|
#include <stb_image.h>
|
||||||
#include <glad/glad.h>
|
#include <glad/glad.h>
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
@@ -29,8 +23,8 @@
|
|||||||
#endif
|
#endif
|
||||||
#include "imgui_internal.h"
|
#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 s_fs_root(1u, PATH_SEP);
|
||||||
static std::string currentFileDialog;
|
static std::string currentFileDialog;
|
||||||
|
|||||||
11
FileDialog.h
11
FileDialog.h
@@ -6,15 +6,8 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
|
||||||
#include <future>
|
#include <future>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <thread>
|
|
||||||
#include <atomic>
|
|
||||||
#include <mutex>
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
#include <list>
|
|
||||||
|
|
||||||
#define MAX_FILE_DIALOG_NAME_BUFFER 1024
|
#define MAX_FILE_DIALOG_NAME_BUFFER 1024
|
||||||
|
|
||||||
@@ -78,8 +71,8 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
|
|
||||||
FileDialog(); // Prevent construction
|
FileDialog(); // Prevent construction
|
||||||
FileDialog(const FileDialog&) {}; // Prevent construction by copying
|
FileDialog(const FileDialog&) {} // Prevent construction by copying
|
||||||
FileDialog& operator =(const FileDialog&) { return *this; }; // Prevent assignment
|
FileDialog& operator =(const FileDialog&) { return *this; } // Prevent assignment
|
||||||
~FileDialog(); // Prevent unwanted destruction
|
~FileDialog(); // Prevent unwanted destruction
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
#include "imgui.h"
|
#include "imgui.h"
|
||||||
#include "ImGuiToolkit.h"
|
#include "ImGuiToolkit.h"
|
||||||
|
|
||||||
// memmove
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
|
||||||
@@ -98,8 +97,10 @@ void LayerView::draw()
|
|||||||
|
|
||||||
// special action of Mixing view
|
// special action of Mixing view
|
||||||
if (candidate_flatten_group){
|
if (candidate_flatten_group){
|
||||||
if (ImGui::Selectable( ICON_FA_DOWNLOAD " Flatten" ))
|
if (ImGui::Selectable( ICON_FA_DOWNLOAD " Flatten" )) {
|
||||||
Mixer::manager().groupSelection();
|
Mixer::manager().groupSelection();
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
ImGui::TextDisabled( ICON_FA_DOWNLOAD " Flatten" );
|
ImGui::TextDisabled( ICON_FA_DOWNLOAD " Flatten" );
|
||||||
|
|||||||
@@ -5,15 +5,15 @@
|
|||||||
#include <glm/gtc/matrix_access.hpp>
|
#include <glm/gtc/matrix_access.hpp>
|
||||||
#include <glm/gtx/vector_angle.hpp>
|
#include <glm/gtx/vector_angle.hpp>
|
||||||
|
|
||||||
#include "imgui.h"
|
|
||||||
#include "ImGuiToolkit.h"
|
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
|
||||||
#include "Mixer.h"
|
#include "imgui.h"
|
||||||
|
#include "ImGuiToolkit.h"
|
||||||
|
|
||||||
#include "defines.h"
|
#include "defines.h"
|
||||||
|
#include "Mixer.h"
|
||||||
#include "Settings.h"
|
#include "Settings.h"
|
||||||
#include "Resource.h"
|
#include "Resource.h"
|
||||||
#include "PickingVisitor.h"
|
#include "PickingVisitor.h"
|
||||||
|
|||||||
Reference in New Issue
Block a user