mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Sprite3D's incorrect behavior when using AtlasTextures.

Browse Source
This commit is contained in:
Webster Sheets 2018-02-14 17:32:42 -05:00
parent 79f48cde3d
commit 973be3711a
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scene/3d/sprite_3d.cpp
View File

@ -366,11 +366,17 @@ void Sprite3D::_draw() {
final_rect.position * pixel_size,
};
// Properly setup UVs for impostor textures (AtlasTexture).
RID texture_rid = texture->get_rid();
Vector2 src_tsize = Vector2(
VS::get_singleton()->texture_get_width(texture_rid),
VS::get_singleton()->texture_get_height(texture_rid));
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()) {
@ -649,18 +655,23 @@ void AnimatedSprite3D::_draw() {
float pixel_size = get_pixel_size();
Vector2 vertices[4] = {
(final_rect.position + Vector2(0, final_rect.size.y)) * pixel_size,
(final_rect.position + final_rect.size) * pixel_size,
(final_rect.position + Vector2(final_rect.size.x, 0)) * pixel_size,
final_rect.position * pixel_size,
};
// Properly setup UVs for impostor textures (AtlasTexture).
RID texture_rid = texture->get_rid();
Vector2 src_tsize = Vector2(
VS::get_singleton()->texture_get_width(texture_rid),
VS::get_singleton()->texture_get_height(texture_rid));
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()) {