thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MATH: Remove duplicated deg/rad-conversions, replacing them by common/math.h-functionality

Browse source
This commit is contained in:
Einar Johan Trøan Sømåen 2014-02-20 12:22:43 +01:00
parent 5c4100d353
commit adc0067bf7
3 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
math/angle.cpp
View file

@ -21,9 +21,9 @@
*/
#include "common/streamdebug.h"
#include "common/math.h"
#include "math/angle.h"
#include "math/utils.h"
namespace Math {
@ -57,7 +57,7 @@ void Angle::setDegrees(float degrees) {
}
void Angle::setRadians(float radians) {
_degrees = radianToDegree(radians);
_degrees = Common::rad2deg(radians);
}
float Angle::getDegrees() const {
@ -65,7 +65,7 @@ float Angle::getDegrees() const {
}
float Angle::getRadians() const {
return degreeToRadian(getDegrees());
return Common::deg2rad(getDegrees());
}
float Angle::getDegrees(float low) const {
@ -82,7 +82,7 @@ float Angle::getDegrees(float low) const {
float Angle::getRadians(float low) const {
float d = getDegrees(low);
return degreeToRadian(d);
return Common::deg2rad(d);
}
float Angle::getCosine() const {
@ -134,7 +134,7 @@ Angle &Angle::operator-=(float degrees) {
}
Angle Angle::fromRadians(float radians) {
return Angle(radianToDegree(radians));
return Angle(Common::rad2deg(radians));
}
Angle Angle::arcCosine(float x) {