diff options
author | Stijn Buys <ingar@osirion.org> | 2012-12-01 16:04:57 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2012-12-01 16:04:57 +0000 |
commit | d4f69710312305fb37e77eb7c21c536da3dd7e7a (patch) | |
tree | 52002384bcd6c2d5a43a1c1642a5641133f51e9c /src/render/particles.h | |
parent | 8194ae8a7dd116fe35139439475c61956f7b76d8 (diff) |
Allow particles to have the secondary entity color.
Diffstat (limited to 'src/render/particles.h')
-rw-r--r-- | src/render/particles.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/render/particles.h b/src/render/particles.h index c2d9c02..4c3de0e 100644 --- a/src/render/particles.h +++ b/src/render/particles.h @@ -72,10 +72,6 @@ public: return particlescript_color; } - inline bool has_color() const { - return particlescript_has_color; - } - /// axis transformation relative to the ejector inline const math::Axis &axis() const { return particlescript_axis; @@ -86,11 +82,22 @@ public: return particlescript_engine; } - /// true if engine color is to be applied - inline bool entity() const { + /** + * @brief true if entity primary color is to be applied + * */ + inline bool entity() const + { return particlescript_entity; } + /** + * @brief true if entity secondary color is to be applied + * */ + inline bool entity_second() const + { + return particlescript_entity_second; + } + inline float radius() const { return particlescript_radius; } @@ -142,8 +149,8 @@ private: math::Axis particlescript_axis; bool particlescript_entity; + bool particlescript_entity_second; bool particlescript_engine; - bool particlescript_has_color; float particlescript_radius; float particlescript_timeout; |