Skip to content

Commit

Permalink
Merge pull request #86908 from AdSkipper1337/collision-object-2d-gdex…
Browse files Browse the repository at this point in the history
…tension-virtuals

Fix virtual calls for GDExtension in `CollisionObject2D`
  • Loading branch information
akien-mga committed Jan 8, 2024
2 parents 07f5dac + 0517000 commit 4ca33d3
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions scene/2d/collision_object_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -523,30 +523,22 @@ void CollisionObject2D::_input_event_call(Viewport *p_viewport, const Ref<InputE
}

void CollisionObject2D::_mouse_enter() {
if (get_script_instance()) {
get_script_instance()->call(SceneStringNames::get_singleton()->_mouse_enter);
}
GDVIRTUAL_CALL(_mouse_enter);
emit_signal(SceneStringNames::get_singleton()->mouse_entered);
}

void CollisionObject2D::_mouse_exit() {
if (get_script_instance()) {
get_script_instance()->call(SceneStringNames::get_singleton()->_mouse_exit);
}
GDVIRTUAL_CALL(_mouse_exit);
emit_signal(SceneStringNames::get_singleton()->mouse_exited);
}

void CollisionObject2D::_mouse_shape_enter(int p_shape) {
if (get_script_instance()) {
get_script_instance()->call(SceneStringNames::get_singleton()->_mouse_shape_enter, p_shape);
}
GDVIRTUAL_CALL(_mouse_shape_enter, p_shape);
emit_signal(SceneStringNames::get_singleton()->mouse_shape_entered, p_shape);
}

void CollisionObject2D::_mouse_shape_exit(int p_shape) {
if (get_script_instance()) {
get_script_instance()->call(SceneStringNames::get_singleton()->_mouse_shape_exit, p_shape);
}
GDVIRTUAL_CALL(_mouse_shape_exit, p_shape);
emit_signal(SceneStringNames::get_singleton()->mouse_shape_exited, p_shape);
}

Expand Down

0 comments on commit 4ca33d3

Please sign in to comment.