|
@@ -3,64 +3,58 @@
|
|
|
#include <SDL2/SDL_video.h>
|
|
|
#include <fmt/core.h>
|
|
|
#include <memory>
|
|
|
-namespace Game
|
|
|
-{
|
|
|
+namespace Game {
|
|
|
|
|
|
-App::App (const char *window_name, int width, int height)
|
|
|
+App::App(const char* window_name, int width, int height)
|
|
|
{
|
|
|
- m_window = std::make_unique<SDLWindow> (
|
|
|
- SDL_CreateWindow (window_name, SDL_WINDOWPOS_UNDEFINED,
|
|
|
- SDL_WINDOWPOS_UNDEFINED, width, height, 0));
|
|
|
- if (m_window.get ()->_window == NULL)
|
|
|
- {
|
|
|
- fmt::print ("Could not intialize window");
|
|
|
- return;
|
|
|
+ m_window = std::make_unique<SDLWindow>(SDL_CreateWindow(window_name,
|
|
|
+ SDL_WINDOWPOS_UNDEFINED,
|
|
|
+ SDL_WINDOWPOS_UNDEFINED,
|
|
|
+ width,
|
|
|
+ height,
|
|
|
+ 0));
|
|
|
+ if (m_window->_window == NULL) {
|
|
|
+ fmt::print("Could not intialize window");
|
|
|
+ return;
|
|
|
}
|
|
|
|
|
|
- m_renderer = std::make_unique<SDLRenderer> (SDL_CreateRenderer (
|
|
|
- m_window.get ()->_window, -1, SDL_RENDERER_ACCELERATED));
|
|
|
+ m_renderer = std::make_unique<SDLRenderer>(
|
|
|
+ SDL_CreateRenderer(m_window->_window, -1, SDL_RENDERER_ACCELERATED));
|
|
|
|
|
|
- if (!m_renderer.get ()->_renderer)
|
|
|
- {
|
|
|
- fmt::print ("Could not initialize renderer");
|
|
|
- return;
|
|
|
+ if (!m_renderer->_renderer) {
|
|
|
+ fmt::print("Could not initialize renderer");
|
|
|
+ return;
|
|
|
}
|
|
|
|
|
|
- initialized = true;
|
|
|
+ initialized = true;
|
|
|
}
|
|
|
|
|
|
-void
|
|
|
-App::run ()
|
|
|
+void App::run()
|
|
|
{
|
|
|
- if (!initialized)
|
|
|
- {
|
|
|
- fmt::print ("Game not initialized properly. Quitting");
|
|
|
- return;
|
|
|
+ if (!initialized) {
|
|
|
+ fmt::print("Game not initialized properly. Quitting");
|
|
|
+ return;
|
|
|
}
|
|
|
|
|
|
- SDL_Event event;
|
|
|
- for (;;)
|
|
|
- {
|
|
|
- while (SDL_PollEvent (&event))
|
|
|
- {
|
|
|
- switch (event.type)
|
|
|
- {
|
|
|
+ SDL_Event event;
|
|
|
+ for (;;) {
|
|
|
+ while (SDL_PollEvent(&event) == 1) {
|
|
|
+ switch (event.type) {
|
|
|
case SDL_QUIT:
|
|
|
- can_quit = true;
|
|
|
- break;
|
|
|
+ can_quit = true;
|
|
|
+ break;
|
|
|
default:
|
|
|
- break;
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- SDL_SetRenderDrawColor (m_renderer.get ()->_renderer, 51, 51, 51, 255);
|
|
|
- SDL_RenderClear (m_renderer.get ()->_renderer);
|
|
|
- SDL_RenderPresent (m_renderer.get ()->_renderer);
|
|
|
- SDL_Delay (16);
|
|
|
+ SDL_SetRenderDrawColor(m_renderer->_renderer, 51, 51, 51, 255);
|
|
|
+ SDL_RenderClear(m_renderer->_renderer);
|
|
|
+ SDL_RenderPresent(m_renderer->_renderer);
|
|
|
+ SDL_Delay(16);
|
|
|
|
|
|
- if (can_quit)
|
|
|
- {
|
|
|
- return;
|
|
|
+ if (can_quit) {
|
|
|
+ return;
|
|
|
}
|
|
|
}
|
|
|
}
|