maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #7170 from Ovnuniarchos/TileMapBlendMode

Browse source 
TileMap now honors blending mode.
This commit is contained in:
Rémi Verschelde 2016-11-28 15:21:35 +01:00 committed by GitHub
parent 39fede4b17 e07dd9ab32
commit 2cf4c5e173
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scene/2d/canvas_item.h
View file

@ -193,7 +193,7 @@ public:
void update();
void set_blend_mode(BlendMode p_blend_mode);
virtual void set_blend_mode(BlendMode p_blend_mode);
BlendMode get_blend_mode() const;
virtual void set_light_mask(int p_light_mask);

9
scene/2d/tile_map.cpp
View file

@ -352,6 +352,7 @@ void TileMap::_update_dirty_quadrants() {
xform.set_origin( q.pos );
vs->canvas_item_set_transform( canvas_item, xform );
vs->canvas_item_set_light_mask(canvas_item,get_light_mask());
vs->canvas_item_set_blend_mode(canvas_item,VS::MaterialBlendMode(get_blend_mode()));
q.canvas_items.push_back(canvas_item);
@ -1190,6 +1191,14 @@ void TileMap::set_light_mask(int p_light_mask) {
}
}
void TileMap::set_blend_mode(BlendMode p_blend_mode) {
CanvasItem::set_blend_mode(p_blend_mode);
_recreate_quadrants();
}
void TileMap::_bind_methods() {

2
scene/2d/tile_map.h
View file

@ -255,6 +255,8 @@ public:
void set_occluder_light_mask(int p_mask);
int get_occluder_light_mask() const;
void set_blend_mode(BlendMode p_blend_mode);
virtual void set_light_mask(int p_light_mask);
void clear();