Added: #1469 Integration of the modifiers in the processus of steps

--HG--
branch : gsoc2012-fabien

code/ryzom/client/src/camera_animation_manager/camera_animation_modifier_player_factory.cpp

@@ -21,6 +21,9 @@ std::vector<std::pair<std::string, ICameraAnimationModifierPlayerFactory*> >* IC
 
 ICameraAnimationModifierPlayer* ICameraAnimationModifierPlayerFactory::initModifier(const std::string& name, NLMISC::CBitMemStream& impulse)
 {
+	if (!Entries)
+		return NULL;
+
 	// We search the correct modifier type in our entries
 	for (uint i = 0; i < Entries->size(); i++)
 	{

code/ryzom/client/src/camera_animation_manager/camera_animation_player.cpp

@@ -78,7 +78,7 @@ void CCameraAnimationPlayer::playStep(const std::string& stepName, NLMISC::CBitM
 	_Steps.push_back(step);
 
 	// We start playing the step
-	step->playStep();
+	step->playStepAndModifiers();
 }
 
 bool CCameraAnimationPlayer::isPlaying()

code/ryzom/client/src/camera_animation_manager/camera_animation_step_player_factory.cpp

@@ -43,6 +43,27 @@ ICameraAnimationStepPlayer* ICameraAnimationStepPlayerFactory::initStep(const st
 				return NULL;
 			}
 
+			// We look for children (modifiers or sound triggers)
+			uint8 nbModifiers = 0;
+			impulse.serial(nbModifiers);
+			for (uint8 i = 0; i < nbModifiers; i++)
+			{
+				// We get the modifier name
+				std::string modifierName = "";
+				impulse.serial(modifierName);
+
+				ICameraAnimationModifierPlayer* modifier = ICameraAnimationModifierPlayerFactory::initModifier(modifierName, impulse);
+				// We add the modifier to the list
+				if (modifier)
+				{
+					ret->addModifier(modifier);
+				}
+				else
+				{
+					nlwarning("impossible to init the modifier named %s in step named %s", modifierName.c_str(), name.c_str());
+				}
+			}
+
 			return ret;
 		}
 	}
@@ -55,3 +76,33 @@ void ICameraAnimationStepPlayerFactory::init()
 		Entries = new std::vector<std::pair<std::string, ICameraAnimationStepPlayerFactory*> >;
 }
 
+ICameraAnimationStepPlayer::~ICameraAnimationStepPlayer()
+{
+	// We release all the modifiers
+	for (std::vector<ICameraAnimationModifierPlayer*>::iterator it = Modifiers.begin(); it != Modifiers.end(); ++it)
+	{
+		ICameraAnimationModifierPlayer* modifier = *it;
+		delete modifier;
+	}
+	Modifiers.clear();
+}
+
+void ICameraAnimationStepPlayer::addModifier(ICameraAnimationModifierPlayer* modifier)
+{
+	Modifiers.push_back(modifier);
+}
+
+void ICameraAnimationStepPlayer::playStepAndModifiers()
+{
+	// Play the step
+	playStep();
+
+	// Play the modifiers
+	for (std::vector<ICameraAnimationModifierPlayer*>::iterator it = Modifiers.begin(); it != Modifiers.end(); ++it)
+	{
+		ICameraAnimationModifierPlayer* modifier = *it;
+		
+		// We play the modifier
+		modifier->playModifier();
+	}
+}

code/ryzom/client/src/camera_animation_manager/camera_animation_step_player_factory.h

@@ -20,6 +20,7 @@
 #include <string>
 #include <vector>
 #include "nel\misc\bit_mem_stream.h"
+#include "camera_animation_manager\camera_animation_modifier_player_factory.h"
 
 /************************************************************************/
 /* Interface for camera animation steps.
@@ -29,13 +30,23 @@
 class ICameraAnimationStepPlayer
 {
 public:
+	virtual ~ICameraAnimationStepPlayer();
+
 	/// This function is called when it's time to init the step from an impulse
 	virtual bool initStep(NLMISC::CBitMemStream& impulse) = 0;
 
 	/// Function that plays the step
 	virtual void playStep() = 0;
 
+	/// Function that adds a camera animation modifier to this step
+	void addModifier(ICameraAnimationModifierPlayer* modifier);
+
+	// Plays the step and its modifiers
+	void playStepAndModifiers();
+
 protected:
+	// The list of modifiers
+	std::vector<ICameraAnimationModifierPlayer*> Modifiers;
 };
 
 /************************************************************************/

code/ryzom/server/src/entities_game_service/camera_animation_manager/camera_animation_step_factory.h

@@ -71,9 +71,6 @@ protected:
 	static void init();
 	virtual ICameraAnimationStep * instanciate() = 0;
 	static std::vector<std::pair<std::string, ICameraAnimationStepFactory*> >* Entries;
-
-	// The list of modifiers
-	std::vector<ICameraAnimationModifier*> Modifiers;
 };
 
 // Define used to register the different types of camera animation steps