Fix input and update Unity

maikramer · Aug 9, 2019 · 9b43da1 · 9b43da1
1 parent 406e92a
commit 9b43da1
Show file tree

Hide file tree

Showing 70 changed files with 464 additions and 1,961 deletions.
diff --git a/.idea/.idea.Materialize/.idea/contentModel.xml b/.idea/.idea.Materialize/.idea/contentModel.xml
diff --git a/.idea/.idea.Materialize/.idea/indexLayout.xml b/.idea/.idea.Materialize/.idea/indexLayout.xml
diff --git a/.idea/.idea.Materialize/.idea/projectSettingsUpdater.xml b/.idea/.idea.Materialize/.idea/projectSettingsUpdater.xml
diff --git a/.idea/.idea.Materialize/.idea/workspace.xml b/.idea/.idea.Materialize/.idea/workspace.xml
diff --git a/.idea/.idea.Materialize/riderModule.iml b/.idea/.idea.Materialize/riderModule.iml
diff --git a/Assets/MainScene.unity b/Assets/MainScene.unity
diff --git a/Assets/Materials/AO_Preview.mat b/Assets/Materials/AO_Preview.mat
diff --git a/Assets/Materials/Alignment_Material.mat b/Assets/Materials/Alignment_Material.mat
diff --git a/Assets/Materials/Box_Material.mat b/Assets/Materials/Box_Material.mat
diff --git a/Assets/Materials/DNMS_Physical.mat b/Assets/Materials/DNMS_Physical.mat
diff --git a/Assets/Materials/DNS_Physical.mat b/Assets/Materials/DNS_Physical.mat
diff --git a/Assets/Materials/Edge_Preview.mat b/Assets/Materials/Edge_Preview.mat
diff --git a/Assets/Materials/Edit_Diffuse_Preview.mat b/Assets/Materials/Edit_Diffuse_Preview.mat
diff --git a/Assets/Materials/Full_Material.mat b/Assets/Materials/Full_Material.mat
diff --git a/Assets/Materials/Full_Material_Copy.mat b/Assets/Materials/Full_Material_Copy.mat
diff --git a/Assets/Materials/Height_Preview.mat b/Assets/Materials/Height_Preview.mat
diff --git a/Assets/Materials/Inverse_Cube.mat b/Assets/Materials/Inverse_Cube.mat
diff --git a/Assets/Materials/Inverse_Cube_Probe.mat b/Assets/Materials/Inverse_Cube_Probe.mat
diff --git a/Assets/Materials/LightDot.mat b/Assets/Materials/LightDot.mat
diff --git a/Assets/Materials/Metallic_Preview.mat b/Assets/Materials/Metallic_Preview.mat
diff --git a/Assets/Materials/Normal_Preview.mat b/Assets/Materials/Normal_Preview.mat
diff --git a/Assets/Materials/Rough_Spec_Preview.mat b/Assets/Materials/Rough_Spec_Preview.mat
diff --git a/Assets/Materials/Sample_Material.mat b/Assets/Materials/Sample_Material.mat
diff --git a/Assets/Materials/Skybox.mat b/Assets/Materials/Skybox.mat
diff --git a/Assets/Materials/Smoothness_Preview.mat b/Assets/Materials/Smoothness_Preview.mat
diff --git a/Assets/Materials/Test_Material.mat b/Assets/Materials/Test_Material.mat
diff --git a/Assets/Models/Materials/box_material.mat b/Assets/Models/Materials/box_material.mat
diff --git a/Assets/Models/Materials/cube_material.mat b/Assets/Models/Materials/cube_material.mat
diff --git a/Assets/Models/Materials/cylinder_material.mat b/Assets/Models/Materials/cylinder_material.mat
diff --git a/Assets/Models/Materials/sphere_material.mat b/Assets/Models/Materials/sphere_material.mat
diff --git a/Assets/OBJ-IO/Examples/Meshes/Materials/Teapot001Mat.mat b/Assets/OBJ-IO/Examples/Meshes/Materials/Teapot001Mat.mat
diff --git a/Assets/OBJ-IO/Examples/Scenes/Example.unity b/Assets/OBJ-IO/Examples/Scenes/Example.unity
diff --git a/Assets/Plugins/ClipboardHelper.dll.meta b/Assets/Plugins/ClipboardHelper.dll.meta
diff --git a/Assets/Plugins/Editor/JetBrains.meta b/Assets/Plugins/Editor/JetBrains.meta
diff --git a/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll b/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll
diff --git a/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll.meta b/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll.meta
diff --git a/Assets/Scripts/AlignmentGui.cs b/Assets/Scripts/AlignmentGui.cs
@@ -33,18 +33,15 @@ public class AlignmentGui : MonoBehaviour
     private int _grabbedPoint;
 
     private float _lensDistort;
-    private string _lensDistortText = "0.0";
 
     private RenderTexture _lensMap;
 
     private MainGui _mainGui;
     private RenderTexture _perspectiveMap;
 
     private float _perspectiveX;
-    private string _perspectiveXText = "0.0";
 
     private float _perspectiveY;
-    private string _perspectiveYText = "0.0";
     private Vector2 _pointBl = new Vector2(0.0f, 0.0f);
     private Vector2 _pointBr = new Vector2(1.0f, 0.0f);
 
@@ -204,7 +201,7 @@ private void Update()
     {
         SelectClosestPoint();
         DragPoint();
-        
+
         ProcessMap(_textureToAlign);
 
         var aspect = _textureToAlign.width / (float) _textureToAlign.height;
@@ -321,15 +318,15 @@ private void DoMyWindow(int windowId)
 
 
         if (GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "Lens Distort Correction", _lensDistort,
-            _lensDistortText, out _lensDistort, out _lensDistortText, -1.0f, 1.0f)) _doStuff = true;
+            out _lensDistort, -1.0f, 1.0f)) _doStuff = true;
         offsetY += 40;
 
         if (GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "Perspective Correction X", _perspectiveX,
-            _perspectiveXText, out _perspectiveX, out _perspectiveXText, -5.0f, 5.0f)) _doStuff = true;
+            out _perspectiveX, -5.0f, 5.0f)) _doStuff = true;
         offsetY += 40;
 
         if (GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "Perspective Correction Y", _perspectiveY,
-            _perspectiveYText, out _perspectiveY, out _perspectiveYText, -5.0f, 5.0f)) _doStuff = true;
+            out _perspectiveY, -5.0f, 5.0f)) _doStuff = true;
         offsetY += 50;
 
         if (GUI.Button(new Rect(offsetX, offsetY, 130, 30), "Reset Points"))

diff --git a/Assets/Scripts/AoFromNormalGui.cs b/Assets/Scripts/AoFromNormalGui.cs
@@ -137,25 +137,24 @@ private void DoMyWindow(int windowId)
         const int offsetX = 10;
         var offsetY = 30;
 
-        if (GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "AO pixel Spread", _aos.Spread, _aos.SpreadText,
-            out _aos.Spread, out _aos.SpreadText, 10.0f, 100.0f)) _doStuff = true;
+        if (GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "AO pixel Spread", _aos.Spread,
+            out _aos.Spread, 10.0f, 100.0f)) _doStuff = true;
         offsetY += 40;
 
-        if (GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "Pixel Depth", _aos.Depth, _aos.DepthText,
-            out _aos.Depth, out _aos.DepthText, 0.0f, 256.0f)) _doStuff = true;
+        if (GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "Pixel Depth", _aos.Depth,
+            out _aos.Depth, 0.0f, 256.0f)) _doStuff = true;
         offsetY += 40;
 
         GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "Blend Normal AO and Depth AO", _aos.Blend,
-            _aos.BlendText,
-            out _aos.Blend, out _aos.BlendText, 0.0f, 1.0f);
+            out _aos.Blend, 0.0f, 1.0f);
         offsetY += 40;
 
-        GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "AO Power", _aos.FinalContrast, _aos.FinalContrastText,
-            out _aos.FinalContrast, out _aos.FinalContrastText, 0.1f, 10.0f);
+        GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "AO Power", _aos.FinalContrast,
+            out _aos.FinalContrast, 0.1f, 10.0f);
         offsetY += 40;
 
-        GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "AO Bias", _aos.FinalBias, _aos.FinalBiasText,
-            out _aos.FinalBias, out _aos.FinalBiasText, -1.0f, 1.0f);
+        GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "AO Bias", _aos.FinalBias,
+            out _aos.FinalBias, -1.0f, 1.0f);
         offsetY += 50;
 
         GUI.enabled = !Busy;

diff --git a/Assets/Scripts/EdgeFromNormalGui.cs b/Assets/Scripts/EdgeFromNormalGui.cs
@@ -252,7 +252,7 @@ private void DoMyWindow(int windowId)
         var offsetY = 30;
 
         _doStuff = GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "Pre Contrast", _settings.Blur0Contrast,
-            _settings.Blur0ContrastText, out _settings.Blur0Contrast, out _settings.Blur0ContrastText, 0.0f, 5.0f);
+            out _settings.Blur0Contrast, 0.0f, 5.0f);
         offsetY += 50;
 
         GUI.Label(new Rect(offsetX, offsetY, 250, 30), "Frequency Equalizer");
@@ -281,33 +281,27 @@ private void DoMyWindow(int windowId)
         offsetY += 120;
 
         GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "Edge Amount", _settings.EdgeAmount,
-            _settings.EdgeAmountText,
-            out _settings.EdgeAmount, out _settings.EdgeAmountText, 0.0f, 1.0f);
+            out _settings.EdgeAmount, 0.0f, 1.0f);
         offsetY += 40;
 
         GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "Crevice Amount", _settings.CreviceAmount,
-            _settings.CreviceAmountText,
-            out _settings.CreviceAmount, out _settings.CreviceAmountText, 0.0f, 1.0f);
+            out _settings.CreviceAmount, 0.0f, 1.0f);
         offsetY += 40;
 
-        GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "Pinch", _settings.Pinch, _settings.PinchText,
-            out _settings.Pinch,
-            out _settings.PinchText, 0.1f, 10.0f);
+        GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "Pinch", _settings.Pinch, out _settings.Pinch,
+            0.1f, 10.0f);
         offsetY += 40;
 
-        GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "Pillow", _settings.Pillow, _settings.PillowText,
-            out _settings.Pillow,
-            out _settings.PillowText, 0.1f, 5.0f);
+        GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "Pillow", _settings.Pillow, out _settings.Pillow,
+            0.1f, 5.0f);
         offsetY += 40;
 
         GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "Final Contrast", _settings.FinalContrast,
-            _settings.FinalContrastText,
-            out _settings.FinalContrast, out _settings.FinalContrastText, 0.1f, 30.0f);
+            out _settings.FinalContrast, 0.1f, 30.0f);
         offsetY += 40;
 
         GuiHelper.Slider(new Rect(offsetX, offsetY, 280, 50), "Final Bias", _settings.FinalBias,
-            _settings.FinalBiasText,
-            out _settings.FinalBias, out _settings.FinalBiasText, -1.0f, 1.0f);
+            out _settings.FinalBias, -1.0f, 1.0f);
         offsetY += 50;
 
         if (GUI.Button(new Rect(offsetX + 10, offsetY, 130, 30), "Reset to Defaults"))