asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Warn about resizing a rigidbody (2D or 3D), covers the most common cases, closes #7615

Browse source
This commit is contained in:
Juan Linietsky 2017-08-05 16:06:15 -03:00
parent cfe4b30941
commit de9fb90dbf
4 changed files with 70 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
scene/2d/physics_body_2d.cpp
View file

@ -798,6 +798,40 @@ bool RigidBody2D::is_contact_monitor_enabled() const {
return contact_monitor != NULL;
}
void RigidBody2D::_notification(int p_what) {
#ifdef TOOLS_ENABLED
if (p_what == NOTIFICATION_ENTER_TREE) {
if (get_tree()->is_editor_hint()) {
set_notify_local_transform(true); //used for warnings and only in editor
}
}
if (p_what == NOTIFICATION_LOCAL_TRANSFORM_CHANGED) {
if (get_tree()->is_editor_hint()) {
update_configuration_warning();
}
}
#endif
}
String RigidBody2D::get_configuration_warning() const {
Transform2D t = get_transform();
String warning = CollisionObject2D::get_configuration_warning();
if ((get_mode() == MODE_RIGID || get_mode() == MODE_CHARACTER) && (ABS(t.elements[0].length() - 1.0) > 0.05 || ABS(t.elements[1].length() - 1.0) > 0.05)) {
if (warning != String()) {
warning += "\n";
}
warning += TTR("Size changes to RigidBody2D (in character or rigid modes) will be overriden by the physics engine when running.\nChange the size in children collision shapes instead.");
}
return warning;
}
void RigidBody2D::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_mode", "mode"), &RigidBody2D::set_mode);

3
scene/2d/physics_body_2d.h
View file

@ -185,6 +185,7 @@ private:
bool _test_motion(const Vector2 &p_motion, float p_margin = 0.08, const Ref<Physics2DTestMotionResult> &p_result = Ref<Physics2DTestMotionResult>());
protected:
void _notification(int p_what);
static void _bind_methods();
public:
@ -253,6 +254,8 @@ public:
Array get_colliding_bodies() const; //function for script
virtual String get_configuration_warning() const;
RigidBody2D();
~RigidBody2D();
};

31
scene/3d/physics_body.cpp
View file

@ -473,6 +473,21 @@ void RigidBody::_direct_state_changed(Object *p_state) {
}
void RigidBody::_notification(int p_what) {
#ifdef TOOLS_ENABLED
if (p_what == NOTIFICATION_ENTER_TREE) {
if (get_tree()->is_editor_hint()) {
set_notify_local_transform(true); //used for warnings and only in editor
}
}
if (p_what == NOTIFICATION_LOCAL_TRANSFORM_CHANGED) {
if (get_tree()->is_editor_hint()) {
update_configuration_warning();
}
}
#endif
}
void RigidBody::set_mode(Mode p_mode) {
@ -747,6 +762,22 @@ Array RigidBody::get_colliding_bodies() const {
return ret;
}
String RigidBody::get_configuration_warning() const {
Transform t = get_transform();
String warning = CollisionObject::get_configuration_warning();
if ((get_mode() == MODE_RIGID || get_mode() == MODE_CHARACTER) && (ABS(t.basis.get_axis(0).length() - 1.0) > 0.05 || ABS(t.basis.get_axis(1).length() - 1.0) > 0.05 || ABS(t.basis.get_axis(0).length() - 1.0) > 0.05)) {
if (warning != String()) {
warning += "\n";
}
warning += TTR("Size changes to RigidBody (in character or rigid modes) will be overriden by the physics engine when running.\nChange the size in children collision shapes instead.");
}
return warning;
}
void RigidBody::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_mode", "mode"), &RigidBody::set_mode);

2
scene/3d/physics_body.h
View file

@ -252,6 +252,8 @@ public:
void apply_impulse(const Vector3 &p_pos, const Vector3 &p_impulse);
virtual String get_configuration_warning() const;
RigidBody();
~RigidBody();
};