MOAIBox2DWheelJoint: fixes unit conversion to match what box2d states…

… it is meters typically except motor speed as angle/s^2
h2soft · Jan 8, 2012 · 409c69c · 409c69c
1 parent 10f72d0
commit 409c69c
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/moaicore/MOAIBox2DWheelJoint.cpp b/src/moaicore/MOAIBox2DWheelJoint.cpp
@@ -147,14 +147,15 @@ int MOAIBox2DWheelJoint::_getSpringDampingRatio ( lua_State* L ) {
  */
 int MOAIBox2DWheelJoint::_getMaxMotorTorque ( lua_State* L ) {
 	MOAI_LUA_SETUP ( MOAIBox2DWheelJoint, "U" )
-
+	float unitsToMeters = self->GetUnitsToMeters ();
+
 	if ( !self->mJoint ) {
 		MOAILog ( state, MOAILogMessages::MOAIBox2DJoint_MissingInstance );
 		return 0;
 	}
 
 	b2WheelJoint* joint = ( b2WheelJoint* )self->mJoint;	
-	state.Push ( joint->GetMaxMotorTorque () * ( float )R2D );
+	state.Push ( joint->GetMaxMotorTorque () / unitsToMeters );
 
 	return 1;
 }
@@ -168,15 +169,16 @@ int MOAIBox2DWheelJoint::_getMaxMotorTorque ( lua_State* L ) {
  */
 int MOAIBox2DWheelJoint::_getMotorTorque ( lua_State* L ) {
 	MOAI_LUA_SETUP ( MOAIBox2DWheelJoint, "U" )
-
+	float unitsToMeters = self->GetUnitsToMeters ();
+
 	if ( !self->mJoint ) {
 		MOAILog ( state, MOAILogMessages::MOAIBox2DJoint_MissingInstance );
 		return 0;
 	}
 
 	b2WheelJoint* joint = ( b2WheelJoint* )self->mJoint;
 	float step = ( float )( 1.0 / MOAISim::Get ().GetStep ());	
-	state.Push ( joint->GetMotorTorque (step) * ( float )R2D );
+	state.Push ( joint->GetMotorTorque (step) / unitsToMeters );
 
 	return 1;
 }
@@ -259,13 +261,14 @@ int MOAIBox2DWheelJoint::_setMotorEnabled ( lua_State* L ) {
  */
 int MOAIBox2DWheelJoint::_setMaxMotorTorque ( lua_State* L ) {
 	MOAI_LUA_SETUP ( MOAIBox2DWheelJoint, "U" )
-
+	float unitsToMeters = self->GetUnitsToMeters ();
+
 	if ( !self->mJoint ) {
 		MOAILog ( state, MOAILogMessages::MOAIBox2DJoint_MissingInstance );
 		return 0;
 	}
 
-	float maxMotorTorque = state.GetValue < float >( 2, 0.0f ) * ( float )D2R;
+	float maxMotorTorque = state.GetValue < float >( 2, 0.0f ) * unitsToMeters;
 
 	b2WheelJoint* joint = ( b2WheelJoint* )self->mJoint;
 	joint->SetMaxMotorTorque ( maxMotorTorque );