mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-04-01 00:41:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24504 from harrisyu/AtlasCheckPixelOpaque

Browse Source 
Fix #24470 Atlas Texture with margin setting cause error in editor.
This commit is contained in:
Rémi Verschelde 2019-01-04 16:11:37 +01:00 committed by GitHub
commit bc9899fb9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/resources/texture.cpp
View File

@ -1087,8 +1087,12 @@ bool AtlasTexture::is_pixel_opaque(int p_x, int p_y) const {
if (!atlas.is_valid())
return true;
int x = p_x + region.position.x + margin.position.x;
int y = p_y + region.position.y + margin.position.y;
int x = p_x + region.position.x - margin.position.x;
int y = p_y + region.position.y - margin.position.y;
// margin edge may outside of atlas
if (x < 0 || x >= atlas->get_width()) return false;
if (y < 0 || y >= atlas->get_height()) return false;
return atlas->is_pixel_opaque(x, y);
}