maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #16122 from ibrahn/sprite-region-with-frames

Browse source 
Allow use of frames in sprites with texture region enabled.
This commit is contained in:
Juan Linietsky 2018-05-07 20:38:12 -03:00 committed by GitHub
parent 299d8a80ba 9db767d076
commit 9b1fdad035
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
scene/2d/sprite.cpp
View file

@ -68,31 +68,31 @@ bool Sprite::_edit_use_rect() const {
void Sprite::_get_rects(Rect2 &r_src_rect, Rect2 &r_dst_rect, bool &r_filter_clip) const { void Sprite::_get_rects(Rect2 &r_src_rect, Rect2 &r_dst_rect, bool &r_filter_clip) const {
Size2 s; Rect2 base_rect;
r_filter_clip = false;
if (region) { if (region) {
s = region_rect.size;
r_src_rect = region_rect;
r_filter_clip = region_filter_clip; r_filter_clip = region_filter_clip;
base_rect = region_rect;
} else { } else {
s = Size2(texture->get_size()); r_filter_clip = false;
s = s / Size2(hframes, vframes); base_rect = Rect2(0, 0, texture->get_width(), texture->get_height());
r_src_rect.size = s;
r_src_rect.position.x = float(frame % hframes) * s.x;
r_src_rect.position.y = float(frame / hframes) * s.y;
} }
Point2 ofs = offset; Size2 frame_size = base_rect.size / Size2(hframes, vframes);
Point2 frame_offset = Point2(frame % hframes, frame / hframes);
frame_offset *= frame_size;
r_src_rect.size = frame_size;
r_src_rect.position = base_rect.position + frame_offset;
Point2 dest_offset = offset;
if (centered) if (centered)
ofs -= s / 2; dest_offset -= frame_size / 2;
if (Engine::get_singleton()->get_use_pixel_snap()) { if (Engine::get_singleton()->get_use_pixel_snap()) {
ofs = ofs.floor(); dest_offset = dest_offset.floor();
} }
r_dst_rect = Rect2(ofs, s); r_dst_rect = Rect2(dest_offset, frame_size);
if (hflip) if (hflip)
r_dst_rect.size.x = -r_dst_rect.size.x; r_dst_rect.size.x = -r_dst_rect.size.x;
@ -375,13 +375,13 @@ Rect2 Sprite::get_rect() const {
Size2i s; Size2i s;
if (region) { if (region) {
s = region_rect.size; s = region_rect.size;
} else { } else {
s = texture->get_size(); s = texture->get_size();
s = s / Point2(hframes, vframes);
} }
s = s / Point2(hframes, vframes);
Point2 ofs = offset; Point2 ofs = offset;
if (centered) if (centered)
ofs -= s / 2; ofs -= s / 2;