Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #9318 from bojidar-bg/readd-normal-tilemap

Browse source 
Add normal map to tilemaps and tilesets
This commit is contained in:
Rémi Verschelde 2017-06-26 22:47:11 +02:00 • committed by GitHub
commit f7b77e5b76
4 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scene/2d/tile_map.cpp
View file

@ -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);