diff options
| author | Rémi Verschelde | 2017-06-26 22:47:11 +0200 |
|---|---|---|
| committer | GitHub | 2017-06-26 22:47:11 +0200 |
| commit | f7b77e5b76639dbc2e7a770cc57b64fc02a1e075 (patch) | |
| tree | 697fa698482091279b49847a98b0ba1048e6d995 /scene/2d/tile_map.cpp | |
| parent | 8ca690bbd707dfe56f0c8bc63bba57837664193e (diff) | |
| parent | 2edb082c7eb85fa1175771ad298f8a8169bc267a (diff) | |
| download | godot-f7b77e5b76639dbc2e7a770cc57b64fc02a1e075.tar.gz godot-f7b77e5b76639dbc2e7a770cc57b64fc02a1e075.tar.zst godot-f7b77e5b76639dbc2e7a770cc57b64fc02a1e075.zip | |
Merge pull request #9318 from bojidar-bg/readd-normal-tilemap
Add normal map to tilemaps and tilesets
Diffstat (limited to '')
| -rw-r--r-- | scene/2d/tile_map.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 7ffe02923..098bdf93d 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -441,14 +441,15 @@ void TileMap::_update_dirty_quadrants() { rect.position.y -= center.y; } + Ref<Texture> normal_map = tile_set->tile_get_normal_map(c.id); Color modulate = tile_set->tile_get_modulate(c.id); Color self_modulate = get_self_modulate(); modulate = Color(modulate.r * self_modulate.r, modulate.g * self_modulate.g, modulate.b * self_modulate.b, modulate.a * self_modulate.a); if (r == Rect2()) { - tex->draw_rect(canvas_item, rect, false, modulate, c.transpose); + tex->draw_rect(canvas_item, rect, false, modulate, c.transpose, normal_map); } else { - tex->draw_rect_region(canvas_item, rect, r, modulate, c.transpose); + tex->draw_rect_region(canvas_item, rect, r, modulate, c.transpose, normal_map); } Vector<Ref<Shape2D> > shapes = tile_set->tile_get_shapes(c.id); |
