Merge remote-tracking branch 'origin/master' into tbo_skinning

2017-10-20 08:36:54 +08:00 · 2017-10-20 08:36:54 +08:00 · ebdde49984
commit ebdde49984
parent 553b2439ac 5216f8e917
1 changed files with 7 additions and 1 deletions
--- a/src/graphics/explosion.cpp
+++ b/src/graphics/explosion.cpp
@ -45,7 +45,13 @@ Explosion::Explosion(const Vec3& coord, const char* explosion_sound, const char
    std::string filename = particle_file;
    
 #ifdef ANDROID
-    filename = "explosion_low.xml";
+    // Use a lower quality effect on Android for better performance
+    if (filename == "explosion.xml" || 
+        filename == "explosion_bomb.xml" ||
+        filename == "explosion_cake.xml")
+    {
+        filename = "explosion_low.xml";
+    }
 #endif
    
    ParticleKindManager* pkm = ParticleKindManager::get();