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

Merge pull request #18230 from volzhs/fix-image-error 

Fix index out of size error on Image
This commit is contained in:
Rémi Verschelde 2018-04-18 13:26:03 +02:00 committed by GitHub
parent 90e462b0c2 3ecf8eef37
commit a6a0495829
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scene/2d/sprite.cpp
View File

@ -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();