Kajetan Johannes Hammerle 3 år sedan
förälder
incheckning
87aa3c8bed
2 ändrade filer med 3 tillägg och 1 borttagningar
  1. 2 1
      rendering/Framebuffer.h
  2. 1 0
      rendering/Window.cpp

+ 2 - 1
rendering/Framebuffer.h

@@ -2,12 +2,13 @@
 #define FRAMEBUFFER_H
 
 #include "rendering/Texture.h"
+#include "utils/Array.h"
 #include "utils/ArrayList.h"
 #include "utils/Size.h"
 
 template<int N>
 class Framebuffer final {
-    ArrayList<Texture, N> textures;
+    Array<Texture, N> textures;
     GL::Framebuffer buffer;
 
 public:

+ 1 - 0
rendering/Window.cpp

@@ -45,6 +45,7 @@ Error Window::open(const WindowOptions& options) {
     if(window == nullptr) {
         return {"could not create window"};
     }
+    size = options.size;
     glfwSetWindowUserPointer(window, this);
     glfwSetKeyCallback(window, onKey);
     glfwSetCharCallback(window, onChar);