ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up particle .xml

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

Also remove flips that are not visible at all
This commit is contained in:
Benau 2017-10-15 12:46:09 +08:00
parent 998b11ed51
commit f646a26fbe
44 changed files with 6 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/gfx/black_smoke.xml
View File

@ -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>

6
data/gfx/confetti.xml
View File

@ -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"
flips="Y" />
<wind flips="Y" />
</particles>

6
data/gfx/confetti_bleu.xml
View File

@ -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"
flips="Y" />
<wind flips="Y" />
</particles>

3
data/gfx/droplet.xml
View File

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

3
data/gfx/explosion.xml
View File

@ -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>

3
data/gfx/explosion_bomb.xml
View File

@ -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>

3
data/gfx/explosion_cake.xml
View File

@ -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>

2
data/gfx/fire.xml
View File

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

3
data/gfx/gfx_blueNebula_a.xml
View File

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

3
data/gfx/gfx_bubbleFast_a.xml
View File

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

3
data/gfx/gfx_bubble_a.xml
View File

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

6
data/gfx/gfx_fallingLeaf_a.xml
View File

@ -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"
flips="Y" />
<wind flips="Y" />
</particles>

3
data/gfx/gfx_fireworkExplosion_a.xml
View File

@ -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>

3
data/gfx/gfx_fireworkGreen_a.xml
View File

@ -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>

4
data/gfx/gfx_fireworkSmoke_a.xml
View File

@ -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>

6
data/gfx/gfx_firework_a.xml
View File

@ -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>

3
data/gfx/gfx_jetBlastEarth_a.xml
View File

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

3
data/gfx/gfx_jetBlastSand_a.xml
View File

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

6
data/gfx/gfx_mudPot_a.xml
View File

@ -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>

3
data/gfx/gfx_sandExplosion_a.xml
View File

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

3
data/gfx/gfx_smallWaterFlow.xml
View File

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

8
data/gfx/gfx_sparkBlue_a.xml
View File

@ -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>

6
data/gfx/gfx_sparkFire_a.xml
View File

@ -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>

3
data/gfx/jump_explosion.xml
View File

@ -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>

3
data/gfx/kart_exhaust.xml
View File

@ -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>

3
data/gfx/nitro-smoke.xml
View File

@ -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>

3
data/gfx/nitro.xml
View File

@ -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>

5
data/gfx/rain-ground.xml
View File

@ -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>

4
data/gfx/rain.xml
View File

@ -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>

3
data/gfx/skid1.xml
View File

@ -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>

3
data/gfx/skid2.xml
View File

@ -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>

3
data/gfx/smoke.xml
View File

@ -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>

3
data/gfx/smoke_brown.xml
View File

@ -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>

3
data/gfx/smoke_red.xml
View File

@ -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>

3
data/gfx/smoke_short_burst.xml
View File

@ -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>

3
data/gfx/smoke_yellow.xml
View File

@ -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>

6
data/gfx/snow.xml
View File

@ -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"
flips="Y" />
<wind flips="Y" />
</particles>

3
data/gfx/sparks.xml
View File

@ -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>

5
data/gfx/splash.xml
View File

@ -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>

5
data/gfx/swampDriving.xml
View File

@ -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>

3
data/gfx/waterfall.xml
View File

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

3
data/gfx/zipper_fire.xml
View File

@ -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>

35
src/graphics/particle_kind.cpp
View File

@ -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);
}

23
src/graphics/particle_kind.hpp
View File

@ -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; }