From 99cb204d29a63bf5f4edb40b25f4fc1a6605fbd1 Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Wed, 22 Jun 2011 21:47:53 +0200
Subject: Made possible to separate the dye colors and channels for particle
 effects.

It is now possible to write, for instance:

<particlefx>my-particle-file.xml|#cbcb78,345678</particlefx>

and in my-particle-file.xml:
...
<property image="my-image.png|W" />
...

This will permit the use (and reuse) of generic particle files.

Conflicts:

	src/particle.cpp
	src/particleemitter.cpp
	src/particleemitter.h
	src/simpleanimation.cpp
---
 src/simpleanimation.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/simpleanimation.h')

diff --git a/src/simpleanimation.h b/src/simpleanimation.h
index 572a7704c..000bb1399 100644
--- a/src/simpleanimation.h
+++ b/src/simpleanimation.h
@@ -47,7 +47,8 @@ class SimpleAnimation
         /**
          * Creates a simple animation that creates its animation from XML Data.
          */
-        SimpleAnimation(xmlNodePtr animationNode);
+        SimpleAnimation(xmlNodePtr animationNode,
+                        const std::string& dyePalettes = std::string());
 
         ~SimpleAnimation();
 
@@ -67,7 +68,8 @@ class SimpleAnimation
         Image *getCurrentImage() const;
 
     private:
-        void initializeAnimation(xmlNodePtr animationNode);
+        void initializeAnimation(xmlNodePtr animationNode,
+                                const std::string& dyePalettes = std::string());
 
         /** The hosted animation. */
         Animation *mAnimation;
-- 
cgit v1.2.3-70-g09d2