window options merged into window as they are always together

Main.cpp

@@ -73,7 +73,7 @@ int main(int argAmount, char** args) {
     NetworkTests::test();
     ComponentsTests::test();
 
-    WindowOptions options(4, 3, {800, 480}, false, "Test");
+    Window::Options options(4, 3, {800, 480}, false, "Test");
     Error error = Window::open(options);
     if(error.has()) {
         LOG_ERROR(error.message);

meson.build

@@ -16,7 +16,6 @@ src = [
     'rendering/Texture.cpp',
     'rendering/VertexBuffer.cpp',
     'rendering/Window.cpp',
-    'rendering/WindowOptions.cpp',
     'utils/BitArray.cpp',
     'utils/Buffer.cpp',
     'utils/Clock.cpp',

rendering/Window.cpp

@@ -60,6 +60,12 @@ static Vector2 mousePosition;
 static int activeController = -1;
 static GLFWgamepadstate lastControllerState;
 
+Window::Options::Options(int majorVersion, int minorVersion,
+                         const IntVector2& size, bool es, const char* name)
+    : majorVersion(majorVersion), minorVersion(minorVersion), size(size),
+      fullscreen(false), es(es), vsync(true), name(name) {
+}
+
 static void onButton(HashMap<int, Window::Controls::ButtonId>& map, int key,
                      int action) {
     Window::Controls::ButtonId* b = map.search(key);
@@ -146,7 +152,7 @@ static void onMouseMove(GLFWwindow*, double x, double y) {
     mousePosition = Vector2(x, y);
 }
 
-Error Window::open(const WindowOptions& o) {
+Error Window::open(const Options& o) {
     if(!glfwInit()) {
         Error e{"could not initialize GLFW"};
         addError(e);

rendering/Window.h

@@ -2,7 +2,6 @@
 #define WINDOW_H
 
 #include "math/Vector.h"
-#include "rendering/WindowOptions.h"
 #include "utils/Clock.h"
 #include "utils/Error.h"
 #include "utils/List.h"
@@ -13,7 +12,20 @@ namespace Window {
     typedef void (*Tick)();
     typedef void (*Render)(float);
 
-    Error open(const WindowOptions& options);
+    struct Options final {
+        int majorVersion;
+        int minorVersion;
+        const IntVector2& size;
+        bool fullscreen;
+        bool es;
+        bool vsync;
+        const char* name;
+
+        Options(int majorVersion, int minorVersion, const IntVector2& size,
+                bool es, const char* name);
+    };
+
+    Error open(const Options& options);
     void close();
 
     float getTicksPerSecond();

rendering/WindowOptions.cpp

@@ -1,7 +0,0 @@
-#include "rendering/WindowOptions.h"
-
-WindowOptions::WindowOptions(int majorVersion, int minorVersion,
-                             const IntVector2& size, bool es, const char* name)
-    : majorVersion(majorVersion), minorVersion(minorVersion), size(size),
-      fullscreen(false), es(es), vsync(true), name(name) {
-}

rendering/WindowOptions.h

@@ -1,19 +0,0 @@
-#ifndef WINDOWOPTIONS_H
-#define WINDOWOPTIONS_H
-
-#include "math/Vector.h"
-
-struct WindowOptions final {
-    int majorVersion;
-    int minorVersion;
-    const IntVector2& size;
-    bool fullscreen;
-    bool es;
-    bool vsync;
-    const char* name;
-
-    WindowOptions(int majorVersion, int minorVersion, const IntVector2& size,
-                  bool es, const char* name);
-};
-
-#endif