Pull request changes, round 4

microsoft · Nov 10, 2017 · 00e448a · 00e448a
1 parent d3d19ff
commit 00e448a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/Assets/HoloToolkit/Input/Scripts/Focus/IPointingSource.cs b/Assets/HoloToolkit/Input/Scripts/Focus/IPointingSource.cs
@@ -25,6 +25,9 @@ public interface IPointingSource
 
         PointerResult Result { get; set; }
 
+        [Obsolete("Will be removed in a later version. Use OnPreRaycast / OnPostRaycast instead.")]
+        void UpdatePointer();
+
         void OnPreRaycast();
 
         void OnPostRaycast();

diff --git a/Assets/HoloToolkit/Input/Scripts/Focus/InputSourcePointer.cs b/Assets/HoloToolkit/Input/Scripts/Focus/InputSourcePointer.cs
@@ -24,7 +24,8 @@ public class InputSourcePointer : IPointingSource
         [Obsolete("Will be removed in a later version. Use Rays instead.")]
         public Ray Ray { get { return Rays[0]; } }
 
-        public RayStep[] Rays {
+        public RayStep[] Rays
+        {
             get
             {
                 return rays;
@@ -46,8 +47,14 @@ public bool InteractionEnabled
         }
 
         private RayStep[] rays = new RayStep[1] { new RayStep(Vector3.zero, Vector3.forward) };
-
-        public void OnPreRaycast()
+
+        [Obsolete("Will be removed in a later version. Use OnPreRaycast / OnPostRaycast instead.")]
+        public void UpdatePointer()
+        {
+
+        }
+
+        public virtual void OnPreRaycast()
         {
             if (InputSource == null)
             {
@@ -60,7 +67,7 @@ public void OnPreRaycast()
                 Ray pointingRay = default(Ray);
                 if (InputSource.TryGetPointingRay(InputSourceId, out pointingRay))
                 {
-                    rays[0].CopyRay(pointingRay, FocusManager.Instance.GetPointingExtent (this));
+                    rays[0].CopyRay(pointingRay, FocusManager.Instance.GetPointingExtent(this));
                 }
             }
 
@@ -71,7 +78,7 @@ public void OnPreRaycast()
             }
         }
 
-        public void OnPostRaycast()
+        public virtual void OnPostRaycast()
         {
             // Nothing needed
         }
@@ -88,6 +95,6 @@ public bool InputIsFromSource(BaseEventData eventData)
             return (inputData != null)
                 && (inputData.InputSource == InputSource)
                 && (inputData.SourceId == InputSourceId);
-        }    
+        }
     }
 }
diff --git a/Assets/HoloToolkit/Input/Scripts/Gaze/GazeManager.cs b/Assets/HoloToolkit/Input/Scripts/Gaze/GazeManager.cs
@@ -209,12 +209,18 @@ private void UpdateGazeInfo()
             UpdateHitPosition();
         }
 
-        public void OnPreRaycast()
+        [Obsolete("Will be removed in a later version. Use OnPreRaycast / OnPostRaycast instead.")]
+        public void UpdatePointer()
+        {
+
+        }
+
+        public virtual void OnPreRaycast()
         {
             UpdateGazeInfo();
         }
 
-        public void OnPostRaycast()
+        public virtual void OnPostRaycast()
         {
             // Nothing needed
         }