* Some changes on camera Target and camera itself.

Author: ereneld

Scripts/Camera/CameraTarget.cs

@@ -54,6 +54,40 @@ public class CameraTarget : MonoBehaviour
 
         #region Public Members
 
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="IBM.Watson.DeveloperCloud.Camera.CameraTarget"/> use
+        /// custom position.
+        /// </summary>
+        /// <value><c>true</c> if use custom position; otherwise, <c>false</c>.</value>
+        public bool UseCustomPosition
+        {
+            get
+            {
+                return m_UseCustomPosition;
+            }
+            set
+            {
+                m_UseCustomPosition = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="IBM.Watson.DeveloperCloud.Camera.CameraTarget"/> use
+        /// custom rotation.
+        /// </summary>
+        /// <value><c>true</c> if use custom rotation; otherwise, <c>false</c>.</value>
+        public bool UseCustomRotation
+        {
+            get
+            {
+                return m_UseCustomRotation;
+            }
+            set
+            {
+                m_UseCustomRotation = value;
+            }
+        }
+
         /// <summary>
         /// Gets or sets the target position.
         /// </summary>
@@ -128,6 +162,10 @@ public Quaternion TargetRotation
             }
         }
 
+        /// <summary>
+        /// Gets or sets the target object.
+        /// </summary>
+        /// <value>The target object.</value>
         public GameObject TargetObject
         {
             get
@@ -149,6 +187,10 @@ public GameObject TargetObject
             }
         }
 
+        /// <summary>
+        /// Gets the camera attached.
+        /// </summary>
+        /// <value>The camera attached.</value>
         public UnityEngine.Camera CameraAttached
         {
             get
@@ -162,6 +204,10 @@ public UnityEngine.Camera CameraAttached
             }
         }
 
+        /// <summary>
+        /// Gets the watson camera attached.
+        /// </summary>
+        /// <value>The watson camera attached.</value>
         public WatsonCamera WatsonCameraAttached
         {
             get
@@ -178,6 +224,10 @@ public WatsonCamera WatsonCameraAttached
 
         #region Set Target on Camera
 
+        /// <summary>
+        /// Sets the current target on camera.
+        /// </summary>
+        /// <param name="enable">If set to <c>true</c> enable.</param>
         public void SetCurrentTargetOnCamera(bool enable)
         {
             if (WatsonCamera.Instance != null)
@@ -189,6 +239,9 @@ public void SetCurrentTargetOnCamera(bool enable)
             }
         }
 
+        /// <summary>
+        /// Sets the target position default.
+        /// </summary>
         public void SetTargetPositionDefault()
         {
             if (WatsonCamera.Instance != null && WatsonCamera.Instance.DefaultCameraTarget != null)
@@ -197,6 +250,9 @@ public void SetTargetPositionDefault()
             }
         }
 
+        /// <summary>
+        /// Sets the target rotation default.
+        /// </summary>
         public void SetTargetRotationDefault()
         {
             if (WatsonCamera.Instance != null && WatsonCamera.Instance.DefaultCameraTarget != null)

Scripts/Camera/WatsonCamera.cs

@@ -163,7 +163,7 @@ protected virtual void CameraPositionOnUpdate()
             if (CurrentCameraTarget != null)
             {
                 transform.localPosition = Vector3.Lerp(transform.localPosition, CurrentCameraTarget.TargetPosition, Time.deltaTime * m_SpeedForCameraAnimation);
-                transform.rotation = Quaternion.Lerp(transform.localRotation, CurrentCameraTarget.TargetRotation, Time.deltaTime * m_SpeedForCameraAnimation);
+                transform.rotation = Quaternion.Slerp(transform.localRotation, CurrentCameraTarget.TargetRotation, Time.deltaTime * m_SpeedForCameraAnimation);
             }
         }
 
@@ -172,6 +172,11 @@ protected virtual void InitializeCameraTargetList()
             if (m_ListCameraTarget == null)
                 m_ListCameraTarget = new List<CameraTarget>();
 
+            for (int i = 0; m_ListCameraTarget != null && i < m_ListCameraTarget.Count; i++)
+            {
+                Destroy(m_ListCameraTarget[i]);
+            }
+
             m_ListCameraTarget.Clear();
 
             CameraTarget defaultCameraTarget = this.gameObject.GetComponent<CameraTarget>();
@@ -263,6 +268,18 @@ protected virtual void OnCameraSetTwoFingerDrag(System.Object[] args)
         }
 
 
+        /// <summary>
+        /// Event handler reseting the camera. Deleting all camera target and set the initial as default. 
+        /// </summary>
+        /// <param name="args">Arguments.</param>
+        protected virtual void ResetCamera(System.Object[] args)
+        {
+            if (m_DisableInteractivity)
+                return;
+            
+            InitializeCameraTargetList();
+        }
+
         /// <summary>
         /// Event handler reseting the camera position.
         /// </summary>
@@ -272,7 +289,8 @@ protected virtual void ResetCameraPosition(System.Object[] args)
             if (m_DisableInteractivity)
                 return;
             //Log.Status("WatsonCamera", "Reset Camera Position");
-            InitializeCameraTargetList();
+            CurrentCameraTarget.TargetPosition = m_CameraInitialLocation;
+            CurrentCameraTarget.TargetRotation = m_CameraInitialRotation;
         }