Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-01-27 09:41:25 +0000
committerStijn Buys <ingar@osirion.org>2013-01-27 09:41:25 +0000
commitf096586dac6e6c0e083e23afafc99731bf2ba642 (patch)
tree2414c2ac1c115696e449c8006e70fae1ebb0d679 /src/render/particleejectorscript.cc
parent52a0d3571f56187d8801793b36a5511966e1d9a0 (diff)
Added support for particles minimum/maximum speed,
renamed [ejector] sections in particle ini files, resolved the issue where only 1 particle per frame could be ejected.
Diffstat (limited to 'src/render/particleejectorscript.cc')
-rw-r--r--src/render/particleejectorscript.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/render/particleejectorscript.cc b/src/render/particleejectorscript.cc
index a37ab9d..1eb1eff 100644
--- a/src/render/particleejectorscript.cc
+++ b/src/render/particleejectorscript.cc
@@ -17,7 +17,6 @@ ParticleEjectorScript::ParticleEjectorScript()
script_cone = 0.0f;
script_offset = 0.5f;
script_lifespan = 1000;
- script_speed = 0;
script_acceleration = 0.0f;
script_entity = false;
script_entity_second = false;
@@ -37,7 +36,6 @@ ParticleEjectorScript::ParticleEjectorScript(const ParticleEjectorScript &other)
script_spawn_radius = other.spawn_radius();
script_offset = other.offset();
script_lifespan = other.lifespan();
- script_speed = other.speed();
script_acceleration = other.acceleration();
script_entity = other.entity();
script_entity_second = other.entity_second();
@@ -51,6 +49,7 @@ ParticleEjectorScript::ParticleEjectorScript(const ParticleEjectorScript &other)
script_axis.assign(other.axis());
script_radius_vec.assign(other.radius_vec());
script_alpha_vec.assign(other.alpha_vec());
+ script_speed_vec.assign(other.speed_vec());
script_color.assign(other.color());
}