diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2021-09-10 16:32:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-10 16:32:19 +0200 |
| commit | 8f8744a5636666e78a0683fa920fe14f03cd185f (patch) | |
| tree | 87807185d2b82e225c2c24881830ff9577bce513 /scene/resources/tile_set.h | |
| parent | 6423e891a683f34124ee10a31a1b9c464ec01b9b (diff) | |
| parent | 0c85f3acc1ac18ded5faaa35f0cef87781801ab8 (diff) | |
Merge pull request #52433 from groud/document_tiles
Tiles renames and documentation
Diffstat (limited to 'scene/resources/tile_set.h')
| -rw-r--r-- | scene/resources/tile_set.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scene/resources/tile_set.h b/scene/resources/tile_set.h index 29a71d31d2..3baf022dc0 100644 --- a/scene/resources/tile_set.h +++ b/scene/resources/tile_set.h @@ -304,7 +304,7 @@ public: void remove_occlusion_layer(int p_index); void set_occlusion_layer_light_mask(int p_layer_index, int p_light_mask); int get_occlusion_layer_light_mask(int p_layer_index) const; - void set_occlusion_layer_sdf_collision(int p_layer_index, int p_sdf_collision); + void set_occlusion_layer_sdf_collision(int p_layer_index, bool p_sdf_collision); bool get_occlusion_layer_sdf_collision(int p_layer_index) const; // Physics @@ -404,6 +404,8 @@ class TileSetSource : public Resource { protected: const TileSet *tile_set = nullptr; + static void _bind_methods(); + public: static const Vector2i INVALID_ATLAS_COORDS; // Vector2i(-1, -1); static const int INVALID_TILE_ALTERNATIVE; // -1; @@ -679,8 +681,8 @@ public: void set_texture_offset(Vector2i p_texture_offset); Vector2i get_texture_offset() const; - void tile_set_material(Ref<ShaderMaterial> p_material); - Ref<ShaderMaterial> tile_get_material() const; + void set_material(Ref<ShaderMaterial> p_material); + Ref<ShaderMaterial> get_material() const; void set_modulate(Color p_modulate); Color get_modulate() const; void set_z_index(int p_z_index); |