POSITIVE-MENTAL-ATTITUDE 8 years ago
parent
commit
02faad0bac
5 changed files with 18 additions and 8 deletions
  1. BIN
      data/background/75pxjitter03.png
  2. 10 0
      src/GuiTriangle.cpp
  3. 1 2
      src/MenuState.cpp
  4. 3 3
      src/Triangles.cpp
  5. 4 3
      src/TrianglesWindow.cpp

BIN
data/background/75pxjitter03.png


+ 10 - 0
src/GuiTriangle.cpp

@@ -57,6 +57,11 @@ void GuiTriangle::update(sf::Vector2i mouseXY, sf::Time delta)
 			_scale += delta.asSeconds() * (1.25f - _scale) * 2.5f; 
 			setScale(_scale < 1.2f ? _scale : 1.2f, _scale < 1.2f ? _scale : 1.2f);
 		}
+		else
+		{
+			_scale = 1.2f;
+			setScale(1.2f, 1.2f);
+		}
 	}
 	else
 	{
@@ -65,6 +70,11 @@ void GuiTriangle::update(sf::Vector2i mouseXY, sf::Time delta)
 			_scale -= delta.asSeconds() * (1.25f - _scale) * 1.5f;
 			setScale(_scale > 1.f ? _scale : 1.f, _scale > 1.f ? _scale : 1.f);
 		}
+		else
+		{
+			_scale = 1.f;
+			setScale(1.f, 1.f);
+		}
 	}
 }
 

+ 1 - 2
src/MenuState.cpp

@@ -271,7 +271,7 @@ void MenuState::coreUpdate(sf::Time delta)
 	static bool ongoing = false;
 	static int k = -1;
 	static float d = 0;
-	static float direction = 0.f;
+	static float direction = 0.f; 
 	static float speed = 0.f;
 	static float r = 0;
 
@@ -330,7 +330,6 @@ void MenuState::coreUpdate(sf::Time delta)
 
 void MenuState::coreRender()
 {
-	//_crazy.clear(sf::Color(100, 150, 220));
 	_crazy.clear(_color);
 	for(unsigned int i = 0; i < 30; ++i)
 		_crazy.draw(_crazyTriangles[i]);

+ 3 - 3
src/Triangles.cpp

@@ -34,7 +34,7 @@ Triangles::Triangles(int argc, char** argv):
 {
 	_variables.fullscreen = false;
 	_variables.borderless = false;
-	_variables.vsync = false;
+	_variables.vsync = true;
 	_variables.running = true;
 	_variables.needsUpdate = false;
 	_variables.shaders = sf::Shader::isAvailable();
@@ -292,7 +292,7 @@ int Triangles::run()
 	
 	if(_context.running)
 	{
-		Echo::out(Echo::Empty, "Triangles version -0.7.8");
+		Echo::out(Echo::Empty, "Triangles version 0.0.1");
 		Echo::out(Echo::Empty, "Copyright (C) 2016 POSITIVE MENTAL ATTITUDE");
 		Echo::out(Echo::Empty, "This program comes with ABSOLUTELY NO WARRANTY;");
 		Echo::out(Echo::Empty, "This is free software, and you are welcome to redistribute it");
@@ -305,7 +305,7 @@ int Triangles::run()
 	while(_context.running)
 	{
 		if(_context.needsUpdate)
-		{
+		{ 
 			refresh();
 			_current->refresh();
 			_context.needsUpdate = false;

+ 4 - 3
src/TrianglesWindow.cpp

@@ -18,6 +18,7 @@
 #include "TrianglesWindow.hpp"
 #include "InputTarget.hpp"
 #include "Utility.hpp"
+
 TrianglesWindow::TrianglesWindow(const std::string& title, sf::Vector2u size):
 	InputTarget(_inputMap),
 	_size(size),
@@ -26,8 +27,8 @@ TrianglesWindow::TrianglesWindow(const std::string& title, sf::Vector2u size):
 {
 	_context = nullptr;
 	_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)
 	{
 		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];
 			if(vm.width < 640 || vm.height < 480)
-				break;
+				continue;
 			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)