declutter stuff outta UI class

2 files changed, 48 insertions, 26 deletions

diff --git a/opentrack/state.hpp b/opentrack/state.hpp
new file mode 100644
index 00000000..7fde64dc
--- /dev/null
+++ b/opentrack/state.hpp
@@ -0,0 +1,48 @@
+#include <vector>
+#include "opentrack/options.hpp"
+using namespace options;
+#include "opentrack/plugin-support.h"
+#include "opentrack/main-settings.hpp"
+#include "opentrack/mappings.hpp"
+
+struct Modules {
+    Modules() :
+        module_list(dylib::enum_libraries()),
+        filter_modules(filter(dylib::Filter)),
+        tracker_modules(filter(dylib::Tracker)),
+        protocol_modules(filter(dylib::Protocol))
+    {}
+    QList<ptr<dylib>>& filters() { return filter_modules; }
+    QList<ptr<dylib>>& trackers() { return tracker_modules; }
+    QList<ptr<dylib>>& protocols() { return protocol_modules; }
+private:
+    QList<ptr<dylib>> module_list;
+    QList<ptr<dylib>> filter_modules;
+    QList<ptr<dylib>> tracker_modules;
+    QList<ptr<dylib>> protocol_modules;
+    
+    QList<ptr<dylib>> filter(dylib::Type t)
+    {
+        QList<ptr<dylib>> ret;
+        for (auto x : module_list)
+            if (x->type == t)
+                ret.push_back(x);
+        return ret;
+    }
+};
+
+struct Work;
+
+struct State {
+    State() :
+        b(bundle("opentrack-ui")),
+        s(b),
+        pose(std::vector<axis_opts*>{&s.a_x, &s.a_y, &s.a_z, &s.a_yaw, &s.a_pitch, &s.a_roll})
+    {}
+    Modules modules;
+    SelectedLibraries libs;
+    pbundle b;
+    main_settings s;
+    Mappings pose;
+    ptr<Work> work;
+};
diff --git a/opentrack/work.hpp b/opentrack/work.hpp
index 3e51b480..bd69f7ba 100644
--- a/opentrack/work.hpp
+++ b/opentrack/work.hpp
@@ -9,32 +9,6 @@
 #include <QFrame>
 #include <memory>
 
-struct Modules {
-    Modules() :
-        module_list(dylib::enum_libraries()),
-        filter_modules(filter(dylib::Filter)),
-        tracker_modules(filter(dylib::Tracker)),
-        protocol_modules(filter(dylib::Protocol))
-    {}
-    QList<ptr<dylib>>& filters() { return filter_modules; }
-    QList<ptr<dylib>>& trackers() { return tracker_modules; }
-    QList<ptr<dylib>>& protocols() { return protocol_modules; }
-private:
-    QList<ptr<dylib>> module_list;
-    QList<ptr<dylib>> filter_modules;
-    QList<ptr<dylib>> tracker_modules;
-    QList<ptr<dylib>> protocol_modules;
-    
-    QList<ptr<dylib>> filter(dylib::Type t)
-    {
-        QList<ptr<dylib>> ret;
-        for (auto x : module_list)
-            if (x->type == t)
-                ret.push_back(x);
-        return ret;
-    }
-};
-
 struct Work
 {
     main_settings& s;