asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add modulation of tiles from tileset in palette and editor draw

Browse source
This commit is contained in:
Laurent Van Acker 2018-01-20 05:56:30 +01:00 committed by Rémi Verschelde
parent c45a4f0310
commit 4d6a6e0813
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
editor/plugins/tile_map_editor_plugin.cpp
View file

@ -426,6 +426,9 @@ void TileMapEditor::_update_palette() {
Ref<Texture> tex = tileset->tile_get_texture(entries[i].id); Ref<Texture> tex = tileset->tile_get_texture(entries[i].id);
if (tex.is_valid()) { if (tex.is_valid()) {
Color color = tileset->tile_get_modulate(entries[i].id);
palette->set_item_icon_modulate(palette->get_item_count() - 1, color);
Rect2 region = tileset->tile_get_region(entries[i].id); Rect2 region = tileset->tile_get_region(entries[i].id);
if (tileset->tile_get_tile_mode(entries[i].id) == TileSet::AUTO_TILE || tileset->tile_get_tile_mode(entries[i].id) == TileSet::ATLAS_TILE) { if (tileset->tile_get_tile_mode(entries[i].id) == TileSet::AUTO_TILE || tileset->tile_get_tile_mode(entries[i].id) == TileSet::ATLAS_TILE) {
@ -759,10 +762,13 @@ void TileMapEditor::_draw_cell(int p_cell, const Point2i &p_point, bool p_flip_h
rect.position = p_xform.xform(rect.position); rect.position = p_xform.xform(rect.position);
rect.size *= sc; rect.size *= sc;
Color modulate = node->get_tileset()->tile_get_modulate(p_cell);
modulate.a = 0.5;
if (r.has_no_area()) if (r.has_no_area())
canvas_item_editor->draw_texture_rect(t, rect, false, Color(1, 1, 1, 0.5), p_transpose); canvas_item_editor->draw_texture_rect(t, rect, false, modulate, p_transpose);
else else
canvas_item_editor->draw_texture_rect_region(t, rect, r, Color(1, 1, 1, 0.5), p_transpose); canvas_item_editor->draw_texture_rect_region(t, rect, r, modulate, p_transpose);
} }
void TileMapEditor::_draw_fill_preview(int p_cell, const Point2i &p_point, bool p_flip_h, bool p_flip_v, bool p_transpose, const Transform2D &p_xform) { void TileMapEditor::_draw_fill_preview(int p_cell, const Point2i &p_point, bool p_flip_h, bool p_flip_v, bool p_transpose, const Transform2D &p_xform) {