Browse Source

Moved stuff to src to make it cleaner.

POSITIVE-MENTAL-ATTITUDE 8 years ago
parent
commit
b250c9205c

Assets.cpp → src/Assets.cpp


Assets.hpp → src/Assets.hpp


Bullet.cpp → src/Bullet.cpp


Bullet.hpp → src/Bullet.hpp


Camera.cpp → src/Camera.cpp


Camera.hpp → src/Camera.hpp


Circle.cpp → src/Circle.cpp


Circle.hpp → src/Circle.hpp


Collidable.cpp → src/Collidable.cpp


Collidable.hpp → src/Collidable.hpp


+ 1 - 0
Context.hpp

@@ -26,6 +26,7 @@ struct Context
 {
 	bool shaders;
 	bool fullscreen;
+	bool borderless;
 	bool vsync;
 	bool needsUpdate;
 	bool running;

Foreground.cpp → src/Foreground.cpp


Foreground.hpp → src/Foreground.hpp


GuiButton.cpp → src/GuiButton.cpp


GuiButton.hpp → src/GuiButton.hpp


GuiTriangle.cpp → src/GuiTriangle.cpp


GuiTriangle.hpp → src/GuiTriangle.hpp


IngameState.cpp → src/IngameState.cpp


IngameState.hpp → src/IngameState.hpp


Input.cpp → src/Input.cpp


Input.hpp → src/Input.hpp


InputMap.hpp → src/InputMap.hpp


InputTarget.hpp → src/InputTarget.hpp


MenuState.cpp → src/MenuState.cpp


MenuState.hpp → src/MenuState.hpp


Particle.cpp → src/Particle.cpp


Particle.hpp → src/Particle.hpp


Player.cpp → src/Player.cpp


Player.hpp → src/Player.hpp


State.cpp → src/State.cpp


State.hpp → src/State.hpp


Triangle.cpp → src/Triangle.cpp


Triangle.hpp → src/Triangle.hpp


+ 5 - 0
Triangles.cpp

@@ -31,6 +31,7 @@ Triangles::Triangles(int argc, char** argv):
 	_initialState(State::Menu)
 {
 	_variables.fullscreen = false;
+	_variables.borderless = false;
 	_variables.vsync = false;
 	_variables.running = true;
 	_variables.needsUpdate = false;
@@ -104,6 +105,10 @@ void Triangles::passArguments(int argc, char** argv)
 	{
 		_variables.fullscreen = false;
 	});
+	searchArgument(argc, argvStr, 'b', "borderlesswindow", [this]()
+	{
+		_variables.borderless = true;
+	});
 	searchArgument(argc, argvStr, 'v', "vsync", [this]()
 	{
 		_variables.vsync = true;

Triangles.hpp → src/Triangles.hpp


+ 6 - 5
TrianglesWindow.cpp

@@ -151,12 +151,13 @@ const sf::View& TrianglesWindow::getDefaultView()
 void TrianglesWindow::open()
 {
 	sf::ContextSettings settings;
-	settings.majorVersion = 3;
-	settings.minorVersion = 0;
-	settings.antialiasingLevel = 8;
-	_window.create(sf::VideoMode(_size.x, _size.y), _title, (_context->fullscreen ? sf::Style::Fullscreen : (sf::Style::Titlebar | sf::Style::Close)), settings);
+	settings.majorVersion = 4;
+	settings.minorVersion = 5;
+	//settings.antialiasingLevel = 8;
+	_window.create(sf::VideoMode(_size.x, _size.y), _title, (_context->fullscreen ? sf::Style::Fullscreen : (_context->borderless ? sf::Style::None : (sf::Style::Titlebar | sf::Style::Close))), settings);
 	_window.setKeyRepeatEnabled(false);
-	_window.setPosition(sf::Vector2i(1200, 800));
+	if(_context->borderless)
+		_window.setPosition(sf::Vector2i(0, 0));
 	if(_context->vsync)
 		_window.setVerticalSyncEnabled(true);
 	if(_context)

TrianglesWindow.hpp → src/TrianglesWindow.hpp


Utility.cpp → src/Utility.cpp


Utility.hpp → src/Utility.hpp


main.cpp → src/main.cpp


statCounter.hpp → src/statCounter.hpp