Automated formatting fix

This commit is contained in:
Bart van Strien
2011-11-16 11:32:41 +01:00
parent fafe472595
commit 0aae9684b3
262 changed files with 16705 additions and 16503 deletions
+7 -7
View File
@@ -1,14 +1,14 @@
/**
* Copyright (c) 2006-2011 LOVE Development Team
*
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
*
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be
@@ -35,7 +35,7 @@ namespace box2d
{
FrictionJoint::FrictionJoint(Body * body1, Body * body2, float xA, float yA, float xB, float yB, bool collideConnected)
: Joint(body1, body2), joint(NULL)
{
{
b2FrictionJointDef def;
def.Initialize(body1->body, body2->body, Physics::scaleDown(b2Vec2(xA,yA)));
def.localAnchorB = body2->body->GetLocalPoint(Physics::scaleDown(b2Vec2(xB, yB)));
@@ -48,7 +48,7 @@ namespace box2d
destroyJoint(joint);
joint = 0;
}
void FrictionJoint::setMaxForce(float force)
{
joint->SetMaxForce(Physics::scaleDown(force));
@@ -58,12 +58,12 @@ namespace box2d
{
return Physics::scaleUp(joint->GetMaxForce());
}
void FrictionJoint::setMaxTorque(float torque)
{
joint->SetMaxTorque(Physics::scaleDown(Physics::scaleDown(torque)));
}
float FrictionJoint::getMaxTorque() const
{
return Physics::scaleUp(Physics::scaleUp(joint->GetMaxTorque()));