eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2026-06-16 04:27:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean include tree for view cpp

Browse Source
This commit is contained in:
brunoherbelin
2021-02-26 23:33:50 +01:00
parent 70c28d4226
commit adcd735127
8 changed files with 19 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GeometryView.cpp
+1 -11
View File
@@ -5,31 +5,21 @@
#include <glm/gtc/matrix_access.hpp>
#include <glm/gtx/vector_angle.hpp>
#include "imgui.h"
#include "ImGuiToolkit.h"
// memmove
#include <string.h>
#include <string>
#include <sstream>
#include <regex>
#include <iomanip>
#include "Mixer.h"
#include "defines.h"
#include "Settings.h"
#include "Session.h"
#include "Resource.h"
#include "Source.h"
#include "SessionSource.h"
#include "PickingVisitor.h"
#include "BoundingBoxVisitor.h"
#include "DrawVisitor.h"
#include "Decorations.h"
#include "Mixer.h"
#include "UserInterfaceManager.h"
#include "UpdateCallback.h"
#include "ActionManager.h"
#include "Log.h"
#include "GeometryView.h"
LayerView.cpp
+1 -14
View File
@@ -5,31 +5,18 @@
#include <glm/gtc/matrix_access.hpp>
#include <glm/gtx/vector_angle.hpp>
#include "imgui.h"
#include "ImGuiToolkit.h"
// memmove
#include <string.h>
#include <sstream>
#include <regex>
#include <string>
#include <iomanip>
#include "Mixer.h"
#include "defines.h"
#include "Settings.h"
#include "Session.h"
#include "Resource.h"
#include "Source.h"
#include "SessionSource.h"
#include "PickingVisitor.h"
#include "BoundingBoxVisitor.h"
#include "DrawVisitor.h"
#include "Decorations.h"
#include "Mixer.h"
#include "UserInterfaceManager.h"
#include "UpdateCallback.h"
#include "ActionManager.h"
#include "Log.h"
#include "LayerView.h"
MixingView.cpp
+1 -14
View File
@@ -5,31 +5,18 @@
#include <glm/gtc/matrix_access.hpp>
#include <glm/gtx/vector_angle.hpp>
#include "imgui.h"
#include "ImGuiToolkit.h"
// memmove
#include <string.h>
#include <string>
#include <sstream>
#include <regex>
#include <iomanip>
#include "Mixer.h"
#include "defines.h"
#include "Settings.h"
#include "Session.h"
#include "Resource.h"
#include "Source.h"
#include "SessionSource.h"
#include "PickingVisitor.h"
#include "BoundingBoxVisitor.h"
#include "DrawVisitor.h"
#include "Decorations.h"
#include "Mixer.h"
#include "UserInterfaceManager.h"
#include "UpdateCallback.h"
#include "ActionManager.h"
#include "Log.h"
#include "MixingView.h"
MixingView.h
+1
View File
@@ -32,6 +32,7 @@ private:
Disk *stashCircle_;
Mesh *mixingCircle_;
Mesh *circle_;
// TEST
std::vector<glm::vec2> points_;
class LineStrip *lines_;
RenderView.cpp
-23
View File
@@ -5,32 +5,9 @@
#include <glm/gtc/matrix_access.hpp>
#include <glm/gtx/vector_angle.hpp>
#include "imgui.h"
#include "ImGuiToolkit.h"
// memmove
#include <string.h>
#include <sstream>
#include <regex>
#include <iomanip>
#include "Mixer.h"
#include "defines.h"
#include "Settings.h"
#include "Session.h"
#include "Resource.h"
#include "Source.h"
#include "SessionSource.h"
#include "PickingVisitor.h"
#include "BoundingBoxVisitor.h"
#include "DrawVisitor.h"
#include "Decorations.h"
#include "Mixer.h"
#include "UserInterfaceManager.h"
#include "UpdateCallback.h"
#include "ActionManager.h"
#include "Log.h"
#include "RenderView.h"
TextureView.cpp
+1 -10
View File
@@ -5,30 +5,21 @@
#include <glm/gtc/matrix_access.hpp>
#include <glm/gtx/vector_angle.hpp>
#include "imgui.h"
#include "ImGuiToolkit.h"
// memmove
#include <string.h>
#include <string>
#include <sstream>
#include <regex>
#include <iomanip>
#include "Mixer.h"
#include "defines.h"
#include "Settings.h"
#include "Session.h"
#include "Resource.h"
#include "Source.h"
#include "SessionSource.h"
#include "PickingVisitor.h"
#include "BoundingBoxVisitor.h"
#include "DrawVisitor.h"
#include "Decorations.h"
#include "Mixer.h"
#include "UserInterfaceManager.h"
#include "UpdateCallback.h"
#include "ActionManager.h"
#include "Log.h"
TransitionView.cpp
+1 -13
View File
@@ -5,31 +5,19 @@
#include <glm/gtc/matrix_access.hpp>
#include <glm/gtx/vector_angle.hpp>
#include "imgui.h"
#include "ImGuiToolkit.h"
// memmove
#include <string.h>
#include <string>
#include <sstream>
#include <regex>
#include <iomanip>
#include "Mixer.h"
#include "defines.h"
#include "Settings.h"
#include "Session.h"
#include "Resource.h"
#include "Source.h"
#include "SessionSource.h"
#include "PickingVisitor.h"
#include "BoundingBoxVisitor.h"
#include "DrawVisitor.h"
#include "Decorations.h"
#include "Mixer.h"
#include "UserInterfaceManager.h"
#include "UpdateCallback.h"
#include "ActionManager.h"
#include "Log.h"
#include "TransitionView.h"
View.h
+13 -5
View File
@@ -22,10 +22,15 @@ class View
{
public:
typedef enum {RENDERING = 0, MIXING=1, GEOMETRY=2, LAYER=3, TEXTURE=4, TRANSITION=5, INVALID=6 } Mode;
View(Mode m);
virtual ~View() {}
typedef enum {
RENDERING = 0,
MIXING = 1,
GEOMETRY = 2,
LAYER = 3,
TEXTURE = 4,
TRANSITION = 5,
INVALID = 6
} Mode;
inline Mode mode() const { return mode_; }
@@ -91,6 +96,9 @@ public:
protected:
View(Mode m);
virtual ~View() {}
virtual void restoreSettings();
virtual void saveSettings();
@@ -102,7 +110,7 @@ protected:
Group *overlay_selection_;
Frame *overlay_selection_frame_;
Handles *overlay_selection_icon_;
void updateSelectionOverlay();
virtual void updateSelectionOverlay();
// contex menu
typedef enum {