Added: #1469 Integration of the camera animation player in the CamAnimMode and storing and restoring of view info at animation start and stop

--HG--
branch : gsoc2012-fabien

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

@@ -31,18 +31,18 @@
 struct TCameraAnimationInfo
 {
 	TCameraAnimationInfo(const NLMISC::CVector& camPos, 
-						const NLMISC::CVector& camLookAt, 
+						const NLMISC::CVector& camLookAtDir, 
 						float elapsedTimeSinceStartStep)
 	{
 		CamPos = camPos;
-		CamLookAt = camLookAt;
+		CamLookAtDir = camLookAtDir;
 		ElapsedTimeSinceStartStep = elapsedTimeSinceStartStep;
 	}
 
 	TCameraAnimationInfo() {}
 
 	NLMISC::CVector CamPos;						/// Camera position
-	NLMISC::CVector CamLookAt;					/// Camera look at position
+	NLMISC::CVector CamLookAtDir;				/// Camera look at direction
 
 	float ElapsedTimeSinceStartStep;			/// Elapsed time in second since the beginning of this step
 };

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

@@ -20,6 +20,7 @@
 #include "camera_animation_manager/camera_animation_step_player_factory.h"
 #include "time_client.h"
 #include "view.h"
+#include "motion/user_controls.h"
 
 using namespace std;
 using namespace NLMISC;
@@ -34,6 +35,7 @@ CCameraAnimationPlayer::CCameraAnimationPlayer()
 	_IsPlaying = false;
 	_CurrStep = NULL;
 	_ElapsedTimeForCurrStep = 0.f;
+	_HasLastViewInfo = false;
 }
 
 CCameraAnimationPlayer::~CCameraAnimationPlayer()
@@ -47,6 +49,13 @@ void CCameraAnimationPlayer::start()
 		stop();
 
 	_IsPlaying = true;
+
+	// We set the user controls in camAnimMode and we remember the current view and viewPos
+	_LastView = View.currentView();
+	_LastViewPos = View.currentViewPos();
+	_LastMode = UserControls.mode();
+	UserControls.mode(CUserControls::CamAnimMode);
+	_HasLastViewInfo = true;
 }
 
 void CCameraAnimationPlayer::stop()
@@ -54,6 +63,15 @@ void CCameraAnimationPlayer::stop()
 	_IsPlaying = false;
 
 	stopStep();
+
+	// We reset view and viewPos and the usercontrols mode
+	if (_HasLastViewInfo)
+	{
+		UserControls.mode(_LastMode);
+		View.view(_LastView);
+		View.viewPos(_LastViewPos);
+		_HasLastViewInfo = false;
+	}
 }
 
 void CCameraAnimationPlayer::stopStep()
@@ -103,13 +121,13 @@ bool CCameraAnimationPlayer::isPlaying()
 TCameraAnimationInfo CCameraAnimationPlayer::update()
 {
 	// We get the current camera information
-	NLMISC::CVector camLookAt = View.view();
+	NLMISC::CVector camLookAtDir = View.currentView();
-	NLMISC::CVector camPos = View.viewPos();
+	NLMISC::CVector camPos = View.currentViewPos();
 
 	// We update the elapsed time for this step
 	_ElapsedTimeForCurrStep += DT;
 
-	TCameraAnimationInfo currCamInfo(camPos, camLookAt, _ElapsedTimeForCurrStep);
+	TCameraAnimationInfo currCamInfo(camPos, camLookAtDir, _ElapsedTimeForCurrStep);
 
 	if (!isPlaying())
 		return currCamInfo;

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

@@ -23,6 +23,7 @@
 #include "camera_animation_manager/camera_animation_step_player_factory.h"
 #include "nel/misc/vector.h"
 #include "camera_animation_manager\camera_animation_info.h"
+#include "motion\user_controls.h"
 
 
 /************************************************************************/
@@ -85,6 +86,11 @@ private:
 
 	ICameraAnimationStepPlayer* _CurrStep;
 	float _ElapsedTimeForCurrStep;
+
+	NLMISC::CVector _LastView;
+	NLMISC::CVector _LastViewPos;
+	CUserControls::TMoveMode _LastMode;
+	bool _HasLastViewInfo;
 };
 
 

code/ryzom/client/src/motion/modes/cam_anim_mode.cpp

@@ -28,6 +28,8 @@
 #include "../../view.h"
 #include "../../interface_v3/interface_manager.h"
 #include "../../entities.h"
+#include "camera_animation_manager/camera_animation_info.h"
+#include "camera_animation_manager/camera_animation_player.h"
 
 
 ///////////
@@ -78,4 +80,12 @@ void CUserControls::camAnimModeStop()
 void CUserControls::camAnimMode()
 {
 	// Call the camera animation update function to update the view
+	TCameraAnimationInfo newCamInfo = CCameraAnimationPlayer::getInstance()->update();
+
+	// We normalize the look at direction
+	newCamInfo.CamLookAtDir.normalize();
+
+	// We udpate the view
+	View.view(newCamInfo.CamLookAtDir);
+	View.viewPos(newCamInfo.CamPos);
 }// camAnimMode //