Fixed bug in centerOrigin()

Bromeon · Bromeon · commit ff25713ca70a · 2014-10-23T15:27:21.000+02:00
diff --git a/05_States/Source/Utility.cpp b/05_States/Source/Utility.cpp
@@ -7,11 +7,11 @@
 void centerOrigin(sf::Sprite& sprite)
 {
 	sf::FloatRect bounds = sprite.getLocalBounds();
-	sprite.setOrigin(bounds.width / 2.f, bounds.height / 2.f);
+	sprite.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));
 }
 
 void centerOrigin(sf::Text& text)
 {
 	sf::FloatRect bounds = text.getLocalBounds();
-	text.setOrigin(bounds.width / 2.f, bounds.height / 2.f);
+	text.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));
 }
diff --git a/06_Menus/Source/Utility.cpp b/06_Menus/Source/Utility.cpp
@@ -122,11 +122,11 @@ std::string toString(sf::Keyboard::Key key)
 void centerOrigin(sf::Sprite& sprite)
 {
 	sf::FloatRect bounds = sprite.getLocalBounds();
-	sprite.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));
+	sprite.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));
 }
 
 void centerOrigin(sf::Text& text)
 {
 	sf::FloatRect bounds = text.getLocalBounds();
-	text.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));
+	text.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));
 }
diff --git a/07_Gameplay/Source/Utility.cpp b/07_Gameplay/Source/Utility.cpp
@@ -136,13 +136,13 @@ std::string toString(sf::Keyboard::Key key)
 void centerOrigin(sf::Sprite& sprite)
 {
 	sf::FloatRect bounds = sprite.getLocalBounds();
-	sprite.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));
+	sprite.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));
 }
 
 void centerOrigin(sf::Text& text)
 {
 	sf::FloatRect bounds = text.getLocalBounds();
-	text.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));
+	text.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));
 }
 
 float toDegree(float radian)
diff --git a/08_Graphics/Source/Utility.cpp b/08_Graphics/Source/Utility.cpp
@@ -137,19 +137,19 @@ std::string toString(sf::Keyboard::Key key)
 void centerOrigin(sf::Sprite& sprite)
 {
 	sf::FloatRect bounds = sprite.getLocalBounds();
-	sprite.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));
+	sprite.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));
 }
 
 void centerOrigin(sf::Text& text)
 {
 	sf::FloatRect bounds = text.getLocalBounds();
-	text.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));
+	text.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));
 }
 
 void centerOrigin(Animation& animation)
 {
 	sf::FloatRect bounds = animation.getLocalBounds();
-	animation.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));
+	animation.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));
 }
 
 float toDegree(float radian)
diff --git a/09_Audio/Source/Utility.cpp b/09_Audio/Source/Utility.cpp
@@ -137,19 +137,19 @@ std::string toString(sf::Keyboard::Key key)
 void centerOrigin(sf::Sprite& sprite)
 {
 	sf::FloatRect bounds = sprite.getLocalBounds();
-	sprite.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));
+	sprite.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));
 }
 
 void centerOrigin(sf::Text& text)
 {
 	sf::FloatRect bounds = text.getLocalBounds();
-	text.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));
+	text.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));
 }
 
 void centerOrigin(Animation& animation)
 {
 	sf::FloatRect bounds = animation.getLocalBounds();
-	animation.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));
+	animation.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));
 }
 
 float toDegree(float radian)
diff --git a/10_Network/Source/Utility.cpp b/10_Network/Source/Utility.cpp
@@ -137,19 +137,19 @@ std::string toString(sf::Keyboard::Key key)
 void centerOrigin(sf::Sprite& sprite)
 {
 	sf::FloatRect bounds = sprite.getLocalBounds();
-	sprite.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));
+	sprite.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));
 }
 
 void centerOrigin(sf::Text& text)
 {
 	sf::FloatRect bounds = text.getLocalBounds();
-	text.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));
+	text.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));
 }
 
 void centerOrigin(Animation& animation)
 {
 	sf::FloatRect bounds = animation.getLocalBounds();
-	animation.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));
+	animation.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));
 }
 
 float toDegree(float radian)

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@`
`7`	`7`	`void centerOrigin(sf::Sprite& sprite)`
`8`	`8`	`{`
`9`	`9`	`sf::FloatRect bounds = sprite.getLocalBounds();`
`10`		`- sprite.setOrigin(bounds.width / 2.f, bounds.height / 2.f);`
	`10`	`+ sprite.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`void centerOrigin(sf::Text& text)`
`14`	`14`	`{`
`15`	`15`	`sf::FloatRect bounds = text.getLocalBounds();`
`16`		`- text.setOrigin(bounds.width / 2.f, bounds.height / 2.f);`
	`16`	`+ text.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,11 +122,11 @@ std::string toString(sf::Keyboard::Key key)`
`122`	`122`	`void centerOrigin(sf::Sprite& sprite)`
`123`	`123`	`{`
`124`	`124`	`sf::FloatRect bounds = sprite.getLocalBounds();`
`125`		`- sprite.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));`
	`125`	`+ sprite.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`void centerOrigin(sf::Text& text)`
`129`	`129`	`{`
`130`	`130`	`sf::FloatRect bounds = text.getLocalBounds();`
`131`		`- text.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));`
	`131`	`+ text.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,13 +136,13 @@ std::string toString(sf::Keyboard::Key key)`
`136`	`136`	`void centerOrigin(sf::Sprite& sprite)`
`137`	`137`	`{`
`138`	`138`	`sf::FloatRect bounds = sprite.getLocalBounds();`
`139`		`- sprite.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));`
	`139`	`+ sprite.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`void centerOrigin(sf::Text& text)`
`143`	`143`	`{`
`144`	`144`	`sf::FloatRect bounds = text.getLocalBounds();`
`145`		`- text.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));`
	`145`	`+ text.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`float toDegree(float radian)`
Original file line number	Diff line number	Diff line change
`@@ -137,19 +137,19 @@ std::string toString(sf::Keyboard::Key key)`
`137`	`137`	`void centerOrigin(sf::Sprite& sprite)`
`138`	`138`	`{`
`139`	`139`	`sf::FloatRect bounds = sprite.getLocalBounds();`
`140`		`- sprite.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));`
	`140`	`+ sprite.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`void centerOrigin(sf::Text& text)`
`144`	`144`	`{`
`145`	`145`	`sf::FloatRect bounds = text.getLocalBounds();`
`146`		`- text.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));`
	`146`	`+ text.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`void centerOrigin(Animation& animation)`
`150`	`150`	`{`
`151`	`151`	`sf::FloatRect bounds = animation.getLocalBounds();`
`152`		`- animation.setOrigin(std::floor(bounds.width / 2.f), std::floor(bounds.height / 2.f));`
	`152`	`+ animation.setOrigin(std::floor(bounds.left + bounds.width / 2.f), std::floor(bounds.top + bounds.height / 2.f));`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`float toDegree(float radian)`