merge `master` into `loek/savemgr`

1 files changed, 25 insertions, 6 deletions

diff --git a/mwe/events/src/window.cpp b/mwe/events/src/window.cpp
index 41eb85f..f482b7f 100644
--- a/mwe/events/src/window.cpp
+++ b/mwe/events/src/window.cpp
@@ -1,29 +1,48 @@
 #include "window.h"
-WindowManager::WindowManager() {}
+#include <iostream>
+
+WindowManager::WindowManager() { this->uiRenderer = nullptr; }
+
 WindowManager::~WindowManager() { destroyWindow(); }
-SDL_Renderer * WindowManager::getRenderer() { return renderer; }
 
 bool WindowManager::initWindow() {
 	if (SDL_Init(SDL_INIT_EVERYTHING) != 0) {
-		fprintf(stderr, "Error inititalising SDL.\n");
+		std::cerr << "Error initializing SDL.\n";
 		return false;
 	}
+
 	window = SDL_CreateWindow("SDL Tutorial", SDL_WINDOWPOS_UNDEFINED,
 							  SDL_WINDOWPOS_UNDEFINED, SCREEN_WIDTH,
 							  SCREEN_HEIGHT, SDL_WINDOW_SHOWN);
 	if (!window) {
-		fprintf(stderr, "Error creating SDL Window. \n");
+		std::cerr << "Error creating SDL Window.\n";
 		return false;
 	}
-	renderer = SDL_CreateRenderer(window, -1, 0);
+
+	renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
 	if (!renderer) {
-		fprintf(stderr, "Error creating SDL renderer. \n");
+		std::cerr << "Error creating SDL renderer.\n";
 		return false;
 	}
+
+	uiRenderer = new UIRenderer(renderer);
 	return true;
 }
+
 void WindowManager::destroyWindow() {
 	SDL_DestroyRenderer(renderer);
 	SDL_DestroyWindow(window);
 	SDL_Quit();
 }
+
+SDL_Renderer * WindowManager::getRenderer() { return renderer; }
+void WindowManager::addUIObject(UIObject * uiObject) {
+	uiObjects.push_back(uiObject);
+}
+
+void WindowManager::renderUIObjects() {
+	for (UIObject * obj : uiObjects) {
+		uiRenderer->render(obj);
+	}
+	SDL_RenderPresent(this->renderer);
+}