MatMath only one way of rad deg conversion

ChangeLog

@@ -5,6 +5,10 @@
 
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
 
+	[ 20140111 ]
+	* Only one way of conversion between Deg and Rad in MatMath
+	* Use the same style of include guards in all headers
+
 	[ 20140110 ]
 	* Removed endian.(h/cpp) as it shouldn't be needed. See:
 	  http://commandcenter.blogspot.de/2012/04/byte-order-fallacy.html

include/MatMath.h

@@ -104,28 +104,6 @@ void helMidpoint3v(vec3_t a, vec3_t b, vec3_t mid);
  ------------------------------------------------------*/
 
 
-vec_t helDegToRad(vec_t degrees);
-/*------------------------------------------------------
- * Pre  : Given angle in degrees
- * Post : Returns angle in radians
- *
- *-- History ------------------------------------------
- *
- * 1999.06.14:
- * Mongoose - Created, from mtk3d
- ------------------------------------------------------*/
-
-vec_t helRadToDeg(vec_t rad);
-/*------------------------------------------------------
- * Pre  : Given angle in radians
- * Post : Returns angle in degrees
- *
- *-- History ------------------------------------------
- *
- * 1999.06.14:
- * Mongoose - Created, from mtk3d
- ------------------------------------------------------*/
-
 vec_t helRandomNum(vec_t from, vec_t to);
 
 #endif

src/Camera.cpp

@@ -55,8 +55,8 @@ Camera::Camera()
 	mFlags = 0;
 	mViewDistance = 14.0;
 	mTranslateDelta = 256.0;
-	mRotateDelta = helDegToRad(15.0);
- 	mRotateDelta2 = helDegToRad(5.0);
+	mRotateDelta = HEL_DEG_TO_RAD(15.0);
+ 	mRotateDelta2 = HEL_DEG_TO_RAD(5.0);
 	mFlags &= Camera_FlyMode;
 	reset();
 }
@@ -103,7 +103,7 @@ void Camera::getTarget(vec3_t target)
 
 float Camera::getYaw()
 {
-	return helRadToDeg(mTheta);
+	return HEL_RAD_TO_DEG(mTheta);
 }
 
 
@@ -231,13 +231,13 @@ void Camera::reset()
 
 void Camera::setSensitivityY(float angle)
 {
-	mRotateDelta2 = helDegToRad(angle);
+	mRotateDelta2 = HEL_DEG_TO_RAD(angle);
 }
 
 
 void Camera::setSensitivityX(float angle)
 {
-	mRotateDelta = helDegToRad(angle);
+	mRotateDelta = HEL_DEG_TO_RAD(angle);
 }
 
 

src/MatMath.cpp

@@ -7,8 +7,6 @@
 #include <Vector3d.h>
 #include <Matrix.h>
 
-#define COMPUTE
-
 bool tmpHelSphereIntersectLine(Vector3d pos, Vector3d lastPos,
 										 Vector3d center, vec_t radius)
 {
@@ -290,25 +288,3 @@ vec_t helRandomNum(vec_t from, vec_t to)
 	return from + (to*rand()/(RAND_MAX+1.0));
 }
 
-
-vec_t helDegToRad(vec_t degrees)
-{
-#ifdef COMPUTE
-	return ((degrees / 180.0) * HEL_PI);
-#else
-	// degrees * (180.0 / PI);
-	return (degrees * HEL_180_OVER_PI);
-#endif
-}
-
-
-vec_t helRadToDeg(vec_t rad)
-{
-#ifdef COMPUTE
-	return ((rad / HEL_PI) * 180.0);
-#else
-	// rad * (PI / 180.0);
-	return (rad * HEL_PI_OVER_180);
-#endif
-}
-

src/OpenRaider.cpp

@@ -3296,8 +3296,8 @@ void OpenRaider::consoleCommand(char *cmd)
 				print(true, "Room %2i  Pos %.0f %.0f %.0f  Yaw %.0f  Pitch %.0f",
 						LARA->room,
 						LARA->pos[0], LARA->pos[1], LARA->pos[2],
-						helRadToDeg(LARA->angles[1]),
-						helRadToDeg(LARA->angles[2]));
+						HEL_RAD_TO_DEG(LARA->angles[1]),
+						HEL_RAD_TO_DEG(LARA->angles[2]));
 			}
 		}
 		else if (rc_command("room", cmd))