Fixed an #include directive in <PixelRenderer.hpp>
This commit is contained in:
parent
bf70b4dbed
commit
1b09fc172f
3 changed files with 10 additions and 6 deletions
|
|
@ -1 +1 @@
|
||||||
1972
|
1974
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "IOHandlers.hpp"
|
#include <ostd/IOHandlers.hpp>
|
||||||
#include "String.hpp"
|
#include <ostd/String.hpp>
|
||||||
#include <ostd/Color.hpp>
|
#include <ostd/Color.hpp>
|
||||||
#include <ogfx/SDLInclude.hpp>
|
#include <ogfx/SDLInclude.hpp>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|
@ -40,6 +40,10 @@ namespace ogfx
|
||||||
public:
|
public:
|
||||||
inline Font(void) { }
|
inline Font(void) { }
|
||||||
inline Font(const ostd::String& fontPath)
|
inline Font(const ostd::String& fontPath)
|
||||||
|
{
|
||||||
|
init(fontPath);
|
||||||
|
}
|
||||||
|
inline void init(const ostd::String& fontPath)
|
||||||
{
|
{
|
||||||
ostd::ConsoleOutputHandler out;
|
ostd::ConsoleOutputHandler out;
|
||||||
m_fontSurface = SDL_LoadBMP(fontPath.c_str());
|
m_fontSurface = SDL_LoadBMP(fontPath.c_str());
|
||||||
|
|
|
||||||
|
|
@ -65,9 +65,9 @@ namespace ogfx
|
||||||
|
|
||||||
void WindowBase::close(void)
|
void WindowBase::close(void)
|
||||||
{
|
{
|
||||||
m_running = false;
|
m_running = false;
|
||||||
onClose();
|
onClose();
|
||||||
ostd::SignalHandler::emitSignal(ostd::tBuiltinSignals::WindowClosed, ostd::tSignalPriority::RealTime, *this);
|
ostd::SignalHandler::emitSignal(ostd::tBuiltinSignals::WindowClosed, ostd::tSignalPriority::RealTime, *this);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WindowBase::update(void)
|
void WindowBase::update(void)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue