Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick modulate (color) for TileSet tiles (2.1) #7909

Merged
merged 1 commit into from
Mar 1, 2017
Merged

Cherry-pick modulate (color) for TileSet tiles (2.1) #7909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions scene/2d/tile_map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,10 +457,11 @@ void TileMap::_update_dirty_quadrants() {
}


Color modulate = tile_set->tile_get_modulate(c.id);
if (r==Rect2()) {
tex->draw_rect(canvas_item,rect,false,Color(1,1,1),c.transpose);
tex->draw_rect(canvas_item,rect,false,modulate,c.transpose);
} else {
tex->draw_rect_region(canvas_item,rect,r,Color(1,1,1),c.transpose);
tex->draw_rect_region(canvas_item,rect,r,modulate,c.transpose);
}

Vector< Ref<Shape2D> > shapes = tile_set->tile_get_shapes(c.id);
Expand Down
19 changes: 19 additions & 0 deletions scene/resources/tile_set.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ bool TileSet::_set(const StringName& p_name, const Variant& p_value) {
tile_set_texture_offset(id,p_value);
else if (what=="material")
tile_set_material(id,p_value);
else if (what=="modulate")
tile_set_modulate(id,p_value);
else if (what=="shape_offset")
tile_set_shape_offset(id,p_value);
else if (what=="region")
Expand Down Expand Up @@ -91,6 +93,8 @@ bool TileSet::_get(const StringName& p_name,Variant &r_ret) const{
r_ret=tile_get_texture_offset(id);
else if (what=="material")
r_ret=tile_get_material(id);
else if (what=="modulate")
r_ret=tile_get_modulate(id);
else if (what=="shape_offset")
r_ret=tile_get_shape_offset(id);
else if (what=="region")
Expand Down Expand Up @@ -124,6 +128,7 @@ void TileSet::_get_property_list( List<PropertyInfo> *p_list) const{
p_list->push_back(PropertyInfo(Variant::OBJECT,pre+"texture",PROPERTY_HINT_RESOURCE_TYPE,"Texture"));
p_list->push_back(PropertyInfo(Variant::VECTOR2,pre+"tex_offset"));
p_list->push_back(PropertyInfo(Variant::OBJECT,pre+"material",PROPERTY_HINT_RESOURCE_TYPE,"CanvasItemMaterial"));
p_list->push_back(PropertyInfo(Variant::COLOR,pre+"modulate"));
p_list->push_back(PropertyInfo(Variant::RECT2,pre+"region"));
p_list->push_back(PropertyInfo(Variant::VECTOR2,pre+"occluder_offset"));
p_list->push_back(PropertyInfo(Variant::OBJECT,pre+"occluder",PROPERTY_HINT_RESOURCE_TYPE,"OccluderPolygon2D"));
Expand Down Expand Up @@ -175,6 +180,20 @@ Ref<CanvasItemMaterial> TileSet::tile_get_material(int p_id) const{
}


void TileSet::tile_set_modulate(int p_id,const Color &p_modulate) {

ERR_FAIL_COND(!tile_map.has(p_id));
tile_map[p_id].modulate=p_modulate;
emit_changed();

}

Color TileSet::tile_get_modulate(int p_id) const{

ERR_FAIL_COND_V(!tile_map.has(p_id),Color(1,1,1));
return tile_map[p_id].modulate;
}

void TileSet::tile_set_texture_offset(int p_id,const Vector2 &p_offset) {

ERR_FAIL_COND(!tile_map.has(p_id));
Expand Down
7 changes: 7 additions & 0 deletions scene/resources/tile_set.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ class TileSet : public Resource {
Vector2 navigation_polygon_offset;
Ref<NavigationPolygon> navigation_polygon;
Ref<CanvasItemMaterial> material;
Color modulate;

// Default modulate for back-compat
explicit Data() : modulate(1,1,1) {}
};

Map<int,Data> tile_map;
Expand Down Expand Up @@ -94,6 +98,9 @@ class TileSet : public Resource {
void tile_set_material(int p_id,const Ref<CanvasItemMaterial> &p_material);
Ref<CanvasItemMaterial> tile_get_material(int p_id) const;

void tile_set_modulate(int p_id,const Color &p_color);
Color tile_get_modulate(int p_id) const;

void tile_set_occluder_offset(int p_id,const Vector2& p_offset);
Vector2 tile_get_occluder_offset(int p_id) const;

Expand Down
2 changes: 2 additions & 0 deletions tools/editor/plugins/tile_set_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ void TileSetEditor::_import_scene(Node *scene, Ref<TileSet> p_library, bool p_me
p_library->tile_set_texture(id,texture);
p_library->tile_set_material(id,material);

p_library->tile_set_modulate(id,mi->get_modulate());

Vector2 phys_offset;
Size2 s;

Expand Down