godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warnings about wrong member initialization order [-Wreorder] 

Fixes the following GCC 5 warnings:
```
core/object.h:193:11: warning: 'MethodInfo::flags' will be initialized after [-Wreorder]
core/object.h:192:15: warning:   'PropertyInfo MethodInfo::return_val' [-Wreorder]
core/object.cpp:278:1: warning:   when initialized here [-Wreorder]
core/script_debugger_remote.h:97:6: warning: 'ScriptDebuggerRemote::max_cps' will be initialized after [-Wreorder]
core/script_debugger_remote.h:91:6: warning:   'int ScriptDebuggerRemote::max_messages_per_frame' [-Wreorder]
core/script_debugger_remote.cpp:1086:1: warning:   when initialized here [-Wreorder]
core/script_debugger_remote.h:98:6: warning: 'ScriptDebuggerRemote::char_count' will be initialized after [-Wreorder]
core/script_debugger_remote.h:92:6: warning:   'int ScriptDebuggerRemote::n_messages_dropped' [-Wreorder]
core/script_debugger_remote.cpp:1086:1: warning:   when initialized here [-Wreorder]
modules/bullet/area_bullet.h:102:7: warning: 'AreaBullet::isScratched' will be initialized after [-Wreorder]
modules/bullet/area_bullet.h:92:39: warning:   'PhysicsServer::AreaSpaceOverrideMode AreaBullet::spOv_mode' [-Wreorder]
modules/bullet/area_bullet.cpp:46:1: warning:   when initialized here [-Wreorder]
modules/bullet/collision_object_bullet.h:127:15: warning: 'CollisionObjectBullet::space' will be initialized after [-Wreorder]
modules/bullet/collision_object_bullet.h:117:7: warning:   'CollisionObjectBullet::Type CollisionObjectBullet::type' [-Wreorder]
modules/bullet/collision_object_bullet.cpp:67:1: warning:   when initialized here [-Wreorder]
modules/bullet/godot_ray_world_algorithm.h:48:7: warning: 'GodotRayWorldAlgorithm::m_ownManifol1d' will be initialized after [-Wreorder]
modules/bullet/godot_ray_world_algorithm.h:46:33: warning:   'const btDiscreteDynamicsWorld* GodotRayWorldAlgorithm::m_world' [-Wreorder]
modules/bullet/godot_ray_world_algorithm.cpp:50:1: warning:   when initialized here [-Wreorder]
modules/bullet/godot_result_callbacks.h:91:18: warning: 'GodotAllConvexResultCallback::m_exclude' will be initialized after [-Wreorder]
modules/bullet/godot_result_callbacks.h:89:6: warning:   'int GodotAllConvexResultCallback::m_resultMax' [-Wreorder]
modules/bullet/godot_result_callbacks.h:93:2: warning:   when initialized here [-Wreorder]
modules/bullet/godot_result_callbacks.h:142:18: warning: 'GodotAllContactResultCallback::m_exclude' will be initialized after [-Wreorder]
modules/bullet/godot_result_callbacks.h:140:6: warning:   'int GodotAllContactResultCallback::m_resultMax' [-Wreorder]
modules/bullet/godot_result_callbacks.h:147:2: warning:   when initialized here [-Wreorder]
modules/bullet/godot_result_callbacks.h:168:18: warning: 'GodotContactPairContactResultCallback::m_exclude' will be initialized after [-Wreorder]
modules/bullet/godot_result_callbacks.h:166:6: warning:   'int GodotContactPairContactResultCallback::m_resultMax' [-Wreorder]
modules/bullet/godot_result_callbacks.h:173:2: warning:   when initialized here [-Wreorder]
modules/bullet/godot_result_callbacks.h:195:18: warning: 'GodotRestInfoContactResultCallback::m_exclude' will be initialized after [-Wreorder]
modules/bullet/godot_result_callbacks.h:191:7: warning:   'bool GodotRestInfoContactResultCallback::m_collided' [-Wreorder]
modules/bullet/godot_result_callbacks.h:199:2: warning:   when initialized here [-Wreorder]
modules/bullet/rigid_body_bullet.h:200:9: warning: 'RigidBodyBullet::gravity_scale' will be initialized after [-Wreorder]
modules/bullet/rigid_body_bullet.h:199:9: warning:   'real_t RigidBodyBullet::mass' [-Wreorder]
modules/bullet/rigid_body_bullet.cpp:258:1: warning:   when initialized here [-Wreorder]
modules/bullet/rigid_body_bullet.h:222:28: warning: 'RigidBodyBullet::force_integration_callback' will be initialized after [-Wreorder]
modules/bullet/rigid_body_bullet.h:219:7: warning:   'bool RigidBodyBullet::isTransformChanged' [-Wreorder]
modules/bullet/rigid_body_bullet.cpp:258:1: warning:   when initialized here [-Wreorder]
modules/bullet/rigid_body_bullet.h:220:7: warning: 'RigidBodyBullet::previousActiveState' will be initialized after [-Wreorder]
modules/bullet/rigid_body_bullet.h:208:6: warning:   'int RigidBodyBullet::maxCollisionsDetection' [-Wreorder]
modules/bullet/rigid_body_bullet.cpp:258:1: warning:   when initialized here [-Wreorder]
modules/bullet/soft_body_bullet.h:69:9: warning: 'SoftBodyBullet::total_mass' will be initialized after [-Wreorder]
modules/bullet/soft_body_bullet.h:68:6: warning:   'int SoftBodyBullet::simulation_precision' [-Wreorder]
modules/bullet/soft_body_bullet.cpp:38:1: warning:   when initialized here [-Wreorder]
modules/bullet/soft_body_bullet.h:76:9: warning: 'SoftBodyBullet::drag_coefficient' will be initialized after [-Wreorder]
modules/bullet/soft_body_bullet.h:61:14: warning:   'btSoftBody* SoftBodyBullet::bt_soft_body' [-Wreorder]
modules/bullet/soft_body_bullet.cpp:38:1: warning:   when initialized here [-Wreorder]
modules/bullet/space_bullet.h:97:22: warning: 'SpaceBullet::solver' will be initialized after [-Wreorder]
modules/bullet/space_bullet.h:95:35: warning:   'btDefaultCollisionConfiguration* SpaceBullet::collisionConfiguration' [-Wreorder]
modules/bullet/space_bullet.cpp:333:1: warning:   when initialized here [-Wreorder]
modules/bullet/space_bullet.h:101:23: warning: 'SpaceBullet::soft_body_world_info' will be initialized after [-Wreorder]
modules/bullet/space_bullet.h:99:23: warning:   'btGhostPairCallback* SpaceBullet::ghostPairCallback' [-Wreorder]
modules/bullet/space_bullet.cpp:333:1: warning:   when initialized here [-Wreorder]
modules/gdnative/nativescript/nativescript.h:79:13: warning: 'NativeScriptDesc::base_native_type' will be initialized after [-Wreorder]
modules/gdnative/nativescript/nativescript.h:73:9: warning:   'String NativeScriptDesc::documentation' [-Wreorder]
modules/gdnative/nativescript/nativescript.h:88:9: warning:   when initialized here [-Wreorder]
modules/gdscript/gdscript.h:296:6: warning: 'GDScriptWarning::line' will be initialized after [-Wreorder]
modules/gdscript/gdscript.h:294:4: warning:   'GDScriptWarning::Code GDScriptWarning::code' [-Wreorder]
modules/gdscript/gdscript.h:303:2: warning:   when initialized here [-Wreorder]
scene/3d/physics_body.h:544:7: warning: 'PhysicalBone::simulate_physics' will be initialized after [-Wreorder]
scene/3d/physics_body.h:543:7: warning:   'bool PhysicalBone::_internal_static_body' [-Wreorder]
scene/3d/physics_body.cpp:2502:1: warning:   when initialized here [-Wreorder]
scene/3d/physics_body.h:546:6: warning: 'PhysicalBone::bone_id' will be initialized after [-Wreorder]
scene/3d/physics_body.h:539:12: warning:   'Skeleton* PhysicalBone::parent_skeleton' [-Wreorder]
scene/3d/physics_body.cpp:2502:1: warning:   when initialized here [-Wreorder]
scene/3d/spring_arm.h:44:11: warning: 'SpringArm::mask' will be initialized after [-Wreorder]
scene/3d/spring_arm.h:43:8: warning:   'float SpringArm::current_spring_length' [-Wreorder]
scene/3d/spring_arm.cpp:37:1: warning:   when initialized here [-Wreorder]
scene/animation/skeleton_ik.h:159:11: warning: 'SkeletonIK::target_node_override' will be initialized after [-Wreorder]
scene/animation/skeleton_ik.h:152:7: warning:   'bool SkeletonIK::use_magnet' [-Wreorder]
scene/animation/skeleton_ik.cpp:418:1: warning:   when initialized here [-Wreorder]
scene/resources/tile_set.h:84:9: warning: 'TileSet::AutotileData::size' will be initialized after [-Wreorder]
scene/resources/tile_set.h:83:7: warning:   'int TileSet::AutotileData::spacing' [-Wreorder]
scene/resources/tile_set.h:92:12: warning:   when initialized here [-Wreorder]
scene/resources/tile_set.h:115:12: warning: 'TileSet::TileData::tile_mode' will be initialized after [-Wreorder]
scene/resources/tile_set.h:114:9: warning:   'Color TileSet::TileData::modulate' [-Wreorder]
scene/resources/tile_set.h:120:12: warning:   when initialized here [-Wreorder]
servers/physics/body_sw.h:84:19: warning: 'BodySW::direct_state_query_list' will be initialized after [-Wreorder]
servers/physics/body_sw.h:57:11: warning:   'uint16_t BodySW::locked_axis' [-Wreorder]
servers/physics/body_sw.cpp:756:1: warning:   when initialized here [-Wreorder]
```

Nothing really relevant for us, but it's not a bad consistency
improvement anyway so worth taking.
This commit is contained in:
Rémi Verschelde 2018-09-28 17:17:38 +02:00
parent dacc3f33c5
commit 2091f20443
19 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/object.cpp
View File

@ -277,8 +277,8 @@ MethodInfo::MethodInfo(Variant::Type ret, const String &p_name, const PropertyIn
MethodInfo::MethodInfo(const PropertyInfo &p_ret, const String &p_name) : MethodInfo::MethodInfo(const PropertyInfo &p_ret, const String &p_name) :
name(p_name), name(p_name),
flags(METHOD_FLAG_NORMAL),
return_val(p_ret), return_val(p_ret),
flags(METHOD_FLAG_NORMAL),
id(0) { id(0) {
} }

4
core/object.h
View File

@ -187,11 +187,11 @@ Array convert_property_list(const List<PropertyInfo> *p_list);
struct MethodInfo { struct MethodInfo {
String name; String name;
List<PropertyInfo> arguments;
Vector<Variant> default_arguments;
PropertyInfo return_val; PropertyInfo return_val;
uint32_t flags; uint32_t flags;
int id; int id;
List<PropertyInfo> arguments;
Vector<Variant> default_arguments;
inline bool operator==(const MethodInfo &p_method) const { return id == p_method.id; } inline bool operator==(const MethodInfo &p_method) const { return id == p_method.id; }
inline bool operator<(const MethodInfo &p_method) const { return id == p_method.id ? (name < p_method.name) : (id < p_method.id); } inline bool operator<(const MethodInfo &p_method) const { return id == p_method.id ? (name < p_method.name) : (id < p_method.id); }

6
core/script_debugger_remote.cpp
View File

@ -1094,12 +1094,12 @@ ScriptDebuggerRemote::ScriptDebuggerRemote() :
performance(Engine::get_singleton()->get_singleton_object("Performance")), performance(Engine::get_singleton()->get_singleton_object("Performance")),
requested_quit(false), requested_quit(false),
mutex(Mutex::create()), mutex(Mutex::create()),
max_cps(GLOBAL_GET("network/limits/debugger_stdout/max_chars_per_second")),
max_messages_per_frame(GLOBAL_GET("network/limits/debugger_stdout/max_messages_per_frame")), max_messages_per_frame(GLOBAL_GET("network/limits/debugger_stdout/max_messages_per_frame")),
max_errors_per_frame(GLOBAL_GET("network/limits/debugger_stdout/max_errors_per_frame")),
char_count(0),
n_messages_dropped(0), n_messages_dropped(0),
max_errors_per_frame(GLOBAL_GET("network/limits/debugger_stdout/max_errors_per_frame")),
n_errors_dropped(0), n_errors_dropped(0),
max_cps(GLOBAL_GET("network/limits/debugger_stdout/max_chars_per_second")),
char_count(0),
last_msec(0), last_msec(0),
msec_count(0), msec_count(0),
allow_focus_steal_pid(0), allow_focus_steal_pid(0),

4
modules/bullet/area_bullet.cpp
View File

@ -46,7 +46,6 @@
AreaBullet::AreaBullet() : AreaBullet::AreaBullet() :
RigidCollisionObjectBullet(CollisionObjectBullet::TYPE_AREA), RigidCollisionObjectBullet(CollisionObjectBullet::TYPE_AREA),
monitorable(true), monitorable(true),
isScratched(false),
spOv_mode(PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED), spOv_mode(PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED),
spOv_gravityPoint(false), spOv_gravityPoint(false),
spOv_gravityPointDistanceScale(0), spOv_gravityPointDistanceScale(0),
@ -55,7 +54,8 @@ AreaBullet::AreaBullet() :
spOv_gravityMag(10), spOv_gravityMag(10),
spOv_linearDump(0.1), spOv_linearDump(0.1),
spOv_angularDump(1), spOv_angularDump(1),
spOv_priority(0) { spOv_priority(0),
isScratched(false) {
btGhost = bulletnew(btGhostObject); btGhost = bulletnew(btGhostObject);
btGhost->setCollisionShape(BulletPhysicsServer::get_empty_shape()); btGhost->setCollisionShape(BulletPhysicsServer::get_empty_shape());

4
modules/bullet/collision_object_bullet.cpp
View File

@ -66,13 +66,13 @@ void CollisionObjectBullet::ShapeWrapper::claim_bt_shape(const btVector3 &body_s
CollisionObjectBullet::CollisionObjectBullet(Type p_type) : CollisionObjectBullet::CollisionObjectBullet(Type p_type) :
RIDBullet(), RIDBullet(),
space(NULL),
type(p_type), type(p_type),
collisionsEnabled(true), collisionsEnabled(true),
m_isStatic(false), m_isStatic(false),
bt_collision_object(NULL), bt_collision_object(NULL),
body_scale(1., 1., 1.), body_scale(1., 1., 1.),
force_shape_reset(false) {} force_shape_reset(false),
space(NULL) {}
CollisionObjectBullet::~CollisionObjectBullet() { CollisionObjectBullet::~CollisionObjectBullet() {
// Remove all overlapping, notify is not required since godot take care of it // Remove all overlapping, notify is not required since godot take care of it

2
modules/bullet/godot_ray_world_algorithm.cpp
View File

@ -49,9 +49,9 @@ GodotRayWorldAlgorithm::SwappedCreateFunc::SwappedCreateFunc(const btDiscreteDyn
GodotRayWorldAlgorithm::GodotRayWorldAlgorithm(const btDiscreteDynamicsWorld *world, btPersistentManifold *mf, const btCollisionAlgorithmConstructionInfo &ci, const btCollisionObjectWrapper *body0Wrap, const btCollisionObjectWrapper *body1Wrap, bool isSwapped) : GodotRayWorldAlgorithm::GodotRayWorldAlgorithm(const btDiscreteDynamicsWorld *world, btPersistentManifold *mf, const btCollisionAlgorithmConstructionInfo &ci, const btCollisionObjectWrapper *body0Wrap, const btCollisionObjectWrapper *body1Wrap, bool isSwapped) :
btActivatingCollisionAlgorithm(ci, body0Wrap, body1Wrap), btActivatingCollisionAlgorithm(ci, body0Wrap, body1Wrap),
m_world(world),
m_manifoldPtr(mf), m_manifoldPtr(mf),
m_ownManifold(false), m_ownManifold(false),
m_world(world),
m_isSwapped(isSwapped) {} m_isSwapped(isSwapped) {}
GodotRayWorldAlgorithm::~GodotRayWorldAlgorithm() { GodotRayWorldAlgorithm::~GodotRayWorldAlgorithm() {

15
modules/bullet/godot_result_callbacks.h
View File

@ -87,13 +87,13 @@ struct GodotAllConvexResultCallback : public btCollisionWorld::ConvexResultCallb
public: public:
PhysicsDirectSpaceState::ShapeResult *m_results; PhysicsDirectSpaceState::ShapeResult *m_results;
int m_resultMax; int m_resultMax;
int count;
const Set<RID> *m_exclude; const Set<RID> *m_exclude;
int count;
GodotAllConvexResultCallback(PhysicsDirectSpaceState::ShapeResult *p_results, int p_resultMax, const Set<RID> *p_exclude) : GodotAllConvexResultCallback(PhysicsDirectSpaceState::ShapeResult *p_results, int p_resultMax, const Set<RID> *p_exclude) :
m_results(p_results), m_results(p_results),
m_exclude(p_exclude),
m_resultMax(p_resultMax), m_resultMax(p_resultMax),
m_exclude(p_exclude),
count(0) {} count(0) {}
virtual bool needsCollision(btBroadphaseProxy *proxy0) const; virtual bool needsCollision(btBroadphaseProxy *proxy0) const;
@ -125,6 +125,7 @@ public:
GodotClosestConvexResultCallback(const btVector3 &convexFromWorld, const btVector3 &convexToWorld, const Set<RID> *p_exclude, bool p_collide_with_bodies, bool p_collide_with_areas) : GodotClosestConvexResultCallback(const btVector3 &convexFromWorld, const btVector3 &convexToWorld, const Set<RID> *p_exclude, bool p_collide_with_bodies, bool p_collide_with_areas) :
btCollisionWorld::ClosestConvexResultCallback(convexFromWorld, convexToWorld), btCollisionWorld::ClosestConvexResultCallback(convexFromWorld, convexToWorld),
m_exclude(p_exclude), m_exclude(p_exclude),
m_shapeId(0),
collide_with_bodies(p_collide_with_bodies), collide_with_bodies(p_collide_with_bodies),
collide_with_areas(p_collide_with_areas) {} collide_with_areas(p_collide_with_areas) {}
@ -138,8 +139,8 @@ public:
const btCollisionObject *m_self_object; const btCollisionObject *m_self_object;
PhysicsDirectSpaceState::ShapeResult *m_results; PhysicsDirectSpaceState::ShapeResult *m_results;
int m_resultMax; int m_resultMax;
int m_count;
const Set<RID> *m_exclude; const Set<RID> *m_exclude;
int m_count;
bool collide_with_bodies; bool collide_with_bodies;
bool collide_with_areas; bool collide_with_areas;
@ -147,8 +148,8 @@ public:
GodotAllContactResultCallback(btCollisionObject *p_self_object, PhysicsDirectSpaceState::ShapeResult *p_results, int p_resultMax, const Set<RID> *p_exclude, bool p_collide_with_bodies, bool p_collide_with_areas) : GodotAllContactResultCallback(btCollisionObject *p_self_object, PhysicsDirectSpaceState::ShapeResult *p_results, int p_resultMax, const Set<RID> *p_exclude, bool p_collide_with_bodies, bool p_collide_with_areas) :
m_self_object(p_self_object), m_self_object(p_self_object),
m_results(p_results), m_results(p_results),
m_exclude(p_exclude),
m_resultMax(p_resultMax), m_resultMax(p_resultMax),
m_exclude(p_exclude),
m_count(0), m_count(0),
collide_with_bodies(p_collide_with_bodies), collide_with_bodies(p_collide_with_bodies),
collide_with_areas(p_collide_with_areas) {} collide_with_areas(p_collide_with_areas) {}
@ -164,8 +165,8 @@ public:
const btCollisionObject *m_self_object; const btCollisionObject *m_self_object;
Vector3 *m_results; Vector3 *m_results;
int m_resultMax; int m_resultMax;
int m_count;
const Set<RID> *m_exclude; const Set<RID> *m_exclude;
int m_count;
bool collide_with_bodies; bool collide_with_bodies;
bool collide_with_areas; bool collide_with_areas;
@ -173,8 +174,8 @@ public:
GodotContactPairContactResultCallback(btCollisionObject *p_self_object, Vector3 *p_results, int p_resultMax, const Set<RID> *p_exclude, bool p_collide_with_bodies, bool p_collide_with_areas) : GodotContactPairContactResultCallback(btCollisionObject *p_self_object, Vector3 *p_results, int p_resultMax, const Set<RID> *p_exclude, bool p_collide_with_bodies, bool p_collide_with_areas) :
m_self_object(p_self_object), m_self_object(p_self_object),
m_results(p_results), m_results(p_results),
m_exclude(p_exclude),
m_resultMax(p_resultMax), m_resultMax(p_resultMax),
m_exclude(p_exclude),
m_count(0), m_count(0),
collide_with_bodies(p_collide_with_bodies), collide_with_bodies(p_collide_with_bodies),
collide_with_areas(p_collide_with_areas) {} collide_with_areas(p_collide_with_areas) {}
@ -188,11 +189,11 @@ struct GodotRestInfoContactResultCallback : public btCollisionWorld::ContactResu
public: public:
const btCollisionObject *m_self_object; const btCollisionObject *m_self_object;
PhysicsDirectSpaceState::ShapeRestInfo *m_result; PhysicsDirectSpaceState::ShapeRestInfo *m_result;
const Set<RID> *m_exclude;
bool m_collided; bool m_collided;
real_t m_min_distance; real_t m_min_distance;
const btCollisionObject *m_rest_info_collision_object; const btCollisionObject *m_rest_info_collision_object;
btVector3 m_rest_info_bt_point; btVector3 m_rest_info_bt_point;
const Set<RID> *m_exclude;
bool collide_with_bodies; bool collide_with_bodies;
bool collide_with_areas; bool collide_with_areas;

10
modules/bullet/rigid_body_bullet.cpp
View File

@ -259,21 +259,21 @@ RigidBodyBullet::RigidBodyBullet() :
RigidCollisionObjectBullet(CollisionObjectBullet::TYPE_RIGID_BODY), RigidCollisionObjectBullet(CollisionObjectBullet::TYPE_RIGID_BODY),
kinematic_utilities(NULL), kinematic_utilities(NULL),
locked_axis(0), locked_axis(0),
gravity_scale(1),
mass(1), mass(1),
gravity_scale(1),
linearDamp(0), linearDamp(0),
angularDamp(0), angularDamp(0),
can_sleep(true), can_sleep(true),
omit_forces_integration(false), omit_forces_integration(false),
force_integration_callback(NULL),
isTransformChanged(false),
previousActiveState(true),
maxCollisionsDetection(0), maxCollisionsDetection(0),
collisionsCount(0), collisionsCount(0),
maxAreasWhereIam(10), maxAreasWhereIam(10),
areaWhereIamCount(0), areaWhereIamCount(0),
countGravityPointSpaces(0), countGravityPointSpaces(0),
isScratchedSpaceOverrideModificator(false) { isScratchedSpaceOverrideModificator(false),
isTransformChanged(false),
previousActiveState(true),
force_integration_callback(NULL) {
godotMotionState = bulletnew(GodotMotionState(this)); godotMotionState = bulletnew(GodotMotionState(this));

8
modules/bullet/soft_body_bullet.cpp
View File

@ -37,17 +37,17 @@
SoftBodyBullet::SoftBodyBullet() : SoftBodyBullet::SoftBodyBullet() :
CollisionObjectBullet(CollisionObjectBullet::TYPE_SOFT_BODY), CollisionObjectBullet(CollisionObjectBullet::TYPE_SOFT_BODY),
total_mass(1), bt_soft_body(NULL),
isScratched(false),
simulation_precision(5), simulation_precision(5),
total_mass(1.),
linear_stiffness(0.5), linear_stiffness(0.5),
areaAngular_stiffness(0.5), areaAngular_stiffness(0.5),
volume_stiffness(0.5), volume_stiffness(0.5),
pressure_coefficient(0.), pressure_coefficient(0.),
pose_matching_coefficient(0.), pose_matching_coefficient(0.),
damping_coefficient(0.01), damping_coefficient(0.01),
drag_coefficient(0.), drag_coefficient(0.) {}
bt_soft_body(NULL),
isScratched(false) {}
SoftBodyBullet::~SoftBodyBullet() { SoftBodyBullet::~SoftBodyBullet() {
} }

5
modules/bullet/space_bullet.cpp
View File

@ -332,16 +332,17 @@ Vector3 BulletPhysicsDirectSpaceState::get_closest_point_to_object_volume(RID p_
SpaceBullet::SpaceBullet() : SpaceBullet::SpaceBullet() :
broadphase(NULL), broadphase(NULL),
collisionConfiguration(NULL),
dispatcher(NULL), dispatcher(NULL),
solver(NULL), solver(NULL),
collisionConfiguration(NULL),
dynamicsWorld(NULL), dynamicsWorld(NULL),
soft_body_world_info(NULL), soft_body_world_info(NULL),
ghostPairCallback(NULL), ghostPairCallback(NULL),
godotFilterCallback(NULL), godotFilterCallback(NULL),
gravityDirection(0, -1, 0), gravityDirection(0, -1, 0),
gravityMagnitude(10), gravityMagnitude(10),
contactDebugCount(0) { contactDebugCount(0),
delta_time(0.) {
create_empty_world(GLOBAL_DEF("physics/3d/active_soft_world", true)); create_empty_world(GLOBAL_DEF("physics/3d/active_soft_world", true));
direct_access = memnew(BulletPhysicsDirectSpaceState(this)); direct_access = memnew(BulletPhysicsDirectSpaceState(this));

2
modules/bullet/space_bullet.h
View File

@ -96,9 +96,9 @@ class SpaceBullet : public RIDBullet {
btCollisionDispatcher *dispatcher; btCollisionDispatcher *dispatcher;
btConstraintSolver *solver; btConstraintSolver *solver;
btDiscreteDynamicsWorld *dynamicsWorld; btDiscreteDynamicsWorld *dynamicsWorld;
btSoftBodyWorldInfo *soft_body_world_info;
btGhostPairCallback *ghostPairCallback; btGhostPairCallback *ghostPairCallback;
GodotFilterCallback *godotFilterCallback; GodotFilterCallback *godotFilterCallback;
btSoftBodyWorldInfo *soft_body_world_info;
btGjkEpaPenetrationDepthSolver *gjk_epa_pen_solver; btGjkEpaPenetrationDepthSolver *gjk_epa_pen_solver;
btVoronoiSimplexSolver *gjk_simplex_solver; btVoronoiSimplexSolver *gjk_simplex_solver;

4
modules/gdnative/nativescript/nativescript.h
View File

@ -70,8 +70,6 @@ struct NativeScriptDesc {
String documentation; String documentation;
}; };
String documentation;
Map<StringName, Method> methods; Map<StringName, Method> methods;
OrderedHashMap<StringName, Property> properties; OrderedHashMap<StringName, Property> properties;
Map<StringName, Signal> signals_; // QtCreator doesn't like the name signals Map<StringName, Signal> signals_; // QtCreator doesn't like the name signals
@ -81,6 +79,8 @@ struct NativeScriptDesc {
godot_instance_create_func create_func; godot_instance_create_func create_func;
godot_instance_destroy_func destroy_func; godot_instance_destroy_func destroy_func;
String documentation;
const void *type_tag; const void *type_tag;
bool is_tool; bool is_tool;

4
modules/gdscript/gdscript.h
View File

@ -301,8 +301,8 @@ struct GDScriptWarning {
static Code get_code_from_name(const String &p_name); static Code get_code_from_name(const String &p_name);
GDScriptWarning() : GDScriptWarning() :
line(-1), code(WARNING_MAX),
code(WARNING_MAX) {} line(-1) {}
}; };
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED

4
scene/3d/physics_body.cpp
View File

@ -2509,12 +2509,12 @@ PhysicalBone::PhysicalBone() :
gizmo_move_joint(false), gizmo_move_joint(false),
#endif #endif
joint_data(NULL), joint_data(NULL),
parent_skeleton(NULL),
static_body(false), static_body(false),
simulate_physics(false),
_internal_static_body(false), _internal_static_body(false),
simulate_physics(false),
_internal_simulate_physics(false), _internal_simulate_physics(false),
bone_id(-1), bone_id(-1),
parent_skeleton(NULL),
bone_name(""), bone_name(""),
bounce(0), bounce(0),
mass(1), mass(1),

3
scene/3d/spring_arm.cpp
View File

@ -36,8 +36,9 @@
SpringArm::SpringArm() : SpringArm::SpringArm() :
spring_length(1), spring_length(1),
mask(1),
current_spring_length(0), current_spring_length(0),
keep_child_basis(false),
mask(1),
margin(0.01) {} margin(0.01) {}
void SpringArm::_notification(int p_what) { void SpringArm::_notification(int p_what) {

2
scene/3d/spring_arm.h
View File

@ -39,8 +39,8 @@ class SpringArm : public Spatial {
Ref<Shape> shape; Ref<Shape> shape;
Set<RID> excluded_objects; Set<RID> excluded_objects;
float spring_length; float spring_length;
bool keep_child_basis;
float current_spring_length; float current_spring_length;
bool keep_child_basis;
uint32_t mask; uint32_t mask;
float margin; float margin;

4
scene/animation/skeleton_ik.cpp
View File

@ -418,11 +418,11 @@ void SkeletonIK::_notification(int p_what) {
SkeletonIK::SkeletonIK() : SkeletonIK::SkeletonIK() :
Node(), Node(),
interpolation(1), interpolation(1),
skeleton(NULL),
target_node_override(NULL),
use_magnet(false), use_magnet(false),
min_distance(0.01), min_distance(0.01),
max_iterations(10), max_iterations(10),
skeleton(NULL),
target_node_override(NULL),
task(NULL) { task(NULL) {
set_process_priority(1); set_process_priority(1);

9
scene/resources/tile_set.h
View File

@ -80,8 +80,8 @@ public:
struct AutotileData { struct AutotileData {
BitmaskMode bitmask_mode; BitmaskMode bitmask_mode;
int spacing;
Size2 size; Size2 size;
int spacing;
Vector2 icon_coord; Vector2 icon_coord;
Map<Vector2, uint16_t> flags; Map<Vector2, uint16_t> flags;
Map<Vector2, Ref<OccluderPolygon2D> > occluder_map; Map<Vector2, Ref<OccluderPolygon2D> > occluder_map;
@ -90,11 +90,10 @@ public:
// Default size to prevent invalid value // Default size to prevent invalid value
explicit AutotileData() : explicit AutotileData() :
bitmask_mode(BITMASK_2X2),
size(64, 64), size(64, 64),
spacing(0), spacing(0),
icon_coord(0, 0) { icon_coord(0, 0) {}
bitmask_mode = BITMASK_2X2;
}
}; };
private: private:
@ -111,8 +110,8 @@ private:
Vector2 navigation_polygon_offset; Vector2 navigation_polygon_offset;
Ref<NavigationPolygon> navigation_polygon; Ref<NavigationPolygon> navigation_polygon;
Ref<ShaderMaterial> material; Ref<ShaderMaterial> material;
Color modulate;
TileMode tile_mode; TileMode tile_mode;
Color modulate;
AutotileData autotile_data; AutotileData autotile_data;
int z_index; int z_index;

4
servers/physics/body_sw.cpp
View File

@ -755,10 +755,10 @@ void BodySW::set_kinematic_margin(real_t p_margin) {
BodySW::BodySW() : BodySW::BodySW() :
CollisionObjectSW(TYPE_BODY), CollisionObjectSW(TYPE_BODY),
locked_axis(0),
active_list(this), active_list(this),
inertia_update_list(this), inertia_update_list(this),
direct_state_query_list(this), direct_state_query_list(this) {
locked_axis(0) {
mode = PhysicsServer::BODY_MODE_RIGID; mode = PhysicsServer::BODY_MODE_RIGID;
active = true; active = true;