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-21 18:37:59 +0000
committerStijn Buys <ingar@osirion.org>2013-01-21 18:37:59 +0000
commit266d0d2cf6648509650bdd490c8e9c64be75b92e (patch)
treedf5fdb640ed09edcf044efdc8784b18a5881a513 /src/render/particleejectorscript.cc
parentd4f9da2f3c19511b028da2569d7b6a8d1371e135 (diff)
Added attached property to draw particle systems in entity space instead of world space,
corrected several bugs in the initial particle system implementation, added impulse key to have particle systems react on impulse drive.
Diffstat (limited to 'src/render/particleejectorscript.cc')
-rw-r--r--src/render/particleejectorscript.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/render/particleejectorscript.cc b/src/render/particleejectorscript.cc
index 4c9b6c9..3609b9e 100644
--- a/src/render/particleejectorscript.cc
+++ b/src/render/particleejectorscript.cc
@@ -21,9 +21,11 @@ ParticleEjectorScript::ParticleEjectorScript()
script_entity = false;
script_entity_second = false;
script_engine = false;
+ script_impulse = false;
script_thrust = false;
script_cull = model::CullNone;
script_spawn_radius = 0.0f;
+ script_attached = false;
}
ParticleEjectorScript::ParticleEjectorScript(const ParticleEjectorScript &other)
@@ -31,15 +33,17 @@ ParticleEjectorScript::ParticleEjectorScript(const ParticleEjectorScript &other)
script_type = other.type();
script_interval = other.interval();
script_cone = other.cone();
+ script_spawn_radius = other.spawn_radius();
script_offset = other.offset();
script_lifespan = other.lifespan();
script_speed = other.speed();
script_entity = other.entity();
script_entity_second = other.entity_second();
script_engine = other.engine();
+ script_impulse = other.impulse();
script_thrust = other.thrust();
script_cull = other.cull();
- script_spawn_radius = other.spawn_radius();
+ script_attached = other.attached();
script_texture.assign(other.texture());
script_axis.assign(other.axis());