pnx/spectre
1
0
Fork 0
Code Releases 2 Activity

Rename Display to Window.

Browse source 
It makes more sense to be consistent and always call it window.
This commit is contained in:
Henrik Hautakoski 2023-08-22 07:12:47 +02:00
parent 416a71f744
commit 24da7f45e0
33 changed files with 257 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

20
examples/display/DisplayExample.cpp
View file

@ -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);
}
}
}

2
examples/display/DisplayExample.h
View file

@ -23,7 +23,7 @@ protected :
protected :
sp::Display::Mode m_mode;
sp::Window::Mode m_mode;
sp::Camera2D m_camera;
sp::Renderer2D *m_renderer;

6
examples/input/InputExample.cpp
View file

@ -61,7 +61,7 @@ void InputExample::update(double dt)
}
}
void InputExample::onSizeChanged(sp::Display* display, int width, int height)
void InputExample::onSizeChanged(sp::Window* Window, int width, int height)
{
}
@ -70,10 +70,10 @@ void InputExample::onEvent(const sp::Event& event)
{
if (event.type == event.Key && !event.key.pressed) {
if (event.key.code == sp::Keyboard::G) {
getGraphics()->getDisplay()->grabCursor(true);
getGraphics()->getWindow()->grabCursor(true);
sp::Log::info("Mouse Grabbed");
} else if (event.key.code == sp::Keyboard::U) {
getGraphics()->getDisplay()->grabCursor(false);
getGraphics()->getWindow()->grabCursor(false);
sp::Log::info("Mouse Released");
}
} else if (event.type == event.MouseButton && event.mouseButton.button == sp::Mouse::Right) {

2
examples/input/InputExample.h
View file

@ -22,7 +22,7 @@ protected :
void render();
void onSizeChanged(sp::Display* display, int width, int height);
void onSizeChanged(sp::Window* display, int width, int height);
void onEvent(const sp::Event& event);