godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AtlasTexture fixes, part 2. 

(cherry picked from commit c522fe05e0)
This commit is contained in:
Webster Sheets 2018-08-27 15:24:56 -04:00 committed by Rémi Verschelde
parent d1c93a0af3
commit 46f091bfcb
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

@ -367,7 +367,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). // Properly setup UVs for impostor textures (AtlasTexture).
Ref<AtlasTexture> atlas_tex = texture; Ref<AtlasTexture> atlas_tex = texture;
@ -377,10 +377,10 @@ void Sprite3D::_draw() {
} }
Vector2 uvs[4] = { Vector2 uvs[4] = {
final_src_rect.position / tsize, final_src_rect.position / src_tsize,
(final_src_rect.position + Vector2(final_src_rect.size.x, 0)) / tsize, (final_src_rect.position + Vector2(final_src_rect.size.x, 0)) / src_tsize,
(final_src_rect.position + final_src_rect.size) / tsize, (final_src_rect.position + final_src_rect.size) / src_tsize,
(final_src_rect.position + Vector2(0, final_src_rect.size.y)) / tsize, (final_src_rect.position + Vector2(0, final_src_rect.size.y)) / src_tsize,
}; };
if (is_flipped_h()) { if (is_flipped_h()) {
@ -667,7 +667,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). // Properly setup UVs for impostor textures (AtlasTexture).
Ref<AtlasTexture> atlas_tex = texture; Ref<AtlasTexture> atlas_tex = texture;
@ -677,10 +677,10 @@ void AnimatedSprite3D::_draw() {
} }
Vector2 uvs[4] = { Vector2 uvs[4] = {
final_src_rect.position / tsize, final_src_rect.position / src_tsize,
(final_src_rect.position + Vector2(final_src_rect.size.x, 0)) / tsize, (final_src_rect.position + Vector2(final_src_rect.size.x, 0)) / src_tsize,
(final_src_rect.position + final_src_rect.size) / tsize, (final_src_rect.position + final_src_rect.size) / src_tsize,
(final_src_rect.position + Vector2(0, final_src_rect.size.y)) / tsize, (final_src_rect.position + Vector2(0, final_src_rect.size.y)) / src_tsize,
}; };
if (is_flipped_h()) { if (is_flipped_h()) {