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-04-16 21:06:49 +0000
committerStijn Buys <ingar@osirion.org>2013-04-16 21:06:49 +0000
commit2c8331414db790824df9e9e2ea6e25ad7aa39b99 (patch)
tree387bd65dc1d0c6fde5942dce0591c430a6eb9053 /src/render/particleejectorscript.cc
parentc625314940a3e41c28aff7a311ccd7ad2d0bf8d7 (diff)
Support for 'colorsecond' in particle scripts, have trail style particles use a single texture for the entire length instead of repeating it.
Diffstat (limited to 'src/render/particleejectorscript.cc')
-rw-r--r--src/render/particleejectorscript.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/render/particleejectorscript.cc b/src/render/particleejectorscript.cc
index b2c84bc..250eb20 100644
--- a/src/render/particleejectorscript.cc
+++ b/src/render/particleejectorscript.cc
@@ -28,6 +28,8 @@ ParticleEjectorScript::ParticleEjectorScript()
script_spawn_radius = 0.0f;
script_attached = false;
script_scaled = false;
+
+ script_color_interpolated = false;
}
ParticleEjectorScript::ParticleEjectorScript(const ParticleEjectorScript &other)
@@ -48,6 +50,7 @@ ParticleEjectorScript::ParticleEjectorScript(const ParticleEjectorScript &other)
script_cull = other.cull();
script_attached = other.attached();
script_scaled = other.scaled();
+ script_color_interpolated = other.color_interpolated();
script_texture.assign(other.texture());
script_axis.assign(other.axis());
@@ -56,6 +59,7 @@ ParticleEjectorScript::ParticleEjectorScript(const ParticleEjectorScript &other)
script_speed_vec.assign(other.speed_vec());
script_tailspeed_vec.assign(other.tailspeed_vec());
script_color.assign(other.color());
+ script_color_second.assign(other.color_second());
}
ParticleEjectorScript::~ParticleEjectorScript()