Move ColorValues enum to parent namespace so it gets used over the stock KSP one

JonnyOThan · JonnyOThan · commit 724b865ec2eb · 2025-02-17T10:35:46.000-05:00
diff --git a/SCANsat.Unity/HSVPicker/ColorValues.cs b/SCANsat.Unity/HSVPicker/ColorValues.cs
@@ -1,6 +1,6 @@
 ﻿using UnityEngine;
 
-namespace SCANsat.Unity.HSVPicker.Enum
+namespace SCANsat.Unity.HSVPicker
 {
 	public enum ColorValues
 	{
diff --git a/SCANsat.Unity/HSVPicker/UI/ColorInput.cs b/SCANsat.Unity/HSVPicker/UI/ColorInput.cs
@@ -1,7 +1,6 @@
 ﻿using UnityEngine;
 using UnityEngine.UI;
 using System;
-using SCANsat.Unity.HSVPicker.Enum;
 
 namespace SCANsat.Unity.HSVPicker.UI
 {
diff --git a/SCANsat.Unity/HSVPicker/UI/ColorLabel.cs b/SCANsat.Unity/HSVPicker/UI/ColorLabel.cs
@@ -1,14 +1,13 @@
 ﻿using UnityEngine;
 using System;
-using SCANsat.Unity.HSVPicker.Enum;
 
 namespace SCANsat.Unity.HSVPicker.UI
 {
 	[RequireComponent(typeof(TextHandler))]
 	public class ColorLabel : MonoBehaviour
 	{
 		public ColorPicker picker;
-		public Enum.ColorValues type;
+		public ColorValues type;
 
 		private TextHandler label;
 
@@ -58,23 +57,23 @@ private void UpdateValue()
 				float valueThree = 0;
 
 
-				if (type == Enum.ColorValues.R)
+				if (type == ColorValues.R)
 				{
 					valueOne = picker.GetValue(ColorValues.R) * 255;
 					valueTwo = picker.GetValue(ColorValues.G) * 255;
 					valueThree = picker.GetValue(ColorValues.B) * 255;
 
 					label.OnTextUpdate.Invoke(string.Format("{0:N0},{1:N0},{2:N0}", Mathf.FloorToInt(valueOne), Mathf.FloorToInt(valueTwo), Mathf.FloorToInt(valueThree)));
 				}
-				else if (type == Enum.ColorValues.Hue)
+				else if (type == ColorValues.Hue)
 				{
 					valueOne = picker.GetValue(ColorValues.Hue) * 360;
 					valueTwo = picker.GetValue(ColorValues.Saturation) * 255;
 					valueThree = picker.GetValue(ColorValues.Value) * 255;
 
 					label.OnTextUpdate.Invoke(string.Format("{0:N0},{1:N0},{2:N0}", Mathf.FloorToInt(valueOne), Mathf.FloorToInt(valueTwo), Mathf.FloorToInt(valueThree)));
 				}
-				else if (type == Enum.ColorValues.Hex)
+				else if (type == ColorValues.Hex)
 				{
 					valueOne = picker.GetValue(ColorValues.R) * 255;
 					valueTwo = picker.GetValue(ColorValues.G) * 255;
diff --git a/SCANsat.Unity/HSVPicker/UI/ColorPicker.cs b/SCANsat.Unity/HSVPicker/UI/ColorPicker.cs
@@ -3,7 +3,6 @@
 using UnityEngine.UI;
 using UnityEngine.Events;
 using SCANsat.Unity.HSVPicker.Utility;
-using SCANsat.Unity.HSVPicker.Enum;
 using SCANsat.Unity.HSVPicker.Events;
 
 namespace SCANsat.Unity.HSVPicker.UI
diff --git a/SCANsat.Unity/HSVPicker/UI/ColorSlider.cs b/SCANsat.Unity/HSVPicker/UI/ColorSlider.cs
@@ -1,7 +1,6 @@
 ﻿using UnityEngine;
 using UnityEngine.UI;
 using System;
-using SCANsat.Unity.HSVPicker.Enum;
 
 namespace SCANsat.Unity.HSVPicker.UI
 {
diff --git a/SCANsat.Unity/HSVPicker/UI/ColorSliderImage.cs b/SCANsat.Unity/HSVPicker/UI/ColorSliderImage.cs
@@ -1,7 +1,6 @@
 ﻿using UnityEngine;
 using UnityEngine.UI;
 using System.Collections;
-using SCANsat.Unity.HSVPicker.Enum;
 using SCANsat.Unity.HSVPicker.Utility;
 
 namespace SCANsat.Unity.HSVPicker.UI
diff --git a/SCANsat.Unity/HSVPicker/UI/SVBoxSlider.cs b/SCANsat.Unity/HSVPicker/UI/SVBoxSlider.cs
@@ -2,7 +2,6 @@
 using UnityEngine.UI;
 using System.Collections;
 using SCANsat.Unity.HSVPicker.Utility;
-using SCANsat.Unity.HSVPicker.Enum;
 
 namespace SCANsat.Unity.HSVPicker.UI
 {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using UnityEngine;`
`2`	`2`
`3`		`-namespace SCANsat.Unity.HSVPicker.Enum`
	`3`	`+namespace SCANsat.Unity.HSVPicker`
`4`	`4`	`{`
`5`	`5`	`public enum ColorValues`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using UnityEngine;`
`2`	`2`	`using UnityEngine.UI;`
`3`	`3`	`using System;`
`4`		`-using SCANsat.Unity.HSVPicker.Enum;`
`5`	`4`
`6`	`5`	`namespace SCANsat.Unity.HSVPicker.UI`
`7`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,13 @@`
`1`	`1`	`using UnityEngine;`
`2`	`2`	`using System;`
`3`		`-using SCANsat.Unity.HSVPicker.Enum;`
`4`	`3`
`5`	`4`	`namespace SCANsat.Unity.HSVPicker.UI`
`6`	`5`	`{`
`7`	`6`	`[RequireComponent(typeof(TextHandler))]`
`8`	`7`	`public class ColorLabel : MonoBehaviour`
`9`	`8`	`{`
`10`	`9`	`public ColorPicker picker;`
`11`		`- public Enum.ColorValues type;`
	`10`	`+ public ColorValues type;`
`12`	`11`
`13`	`12`	`private TextHandler label;`
`14`	`13`
`@@ -58,23 +57,23 @@ private void UpdateValue()`
`58`	`57`	`float valueThree = 0;`
`59`	`58`
`60`	`59`
`61`		`- if (type == Enum.ColorValues.R)`
	`60`	`+ if (type == ColorValues.R)`
`62`	`61`	`{`
`63`	`62`	`valueOne = picker.GetValue(ColorValues.R) * 255;`
`64`	`63`	`valueTwo = picker.GetValue(ColorValues.G) * 255;`
`65`	`64`	`valueThree = picker.GetValue(ColorValues.B) * 255;`
`66`	`65`
`67`	`66`	`label.OnTextUpdate.Invoke(string.Format("{0:N0},{1:N0},{2:N0}", Mathf.FloorToInt(valueOne), Mathf.FloorToInt(valueTwo), Mathf.FloorToInt(valueThree)));`
`68`	`67`	`}`
`69`		`- else if (type == Enum.ColorValues.Hue)`
	`68`	`+ else if (type == ColorValues.Hue)`
`70`	`69`	`{`
`71`	`70`	`valueOne = picker.GetValue(ColorValues.Hue) * 360;`
`72`	`71`	`valueTwo = picker.GetValue(ColorValues.Saturation) * 255;`
`73`	`72`	`valueThree = picker.GetValue(ColorValues.Value) * 255;`
`74`	`73`
`75`	`74`	`label.OnTextUpdate.Invoke(string.Format("{0:N0},{1:N0},{2:N0}", Mathf.FloorToInt(valueOne), Mathf.FloorToInt(valueTwo), Mathf.FloorToInt(valueThree)));`
`76`	`75`	`}`
`77`		`- else if (type == Enum.ColorValues.Hex)`
	`76`	`+ else if (type == ColorValues.Hex)`
`78`	`77`	`{`
`79`	`78`	`valueOne = picker.GetValue(ColorValues.R) * 255;`
`80`	`79`	`valueTwo = picker.GetValue(ColorValues.G) * 255;`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using UnityEngine.UI;`
`3`	`3`	`using System.Collections;`
`4`	`4`	`using SCANsat.Unity.HSVPicker.Utility;`
`5`		`-using SCANsat.Unity.HSVPicker.Enum;`
`6`	`5`
`7`	`6`	`namespace SCANsat.Unity.HSVPicker.UI`
`8`	`7`	`{`