diff options
| author | Olafur Haukur Flygenring <olifly@gmail.com> | 2014-02-19 20:52:07 +0000 |
|---|---|---|
| committer | Olafur Haukur Flygenring <olifly@gmail.com> | 2014-02-19 20:52:07 +0000 |
| commit | c78a06536ebc7c2c2718eaf800c8227bdb07a931 (patch) | |
| tree | 6e8d888dfe91c9717b85c18bca6e73d6a43789aa /scene/resources/tile_set.h | |
| parent | ec448845e295c4b8e897793b0971ebd9912e3101 (diff) | |
| parent | 449bc14fb49d3266f5bd82dbe3c53a4b9f4062da (diff) | |
| download | redot-engine-c78a06536ebc7c2c2718eaf800c8227bdb07a931.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scene/resources/tile_set.h')
| -rw-r--r-- | scene/resources/tile_set.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scene/resources/tile_set.h b/scene/resources/tile_set.h index 5773c56ed2..ddbb1b59a6 100644 --- a/scene/resources/tile_set.h +++ b/scene/resources/tile_set.h @@ -42,6 +42,7 @@ class TileSet : public Resource { String name; Ref<Texture> texture; Vector2 offset; + Vector2 shape_offset; Rect2i region; Vector<Ref<Shape2D> > shapes; }; @@ -71,8 +72,11 @@ public: void tile_set_texture(int p_id, const Ref<Texture> &p_texture); Ref<Texture> tile_get_texture(int p_id) const; - void tile_set_offset(int p_id,const Vector2 &p_offset); - Vector2 tile_get_offset(int p_id) const; + void tile_set_texture_offset(int p_id,const Vector2 &p_offset); + Vector2 tile_get_texture_offset(int p_id) const; + + void tile_set_shape_offset(int p_id,const Vector2 &p_offset); + Vector2 tile_get_shape_offset(int p_id) const; void tile_set_region(int p_id,const Rect2 &p_region); Rect2 tile_get_region(int p_id) const; |