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

Merge pull request #47382 from akien-mga/3.x-tilemap-collisions-opt-in 

TileMap: Make collision visibility opt-in
This commit is contained in:
Rémi Verschelde 2021-03-31 17:59:41 +02:00 committed by GitHub
parent bd5663e2cf 72a547dc9d
commit 7b35fc4549
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/TileMap.xml
View File

@ -326,7 +326,7 @@
<member name="occluder_light_mask" type="int" setter="set_occluder_light_mask" getter="get_occluder_light_mask" default="1"> <member name="occluder_light_mask" type="int" setter="set_occluder_light_mask" getter="get_occluder_light_mask" default="1">
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="true"> <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 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.
</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">

2
scene/2d/tile_map.h
View File

@ -80,7 +80,7 @@ private:
CollisionObject2D *collision_parent; CollisionObject2D *collision_parent;
bool use_kinematic; bool use_kinematic;
Navigation2D *navigation; Navigation2D *navigation;
bool show_collision = true; bool show_collision = false;
union PosKey { union PosKey {