asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #32791 from groud/fix_sprite_frame_coords

Browse source 
Fixes Sprite's frame_coords
This commit is contained in:
Rémi Verschelde 2019-10-13 08:56:49 +02:00 committed by GitHub
commit 3bf3a0abaa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/2d/sprite.cpp
View file

@ -269,8 +269,8 @@ int Sprite::get_frame() const {
} }
void Sprite::set_frame_coords(const Vector2 &p_coord) { void Sprite::set_frame_coords(const Vector2 &p_coord) {
ERR_FAIL_INDEX(int(p_coord.x), vframes); ERR_FAIL_INDEX(int(p_coord.x), hframes);
ERR_FAIL_INDEX(int(p_coord.y), hframes); ERR_FAIL_INDEX(int(p_coord.y), vframes);
set_frame(int(p_coord.y) * hframes + int(p_coord.x)); set_frame(int(p_coord.y) * hframes + int(p_coord.x));
} }

4
scene/3d/sprite_3d.cpp
View file

@ -593,8 +593,8 @@ int Sprite3D::get_frame() const {
} }
void Sprite3D::set_frame_coords(const Vector2 &p_coord) { void Sprite3D::set_frame_coords(const Vector2 &p_coord) {
ERR_FAIL_INDEX(int(p_coord.x), vframes); ERR_FAIL_INDEX(int(p_coord.x), hframes);
ERR_FAIL_INDEX(int(p_coord.y), hframes); ERR_FAIL_INDEX(int(p_coord.y), vframes);
set_frame(int(p_coord.y) * hframes + int(p_coord.x)); set_frame(int(p_coord.y) * hframes + int(p_coord.x));
} }