diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2019-10-02 09:44:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-02 09:44:06 +0200 |
commit | 9327eb226ad41f29ea822da031ed06eada253e0d (patch) | |
tree | d6e405da4a9e4e9aeaee0cab0b64f388fec55cfe | |
parent | 09bf1b35c0310617924fc4eaca32d5b91460d492 (diff) |
Revert "Fixes CPUParticles2D not making use of AtlasTextures"
-rw-r--r-- | scene/2d/cpu_particles_2d.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/scene/2d/cpu_particles_2d.cpp b/scene/2d/cpu_particles_2d.cpp index b5e5fe51d1..85c423964b 100644 --- a/scene/2d/cpu_particles_2d.cpp +++ b/scene/2d/cpu_particles_2d.cpp @@ -166,20 +166,10 @@ void CPUParticles2D::_update_mesh_texture() { vertices.push_back(-tex_size * 0.5 + Vector2(tex_size.x, tex_size.y)); vertices.push_back(-tex_size * 0.5 + Vector2(0, tex_size.y)); PoolVector<Vector2> uvs; - AtlasTexture *at = Object::cast_to<AtlasTexture>(*texture); - if (!at) { - uvs.push_back(Vector2(0, 0)); - uvs.push_back(Vector2(1, 0)); - uvs.push_back(Vector2(1, 1)); - uvs.push_back(Vector2(0, 1)); - } else { - Rect2 region_rect = at->get_region(); - Size2 atlas_size = at->get_atlas()->get_size(); - uvs.push_back(Vector2(region_rect.position.x / atlas_size.x, region_rect.position.y / atlas_size.y)); - uvs.push_back(Vector2((region_rect.position.x + region_rect.size.x) / atlas_size.x, region_rect.position.y / atlas_size.y)); - uvs.push_back(Vector2((region_rect.position.x + region_rect.size.x) / atlas_size.x, (region_rect.position.y + region_rect.size.y) / atlas_size.y)); - uvs.push_back(Vector2(region_rect.position.x / atlas_size.x, (region_rect.position.y + region_rect.size.y) / atlas_size.y)); - } + uvs.push_back(Vector2(0, 0)); + uvs.push_back(Vector2(1, 0)); + uvs.push_back(Vector2(1, 1)); + uvs.push_back(Vector2(0, 1)); PoolVector<Color> colors; colors.push_back(Color(1, 1, 1, 1)); colors.push_back(Color(1, 1, 1, 1)); |