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

Merge pull request #17189 from CodeAndWeb/master 

Fixes Selection of Sprites using AtlasTexture
This commit is contained in:
Rémi Verschelde 2018-03-08 08:37:22 +01:00 committed by GitHub
parent 938469157f a01ba4523b
commit 0b600fde3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scene/2d/sprite.cpp
View File

@ -287,7 +287,27 @@ bool Sprite::_edit_is_selected_on_click(const Point2 &p_point, double p_toleranc
Vector2 q = ((p_point - dst_rect.position) / dst_rect.size) * src_rect.size + src_rect.position;
Ref<Image> image = texture->get_data();
Ref<Image> image;
Ref<AtlasTexture> atlasTexture = texture;
if (atlasTexture.is_null()) {
image = texture->get_data();
} else {
ERR_FAIL_COND_V(atlasTexture->get_atlas().is_null(), false);
image = atlasTexture->get_atlas()->get_data();
Rect2 region = atlasTexture->get_region();
Rect2 margin = atlasTexture->get_margin();
q -= margin.position;
if ((q.x > region.size.width) || (q.y > region.size.height)) {
return false;
}
q += region.position;
}
ERR_FAIL_COND_V(image.is_null(), false);
image->lock();