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

Merge pull request #53157 from boruok/fix-atlas-texture-return-null

Browse source
This commit is contained in:
Rémi Verschelde 2021-09-28 18:53:53 +02:00 committed by GitHub
commit 72950684c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scene/resources/texture.cpp
View file

@ -959,6 +959,14 @@ bool AtlasTexture::has_filter_clip() const {
return filter_clip;
}
Ref<Image> AtlasTexture::get_data() const {
if (!atlas.is_valid()) {
return Ref<Image>();
}
return atlas->get_data()->get_rect(region);
}
void AtlasTexture::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_atlas", "atlas"), &AtlasTexture::set_atlas);
ClassDB::bind_method(D_METHOD("get_atlas"), &AtlasTexture::get_atlas);

2
scene/resources/texture.h
View file

@ -270,6 +270,8 @@ public:
void set_filter_clip(const bool p_enable);
bool has_filter_clip() const;
virtual Ref<Image> get_data() const;
virtual void draw(RID p_canvas_item, const Point2 &p_pos, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false, const Ref<Texture> &p_normal_map = Ref<Texture>()) const;
virtual void draw_rect(RID p_canvas_item, const Rect2 &p_rect, bool p_tile = false, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false, const Ref<Texture> &p_normal_map = Ref<Texture>()) const;
virtual void draw_rect_region(RID p_canvas_item, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false, const Ref<Texture> &p_normal_map = Ref<Texture>(), bool p_clip_uv = true) const;