summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorbitstopper <danielhartmann@alterpolis.net>2019-10-01 10:12:51 +0200
committerbitstopper <danielhartmann@alterpolis.net>2019-10-01 14:04:37 +0200
commit9f21fcf8794568d9ee2dce04a8a066b10721bfad (patch)
treeb1941bb60f33d9ec8648dfe9c94428c3e98a75f3 /scene
parent7e3dcf54ea209affff0855c080686a59a2ccc70f (diff)
Fixes CPUParticles2D not making use of AtlasTextures
Fixes CPUParticles2D not making use of AtlasTextures #2
Diffstat (limited to 'scene')
-rw-r--r--scene/2d/cpu_particles_2d.cpp18
1 files changed, 14 insertions, 4 deletions
diff --git a/scene/2d/cpu_particles_2d.cpp b/scene/2d/cpu_particles_2d.cpp
index 85c423964b..b5e5fe51d1 100644
--- a/scene/2d/cpu_particles_2d.cpp
+++ b/scene/2d/cpu_particles_2d.cpp
@@ -166,10 +166,20 @@ 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;
- uvs.push_back(Vector2(0, 0));
- uvs.push_back(Vector2(1, 0));
- uvs.push_back(Vector2(1, 1));
- uvs.push_back(Vector2(0, 1));
+ 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));
+ }
PoolVector<Color> colors;
colors.push_back(Color(1, 1, 1, 1));
colors.push_back(Color(1, 1, 1, 1));