]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/particles.cpp
guiFormspecMenu: Allow fraction values for container[] (#7497)
[dragonfireclient.git] / src / particles.cpp
index 815ae98c5af10ec4dd110b513bfaa23e068e0b87..e98068f5355dad1387c526b0b92b8c0ee3a82dde 100644 (file)
@@ -18,8 +18,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "particles.h"
+#include <cmath>
 #include "client.h"
 #include "collision.h"
+#include "client/clientevent.h"
 #include "client/renderingengine.h"
 #include "util/numeric.h"
 #include "light.h"
@@ -226,7 +228,8 @@ void Particle::updateVertices()
        for (video::S3DVertex &vertex : m_vertices) {
                if (m_vertical) {
                        v3f ppos = m_player->getPosition()/BS;
-                       vertex.Pos.rotateXZBy(atan2(ppos.Z-m_pos.Z, ppos.X-m_pos.X)/core::DEGTORAD+90);
+                       vertex.Pos.rotateXZBy(std::atan2(ppos.Z - m_pos.Z, ppos.X - m_pos.X) /
+                               core::DEGTORAD + 90);
                } else {
                        vertex.Pos.rotateYZBy(m_player->getPitch());
                        vertex.Pos.rotateXZBy(m_player->getYaw());
@@ -280,6 +283,58 @@ ParticleSpawner::ParticleSpawner(IGameDef *gamedef, LocalPlayer *player,
        }
 }
 
+void ParticleSpawner::spawnParticle(ClientEnvironment *env, float radius,
+       bool is_attached, const v3f &attached_pos, float attached_yaw)
+{
+       v3f ppos = m_player->getPosition() / BS;
+       v3f pos = random_v3f(m_minpos, m_maxpos);
+
+       // Need to apply this first or the following check
+       // will be wrong for attached spawners
+       if (is_attached) {
+               pos.rotateXZBy(attached_yaw);
+               pos += attached_pos;
+       }
+
+       if (pos.getDistanceFrom(ppos) > radius)
+               return;
+
+       v3f vel = random_v3f(m_minvel, m_maxvel);
+       v3f acc = random_v3f(m_minacc, m_maxacc);
+
+       if (is_attached) {
+               // Apply attachment yaw
+               vel.rotateXZBy(attached_yaw);
+               acc.rotateXZBy(attached_yaw);
+       }
+
+       float exptime = rand() / (float)RAND_MAX
+                       * (m_maxexptime - m_minexptime)
+                       + m_minexptime;
+       float size = rand() / (float)RAND_MAX
+                       * (m_maxsize - m_minsize)
+                       + m_minsize;
+
+       m_particlemanager->addParticle(new Particle(
+               m_gamedef,
+               m_player,
+               env,
+               pos,
+               vel,
+               acc,
+               exptime,
+               size,
+               m_collisiondetection,
+               m_collision_removal,
+               m_vertical,
+               m_texture,
+               v2f(0.0, 0.0),
+               v2f(1.0, 1.0),
+               m_animation,
+               m_glow
+       ));
+}
+
 void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 {
        m_time += dtime;
@@ -301,120 +356,33 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
                }
        }
 
-       if (m_spawntime != 0) // Spawner exists for a predefined timespan
-       {
-               for(std::vector<float>::iterator i = m_spawntimes.begin();
-                               i != m_spawntimes.end();)
-               {
-                       if ((*i) <= m_time && m_amount > 0)
-                       {
+       if (m_spawntime != 0) {
+               // Spawner exists for a predefined timespan
+               for (std::vector<float>::iterator i = m_spawntimes.begin();
+                               i != m_spawntimes.end();) {
+                       if ((*i) <= m_time && m_amount > 0) {
                                m_amount--;
 
                                // Pretend to, but don't actually spawn a particle if it is
                                // attached to an unloaded object or distant from player.
-                               if (!unloaded) {
-                                       v3f ppos = m_player->getPosition() / BS;
-                                       v3f pos = random_v3f(m_minpos, m_maxpos);
-
-                                       if (pos.getDistanceFrom(ppos) <= radius) {
-                                               v3f vel = random_v3f(m_minvel, m_maxvel);
-                                               v3f acc = random_v3f(m_minacc, m_maxacc);
-
-                                               if (is_attached) {
-                                                       // Apply attachment yaw and position
-                                                       pos.rotateXZBy(attached_yaw);
-                                                       pos += attached_pos;
-                                                       vel.rotateXZBy(attached_yaw);
-                                                       acc.rotateXZBy(attached_yaw);
-                                               }
-
-                                               float exptime = rand()/(float)RAND_MAX
-                                                               *(m_maxexptime-m_minexptime)
-                                                               +m_minexptime;
-                                               float size = rand()/(float)RAND_MAX
-                                                               *(m_maxsize-m_minsize)
-                                                               +m_minsize;
-
-                                               Particle* toadd = new Particle(
-                                                       m_gamedef,
-                                                       m_player,
-                                                       env,
-                                                       pos,
-                                                       vel,
-                                                       acc,
-                                                       exptime,
-                                                       size,
-                                                       m_collisiondetection,
-                                                       m_collision_removal,
-                                                       m_vertical,
-                                                       m_texture,
-                                                       v2f(0.0, 0.0),
-                                                       v2f(1.0, 1.0),
-                                                       m_animation,
-                                                       m_glow);
-                                               m_particlemanager->addParticle(toadd);
-                                       }
-                               }
+                               if (!unloaded)
+                                       spawnParticle(env, radius, is_attached, attached_pos, attached_yaw);
+
                                i = m_spawntimes.erase(i);
-                       }
-                       else
-                       {
+                       } else {
                                ++i;
                        }
                }
-       }
-       else // Spawner exists for an infinity timespan, spawn on a per-second base
-       {
+       } else {
+               // Spawner exists for an infinity timespan, spawn on a per-second base
+
                // Skip this step if attached to an unloaded object
                if (unloaded)
                        return;
-               for (int i = 0; i <= m_amount; i++)
-               {
-                       if (rand()/(float)RAND_MAX < dtime)
-                       {
-                               // Do not spawn particle if distant from player
-                               v3f ppos = m_player->getPosition() / BS;
-                               v3f pos = random_v3f(m_minpos, m_maxpos);
-
-                               if (pos.getDistanceFrom(ppos) <= radius) {
-                                       v3f vel = random_v3f(m_minvel, m_maxvel);
-                                       v3f acc = random_v3f(m_minacc, m_maxacc);
-
-                                       if (is_attached) {
-                                               // Apply attachment yaw and position
-                                               pos.rotateXZBy(attached_yaw);
-                                               pos += attached_pos;
-                                               vel.rotateXZBy(attached_yaw);
-                                               acc.rotateXZBy(attached_yaw);
-                                       }
-
-                                       float exptime = rand()/(float)RAND_MAX
-                                                       *(m_maxexptime-m_minexptime)
-                                                       +m_minexptime;
-                                       float size = rand()/(float)RAND_MAX
-                                                       *(m_maxsize-m_minsize)
-                                                       +m_minsize;
-
-                                       Particle* toadd = new Particle(
-                                               m_gamedef,
-                                               m_player,
-                                               env,
-                                               pos,
-                                               vel,
-                                               acc,
-                                               exptime,
-                                               size,
-                                               m_collisiondetection,
-                                               m_collision_removal,
-                                               m_vertical,
-                                               m_texture,
-                                               v2f(0.0, 0.0),
-                                               v2f(1.0, 1.0),
-                                               m_animation,
-                                               m_glow);
-                                       m_particlemanager->addParticle(toadd);
-                               }
-                       }
+
+               for (int i = 0; i <= m_amount; i++) {
+                       if (rand() / (float)RAND_MAX < dtime)
+                               spawnParticle(env, radius, is_attached, attached_pos, attached_yaw);
                }
        }
 }
@@ -600,21 +568,23 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, Client *client,
 void ParticleManager::addDiggingParticles(IGameDef* gamedef,
        LocalPlayer *player, v3s16 pos, const MapNode &n, const ContentFeatures &f)
 {
+       // No particles for "airlike" nodes
+       if (f.drawtype == NDT_AIRLIKE)
+               return;
+
        // set the amount of particles here
        for (u16 j = 0; j < 32; j++) {
                addNodeParticle(gamedef, player, pos, n, f);
        }
 }
 
-void ParticleManager::addPunchingParticles(IGameDef* gamedef,
-       LocalPlayer *player, v3s16 pos, const MapNode &n, const ContentFeatures &f)
-{
-       addNodeParticle(gamedef, player, pos, n, f);
-}
-
 void ParticleManager::addNodeParticle(IGameDef* gamedef,
        LocalPlayer *player, v3s16 pos, const MapNode &n, const ContentFeatures &f)
 {
+       // No particles for "airlike" nodes
+       if (f.drawtype == NDT_AIRLIKE)
+               return;
+
        // Texture
        u8 texid = myrand_range(0, 5);
        const TileLayer &tile = f.tiles[texid].layers[0];
@@ -630,6 +600,8 @@ void ParticleManager::addNodeParticle(IGameDef* gamedef,
 
        float size = rand() % 64 / 512.;
        float visual_size = BS * size;
+       if (tile.scale)
+               size /= tile.scale;
        v2f texsize(size * 2, size * 2);
        v2f texpos;
        texpos.X = ((rand() % 64) / 64. - texsize.X);