Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Style: apply clang-format (5.0.0) to current source

Browse source
This commit is contained in:
Rémi Verschelde 2017-12-11 15:31:49 +01:00
parent 7e2d6b4450
commit 6a4e7198c5
147 changed files with 465 additions and 399 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scene/3d/area.cpp
View file

@ -639,8 +639,8 @@ void Area::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "collision/mask", PROPERTY_HINT_ALL_FLAGS), _SCS("set_collision_mask"), _SCS("get_collision_mask"));
}
Area::Area()
: CollisionObject(PhysicsServer::get_singleton()->area_create(), true) {
Area::Area() :
CollisionObject(PhysicsServer::get_singleton()->area_create(), true) {
space_override = SPACE_OVERRIDE_DISABLED;
set_gravity(9.8);

4
scene/3d/light.cpp
View file

@ -598,8 +598,8 @@ void DirectionalLight::_bind_methods() {
BIND_CONSTANT(SHADOW_PARAM_PSSM_ZOFFSET_SCALE);
}
DirectionalLight::DirectionalLight()
: Light(VisualServer::LIGHT_DIRECTIONAL) {
DirectionalLight::DirectionalLight() :
Light(VisualServer::LIGHT_DIRECTIONAL) {
shadow_mode = SHADOW_ORTHOGONAL;
shadow_param[SHADOW_PARAM_MAX_DISTANCE] = 0;

8
scene/3d/light.h
View file

@ -192,8 +192,8 @@ protected:
static void _bind_methods();
public:
OmniLight()
: Light(VisualServer::LIGHT_OMNI) { set_parameter(PARAM_SHADOW_Z_OFFSET, 0.001); }
OmniLight() :
Light(VisualServer::LIGHT_OMNI) { set_parameter(PARAM_SHADOW_Z_OFFSET, 0.001); }
};
class SpotLight : public Light {
@ -204,8 +204,8 @@ protected:
static void _bind_methods();
public:
SpotLight()
: Light(VisualServer::LIGHT_SPOT) {}
SpotLight() :
Light(VisualServer::LIGHT_SPOT) {}
};
#endif

16
scene/3d/physics_body.cpp
View file

@ -163,8 +163,8 @@ void PhysicsBody::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "collision/mask", PROPERTY_HINT_ALL_FLAGS), _SCS("set_collision_mask"), _SCS("get_collision_mask"));
}
PhysicsBody::PhysicsBody(PhysicsServer::BodyMode p_mode)
: CollisionObject(PhysicsServer::get_singleton()->body_create(p_mode), false) {
PhysicsBody::PhysicsBody(PhysicsServer::BodyMode p_mode) :
CollisionObject(PhysicsServer::get_singleton()->body_create(p_mode), false) {
layer_mask = 1;
collision_mask = 1;
@ -238,8 +238,8 @@ void StaticBody::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "constant_angular_velocity"), _SCS("set_constant_angular_velocity"), _SCS("get_constant_angular_velocity"));
}
StaticBody::StaticBody()
: PhysicsBody(PhysicsServer::BODY_MODE_STATIC) {
StaticBody::StaticBody() :
PhysicsBody(PhysicsServer::BODY_MODE_STATIC) {
bounce = 0;
friction = 1;
@ -871,8 +871,8 @@ void RigidBody::_bind_methods() {
BIND_CONSTANT(MODE_CHARACTER);
}
RigidBody::RigidBody()
: PhysicsBody(PhysicsServer::BODY_MODE_RIGID) {
RigidBody::RigidBody() :
PhysicsBody(PhysicsServer::BODY_MODE_RIGID) {
mode = MODE_RIGID;
@ -1283,8 +1283,8 @@ void KinematicBody::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::REAL, "collision/margin", PROPERTY_HINT_RANGE, "0.001,256,0.001"), _SCS("set_collision_margin"), _SCS("get_collision_margin"));
}
KinematicBody::KinematicBody()
: PhysicsBody(PhysicsServer::BODY_MODE_KINEMATIC) {
KinematicBody::KinematicBody() :
PhysicsBody(PhysicsServer::BODY_MODE_KINEMATIC) {
collide_static = true;
collide_rigid = true;

4
scene/3d/spatial.cpp
View file

@ -788,8 +788,8 @@ void Spatial::_bind_methods() {
ADD_SIGNAL(MethodInfo("visibility_changed"));
}
Spatial::Spatial()
: xform_change(this) {
Spatial::Spatial() :
xform_change(this) {
data.dirty = DIRTY_NONE;
data.children_lock = 0;

2
scene/3d/sprite_3d.cpp
View file

@ -597,7 +597,7 @@ Sprite3D::Sprite3D() {
hframes = 1;
}
////////////////////////////////////////
////////////////////////////////////////
#if 0

20
scene/3d/vehicle_body.cpp
View file

@ -54,8 +54,8 @@ public:
const Vector3 &inertiaInvA,
const real_t massInvA,
const Vector3 &inertiaInvB,
const real_t massInvB)
: m_linearJointAxis(jointAxis) {
const real_t massInvB) :
m_linearJointAxis(jointAxis) {
m_aJ = world2A.xform(rel_pos1.cross(m_linearJointAxis));
m_bJ = world2B.xform(rel_pos2.cross(-m_linearJointAxis));
m_0MinvJt = inertiaInvA * m_aJ;
@ -573,12 +573,12 @@ void VehicleBody::_resolve_single_bilateral(PhysicsDirectBodyState *s, const Vec
#endif
}
VehicleBody::btVehicleWheelContactPoint::btVehicleWheelContactPoint(PhysicsDirectBodyState *s, PhysicsBody *body1, const Vector3 &frictionPosWorld, const Vector3 &frictionDirectionWorld, real_t maxImpulse)
: m_s(s),
m_body1(body1),
m_frictionPositionWorld(frictionPosWorld),
m_frictionDirectionWorld(frictionDirectionWorld),
m_maxImpulse(maxImpulse) {
VehicleBody::btVehicleWheelContactPoint::btVehicleWheelContactPoint(PhysicsDirectBodyState *s, PhysicsBody *body1, const Vector3 &frictionPosWorld, const Vector3 &frictionDirectionWorld, real_t maxImpulse) :
m_s(s),
m_body1(body1),
m_frictionPositionWorld(frictionPosWorld),
m_frictionDirectionWorld(frictionDirectionWorld),
m_maxImpulse(maxImpulse) {
float denom0 = 0;
float denom1 = 0;
@ -947,8 +947,8 @@ void VehicleBody::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::REAL, "body/friction", PROPERTY_HINT_RANGE, "0.01,1,0.01"), _SCS("set_friction"), _SCS("get_friction"));
}
VehicleBody::VehicleBody()
: PhysicsBody(PhysicsServer::BODY_MODE_RIGID) {
VehicleBody::VehicleBody() :
PhysicsBody(PhysicsServer::BODY_MODE_RIGID) {
m_pitchControl = 0;
m_currentVehicleSpeedKmHour = real_t(0.);

1
scene/3d/visibility_notifier.cpp
View file

@ -32,7 +32,6 @@
#include "scene/3d/physics_body.h"
#include "scene/animation/animation_player.h"
#include "scene/scene_string_names.h"
#include "scene/scene_string_names.h"
void VisibilityNotifier::_enter_camera(Camera *p_camera) {