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

Merge pull request #49075 from nekomatata/tilemap-collision-debug-fix-3.x

Browse source 
Fix logic for showing tilemap debug collision
This commit is contained in:
Rémi Verschelde 2021-05-25 21:12:48 +02:00 committed by GitHub
commit 00abdaf333
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/classes/TileMap.xml
View file

@ -327,7 +327,7 @@
The light mask assigned to all light occluders in the TileMap. The TileSet's light occluders will cast shadows only from Light2D(s) that have the same light mask(s). The light mask assigned to all light occluders in the TileMap. The TileSet's light occluders will cast shadows only from Light2D(s) that have the same light mask(s).
</member> </member>
<member name="show_collision" type="bool" setter="set_show_collision" getter="is_show_collision_enabled" default="false"> <member name="show_collision" type="bool" setter="set_show_collision" getter="is_show_collision_enabled" default="false">
If [code]true[/code], collision shapes are shown in the editor and at run-time. Requires [b]Visible Collision Shapes[/b] to be enabled in the [b]Debug[/b] menu for collision shapes to be visible at run-time. If [code]true[/code], collision shapes are visible in the editor. Doesn't affect collision shapes visibility at runtime. To show collision shapes at runtime, enable [b]Visible Collision Shapes[/b] in the [b]Debug[/b] menu instead.
</member> </member>
<member name="tile_set" type="TileSet" setter="set_tileset" getter="get_tileset"> <member name="tile_set" type="TileSet" setter="set_tileset" getter="get_tileset">
The assigned [TileSet]. The assigned [TileSet].

13
scene/2d/tile_map.cpp
View file

@ -328,10 +328,17 @@ void TileMap::update_dirty_quadrants() {
Color debug_collision_color; Color debug_collision_color;
Color debug_navigation_color; Color debug_navigation_color;
bool debug_shapes = show_collision && (Engine::get_singleton()->is_editor_hint() || (st && st->is_debugging_collisions_hint())); bool debug_shapes = false;
if (st) {
if (Engine::get_singleton()->is_editor_hint()) {
debug_shapes = show_collision;
} else {
debug_shapes = st->is_debugging_collisions_hint();
}
if (debug_shapes) { if (debug_shapes) {
debug_collision_color = st->get_debug_collisions_color(); debug_collision_color = st->get_debug_collisions_color();
}
} }
bool debug_navigation = st && st->is_debugging_navigation_hint(); bool debug_navigation = st && st->is_debugging_navigation_hint();