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

Merge pull request #13408 from VinegarLove/13399-raycast_exclude

Browse source 
Ported 'Exclude Parent' from Raycast2D to Raycast
This commit is contained in:
Rémi Verschelde 2017-11-30 20:50:04 +01:00 committed by GitHub
commit 581ee23a15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
scene/3d/ray_cast.cpp
View file

@ -119,6 +119,29 @@ bool RayCast::is_enabled() const {
return enabled;
}
void RayCast::set_exclude_parent_body(bool p_exclude_parent_body) {
if (exclude_parent_body == p_exclude_parent_body)
return;
exclude_parent_body = p_exclude_parent_body;
if (!is_inside_tree())
return;
if (Object::cast_to<CollisionObject>(get_parent())) {
if (exclude_parent_body)
exclude.insert(Object::cast_to<CollisionObject>(get_parent())->get_rid());
else
exclude.erase(Object::cast_to<CollisionObject>(get_parent())->get_rid());
}
}
bool RayCast::get_exclude_parent_body() const {
return exclude_parent_body;
}
void RayCast::_notification(int p_what) {
switch (p_what) {
@ -133,6 +156,13 @@ void RayCast::_notification(int p_what) {
} else
set_physics_process(false);
if (Object::cast_to<CollisionObject>(get_parent())) {
if (exclude_parent_body)
exclude.insert(Object::cast_to<CollisionObject>(get_parent())->get_rid());
else
exclude.erase(Object::cast_to<CollisionObject>(get_parent())->get_rid());
}
} break;
case NOTIFICATION_EXIT_TREE: {
@ -256,7 +286,11 @@ void RayCast::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_collision_mask_bit", "bit", "value"), &RayCast::set_collision_mask_bit);
ClassDB::bind_method(D_METHOD("get_collision_mask_bit", "bit"), &RayCast::get_collision_mask_bit);
ClassDB::bind_method(D_METHOD("set_exclude_parent_body", "mask"), &RayCast::set_exclude_parent_body);
ClassDB::bind_method(D_METHOD("get_exclude_parent_body"), &RayCast::get_exclude_parent_body);
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "enabled"), "set_enabled", "is_enabled");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "exclude_parent"), "set_exclude_parent_body", "get_exclude_parent_body");
ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "cast_to"), "set_cast_to", "get_cast_to");
ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_mask", PROPERTY_HINT_LAYERS_3D_PHYSICS), "set_collision_mask", "get_collision_mask");
}
@ -332,4 +366,5 @@ RayCast::RayCast() {
collision_mask = 1;
cast_to = Vector3(0, -1, 0);
debug_shape = NULL;
exclude_parent_body = true;
}

4
scene/3d/ray_cast.h
View file

@ -48,6 +48,7 @@ class RayCast : public Spatial {
Set<RID> exclude;
uint32_t collision_mask;
bool exclude_parent_body;
Node *debug_shape;
Ref<Material> debug_material;
@ -74,6 +75,9 @@ public:
void set_collision_mask_bit(int p_bit, bool p_value);
bool get_collision_mask_bit(int p_bit) const;
void set_exclude_parent_body(bool p_exclude_parent_body);
bool get_exclude_parent_body() const;
void force_raycast_update();
bool is_colliding() const;
Object *get_collider() const;