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

Merge pull request #46675 from fabriceci/improvement-raycast2d-debug-shape

Browse Source 
Improving the Raycast2D debug Shape
This commit is contained in:
Rémi Verschelde 2021-03-05 00:59:21 +01:00 committed by GitHub
commit bd9799e9f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
scene/2d/ray_cast_2d.cpp
View File

@ -159,30 +159,7 @@ void RayCast2D::_notification(int p_what) {
if (!Engine::get_singleton()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) { if (!Engine::get_singleton()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) {
break; break;
} }
Transform2D xf; _draw_debug_shape();
xf.rotate(target_position.angle());
xf.translate(Vector2(target_position.length(), 0));
// Draw an arrow indicating where the RayCast is pointing to
Color draw_col = get_tree()->get_debug_collisions_color();
if (!enabled) {
float g = draw_col.get_v();
draw_col.r = g;
draw_col.g = g;
draw_col.b = g;
}
draw_line(Vector2(), target_position, draw_col, 2);
Vector<Vector2> pts;
float tsize = 8.0;
pts.push_back(xf.xform(Vector2(tsize, 0)));
pts.push_back(xf.xform(Vector2(0, Math_SQRT12 * tsize)));
pts.push_back(xf.xform(Vector2(0, -Math_SQRT12 * tsize)));
Vector<Color> cols;
for (int i = 0; i < 3; i++) {
cols.push_back(draw_col);
}
draw_primitive(pts, cols, Vector<Vector2>());
} break; } break;
@ -212,7 +189,7 @@ void RayCast2D::_update_raycast_state() {
} }
PhysicsDirectSpaceState2D::RayResult rr; PhysicsDirectSpaceState2D::RayResult rr;
bool prev_collision_state = collided;
if (dss->intersect_ray(gt.get_origin(), gt.xform(to), rr, exclude, collision_mask, collide_with_bodies, collide_with_areas)) { if (dss->intersect_ray(gt.get_origin(), gt.xform(to), rr, exclude, collision_mask, collide_with_bodies, collide_with_areas)) {
collided = true; collided = true;
against = rr.collider_id; against = rr.collider_id;
@ -224,6 +201,43 @@ void RayCast2D::_update_raycast_state() {
against = ObjectID(); against = ObjectID();
against_shape = 0; against_shape = 0;
} }
if (prev_collision_state != collided) {
update();
}
}
void RayCast2D::_draw_debug_shape() {
float tsize = 6.0;
bool draw_arrow = target_position.length() >= tsize;
Color draw_col = collided ? Color(1.0, 0.01, 0) : get_tree()->get_debug_collisions_color();
if (!enabled) {
float g = draw_col.get_v();
draw_col.r = g;
draw_col.g = g;
draw_col.b = g;
}
draw_line(Vector2(), target_position - Vector2(0, tsize * draw_arrow), draw_col, 1.4);
// Draw an arrow indicating where the RayCast is pointing to
if (draw_arrow) {
Transform2D xf;
xf.rotate(target_position.angle());
xf.translate(Vector2(target_position.length() - tsize, 0));
Vector<Vector2> pts;
pts.push_back(xf.xform(Vector2(tsize, 0)));
pts.push_back(xf.xform(Vector2(0, 0.5 * tsize)));
pts.push_back(xf.xform(Vector2(0, -0.5 * tsize)));
Vector<Color> cols;
for (int i = 0; i < 3; i++) {
cols.push_back(draw_col);
}
draw_primitive(pts, cols, Vector<Vector2>());
}
} }
void RayCast2D::force_raycast_update() { void RayCast2D::force_raycast_update() {

2
scene/2d/ray_cast_2d.h
View File

@ -51,6 +51,8 @@ class RayCast2D : public Node2D {
bool collide_with_areas = false; bool collide_with_areas = false;
bool collide_with_bodies = true; bool collide_with_bodies = true;
void _draw_debug_shape();
protected: protected:
void _notification(int p_what); void _notification(int p_what);
void _update_raycast_state(); void _update_raycast_state();