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

Merge pull request #21502 from Web-eWorks/atlasfixes

Browse source 
AtlasTexture fixes, part 2.
This commit is contained in:
Rémi Verschelde 2018-09-14 15:02:23 +02:00 committed by GitHub
parent ebc07ad5a2 c522fe05e0
commit c52a3646f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
scene/3d/sprite_3d.cpp
View file

@ -431,7 +431,7 @@ void Sprite3D::_draw() {
};
Vector2 src_tsize = Vector2(texture->get_width(), texture->get_height());
Vector2 src_tsize = tsize;
// Properly setup UVs for impostor textures (AtlasTexture).
Ref<AtlasTexture> atlas_tex = texture;
@ -441,10 +441,10 @@ void Sprite3D::_draw() {
}
Vector2 uvs[4] = {
final_src_rect.position / tsize,
(final_src_rect.position + Vector2(final_src_rect.size.x, 0)) / tsize,
(final_src_rect.position + final_src_rect.size) / tsize,
(final_src_rect.position + Vector2(0, final_src_rect.size.y)) / tsize,
final_src_rect.position / src_tsize,
(final_src_rect.position + Vector2(final_src_rect.size.x, 0)) / src_tsize,
(final_src_rect.position + final_src_rect.size) / src_tsize,
(final_src_rect.position + Vector2(0, final_src_rect.size.y)) / src_tsize,
};
if (is_flipped_h()) {
@ -731,7 +731,7 @@ void AnimatedSprite3D::_draw() {
};
Vector2 src_tsize = Vector2(texture->get_width(), texture->get_height());
Vector2 src_tsize = tsize;
// Properly setup UVs for impostor textures (AtlasTexture).
Ref<AtlasTexture> atlas_tex = texture;
@ -741,10 +741,10 @@ void AnimatedSprite3D::_draw() {
}
Vector2 uvs[4] = {
final_src_rect.position / tsize,
(final_src_rect.position + Vector2(final_src_rect.size.x, 0)) / tsize,
(final_src_rect.position + final_src_rect.size) / tsize,
(final_src_rect.position + Vector2(0, final_src_rect.size.y)) / tsize,
final_src_rect.position / src_tsize,
(final_src_rect.position + Vector2(final_src_rect.size.x, 0)) / src_tsize,
(final_src_rect.position + final_src_rect.size) / src_tsize,
(final_src_rect.position + Vector2(0, final_src_rect.size.y)) / src_tsize,
};
if (is_flipped_h()) {