Add functions and constructor parameter to set the distance of the maya camera...

Add functions and constructor parameter to set the distance of the maya camera from the currently used target.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4002 dfc29bdd-3216-0410-991c-e03cc46cb475

include/ISceneManager.h

@@ -618,19 +618,24 @@ namespace scene
 		//! Adds a maya style user controlled camera scene node to the scene graph.
 		/** This is a standard camera with an animator that provides mouse control similar
 		to camera in the 3D Software Maya by Alias Wavefront.
+		The camera does not react on setPosition anymore after applying this animator. Instead
+		use setTarget, to fix the target the camera the camera hovers around. And setDistance
+		to set the current distance from that target, i.e. the radius of the orbit the camera
+		hovers on.
 		\param parent: Parent scene node of the camera. Can be null.
 		\param rotateSpeed: Rotation speed of the camera.
 		\param zoomSpeed: Zoom speed of the camera.
 		\param translationSpeed: TranslationSpeed of the camera.
 		\param id: id of the camera. This id can be used to identify the camera.
+		\param distance Initial distance of the camera from the object
 		\param makeActive Flag whether this camera should become the active one.
 		Make sure you always have one active camera.
 		\return Returns a pointer to the interface of the camera if successful, otherwise 0.
 		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
-		virtual ICameraSceneNode* addCameraSceneNodeMaya(ISceneNode* parent = 0,
-			f32 rotateSpeed = -1500.0f, f32 zoomSpeed = 200.0f,
-			f32 translationSpeed = 1500.0f, s32 id=-1,
-			bool makeActive=true) = 0;
+		virtual ICameraSceneNode* addCameraSceneNodeMaya(ISceneNode* parent=0,
+			f32 rotateSpeed=-1500.f, f32 zoomSpeed=200.f,
+			f32 translationSpeed=1500.f, s32 id=-1, f32 distance=70.f,
+			bool makeActive=true) =0;
 
 		//! Adds a camera scene node with an animator which provides mouse and keyboard control appropriate for first person shooters (FPS).
 		/** This FPS camera is intended to provide a demonstration of a

include/ISceneNodeAnimatorCameraMaya.h

@@ -18,6 +18,9 @@ namespace scene
 	modelling tool.
 	The camera is moving relative to the target with the mouse, by pressing either
 	of the three buttons.
+	In order to move the camera, set a new target for the camera. The distance defines
+	the current orbit radius the camera moves on. Distance can be changed via the setter
+	or by mouse events.
 	*/
 	class ISceneNodeAnimatorCameraMaya : public ISceneNodeAnimator
 	{
@@ -41,6 +44,11 @@ namespace scene
 		//! Set the zoom speed
 		virtual void setZoomSpeed(f32 zoomSpeed) = 0;
 
+		//! Returns the current distance, i.e. orbit radius
+		virtual f32 getDistance() const = 0;
+
+		//! Set the distance
+		virtual void setDistance(f32 distance) = 0;
 	};
 
 } // end namespace scene

source/Irrlicht/CSceneManager.cpp

@@ -715,7 +715,7 @@ ICameraSceneNode* CSceneManager::addCameraSceneNode(ISceneNode* parent,
 //! to in the 3D Software Maya by Alias Wavefront.
 //! The returned pointer must not be dropped.
 ICameraSceneNode* CSceneManager::addCameraSceneNodeMaya(ISceneNode* parent,
-	f32 rotateSpeed, f32 zoomSpeed, f32 translationSpeed, s32 id,
+	f32 rotateSpeed, f32 zoomSpeed, f32 translationSpeed, s32 id, f32 distance,
 	bool makeActive)
 {
 	ICameraSceneNode* node = addCameraSceneNode(parent, core::vector3df(),
@@ -723,7 +723,7 @@ ICameraSceneNode* CSceneManager::addCameraSceneNodeMaya(ISceneNode* parent,
 	if (node)
 	{
 		ISceneNodeAnimator* anm = new CSceneNodeAnimatorCameraMaya(CursorControl,
-			rotateSpeed, zoomSpeed, translationSpeed);
+			rotateSpeed, zoomSpeed, translationSpeed, distance);
 
 		node->addAnimator(anm);
 		anm->drop();

source/Irrlicht/CSceneManager.h

@@ -139,9 +139,9 @@ namespace scene
 		//! Adds a camera scene node which is able to be controlle with the mouse similar
 		//! like in the 3D Software Maya by Alias Wavefront.
 		//! The returned pointer must not be dropped.
-		virtual ICameraSceneNode* addCameraSceneNodeMaya(ISceneNode* parent = 0,
-			f32 rotateSpeed = -1500.0f, f32 zoomSpeed = 200.0f,
-			f32 translationSpeed = 1500.0f, s32 id=-1,
+		virtual ICameraSceneNode* addCameraSceneNodeMaya(ISceneNode* parent=0,
+			f32 rotateSpeed=-1500.f, f32 zoomSpeed=200.f,
+			f32 translationSpeed=1500.f, s32 id=-1, f32 distance=70.f,
 			bool makeActive=true);
 
 		//! Adds a camera scene node which is able to be controled with the mouse and keys

source/Irrlicht/CSceneNodeAnimatorCameraMaya.cpp

@@ -14,10 +14,11 @@ namespace scene
 {
 
 //! constructor
-CSceneNodeAnimatorCameraMaya::CSceneNodeAnimatorCameraMaya(gui::ICursorControl* cursor, f32 rotate, f32 zoom, f32 translate)
+CSceneNodeAnimatorCameraMaya::CSceneNodeAnimatorCameraMaya(gui::ICursorControl* cursor,
+	f32 rotateSpeed, f32 zoomSpeed, f32 translateSpeed, f32 distance)
 	: CursorControl(cursor), OldCamera(0), MousePos(0.5f, 0.5f),
-	ZoomSpeed(zoom), RotateSpeed(rotate), TranslateSpeed(translate),
-	CurrentZoom(70.0f), RotX(0.0f), RotY(0.0f),
+	ZoomSpeed(zoomSpeed), RotateSpeed(rotateSpeed), TranslateSpeed(translateSpeed),
+	CurrentZoom(distance), RotX(0.0f), RotY(0.0f),
 	Zooming(false), Rotating(false), Moving(false), Translating(false)
 {
 	#ifdef _DEBUG
@@ -269,6 +270,13 @@ void CSceneNodeAnimatorCameraMaya::setZoomSpeed(f32 speed)
 }
 
 
+//! Set the distance
+void CSceneNodeAnimatorCameraMaya::setDistance(f32 distance)
+{
+	CurrentZoom=distance;
+}
+
+		
 //! Gets the rotation speed
 f32 CSceneNodeAnimatorCameraMaya::getRotateSpeed() const
 {
@@ -290,6 +298,13 @@ f32 CSceneNodeAnimatorCameraMaya::getZoomSpeed() const
 }
 
 
+//! Returns the current distance, i.e. orbit radius
+f32 CSceneNodeAnimatorCameraMaya::getDistance() const
+{
+	return CurrentZoom;
+}
+
+
 ISceneNodeAnimator* CSceneNodeAnimatorCameraMaya::createClone(ISceneNode* node, ISceneManager* newManager)
 {
 	CSceneNodeAnimatorCameraMaya * newAnimator =

source/Irrlicht/CSceneNodeAnimatorCameraMaya.h

@@ -28,8 +28,8 @@ namespace scene
 	{
 	public:
 		//! Constructor
-		CSceneNodeAnimatorCameraMaya(gui::ICursorControl* cursor, f32 rotateSpeed = -1500.0f, 
-			f32 zoomSpeed = 200.0f, f32 translationSpeed = 1500.0f);
+		CSceneNodeAnimatorCameraMaya(gui::ICursorControl* cursor, f32 rotateSpeed = -1500.f, 
+			f32 zoomSpeed = 200.f, f32 translationSpeed = 1500.f, f32 distance=70.f);
 
 		//! Destructor
 		virtual ~CSceneNodeAnimatorCameraMaya();
@@ -58,6 +58,12 @@ namespace scene
 		//! Set the zoom speed
 		virtual void setZoomSpeed(f32 zoomSpeed);
 
+		//! Returns the current distance, i.e. orbit radius
+		virtual f32 getDistance() const;
+
+		//! Set the distance
+		virtual void setDistance(f32 distance);
+
 		//! This animator will receive events when attached to the active camera
 		virtual bool isEventReceiverEnabled() const
 		{