Merge branch 'master' of https://github.com/Microsoft/HoloToolkit-Unity into InputManagerRefactoring

Author: aalmada

.gitattributes

@@ -4,5 +4,10 @@
 *.md text
 
 *.prefab eol=lf
+*.meta eol=lf
+*.mat eol=lf
+*.anim eol=lf
+*.controller eol=lf
+*.asset eol=lf
 
 .gitattributes text

Assets/HoloToolkit-Examples/ColorPicker/GazeableColorPicker.cs

@@ -1,8 +1,11 @@
-using HoloToolkit.Unity.InputModule;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using HoloToolkit.Unity.InputModule;
 using UnityEngine;
 using UnityEngine.Events;
 
-namespace Lighthouse
+namespace HoloToolkit.Examples.ColorPicker
 {
     public class GazeableColorPicker : MonoBehaviour, IFocusable, IInputClickHandler
     {

Assets/HoloToolkit-Examples/GazeRuler/Scripts/DeleteLine.cs

@@ -1,17 +1,23 @@
-using UnityEngine;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using UnityEngine;
 using System.Collections;
 
-public class DeleteLine : MonoBehaviour
+namespace HoloToolkit.Examples.GazeRuler
 {
-    /// <summary>
-    /// when tip text is tapped, destroy this tip and relative objects.
-    /// </summary>
-	public void OnSelect()
+    public class DeleteLine : MonoBehaviour
     {
-        var parent = gameObject.transform.parent.gameObject;
-        if (parent != null)
+        /// <summary>
+        /// when tip text is tapped, destroy this tip and relative objects.
+        /// </summary>
+        public void OnSelect()
         {
-            Destroy(parent);
+            var parent = gameObject.transform.parent.gameObject;
+            if (parent != null)
+            {
+                Destroy(parent);
+            }
         }
     }
-}
+}

Assets/HoloToolkit-Examples/GazeRuler/Scripts/IGeometry.cs

@@ -1,16 +1,22 @@
-using UnityEngine;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using UnityEngine;
 using System.Collections;
 
-/// <summary>
-/// interface for geometry class
-/// </summary>
-public interface IGeometry
+namespace HoloToolkit.Examples.GazeRuler
 {
-    void AddPoint(GameObject LinePrefab, GameObject PointPrefab, GameObject TextPrefab);
+    /// <summary>
+    /// interface for geometry class
+    /// </summary>
+    public interface IGeometry
+    {
+        void AddPoint(GameObject LinePrefab, GameObject PointPrefab, GameObject TextPrefab);
 
-    void Delete();
+        void Delete();
 
-    void Clear();
+        void Clear();
 
-    void Reset();
+        void Reset();
+    }
 }

Assets/HoloToolkit-Examples/GazeRuler/Scripts/IPolygonClosable.cs

@@ -1,10 +1,16 @@
-using UnityEngine;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
 
-/// <summary>
-/// any geometry class inherit this interface should be closeable
-/// </summary>
-public interface IPolygonClosable
+using UnityEngine;
+
+namespace HoloToolkit.Examples.GazeRuler
 {
-    //finish special ploygon
-    void ClosePloygon(GameObject LinePrefab, GameObject TextPrefab);
-}
+    /// <summary>
+    /// any geometry class inherit this interface should be closeable
+    /// </summary>
+    public interface IPolygonClosable
+    {
+        //finish special polygon
+        void ClosePolygon(GameObject LinePrefab, GameObject TextPrefab);
+    }
+}

Assets/HoloToolkit-Examples/GazeRuler/Scripts/LineManager.cs

@@ -1,137 +1,143 @@
-using UnityEngine;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using UnityEngine;
 using HoloToolkit.Unity;
 using System.Collections.Generic;
 using HoloToolkit.Unity.InputModule;
 
-/// <summary>
-/// mananger all lines in the scene
-/// </summary>
-public class LineManager : Singleton<LineManager>, IGeometry
+namespace HoloToolkit.Examples.GazeRuler
 {
-    // save all lines in scene
-    private Stack<Line> Lines = new Stack<Line>();
-
-    private Point lastPoint;
-
-    private const float defaultLineScale = 0.005f;
-
-    // place point and lines
-    public void AddPoint(GameObject LinePrefab, GameObject PointPrefab, GameObject TextPrefab)
+    /// <summary>
+    /// mananger all lines in the scene
+    /// </summary>
+    public class LineManager : Singleton<LineManager>, IGeometry
     {
+        // save all lines in scene
+        private Stack<Line> Lines = new Stack<Line>();
 
-        var hitPoint = GazeManager.Instance.HitPosition;
+        private Point lastPoint;
 
-        var point = (GameObject)Instantiate(PointPrefab, hitPoint, Quaternion.identity);
-        if (lastPoint != null && lastPoint.IsStart)
-        {
-            var centerPos = (lastPoint.Position + hitPoint) * 0.5f;
+        private const float defaultLineScale = 0.005f;
 
-            var directionFromCamera = centerPos - Camera.main.transform.position;
+        // place point and lines
+        public void AddPoint(GameObject LinePrefab, GameObject PointPrefab, GameObject TextPrefab)
+        {
 
-            var distanceA = Vector3.Distance(lastPoint.Position, Camera.main.transform.position);
-            var distanceB = Vector3.Distance(hitPoint, Camera.main.transform.position);
+            Vector3 hitPoint = GazeManager.Instance.HitPosition;
 
-            Debug.Log("A: " + distanceA + ",B: " + distanceB);
-            Vector3 direction;
-            if (distanceB > distanceA || (distanceA > distanceB && distanceA - distanceB < 0.1))
+            GameObject point = (GameObject)Instantiate(PointPrefab, hitPoint, Quaternion.identity);
+            if (lastPoint != null && lastPoint.IsStart)
             {
-                direction = hitPoint - lastPoint.Position;
+                Vector3 centerPos = (lastPoint.Position + hitPoint) * 0.5f;
+
+                Vector3 directionFromCamera = centerPos - Camera.main.transform.position;
+
+                float distanceA = Vector3.Distance(lastPoint.Position, Camera.main.transform.position);
+                float distanceB = Vector3.Distance(hitPoint, Camera.main.transform.position);
+
+                Debug.Log("A: " + distanceA + ",B: " + distanceB);
+                Vector3 direction;
+                if (distanceB > distanceA || (distanceA > distanceB && distanceA - distanceB < 0.1))
+                {
+                    direction = hitPoint - lastPoint.Position;
+                }
+                else
+                {
+                    direction = lastPoint.Position - hitPoint;
+                }
+
+                float distance = Vector3.Distance(lastPoint.Position, hitPoint);
+                GameObject line = (GameObject)Instantiate(LinePrefab, centerPos, Quaternion.LookRotation(direction));
+                line.transform.localScale = new Vector3(distance, defaultLineScale, defaultLineScale);
+                line.transform.Rotate(Vector3.down, 90f);
+
+                Vector3 normalV = Vector3.Cross(direction, directionFromCamera);
+                Vector3 normalF = Vector3.Cross(direction, normalV) * -1;
+                GameObject tip = (GameObject)Instantiate(TextPrefab, centerPos, Quaternion.LookRotation(normalF));
+
+                //unit is meter
+                tip.transform.Translate(Vector3.up * 0.05f);
+                tip.GetComponent<TextMesh>().text = distance + "m";
+
+                GameObject root = new GameObject();
+                lastPoint.Root.transform.parent = root.transform;
+                line.transform.parent = root.transform;
+                point.transform.parent = root.transform;
+                tip.transform.parent = root.transform;
+
+                Lines.Push(new Line
+                {
+                    Start = lastPoint.Position,
+                    End = hitPoint,
+                    Root = root,
+                    Distance = distance
+                });
+
+                lastPoint = new Point
+                {
+                    Position = hitPoint,
+                    Root = point,
+                    IsStart = false
+                };
+
             }
             else
             {
-                direction = lastPoint.Position - hitPoint;
+                lastPoint = new Point
+                {
+                    Position = hitPoint,
+                    Root = point,
+                    IsStart = true
+                };
             }
+        }
 
-            var distance = Vector3.Distance(lastPoint.Position, hitPoint);
-            var line = (GameObject)Instantiate(LinePrefab, centerPos, Quaternion.LookRotation(direction));
-            line.transform.localScale = new Vector3(distance, defaultLineScale, defaultLineScale);
-            line.transform.Rotate(Vector3.down, 90f);
-
-            var normalV = Vector3.Cross(direction, directionFromCamera);
-            var normalF = Vector3.Cross(direction, normalV) * -1;
-            var tip = (GameObject)Instantiate(TextPrefab, centerPos, Quaternion.LookRotation(normalF));
-
-            //unit is meter
-            tip.transform.Translate(Vector3.up * 0.05f);
-            tip.GetComponent<TextMesh>().text = distance + "m";
-
-            var root = new GameObject();
-            lastPoint.Root.transform.parent = root.transform;
-            line.transform.parent = root.transform;
-            point.transform.parent = root.transform;
-            tip.transform.parent = root.transform;
-
-            Lines.Push(new Line
-            {
-                Start = lastPoint.Position,
-                End = hitPoint,
-                Root = root,
-                Distance = distance
-            });
-
-            lastPoint = new Point
-            {
-                Position = hitPoint,
-                Root = point,
-                IsStart = false
-            };
 
-        }
-        else
+        // delete latest placed lines
+        public void Delete()
         {
-            lastPoint = new Point
+            if (Lines != null && Lines.Count > 0)
             {
-                Position = hitPoint,
-                Root = point,
-                IsStart = true
-            };
-        }
-    }
-
+                Line lastLine = Lines.Pop();
+                Destroy(lastLine.Root);
+            }
 
-    // delete latest placed lines
-    public void Delete()
-    {
-        if (Lines != null && Lines.Count > 0)
-        {
-            var lastLine = Lines.Pop();
-            Destroy(lastLine.Root);
         }
 
-    }
-
-    // delete all lines in the scene
-    public void Clear()
-    {
-        if (Lines != null && Lines.Count > 0)
+        // delete all lines in the scene
+        public void Clear()
         {
-            while (Lines.Count > 0)
+            if (Lines != null && Lines.Count > 0)
             {
-                var lastLine = Lines.Pop();
-                Destroy(lastLine.Root);
+                while (Lines.Count > 0)
+                {
+                    Line lastLine = Lines.Pop();
+                    Destroy(lastLine.Root);
+                }
             }
         }
-    }
 
-    // reset current unfinished line
-    public void Reset()
-    {
-        if (lastPoint != null && lastPoint.IsStart)
+        // reset current unfinished line
+        public void Reset()
         {
-            Destroy(lastPoint.Root);
-            lastPoint = null;
+            if (lastPoint != null && lastPoint.IsStart)
+            {
+                Destroy(lastPoint.Root);
+                lastPoint = null;
+            }
         }
     }
-}
 
 
-public struct Line
-{
-    public Vector3 Start { get; set; }
+    public struct Line
+    {
+        public Vector3 Start { get; set; }
 
-    public Vector3 End { get; set; }
+        public Vector3 End { get; set; }
 
-    public GameObject Root { get; set; }
+        public GameObject Root { get; set; }
 
-    public float Distance { get; set; }
+        public float Distance { get; set; }
+    }
 }