Merge pull request #1367 from eluchsinger/master

StephenHodgson · web-flow · commit 98f4985c2acf · 2017-11-15T09:15:12.000-08:00
Changed the namespaces to HoloToolkit.Unity.UX
diff --git a/Assets/HoloToolkit/UX/Scripts/Distorters/Distorter.cs b/Assets/HoloToolkit/UX/Scripts/Distorters/Distorter.cs
@@ -5,7 +5,7 @@
 using System;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     public abstract class Distorter : MonoBehaviour, IComparable<Distorter>
     {
diff --git a/Assets/HoloToolkit/UX/Scripts/Distorters/DistorterBulge.cs b/Assets/HoloToolkit/UX/Scripts/Distorters/DistorterBulge.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     public class DistorterBulge : Distorter
     {
diff --git a/Assets/HoloToolkit/UX/Scripts/Distorters/DistorterGravity.cs b/Assets/HoloToolkit/UX/Scripts/Distorters/DistorterGravity.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     public class DistorterGravity : Distorter
     {
diff --git a/Assets/HoloToolkit/UX/Scripts/Distorters/DistorterSimplex.cs b/Assets/HoloToolkit/UX/Scripts/Distorters/DistorterSimplex.cs
@@ -4,7 +4,7 @@
 //
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     public class DistorterSimplex : Distorter
     {
diff --git a/Assets/HoloToolkit/UX/Scripts/Distorters/DistorterSphere.cs b/Assets/HoloToolkit/UX/Scripts/Distorters/DistorterSphere.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     public class DistorterSphere : Distorter
     {
diff --git a/Assets/HoloToolkit/UX/Scripts/Distorters/DistorterWiggly.cs b/Assets/HoloToolkit/UX/Scripts/Distorters/DistorterWiggly.cs
@@ -4,7 +4,7 @@
 //
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     public class DistorterWiggly : Distorter
     {
diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/Bezier.cs b/Assets/HoloToolkit/UX/Scripts/Lines/Bezier.cs
@@ -4,7 +4,7 @@
 using System;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     public class Bezier : LineBase
     {
diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/Ellipse.cs b/Assets/HoloToolkit/UX/Scripts/Lines/Ellipse.cs
@@ -3,7 +3,7 @@
 
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     public class Ellipse : LineBase
     {
diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/Line.cs b/Assets/HoloToolkit/UX/Scripts/Lines/Line.cs
@@ -4,7 +4,7 @@
 using HoloToolkit.Unity;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     public class Line : LineBase
     {
diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/LineBase.cs b/Assets/HoloToolkit/UX/Scripts/Lines/LineBase.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     public abstract class LineBase : MonoBehaviour
     {
diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/LineBaseEditor.cs b/Assets/HoloToolkit/UX/Scripts/Lines/LineBaseEditor.cs
@@ -3,7 +3,7 @@
 
 using HoloToolkit.Unity;
 using UnityEngine;
-using Holotoolkit.Unity.UX;
+using HoloToolkit.Unity.UX;
 #if UNITY_EDITOR
 using UnityEditor;
 
diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/LineMeshes.cs b/Assets/HoloToolkit/UX/Scripts/Lines/LineMeshes.cs
@@ -7,7 +7,7 @@
 using UnityEngine;
 using UnityEngine.Rendering;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     [UseWith(typeof(LineBase))]
     public class LineMeshes : LineRendererBase
diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/LineObjectCollection.cs b/Assets/HoloToolkit/UX/Scripts/Lines/LineObjectCollection.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     public class LineObjectCollection : MonoBehaviour
     {
diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/LineObjectFollower.cs b/Assets/HoloToolkit/UX/Scripts/Lines/LineObjectFollower.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     [ExecuteInEditMode]
     public class LineObjectFollower : MonoBehaviour
diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/LineObjectSwarm.cs b/Assets/HoloToolkit/UX/Scripts/Lines/LineObjectSwarm.cs
@@ -1,7 +1,7 @@
 ﻿using System.Collections.Generic;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     [ExecuteInEditMode]
     public class LineObjectSwarm : MonoBehaviour
diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/LineParticles.cs b/Assets/HoloToolkit/UX/Scripts/Lines/LineParticles.cs
@@ -5,7 +5,7 @@
 using HoloToolkit.Unity;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     [UseWith(typeof(LineBase))]
     public class LineParticles : LineRendererBase
diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/LineRendererBase.cs b/Assets/HoloToolkit/UX/Scripts/Lines/LineRendererBase.cs
@@ -4,7 +4,7 @@
 using HoloToolkit.Unity;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     public abstract class LineRendererBase : MonoBehaviour
     {
diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/LineStripMesh.cs b/Assets/HoloToolkit/UX/Scripts/Lines/LineStripMesh.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     [UseWith(typeof(LineBase))]
     public class LineStripMesh : LineRendererBase
diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/LineUnity.cs b/Assets/HoloToolkit/UX/Scripts/Lines/LineUnity.cs
@@ -5,7 +5,7 @@
 using System.Collections;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     [UseWith(typeof(LineBase))]
     public class LineUnity : LineRendererBase
diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/LineUtility.cs b/Assets/HoloToolkit/UX/Scripts/Lines/LineUtility.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     public enum InterpolationEnum
     {
diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/Parabola.cs b/Assets/HoloToolkit/UX/Scripts/Lines/Parabola.cs
@@ -4,7 +4,7 @@
 using System;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     public class Parabola : LineBase
     {
diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/Rectangle.cs b/Assets/HoloToolkit/UX/Scripts/Lines/Rectangle.cs
@@ -4,7 +4,7 @@
 using HoloToolkit.Unity;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     public class Rectangle : LineBase
     {
diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/Spline.cs b/Assets/HoloToolkit/UX/Scripts/Lines/Spline.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     public class Spline : LineBase
     {
diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/SplinePoint.cs b/Assets/HoloToolkit/UX/Scripts/Lines/SplinePoint.cs
@@ -4,7 +4,7 @@
 using System;
 using UnityEngine;
 
-namespace Holotoolkit.Unity.UX
+namespace HoloToolkit.Unity.UX
 {
     [Serializable]
     public struct SplinePoint

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using System;`
`6`	`6`	`using UnityEngine;`
`7`	`7`
`8`		`-namespace Holotoolkit.Unity.UX`
	`8`	`+namespace HoloToolkit.Unity.UX`
`9`	`9`	`{`
`10`	`10`	`public abstract class Distorter : MonoBehaviour, IComparable<Distorter>`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using UnityEngine;`
`4`	`4`
`5`		`-namespace Holotoolkit.Unity.UX`
	`5`	`+namespace HoloToolkit.Unity.UX`
`6`	`6`	`{`
`7`	`7`	`public class DistorterBulge : Distorter`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`//`
`5`	`5`	`using UnityEngine;`
`6`	`6`
`7`		`-namespace Holotoolkit.Unity.UX`
	`7`	`+namespace HoloToolkit.Unity.UX`
`8`	`8`	`{`
`9`	`9`	`public class DistorterSimplex : Distorter`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`using UnityEngine;`
`5`	`5`
`6`		`-namespace Holotoolkit.Unity.UX`
	`6`	`+namespace HoloToolkit.Unity.UX`
`7`	`7`	`{`
`8`	`8`	`public class Ellipse : LineBase`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using HoloToolkit.Unity;`
`5`	`5`	`using UnityEngine;`
`6`	`6`
`7`		`-namespace Holotoolkit.Unity.UX`
	`7`	`+namespace HoloToolkit.Unity.UX`
`8`	`8`	`{`
`9`	`9`	`public class Line : LineBase`
`10`	`10`	`{`