Fixes

- Stop allowing negative numbers for alpha/scale settings
Hotrian · Jul 22, 2016 · 40c664c · 40c664c · Hotrian · Jul 22, 2016
1 parent e7cac41
commit 40c664c
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 12 deletions.
diff --git a/Assets/HOTK/Example Content/UI Scripts/AlphaMatchInputField.cs b/Assets/HOTK/Example Content/UI Scripts/AlphaMatchInputField.cs
@@ -42,13 +42,34 @@ public void OnAlphaChanged()
         switch (Value)
         {
             case InputValue.AlphaStart:
-                Overlay.Alpha = f;
+                if (f >= 0)
+                {
+                    Overlay.Alpha = f;
+                }
+                else
+                {
+                    InputField.text = Overlay.Alpha.ToString();
+                }
                 break;
             case InputValue.AlphaEnd:
-                Overlay.Alpha2 = f;
+                if (f >= 0)
+                {
+                    Overlay.Alpha2 = f;
+                }
+                else
+                {
+                    InputField.text = Overlay.Alpha2.ToString();
+                }
                 break;
             case InputValue.AlphaSpeed:
-                Overlay.AlphaSpeed = f;
+                if (f >= 0)
+                {
+                    Overlay.AlphaSpeed = f;
+                }
+                else
+                {
+                    InputField.text = Overlay.AlphaSpeed.ToString();
+                }
                 break;
             default:
                 throw new ArgumentOutOfRangeException();

diff --git a/Assets/HOTK/Example Content/UI Scripts/ScaleMatchInputField.cs b/Assets/HOTK/Example Content/UI Scripts/ScaleMatchInputField.cs
@@ -42,13 +42,34 @@ public void OnScaleChanged()
         switch (Value)
         {
             case InputValue.ScaleStart:
-                Overlay.Scale = f;
+                if (f >= 0)
+                {
+                    Overlay.Scale = f;
+                }
+                else
+                {
+                    InputField.text = Overlay.Scale.ToString();
+                }
                 break;
             case InputValue.ScaleEnd:
-                Overlay.Scale2 = f;
+                if (f >= 0)
+                {
+                    Overlay.Scale2 = f;
+                }
+                else
+                {
+                    InputField.text = Overlay.Scale2.ToString();
+                }
                 break;
             case InputValue.ScaleSpeed:
-                Overlay.ScaleSpeed = f;
+                if (f >= 0)
+                {
+                    Overlay.ScaleSpeed = f;
+                }
+                else
+                {
+                    InputField.text = Overlay.ScaleSpeed.ToString();
+                }
                 break;
             default:
                 throw new ArgumentOutOfRangeException();

diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
diff --git a/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll b/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
diff --git a/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb b/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/Library/assetDatabase3 b/Library/assetDatabase3
diff --git a/Library/metadata/00/00000000000000004000000000000000 b/Library/metadata/00/00000000000000004000000000000000
diff --git a/Library/metadata/00/00000000000000006100000000000000 b/Library/metadata/00/00000000000000006100000000000000
diff --git a/Library/metadata/ad/ad1c5ea0176b4cd49bb9a8376812e487 b/Library/metadata/ad/ad1c5ea0176b4cd49bb9a8376812e487
diff --git a/Library/metadata/da/da0c905fbebc3da4b967b90ef4a69758 b/Library/metadata/da/da0c905fbebc3da4b967b90ef4a69758
diff --git a/Library/metadata/fb/fb4e3b1f85575064d83fabf25fdf1285 b/Library/metadata/fb/fb4e3b1f85575064d83fabf25fdf1285
diff --git a/Library/shadercompiler-UnityShaderCompiler.exe1.log b/Library/shadercompiler-UnityShaderCompiler.exe1.log
@@ -1,5 +1,2 @@
 Base path: C:/Program Files/Unity 5.3.5f1/Editor/Data
 Cmd: getPlatforms
-Unhandled exception: Protocol error - failed to read correct magic number
-
-Quitting shader compiler process
diff --git a/Library/shadercompiler-UnityShaderCompiler.exe2.log b/Library/shadercompiler-UnityShaderCompiler.exe2.log
@@ -1,5 +1,2 @@
 Base path: C:/Program Files/Unity 5.3.5f1/Editor/Data
 Cmd: getPlatforms
-Unhandled exception: Protocol error - failed to read correct magic number
-
-Quitting shader compiler process