Merge 05eca9c316
into 171a69757f
This commit is contained in:
commit
71c04449fc
|
@ -63,14 +63,17 @@ void draw_margin_line(Control *edit_draw, Vector2 from, Vector2 to) {
|
||||||
|
|
||||||
void TextureRegionEditor::_region_draw() {
|
void TextureRegionEditor::_region_draw() {
|
||||||
Ref<Texture2D> base_tex = nullptr;
|
Ref<Texture2D> base_tex = nullptr;
|
||||||
|
RenderingServer::CanvasItemTextureFilter tex_filter = RS::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT;
|
||||||
if (atlas_tex.is_valid()) {
|
if (atlas_tex.is_valid()) {
|
||||||
base_tex = atlas_tex->get_atlas();
|
base_tex = atlas_tex->get_atlas();
|
||||||
} else if (node_sprite_2d) {
|
} else if (node_sprite_2d) {
|
||||||
base_tex = node_sprite_2d->get_texture();
|
base_tex = node_sprite_2d->get_texture();
|
||||||
|
tex_filter = node_sprite_2d->get_texture_filter_cache();
|
||||||
} else if (node_sprite_3d) {
|
} else if (node_sprite_3d) {
|
||||||
base_tex = node_sprite_3d->get_texture();
|
base_tex = node_sprite_3d->get_texture();
|
||||||
} else if (node_ninepatch) {
|
} else if (node_ninepatch) {
|
||||||
base_tex = node_ninepatch->get_texture();
|
base_tex = node_ninepatch->get_texture();
|
||||||
|
tex_filter = node_ninepatch->get_texture_filter_cache();
|
||||||
} else if (obj_styleBox.is_valid()) {
|
} else if (obj_styleBox.is_valid()) {
|
||||||
base_tex = obj_styleBox->get_texture();
|
base_tex = obj_styleBox->get_texture();
|
||||||
}
|
}
|
||||||
|
@ -84,6 +87,7 @@ void TextureRegionEditor::_region_draw() {
|
||||||
mtx.scale_basis(Vector2(draw_zoom, draw_zoom));
|
mtx.scale_basis(Vector2(draw_zoom, draw_zoom));
|
||||||
|
|
||||||
RS::get_singleton()->canvas_item_add_set_transform(edit_draw->get_canvas_item(), mtx);
|
RS::get_singleton()->canvas_item_add_set_transform(edit_draw->get_canvas_item(), mtx);
|
||||||
|
RS::get_singleton()->canvas_item_set_default_texture_filter(edit_draw->get_canvas_item(), tex_filter);
|
||||||
edit_draw->draw_texture(base_tex, Point2());
|
edit_draw->draw_texture(base_tex, Point2());
|
||||||
RS::get_singleton()->canvas_item_add_set_transform(edit_draw->get_canvas_item(), Transform2D());
|
RS::get_singleton()->canvas_item_add_set_transform(edit_draw->get_canvas_item(), Transform2D());
|
||||||
|
|
||||||
|
|
|
@ -1144,6 +1144,10 @@ CanvasItem::TextureRepeat CanvasItem::get_texture_repeat() const {
|
||||||
return texture_repeat;
|
return texture_repeat;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
RS::CanvasItemTextureFilter CanvasItem::get_texture_filter_cache() {
|
||||||
|
return texture_filter_cache;
|
||||||
|
}
|
||||||
|
|
||||||
CanvasItem::CanvasItem() :
|
CanvasItem::CanvasItem() :
|
||||||
xform_change(this) {
|
xform_change(this) {
|
||||||
canvas_item = RenderingServer::get_singleton()->canvas_item_create();
|
canvas_item = RenderingServer::get_singleton()->canvas_item_create();
|
||||||
|
|
|
@ -309,6 +309,8 @@ public:
|
||||||
|
|
||||||
int get_canvas_layer() const;
|
int get_canvas_layer() const;
|
||||||
|
|
||||||
|
RS::CanvasItemTextureFilter get_texture_filter_cache();
|
||||||
|
|
||||||
CanvasItem();
|
CanvasItem();
|
||||||
~CanvasItem();
|
~CanvasItem();
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue