Merge pull request moai#24 from harningt/box2d-wheel-fixes

Box2d wheel fixes
h2soft · Jan 8, 2012 · 21f3970 · 21f3970
2 parents 20f9282 + 409c69c
commit 21f3970
Showing 1 changed file with 23 additions and 20 deletions.
diff --git a/src/moaicore/MOAIBox2DWheelJoint.cpp b/src/moaicore/MOAIBox2DWheelJoint.cpp
@@ -40,17 +40,17 @@ MOAIBox2DWheelJoint::MOAIBox2DWheelJoint () {
  */
 int MOAIBox2DWheelJoint::_getJointTranslation ( lua_State* L ) {
 	MOAI_LUA_SETUP ( MOAIBox2DWheelJoint, "U" )
+	float unitsToMeters = self->GetUnitsToMeters ();
 
 	if ( !self->mJoint ) {
 		MOAILog ( state, MOAILogMessages::MOAIBox2DJoint_MissingInstance );
 		return 0;
 	}
 
-	float speed	= state.GetValue < float >( 2, 0.0f ) * ( float )D2R;
 	b2WheelJoint* joint = ( b2WheelJoint* )self->mJoint;
-	joint->SetMotorSpeed(speed);
+	state.Push ( joint->GetJointTranslation () / unitsToMeters );
 
-	return 1;
+	return 0;
 }
 
 //----------------------------------------------------------------//
@@ -104,15 +104,14 @@ int MOAIBox2DWheelJoint::_isMotorEnabled ( lua_State* L ) {
  */
 int MOAIBox2DWheelJoint::_getMotorSpeed ( 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->GetMotorSpeed () / unitsToMeters );
+	state.Push ( joint->GetMotorSpeed () * ( float ) R2D );
 
 	return 1;
 }
@@ -127,17 +126,16 @@ int MOAIBox2DWheelJoint::_getMotorSpeed ( lua_State* L ) {
  */
 int MOAIBox2DWheelJoint::_getSpringDampingRatio ( 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->GetSpringDampingRatio() / unitsToMeters);
+	state.Push ( joint->GetSpringDampingRatio() );
 
-	return 0;
+	return 1;
 }
 
 //----------------------------------------------------------------//
@@ -149,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;
 }
@@ -170,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;
 }
@@ -218,11 +218,13 @@ int MOAIBox2DWheelJoint::_setMotorSpeed ( lua_State* L ) {
 		MOAILog ( state, MOAILogMessages::MOAIBox2DJoint_MissingInstance );
 		return 0;
 	}
-
+
+	float speed = state.GetValue < float >( 2, 0.0f ) * ( float )D2R;
+
 	b2WheelJoint* joint = ( b2WheelJoint* )self->mJoint;
-	state.Push ( joint->GetSpringFrequencyHz() );
-	
-	return 1;
+	joint->SetMotorSpeed ( speed );
+
+	return 0;
 }
 
 //----------------------------------------------------------------//
@@ -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 >( 1, 0.0f ) * ( float )D2R;
+	float maxMotorTorque = state.GetValue < float >( 2, 0.0f ) * unitsToMeters;
 
 	b2WheelJoint* joint = ( b2WheelJoint* )self->mJoint;
 	joint->SetMaxMotorTorque ( maxMotorTorque );
@@ -289,7 +292,7 @@ int MOAIBox2DWheelJoint::_setSpringDampingRatio ( lua_State* L ) {
 		return 0;
 	}
 
-	float dampingRatio = state.GetValue < float >( 1, 0.0f );
+	float dampingRatio = state.GetValue < float >( 2, 0.0f );
 
 	b2WheelJoint* joint = ( b2WheelJoint* )self->mJoint;
 	joint->SetSpringDampingRatio( dampingRatio );
@@ -313,7 +316,7 @@ int MOAIBox2DWheelJoint::_setSpringFrequencyHz ( lua_State* L ) {
 		return 0;
 	}
 
-	float springFrequencyHz = state.GetValue < float >( 1, 0.0f );
+	float springFrequencyHz = state.GetValue < float >( 2, 0.0f );
 
 	b2WheelJoint* joint = ( b2WheelJoint* )self->mJoint;
 	joint->SetSpringFrequencyHz( springFrequencyHz );