Rename Display to Window.
It makes more sense to be consistent and always call it window.
This commit is contained in:
parent
416a71f744
commit
24da7f45e0
33 changed files with 257 additions and 255 deletions
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
#include <Spectre/Display/Display.h>
|
||||
#include <Spectre/Window/Window.h>
|
||||
#include <Spectre/Graphics/BatchRenderer2D.h>
|
||||
#include <Spectre/System/MessageHandler.h>
|
||||
#include <Spectre/System/Log.h>
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
void DisplayExample::init()
|
||||
{
|
||||
m_renderer = new sp::BatchRenderer2D();
|
||||
m_mode = sp::Display::WINDOWED;
|
||||
m_mode = sp::Window::WINDOWED;
|
||||
getMessageHandler()->registerListener(this);
|
||||
|
||||
m_texture.create("assets/textures/tux.png");
|
||||
|
|
@ -26,27 +26,27 @@ void DisplayExample::onEvent(const sp::Event& event)
|
|||
|
||||
if (event.key.code == sp::Keyboard::W) {
|
||||
|
||||
if (m_mode == sp::Display::WINDOWED) {
|
||||
m_mode = sp::Display::WINDOWEDFULLSCREEN;
|
||||
if (m_mode == sp::Window::WINDOWED) {
|
||||
m_mode = sp::Window::WINDOWEDFULLSCREEN;
|
||||
sp::Log::info("Windowed Fullscreen");
|
||||
} else {
|
||||
m_mode = sp::Display::WINDOWED;
|
||||
m_mode = sp::Window::WINDOWED;
|
||||
sp::Log::info("Windowed");
|
||||
}
|
||||
|
||||
getGraphics()->setDisplayMode(m_mode);
|
||||
getGraphics()->setWindowMode(m_mode);
|
||||
|
||||
} else if (event.key.code == sp::Keyboard::Space) {
|
||||
|
||||
if (m_mode == sp::Display::WINDOWED) {
|
||||
m_mode = sp::Display::FULLSCREEN;
|
||||
if (m_mode == sp::Window::WINDOWED) {
|
||||
m_mode = sp::Window::FULLSCREEN;
|
||||
sp::Log::info("Fullscreen");
|
||||
} else {
|
||||
m_mode = sp::Display::WINDOWED;
|
||||
m_mode = sp::Window::WINDOWED;
|
||||
sp::Log::info("Windowed");
|
||||
}
|
||||
|
||||
getGraphics()->setDisplayMode(m_mode);
|
||||
getGraphics()->setWindowMode(m_mode);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue