|
@@ -18,6 +18,7 @@
|
|
#include "TrianglesWindow.hpp"
|
|
#include "TrianglesWindow.hpp"
|
|
#include "InputTarget.hpp"
|
|
#include "InputTarget.hpp"
|
|
#include "Utility.hpp"
|
|
#include "Utility.hpp"
|
|
|
|
+
|
|
TrianglesWindow::TrianglesWindow(const std::string& title, sf::Vector2u size):
|
|
TrianglesWindow::TrianglesWindow(const std::string& title, sf::Vector2u size):
|
|
InputTarget(_inputMap),
|
|
InputTarget(_inputMap),
|
|
_size(size),
|
|
_size(size),
|
|
@@ -26,8 +27,8 @@ TrianglesWindow::TrianglesWindow(const std::string& title, sf::Vector2u size):
|
|
{
|
|
{
|
|
_context = nullptr;
|
|
_context = nullptr;
|
|
_inputMap.map(0, Input(sf::Keyboard::F9, Input::Type::Pressed));
|
|
_inputMap.map(0, Input(sf::Keyboard::F9, Input::Type::Pressed));
|
|
- _inputMap.map(1, Input(sf::Keyboard::F10, Input::Type::Pressed));
|
|
|
|
- _inputMap.map(2, Input(sf::Keyboard::F11, Input::Type::Pressed));
|
|
|
|
|
|
+ _inputMap.map(1, Input(sf::Keyboard::F11, Input::Type::Pressed));
|
|
|
|
+ _inputMap.map(2, Input(sf::Keyboard::F10, Input::Type::Pressed));
|
|
bind(0, [this](const sf::Event&, float)
|
|
bind(0, [this](const sf::Event&, float)
|
|
{
|
|
{
|
|
unsigned s = sf::VideoMode::getFullscreenModes().size();
|
|
unsigned s = sf::VideoMode::getFullscreenModes().size();
|
|
@@ -35,7 +36,7 @@ TrianglesWindow::TrianglesWindow(const std::string& title, sf::Vector2u size):
|
|
{
|
|
{
|
|
sf::VideoMode vm = sf::VideoMode::getFullscreenModes()[i];
|
|
sf::VideoMode vm = sf::VideoMode::getFullscreenModes()[i];
|
|
if(vm.width < 640 || vm.height < 480)
|
|
if(vm.width < 640 || vm.height < 480)
|
|
- break;
|
|
|
|
|
|
+ continue;
|
|
else if(vm.width == _size.x && vm.height == _size.y)
|
|
else if(vm.width == _size.x && vm.height == _size.y)
|
|
{
|
|
{
|
|
if(i + 1 < s && sf::VideoMode::getFullscreenModes()[i + 1].width >= 640 && sf::VideoMode::getFullscreenModes()[i + 1].height >= 480)
|
|
if(i + 1 < s && sf::VideoMode::getFullscreenModes()[i + 1].width >= 640 && sf::VideoMode::getFullscreenModes()[i + 1].height >= 480)
|