diff engine/core/util/math/angles.h @ 407:f27880d4c08c

Moved getAngleBetween() form Camera to angles.h and updated it to not use the camera angle in it's calculation. Added camera rotation to the angle calculation for selecting the correct image by angles. Added a call to setRotation() to make sure that instance rotation is valid.
author prock@33b003aa-7bff-0310-803a-e67f0ece8222
date Fri, 29 Jan 2010 21:03:51 +0000
parents 90005975cdbb
children 356634098bd9
line wrap: on
line diff
--- a/engine/core/util/math/angles.h	Fri Jan 29 19:52:14 2010 +0000
+++ b/engine/core/util/math/angles.h	Fri Jan 29 21:03:51 2010 +0000
@@ -31,14 +31,31 @@
 // These includes are split up in two parts, separated by one empty line
 // First block: files included from the FIFE root src directory
 // Second block: files included from the same folder
+#include "model/structures/location.h"
 
 namespace FIFE {
 	typedef std::map<unsigned int, int> type_angle2id;
-	
+
 	/** Returns id for given angle from angle2id map
 	 * in case there are no elements in the map, negative value is returned
 	 */
 	int getIndexByAngle(int angle, const type_angle2id& angle2id, int& closestMatchingAngle);
+
+	/** Gets angle of vector defined by given locations
+	 *  @return angle in polar coordinates between the line
+	 *  defined by the two locations and the horizontal axis (East <-> West)
+	 */
+	inline int getAngleBetween(const Location& loc1, const Location& loc2) {
+		ExactModelCoordinate c1 = loc1.getMapCoordinates();
+		ExactModelCoordinate c2 = loc2.getMapCoordinates();
+
+		double dy = (c2.y - c1.y);
+		double dx = (c2.x - c1.x);
+
+		int angle = static_cast<int>(atan2(-dy,dx)*(180.0/M_PI));
+
+		return angle;
+	}
 }
 
 #endif