Clean up particle .xml

Remove unsupported entries, notice that particles now are auto-
faded out by lifetime

Also remove flips that are not visible at all

data/gfx/black_smoke.xml

@@ -26,7 +26,4 @@
     <color     min="50 50 50"
                max="100 100 100" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="1000"       />
-
 </particles>

data/gfx/confetti.xml

@@ -25,11 +25,7 @@
     
     <color     min="40 40 255"
                max="255 255 255"   />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"          />
 
-    <wind      speed="0.16"
+    <wind      flips="Y"           />
-               flips="Y"           />
 
 </particles>

data/gfx/confetti_bleu.xml

@@ -25,11 +25,7 @@
     
     <color     min="40 40 255"
                max="255 255 255"   />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"          />
 
-    <wind      speed="0.16"
+    <wind      flips="Y"           />
-               flips="Y"           />
 
 </particles>

data/gfx/droplet.xml

@@ -26,7 +26,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <fadeout   time="3000" />
-
-
 </particles>

data/gfx/explosion.xml

@@ -26,8 +26,5 @@
     
     <color     min="255 255 255"
                max="255 255 255"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="800"         />
 
 </particles>

data/gfx/explosion_bomb.xml

@@ -26,8 +26,5 @@
     
     <color     min="255 255 255"
                max="255 255 255"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="800"         />
 
 </particles>

data/gfx/explosion_cake.xml

@@ -26,8 +26,5 @@
     
     <color     min="255 255 255"
                max="255 255 255"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="800"         />
 
 </particles>

data/gfx/fire.xml

@@ -24,6 +24,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-  <fadeout time="300" />
-
 </particles>

data/gfx/gfx_blueNebula_a.xml

@@ -26,7 +26,4 @@
     <color     min="0 0 0"
                max="255 255 255" />
 
-    <fadeout   time="5000" />
-
-
 </particles>

data/gfx/gfx_bubbleFast_a.xml

@@ -26,7 +26,4 @@
     <color     min="0 0 0"
                max="255 255 255" />
 
-    <fadeout   time="2000" />
-
-
 </particles>

data/gfx/gfx_bubble_a.xml

@@ -26,7 +26,4 @@
     <color     min="0 0 0"
                max="255 255 255" />
 
-    <fadeout   time="5000" />
-
-
 </particles>

data/gfx/gfx_fallingLeaf_a.xml

@@ -25,11 +25,7 @@
     
     <color     min="40 40 255"
                max="255 255 255"   />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"          />
 
-    <wind      speed="0.16"
+    <wind      flips="Y"           />
-               flips="Y"           />
 
 </particles>

data/gfx/gfx_fireworkExplosion_a.xml

@@ -26,8 +26,5 @@
     
     <color     min="255 255 255"
                max="255 0 0"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="50"         />
 
 </particles>

data/gfx/gfx_fireworkGreen_a.xml

@@ -26,8 +26,5 @@
     
     <color     min="255 255 255"
                max="255 0 0"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="50"         />
 
 </particles>

data/gfx/gfx_fireworkSmoke_a.xml

@@ -27,9 +27,5 @@
     
     <color     min="40 40 255"
                max="255 255 255"   />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"          />
-
 
 </particles>

data/gfx/gfx_firework_a.xml

@@ -25,11 +25,5 @@
     
     <color     min="40 40 255"
                max="255 255 255"   />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"          />
-
-    <wind      speed="0.16"
-               flips="Y"           />
 
 </particles>

data/gfx/gfx_jetBlastEarth_a.xml

@@ -26,7 +26,4 @@
     <color     min="0 0 0"
                max="255 255 255" />
 
-    <fadeout   time="5000" />
-
-
 </particles>

data/gfx/gfx_jetBlastSand_a.xml

@@ -26,7 +26,4 @@
     <color     min="0 0 0"
                max="255 255 255" />
 
-    <fadeout   time="5000" />
-
-
 </particles>

data/gfx/gfx_mudPot_a.xml

@@ -27,9 +27,5 @@
     
     <color     min="40 40 255"
                max="255 255 255"   />
-    
+ 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="1000"          />
-
-
 </particles>

data/gfx/gfx_sandExplosion_a.xml

@@ -26,7 +26,4 @@
     <color     min="0 0 0"
                max="255 255 255" />
 
-    <fadeout   time="500" />
-
-
 </particles>

data/gfx/gfx_smallWaterFlow.xml

@@ -26,7 +26,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <fadeout   time="3000" />
-
-
 </particles>

data/gfx/gfx_sparkBlue_a.xml

@@ -18,7 +18,7 @@
     <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
     <lifetime  min="1000"
                max="1500"          />    
-  
+
     <!-- Size of the particles -->
     <size min="0.08"
          max="0.15"
@@ -27,11 +27,5 @@
     
     <color     min="40 40 255"
                max="255 255 255"   />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"          />
-
-    <wind      speed="0.16"
-               flips="Y"           />
 
 </particles>

data/gfx/gfx_sparkFire_a.xml

@@ -25,11 +25,5 @@
     
     <color     min="40 40 255"
                max="255 255 255"   />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"          />
-
-    <wind      speed="0.16"
-               flips="Y"           />
 
 </particles>

data/gfx/jump_explosion.xml

@@ -26,8 +26,5 @@
     
     <color     min="255 255 255"
                max="255 255 255"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="1000"         />
 
 </particles>

data/gfx/kart_exhaust.xml

@@ -26,8 +26,5 @@
     
     <color     min="255 255 255"
                max="0 0 0"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"         />
 
 </particles>

data/gfx/nitro-smoke.xml

@@ -23,8 +23,5 @@
     
     <color     min="255 255 255"
                max="255 255 255"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="75"         />
 
 </particles>

data/gfx/nitro.xml

@@ -26,8 +26,5 @@
     
     <color     min="255 255 255"
                max="255 255 255"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="50"         />
 
 </particles>

data/gfx/rain-ground.xml

@@ -32,9 +32,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="750"        />
-
-    <gravity   strength="-0.01"
-               only-force-time="500" />
 </particles>

data/gfx/rain.xml

@@ -25,9 +25,5 @@
     
     <color     min="255 255 255"
                max="255 255 255"   />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"          />
-
 
 </particles>

data/gfx/skid1.xml

@@ -25,8 +25,5 @@
     
     <color     min="255 255 255"
                max="255 255 255"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="5"         />
 
 </particles>

data/gfx/skid2.xml

@@ -25,8 +25,5 @@
     
     <color     min="255 255 255"
                max="255 255 255"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="5"         />
 
 </particles>

data/gfx/smoke.xml

@@ -24,7 +24,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
 </particles>

data/gfx/smoke_brown.xml

@@ -24,7 +24,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
 </particles>

data/gfx/smoke_red.xml

@@ -24,7 +24,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
 </particles>

data/gfx/smoke_short_burst.xml

@@ -25,7 +25,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
 </particles>

data/gfx/smoke_yellow.xml

@@ -24,7 +24,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
 </particles>

data/gfx/snow.xml

@@ -25,11 +25,7 @@
     
     <color     min="255 255 255"
                max="255 255 255"   />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"          />
 
-    <wind      speed="0.16"
+    <wind      flips="Y"           />
-               flips="Y"           />
 
 </particles>

data/gfx/sparks.xml

@@ -25,7 +25,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
 </particles>

data/gfx/splash.xml

@@ -25,9 +25,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
-    <gravity   strength="-0.01"
-               only-force-time="1000" />
 </particles>

data/gfx/swampDriving.xml

@@ -25,9 +25,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
-    <gravity   strength="-0.01"
-               only-force-time="1000" />
 </particles>

data/gfx/waterfall.xml

@@ -26,7 +26,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <fadeout   time="5000" />
-
-
 </particles>

data/gfx/zipper_fire.xml

@@ -24,8 +24,5 @@
     
     <color     min="255 255 255"
                max="255 255 255"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"         />
 
 </particles>

src/graphics/particle_kind.cpp

@@ -48,15 +48,10 @@ ParticleKind::ParticleKind(const std::string &file)
     m_velocity_x     = 0.001f;
     m_velocity_y     = 0.001f;
     m_velocity_z     = 0.001f;
-    m_gravity_strength = 0.0f;
-    m_fade_away_start  = -1.0f;
-    m_fade_away_end    = -1.0f;
-    m_force_lost_to_gravity_time = 1000;
     m_emission_decay_rate = 0;
     m_has_scale_affector = false;
     m_scale_affector_factor_x = 0.0f;
     m_scale_affector_factor_y = 0.0f;
-    m_wind_speed = 0;
     m_flips = false;
     m_vertical_particles = false;
     m_randomize_initial_y = false;
@@ -196,35 +191,6 @@ ParticleKind::ParticleKind(const std::string &file)
         color->get("max", &m_max_start_color);
     }
 
-    // ------------------------------------------------------------------------
-
-    const XMLNode* fadeout = xml->getNode("fadeout");
-    if (fadeout != NULL)
-    {
-        fadeout->get("time", &m_fadeout_time);
-    }
-
-    //std::cout << "m_fadeout_time = " << m_fadeout_time << "\n";
-
-    // ------------------------------------------------------------------------
-
-    const XMLNode* gravity = xml->getNode("gravity");
-    if (gravity != NULL)
-    {
-        gravity->get("strength",        &m_gravity_strength);
-        gravity->get("only-force-time", &m_force_lost_to_gravity_time);
-    }
-
-    // ------------------------------------------------------------------------
-
-    const XMLNode* fadeaway = xml->getNode("fade-away");
-    if (fadeaway != NULL)
-    {
-        fadeaway->get("start", &m_fade_away_start);
-        fadeaway->get("end",   &m_fade_away_end);
-    }
-
-
     // ------------------------------------------------------------------------
 
     const XMLNode* materials = xml->getNode("materials");
@@ -239,7 +205,6 @@ ParticleKind::ParticleKind(const std::string &file)
     const XMLNode* wind = xml->getNode("wind");
     if (wind != NULL)
     {
-        wind->get("speed", &m_wind_speed);
         wind->get("flips", &m_flips);
     }
 

src/graphics/particle_kind.hpp

@@ -69,26 +69,14 @@ private:
     video::SColor m_min_start_color;
     video::SColor m_max_start_color;
 
-    /** Strength of gravity, not sure what the units are. Make it 0 to disable */
-    float    m_gravity_strength;
-
-    /** Time it takes for gravity to completely replace the emission force */
-    int      m_force_lost_to_gravity_time;
-
     /** For box emitters only */
     float m_box_x, m_box_y, m_box_z;
 
     /** For sphere emitters only */
     float m_sphere_radius;
 
-    /** Distance from camera at which particles start fading out, or negative if disabled */
-    float m_fade_away_start, m_fade_away_end;
-
     int m_emission_decay_rate;
 
-    /** Wind. < 0.01 if disabled. */
-    float m_wind_speed;
-
     bool m_flips;
 
     std::string m_name;
@@ -147,15 +135,6 @@ public:
     float     getVelocityY   () const { return m_velocity_y;      }
     float     getVelocityZ   () const { return m_velocity_z;      }
 
-    /** Get the strength of gravity, not sure what the units are. Will be 0 if disabled. */
-    float     getGravityStrength() const { return m_gravity_strength; }
-
-    /** Get the time it takes for gravity to completely replace the emission force. Meaningless if gravity is disabled. */
-    int       getForceLostToGravityTime() const { return m_force_lost_to_gravity_time; }
-
-    float     getFadeAwayStart() const { return m_fade_away_start; }
-    float     getFadeAwayEnd  () const { return m_fade_away_end;   }
-
     void      setBoxSizeXZ    (float x, float z) { m_box_x = x; m_box_z = z;   }
 
     int       getEmissionDecayRate() const { return m_emission_decay_rate; }
@@ -164,8 +143,6 @@ public:
     float     getScaleAffectorFactorX() const { return m_scale_affector_factor_x; }
     float     getScaleAffectorFactorY() const { return m_scale_affector_factor_y; };
 
-    float     getWindSpeed() const { return m_wind_speed; }
-
     bool      getFlips() const { return m_flips; }
 
     bool      isVerticalParticles() const { return m_vertical_particles; }