godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add tint property to TextureProgress changes progress color

Browse Source
This commit is contained in:
bosak 2018-03-21 20:55:39 +02:00
parent f2df8c94b2
commit 1fa69c24a0
2 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
scene/gui/texture_progress.cpp
View File

@ -80,6 +80,15 @@ bool TextureProgress::get_nine_patch_stretch() const {
return nine_patch_stretch; return nine_patch_stretch;
} }
void TextureProgress::set_tint(const Color &p_tint) {
tint = p_tint;
update();
}
Color TextureProgress::get_tint() const {
return tint;
}
Size2 TextureProgress::get_minimum_size() const { Size2 TextureProgress::get_minimum_size() const {
if (nine_patch_stretch) if (nine_patch_stretch)
@ -170,7 +179,7 @@ Point2 TextureProgress::get_relative_center() {
return p; return p;
} }
void TextureProgress::draw_nine_patch_stretched(const Ref<Texture> &p_texture, FillMode p_mode, double p_ratio) { void TextureProgress::draw_nine_patch_stretched(const Ref<Texture> &p_texture, FillMode p_mode, double p_ratio, const Color &p_modulate) {
Vector2 texture_size = p_texture->get_size(); Vector2 texture_size = p_texture->get_size();
Vector2 topleft = Vector2(stretch_margin[MARGIN_LEFT], stretch_margin[MARGIN_TOP]); Vector2 topleft = Vector2(stretch_margin[MARGIN_LEFT], stretch_margin[MARGIN_TOP]);
Vector2 bottomright = Vector2(stretch_margin[MARGIN_RIGHT], stretch_margin[MARGIN_BOTTOM]); Vector2 bottomright = Vector2(stretch_margin[MARGIN_RIGHT], stretch_margin[MARGIN_BOTTOM]);
@ -240,7 +249,7 @@ void TextureProgress::draw_nine_patch_stretched(const Ref<Texture> &p_texture, F
} }
RID ci = get_canvas_item(); RID ci = get_canvas_item();
VS::get_singleton()->canvas_item_add_nine_patch(ci, dst_rect, src_rect, p_texture->get_rid(), topleft, bottomright); VS::get_singleton()->canvas_item_add_nine_patch(ci, dst_rect, src_rect, p_texture->get_rid(), topleft, bottomright, VS::NINE_PATCH_STRETCH, VS::NINE_PATCH_STRETCH, true, p_modulate);
} }
void TextureProgress::_notification(int p_what) { void TextureProgress::_notification(int p_what) {
@ -254,7 +263,7 @@ void TextureProgress::_notification(int p_what) {
draw_nine_patch_stretched(under, FILL_LEFT_TO_RIGHT, 1.0); draw_nine_patch_stretched(under, FILL_LEFT_TO_RIGHT, 1.0);
} }
if (progress.is_valid()) { if (progress.is_valid()) {
draw_nine_patch_stretched(progress, mode, get_as_ratio()); draw_nine_patch_stretched(progress, mode, get_as_ratio(), tint);
} }
if (over.is_valid()) { if (over.is_valid()) {
draw_nine_patch_stretched(over, FILL_LEFT_TO_RIGHT, 1.0); draw_nine_patch_stretched(over, FILL_LEFT_TO_RIGHT, 1.0);
@ -267,26 +276,26 @@ void TextureProgress::_notification(int p_what) {
switch (mode) { switch (mode) {
case FILL_LEFT_TO_RIGHT: { case FILL_LEFT_TO_RIGHT: {
Rect2 region = Rect2(Point2(), Size2(s.x * get_as_ratio(), s.y)); Rect2 region = Rect2(Point2(), Size2(s.x * get_as_ratio(), s.y));
draw_texture_rect_region(progress, region, region); draw_texture_rect_region(progress, region, region, tint);
} break; } break;
case FILL_RIGHT_TO_LEFT: { case FILL_RIGHT_TO_LEFT: {
Rect2 region = Rect2(Point2(s.x - s.x * get_as_ratio(), 0), Size2(s.x * get_as_ratio(), s.y)); Rect2 region = Rect2(Point2(s.x - s.x * get_as_ratio(), 0), Size2(s.x * get_as_ratio(), s.y));
draw_texture_rect_region(progress, region, region); draw_texture_rect_region(progress, region, region, tint);
} break; } break;
case FILL_TOP_TO_BOTTOM: { case FILL_TOP_TO_BOTTOM: {
Rect2 region = Rect2(Point2(), Size2(s.x, s.y * get_as_ratio())); Rect2 region = Rect2(Point2(), Size2(s.x, s.y * get_as_ratio()));
draw_texture_rect_region(progress, region, region); draw_texture_rect_region(progress, region, region, tint);
} break; } break;
case FILL_BOTTOM_TO_TOP: { case FILL_BOTTOM_TO_TOP: {
Rect2 region = Rect2(Point2(0, s.y - s.y * get_as_ratio()), Size2(s.x, s.y * get_as_ratio())); Rect2 region = Rect2(Point2(0, s.y - s.y * get_as_ratio()), Size2(s.x, s.y * get_as_ratio()));
draw_texture_rect_region(progress, region, region); draw_texture_rect_region(progress, region, region, tint);
} break; } break;
case FILL_CLOCKWISE: case FILL_CLOCKWISE:
case FILL_COUNTER_CLOCKWISE: { case FILL_COUNTER_CLOCKWISE: {
float val = get_as_ratio() * rad_max_degrees / 360; float val = get_as_ratio() * rad_max_degrees / 360;
if (val == 1) { if (val == 1) {
Rect2 region = Rect2(Point2(), s); Rect2 region = Rect2(Point2(), s);
draw_texture_rect_region(progress, region, region); draw_texture_rect_region(progress, region, region, tint);
} else if (val != 0) { } else if (val != 0) {
Array pts; Array pts;
float direction = mode == FILL_CLOCKWISE ? 1 : -1; float direction = mode == FILL_CLOCKWISE ? 1 : -1;
@ -311,7 +320,9 @@ void TextureProgress::_notification(int p_what) {
uvs.push_back(uv); uvs.push_back(uv);
points.push_back(Point2(uv.x * s.x, uv.y * s.y)); points.push_back(Point2(uv.x * s.x, uv.y * s.y));
} }
draw_polygon(points, Vector<Color>(), uvs, progress); Vector<Color> colors;
colors.push_back(tint);
draw_polygon(points, colors, uvs, progress);
} }
if (Engine::get_singleton()->is_editor_hint()) { if (Engine::get_singleton()->is_editor_hint()) {
Point2 p = progress->get_size(); Point2 p = progress->get_size();
@ -323,7 +334,7 @@ void TextureProgress::_notification(int p_what) {
} }
} break; } break;
default: default:
draw_texture_rect_region(progress, Rect2(Point2(), Size2(s.x * get_as_ratio(), s.y)), Rect2(Point2(), Size2(s.x * get_as_ratio(), s.y))); draw_texture_rect_region(progress, Rect2(Point2(), Size2(s.x * get_as_ratio(), s.y)), Rect2(Point2(), Size2(s.x * get_as_ratio(), s.y)), tint);
} }
} }
if (over.is_valid()) if (over.is_valid())
@ -404,11 +415,15 @@ void TextureProgress::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_nine_patch_stretch", "stretch"), &TextureProgress::set_nine_patch_stretch); ClassDB::bind_method(D_METHOD("set_nine_patch_stretch", "stretch"), &TextureProgress::set_nine_patch_stretch);
ClassDB::bind_method(D_METHOD("get_nine_patch_stretch"), &TextureProgress::get_nine_patch_stretch); ClassDB::bind_method(D_METHOD("get_nine_patch_stretch"), &TextureProgress::get_nine_patch_stretch);
ClassDB::bind_method(D_METHOD("set_tint", "tint"), &TextureProgress::set_tint);
ClassDB::bind_method(D_METHOD("get_tint"), &TextureProgress::get_tint);
ADD_GROUP("Textures", "texture_"); ADD_GROUP("Textures", "texture_");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_under", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_under_texture", "get_under_texture"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_under", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_under_texture", "get_under_texture");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_over", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_over_texture", "get_over_texture"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_over", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_over_texture", "get_over_texture");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_progress", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_progress_texture", "get_progress_texture"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_progress", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_progress_texture", "get_progress_texture");
ADD_PROPERTYNZ(PropertyInfo(Variant::INT, "fill_mode", PROPERTY_HINT_ENUM, "Left to Right,Right to Left,Top to Bottom,Bottom to Top,Clockwise,Counter Clockwise"), "set_fill_mode", "get_fill_mode"); ADD_PROPERTYNZ(PropertyInfo(Variant::INT, "fill_mode", PROPERTY_HINT_ENUM, "Left to Right,Right to Left,Top to Bottom,Bottom to Top,Clockwise,Counter Clockwise"), "set_fill_mode", "get_fill_mode");
ADD_PROPERTY(PropertyInfo(Variant::COLOR, "tint", PROPERTY_HINT_COLOR_NO_ALPHA), "set_tint", "get_tint");
ADD_GROUP("Radial Fill", "radial_"); ADD_GROUP("Radial Fill", "radial_");
ADD_PROPERTYNZ(PropertyInfo(Variant::REAL, "radial_initial_angle", PROPERTY_HINT_RANGE, "0.0,360.0,0.1,slider"), "set_radial_initial_angle", "get_radial_initial_angle"); ADD_PROPERTYNZ(PropertyInfo(Variant::REAL, "radial_initial_angle", PROPERTY_HINT_RANGE, "0.0,360.0,0.1,slider"), "set_radial_initial_angle", "get_radial_initial_angle");
ADD_PROPERTYNZ(PropertyInfo(Variant::REAL, "radial_fill_degrees", PROPERTY_HINT_RANGE, "0.0,360.0,0.1,slider"), "set_fill_degrees", "get_fill_degrees"); ADD_PROPERTYNZ(PropertyInfo(Variant::REAL, "radial_fill_degrees", PROPERTY_HINT_RANGE, "0.0,360.0,0.1,slider"), "set_fill_degrees", "get_fill_degrees");
@ -440,4 +455,6 @@ TextureProgress::TextureProgress() {
stretch_margin[MARGIN_RIGHT] = 0; stretch_margin[MARGIN_RIGHT] = 0;
stretch_margin[MARGIN_BOTTOM] = 0; stretch_margin[MARGIN_BOTTOM] = 0;
stretch_margin[MARGIN_TOP] = 0; stretch_margin[MARGIN_TOP] = 0;
tint = Color(1, 1, 1);
} }

6
scene/gui/texture_progress.h
View File

@ -82,6 +82,9 @@ public:
void set_nine_patch_stretch(bool p_stretch); void set_nine_patch_stretch(bool p_stretch);
bool get_nine_patch_stretch() const; bool get_nine_patch_stretch() const;
void set_tint(const Color &p_tint);
Color get_tint() const;
Size2 get_minimum_size() const; Size2 get_minimum_size() const;
TextureProgress(); TextureProgress();
@ -93,10 +96,11 @@ private:
Point2 rad_center_off; Point2 rad_center_off;
bool nine_patch_stretch; bool nine_patch_stretch;
int stretch_margin[4]; int stretch_margin[4];
Color tint;
Point2 unit_val_to_uv(float val); Point2 unit_val_to_uv(float val);
Point2 get_relative_center(); Point2 get_relative_center();
void draw_nine_patch_stretched(const Ref<Texture> &p_texture, FillMode p_mode, double p_ratio); void draw_nine_patch_stretched(const Ref<Texture> &p_texture, FillMode p_mode, double p_ratio, const Color &p_modulate = Color(1, 1, 1));
}; };
VARIANT_ENUM_CAST(TextureProgress::FillMode); VARIANT_ENUM_CAST(TextureProgress::FillMode);