diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-05-03 16:47:21 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-05-03 16:47:21 -0300 |
| commit | af068439829a3fec3a76c4c5d4dd2dba71ab6c5f (patch) | |
| tree | a50bea4ceb2ef7e70e86303148830377e19028ce /scene/2d/tile_map.h | |
| parent | 5f2aac4bbe14d1256feebd4bb12d8b61e5b55f3d (diff) | |
| download | redot-engine-af068439829a3fec3a76c4c5d4dd2dba71ab6c5f.tar.gz | |
-new collision layer & mask system for 2D, for more flexible collision masking
Diffstat (limited to 'scene/2d/tile_map.h')
| -rw-r--r-- | scene/2d/tile_map.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scene/2d/tile_map.h b/scene/2d/tile_map.h index 233529f018..84ca65da4f 100644 --- a/scene/2d/tile_map.h +++ b/scene/2d/tile_map.h @@ -146,6 +146,8 @@ private: float friction; float bounce; uint32_t collision_layer; + uint32_t collision_mask; + TileOrigin tile_origin; void _fix_cell_transform(Matrix32& xform, const Cell& p_cell, const Vector2 &p_offset, const Size2 &p_sc); @@ -207,8 +209,11 @@ public: Rect2 get_item_rect() const; - void set_collision_layer_mask(uint32_t p_layer); - uint32_t get_collision_layer_mask() const; + void set_collision_layer(uint32_t p_layer); + uint32_t get_collision_layer() const; + + void set_collision_mask(uint32_t p_mask); + uint32_t get_collision_mask() const; void set_collision_use_kinematic(bool p_use_kinematic); bool get_collision_use_kinematic() const; |