Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-26 14:13:10 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/okamstudio/godot

Browse Source
This commit is contained in:
Juan Linietsky 2014-10-10 00:34:01 -03:00
commit c72f943866
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scene/2d/sprite.cpp
View File

@ -64,20 +64,20 @@ void Sprite::_notification(int p_what) {
break;
*/
Size2i s;
Rect2i src_rect;
Size2 s;
Rect2 src_rect;
if (region) {
s=region_rect.size;
src_rect=region_rect;
} else {
s = texture->get_size();
s=s/Size2i(hframes,vframes);
s = Size2(texture->get_size());
s=s/Size2(hframes,vframes);
src_rect.size=s;
src_rect.pos.x+=(frame%hframes)*s.x;
src_rect.pos.y+=(frame/hframes)*s.y;
src_rect.pos.x+=float(frame%hframes)*s.x;
src_rect.pos.y+=float(frame/hframes)*s.y;
}
@ -85,7 +85,7 @@ void Sprite::_notification(int p_what) {
if (centered)
ofs-=s/2;
Rect2i dst_rect(ofs,s);
Rect2 dst_rect(ofs,s);
if (hflip)
dst_rect.size.x=-dst_rect.size.x;