godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Style: clang-format: Disable AllowShortIfStatementsOnASingleLine

Browse Source 
Part of #33027, also discussed in #29848.

Enforcing the use of brackets even on single line statements would be
preferred, but `clang-format` doesn't have this functionality yet.
This commit is contained in:
Rémi Verschelde
2020-05-10 12:56:01 +02:00
parent 03b13e0c69
commit e956e80c1f
130 changed files with 967 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
servers/physics_3d/body_3d_sw.h
View File

@@ -175,7 +175,8 @@ public:
_FORCE_INLINE_ void set_max_contacts_reported(int p_size) {
contacts.resize(p_size);
contact_count = 0;
if (mode == PhysicsServer3D::BODY_MODE_KINEMATIC && p_size) set_active(true);
if (mode == PhysicsServer3D::BODY_MODE_KINEMATIC && p_size)
set_active(true);
}
_FORCE_INLINE_ int get_max_contacts_reported() const { return contacts.size(); }

3
servers/physics_3d/collision_object_3d_sw.h
View File

@@ -92,7 +92,8 @@ protected:
#endif
transform = p_transform;
if (p_update_shapes) _update_shapes();
if (p_update_shapes)
_update_shapes();
}
_FORCE_INLINE_ void _set_inv_transform(const Transform &p_transform) { inv_transform = p_transform; }
void _set_static(bool p_static);

6
servers/physics_3d/joints/generic_6dof_joint_3d_sw.cpp
View File

@@ -83,7 +83,8 @@ int G6DOFRotationalLimitMotor3DSW::testLimitValue(real_t test_value) {
real_t G6DOFRotationalLimitMotor3DSW::solveAngularLimits(
real_t timeStep, Vector3 &axis, real_t jacDiagABInv,
Body3DSW *body0, Body3DSW *body1) {
if (!needApplyTorques()) return 0.0f;
if (!needApplyTorques())
return 0.0f;
real_t target_velocity = m_targetVelocity;
real_t maxMotorForce = m_maxMotorForce;
@@ -137,7 +138,8 @@ real_t G6DOFRotationalLimitMotor3DSW::solveAngularLimits(
Vector3 motorImp = clippedMotorImpulse * axis;
body0->apply_torque_impulse(motorImp);
if (body1) body1->apply_torque_impulse(-motorImp);
if (body1)
body1->apply_torque_impulse(-motorImp);
return clippedMotorImpulse;
}

3
servers/physics_3d/space_3d_sw.h
View File

@@ -187,7 +187,8 @@ public:
void set_debug_contacts(int p_amount) { contact_debug.resize(p_amount); }
_FORCE_INLINE_ bool is_debugging_contacts() const { return !contact_debug.empty(); }
_FORCE_INLINE_ void add_debug_contact(const Vector3 &p_contact) {
if (contact_debug_count < contact_debug.size()) contact_debug.write[contact_debug_count++] = p_contact;
if (contact_debug_count < contact_debug.size())
contact_debug.write[contact_debug_count++] = p_contact;
}
_FORCE_INLINE_ Vector<Vector3> get_debug_contacts() { return contact_debug; }
_FORCE_INLINE_ int get_debug_contact_count() { return contact_debug_count; }