diff --git a/src/example/main.cpp b/src/example/main.cpp index 6ee9bbb..242bb02 100644 --- a/src/example/main.cpp +++ b/src/example/main.cpp @@ -7,17 +7,17 @@ using namespace sf; class MyScreen : public IScreen { public: - virtual void OnFocus() override + void OnFocus(IWindow* parent) override { printf("Received Focus\n"); } - virtual void OnDefocus() override + void OnDefocus() override { printf("Lost Focus\n"); } - virtual void OnRender(SDL_Renderer* renderer) override + void OnRender(SDL_Renderer* renderer) override { SDL_SetRenderDrawColor(renderer, 0, 0, 255, 255); SDL_RenderClear(renderer); diff --git a/src/sdlf/Screen.hpp b/src/sdlf/Screen.hpp index fe90342..4491e1f 100644 --- a/src/sdlf/Screen.hpp +++ b/src/sdlf/Screen.hpp @@ -11,9 +11,9 @@ namespace sf public: virtual void OnFocus(IWindow* parent) { } virtual void OnDefocus() { } - virtual bool OnUpdate(double frametime) override { return true; } - virtual bool OnEvent(const SDL_Event& event) override { return true; } - virtual void OnRender(SDL_Renderer* renderer) override {} + bool OnUpdate(double frametime) override { return true; } + bool OnEvent(const SDL_Event& event) override { return true; } + void OnRender(SDL_Renderer* renderer) override {} protected: IScreen() = default; diff --git a/src/sdlf/Window.cpp b/src/sdlf/Window.cpp index cd4bb50..55e67d1 100644 --- a/src/sdlf/Window.cpp +++ b/src/sdlf/Window.cpp @@ -51,7 +51,6 @@ namespace sf m_oEventFunction = std::bind(&IWindow::OnEvent, this, std::placeholders::_1); m_oUpdateFunction = std::bind(&IWindow::OnUpdate, this, std::placeholders::_1); m_oRenderFunction = std::bind(&IWindow::OnRender, this, std::placeholders::_1); - } void IWindow::Destroy() @@ -78,7 +77,6 @@ namespace sf if(m_oMsgLoopThread.joinable()) m_oMsgLoopThread.join(); - } void IWindow::AddEventCallback(EventCallback callback, void* userdata) @@ -109,7 +107,6 @@ namespace sf m_oEventFunction = std::bind(&IWindow::OnEvent, this, std::placeholders::_1); m_oUpdateFunction = std::bind(&IWindow::OnUpdate, this, std::placeholders::_1); m_oRenderFunction = std::bind(&IWindow::OnRender, this, std::placeholders::_1); - } } @@ -119,7 +116,6 @@ namespace sf m_oSize(size), m_oPosition(position), m_strTitle(title), m_uWindowFlags(windowFlags), m_uRenderFlags(renderFlags), m_pCurrentScreen(nullptr), m_pCurrentException("") { - } void IWindow::MessageLoop() @@ -142,7 +138,6 @@ namespace sf { if (m_oEventFunction(m_oEvent)) { - if (m_oEvent.type == SDL_QUIT) { m_atomWindowOpen = false; diff --git a/src/sdlf/Window.hpp b/src/sdlf/Window.hpp index feec15f..3b20f01 100644 --- a/src/sdlf/Window.hpp +++ b/src/sdlf/Window.hpp @@ -38,9 +38,9 @@ namespace sf virtual bool OnCreate() { return true; } virtual void OnClose() { } - virtual bool OnEvent(const SDL_Event& event) override { return true; } - virtual bool OnUpdate(double frametime) override { return true; } - virtual void OnRender(SDL_Renderer* renderer) override { } + bool OnEvent(const SDL_Event& event) override { return true; } + bool OnUpdate(double frametime) override { return true; } + void OnRender(SDL_Renderer* renderer) override { } protected: SDL_Window* m_pWindow;