diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-22 16:40:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-22 16:40:20 +0100 |
| commit | 2ea5ac17e8200625ee8e9b09c7836462e33baf26 (patch) | |
| tree | 450a1da04bbccb9d5ba660736532203370d6906d /scene/main | |
| parent | 09153f1143f9af563967eb6e355a88c3fd2c1ec1 (diff) | |
| parent | d6e413bb9cb91255014cddacdba1591e14df56dd (diff) | |
Merge pull request #13159 from AndreaCatania/ray
Removed type_mask and fixed some variable name
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/viewport.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 1f539041fd..1fc2d4b16e 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -539,7 +539,7 @@ void Viewport::_notification(int p_what) { Vector2 point = get_canvas_transform().affine_inverse().xform(pos); Physics2DDirectSpaceState::ShapeResult res[64]; - int rc = ss2d->intersect_point(point, res, 64, Set<RID>(), 0xFFFFFFFF, 0xFFFFFFFF, true); + int rc = ss2d->intersect_point(point, res, 64, Set<RID>(), 0xFFFFFFFF, true); for (int i = 0; i < rc; i++) { if (res[i].collider_id && res[i].collider) { @@ -622,7 +622,7 @@ void Viewport::_notification(int p_what) { PhysicsDirectSpaceState *space = PhysicsServer::get_singleton()->space_get_direct_state(find_world()->get_space()); if (space) { - bool col = space->intersect_ray(from, from + dir * 10000, result, Set<RID>(), 0xFFFFFFFF, 0xFFFFFFFF, true); + bool col = space->intersect_ray(from, from + dir * 10000, result, Set<RID>(), 0xFFFFFFFF, true); ObjectID new_collider = 0; if (col) { @@ -658,7 +658,7 @@ void Viewport::_notification(int p_what) { PhysicsDirectSpaceState *space = PhysicsServer::get_singleton()->space_get_direct_state(find_world()->get_space()); if (space) { - bool col = space->intersect_ray(from, from + dir * 10000, result, Set<RID>(), 0xFFFFFFFF, 0xFFFFFFFF, true); + bool col = space->intersect_ray(from, from + dir * 10000, result, Set<RID>(), 0xFFFFFFFF, true); ObjectID new_collider = 0; if (col) { CollisionObject *co = Object::cast_to<CollisionObject>(result.collider); |