diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-04-18 13:26:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-18 13:26:03 +0200 |
commit | a6a0495829d7702bdc61c3111b466e1bf81060ac (patch) | |
tree | bf6b0f38338b030f0013de6d7e68107475de60b4 /scene | |
parent | 90e462b0c2edc062c8c16f73d08cea99c7257399 (diff) | |
parent | 3ecf8eef37db55e50b2fd70a376cd60787f54203 (diff) |
Merge pull request #18230 from volzhs/fix-image-error
Fix index out of size error on Image
Diffstat (limited to 'scene')
-rw-r--r-- | scene/2d/sprite.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/scene/2d/sprite.cpp b/scene/2d/sprite.cpp index ca1ac2cd7f..bc39368c88 100644 --- a/scene/2d/sprite.cpp +++ b/scene/2d/sprite.cpp @@ -331,7 +331,31 @@ bool Sprite::_edit_is_selected_on_click(const Point2 &p_point, double p_toleranc } ERR_FAIL_COND_V(image.is_null(), false); + if (image->is_compressed()) { + return dst_rect.has_point(p_point); + } + bool is_repeat = texture->get_flags() & Texture::FLAG_REPEAT; + bool is_mirrored_repeat = texture->get_flags() & Texture::FLAG_MIRRORED_REPEAT; + if (is_repeat) { + int mirror_x = 0; + int mirror_y = 0; + if (is_mirrored_repeat) { + mirror_x = (int)(q.x / texture->get_size().width); + mirror_y = (int)(q.y / texture->get_size().height); + } + q.x = Math::fmod(q.x, texture->get_size().width); + q.y = Math::fmod(q.y, texture->get_size().height); + if (mirror_x % 2 == 1) { + q.x = texture->get_size().width - q.x - 1; + } + if (mirror_y % 2 == 1) { + q.y = texture->get_size().height - q.y - 1; + } + } else { + q.x = MIN(q.x, texture->get_size().width - 1); + q.y = MIN(q.y, texture->get_size().height - 1); + } image->lock(); const Color c = image->get_pixel((int)q.x, (int)q.y); image->unlock(); |