Merge pull request #546 from Unity-Technologies/staging

0.2.1 staging -> master
Unity-Technologies · Mar 6, 2019 · ff05b55 · ff05b55
2 parents 786fdb3 + 57918e5
commit ff05b55
Show file tree

Hide file tree

Showing 182 changed files with 2,190 additions and 1,722 deletions.
diff --git a/Actions/BaseAction.cs b/Actions/BaseAction.cs
@@ -7,14 +7,16 @@ namespace UnityEditor.Experimental.EditorVR.Actions
     /// </summary>
     abstract class BaseAction : MonoBehaviour, IAction
     {
+#pragma warning disable 649
+        [SerializeField]
+        Sprite m_Icon;
+#pragma warning restore 649
+
         public Sprite icon
         {
             get { return m_Icon; }
         }
 
-        [SerializeField]
-        Sprite m_Icon;
-
         public abstract void ExecuteAction();
     }
 }
diff --git a/Editor/LockableHierarchyGUI.cs b/Editor/LockableHierarchyGUI.cs
@@ -4,11 +4,13 @@
 [InitializeOnLoad]
 class LockableHierarchyGUI : ScriptableSingleton<LockableHierarchyGUI>
 {
+#pragma warning disable 649
     [SerializeField]
     Texture2D m_LockIcon;
 
     [SerializeField]
     Texture2D m_UnlockIcon;
+#pragma warning restore 649
 
     static LockableHierarchyGUI()
     {

diff --git a/Fonts/Roboto/Roboto-Medium SDF Alternate Menu Text.mat b/Fonts/Roboto/Roboto-Medium SDF Alternate Menu Text.mat
@@ -4,7 +4,7 @@
 Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: Roboto-Medium SDF Alternate Menu Text
   m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}

diff --git a/Manipulators/BaseManipulator.cs b/Manipulators/BaseManipulator.cs
@@ -8,10 +8,6 @@ namespace UnityEditor.Experimental.EditorVR.Manipulators
 {
     class BaseManipulator : MonoBehaviour, IManipulator
     {
-        protected const float k_BaseManipulatorSize = 0.3f;
-        const float k_MinHandleTipDirectionDelta = 0.01f;
-        const float k_LazyFollow = 40f;
-
         class HandleTip
         {
             public Renderer renderer;
@@ -20,6 +16,12 @@ class HandleTip
             public Vector3? positionOffset;
         }
 
+        const float k_MinHandleTipDirectionDelta = 0.01f;
+        const float k_LazyFollow = 40f;
+
+        protected const float k_BaseManipulatorSize = 0.3f;
+
+#pragma warning disable 649
         [SerializeField]
         Renderer m_HandleTip;
 
@@ -40,6 +42,7 @@ class HandleTip
 
         [SerializeField]
         float m_HandleHoverAlpha = 0.8f;
+#pragma warning restore 649
 
         readonly Dictionary<Type, float> m_ScaleBumps = new Dictionary<Type, float>();
         readonly Dictionary<Transform, HandleTip> m_HandleTips = new Dictionary<Transform, HandleTip>();

diff --git a/Manipulators/ScaleManipulator.cs b/Manipulators/ScaleManipulator.cs
@@ -5,8 +5,10 @@ namespace UnityEditor.Experimental.EditorVR.Manipulators
 {
     sealed class ScaleManipulator : BaseManipulator
     {
+#pragma warning disable 649
         [SerializeField]
         BaseHandle m_UniformHandle;
+#pragma warning restore 649
 
         protected override void OnHandleDragging(BaseHandle handle, HandleEventData eventData)
         {

diff --git a/Manipulators/ScaleManipulator.prefab b/Manipulators/ScaleManipulator.prefab
@@ -429,8 +429,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  m_Name:
+  m_EditorClassIdentifier:
   m_SelectionFlags: 3
   m_OrientDragPlaneToRay: 1
   m_Constraints: 0
@@ -443,8 +443,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  m_Name:
+  m_EditorClassIdentifier:
   m_SelectionFlags: 3
   m_OrientDragPlaneToRay: 1
   m_Constraints: 0
@@ -457,8 +457,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  m_Name:
+  m_EditorClassIdentifier:
   m_SelectionFlags: 3
   m_OrientDragPlaneToRay: 1
   m_Constraints: 0
@@ -471,8 +471,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  m_Name:
+  m_EditorClassIdentifier:
   m_SelectionFlags: 3
   m_OrientDragPlaneToRay: 1
   m_Constraints: 0
@@ -485,8 +485,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4dbf941c00473034b89a9acd39176c7f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  m_Name:
+  m_EditorClassIdentifier:
   m_HandleTip: {fileID: 23000013012300180}
   m_AllHandles:
   - {fileID: 114000010053947466}

diff --git a/Manipulators/StandardManipulator.cs b/Manipulators/StandardManipulator.cs
@@ -6,6 +6,7 @@ namespace UnityEditor.Experimental.EditorVR.Manipulators
 {
     sealed class StandardManipulator : BaseManipulator
     {
+#pragma warning disable 649
         [SerializeField]
         Transform m_PlaneHandlesParent;
 
@@ -17,6 +18,7 @@ sealed class StandardManipulator : BaseManipulator
 
         [SerializeField]
         float m_SphereHandleHideScale = 0.1f;
+#pragma warning restore 649
 
         void Update()
         {

diff --git a/Menus/MainMenu/MainMenu.cs b/Menus/MainMenu/MainMenu.cs
@@ -18,6 +18,7 @@ sealed class MainMenu : MonoBehaviour, IMainMenu, IConnectInterfaces, IInstantia
         const string k_SettingsMenuSectionName = "Settings";
         const float k_MaxFlickDuration = 0.3f;
 
+#pragma warning disable 649
         [SerializeField]
         ActionMap m_ActionMap;
 
@@ -38,6 +39,7 @@ sealed class MainMenu : MonoBehaviour, IMainMenu, IConnectInterfaces, IInstantia
 
         [SerializeField]
         HapticPulse m_ButtonHoverPulse;
+#pragma warning restore 649
 
         Transform m_AlternateMenuOrigin;
         Transform m_MenuOrigin;

diff --git a/Menus/MainMenu/Scripts/MainMenuButton.cs b/Menus/MainMenu/Scripts/MainMenuButton.cs
@@ -12,8 +12,10 @@ namespace UnityEditor.Experimental.EditorVR.Menus
 {
     sealed class MainMenuButton : MainMenuSelectable, ITooltip, IRayEnterHandler, IRayExitHandler, IPointerClickHandler
     {
+#pragma warning disable 649
         [SerializeField]
         Button m_Button;
+#pragma warning restore 649
 
         CanvasGroup m_CanvasGroup;
 

diff --git a/Menus/MainMenu/Scripts/MainMenuFace.cs b/Menus/MainMenu/Scripts/MainMenuFace.cs
@@ -20,6 +20,7 @@ sealed class MainMenuFace : MonoBehaviour
     {
         static readonly Vector3 k_LocalOffset = Vector3.down * 0.15f;
 
+#pragma warning disable 649
         [SerializeField]
         MeshRenderer m_BorderOutline;
 
@@ -39,6 +40,7 @@ sealed class MainMenuFace : MonoBehaviour
 
         [SerializeField]
         ScrollRect m_ScrollRect;
+#pragma warning restore 649
 
         Material m_BorderOutlineMaterial;
         Vector3 m_BorderOutlineOriginalLocalScale;

diff --git a/Menus/MainMenu/Scripts/MainMenuToggle.cs b/Menus/MainMenu/Scripts/MainMenuToggle.cs
@@ -11,8 +11,10 @@ namespace UnityEditor.Experimental.EditorVR.Menus
 {
     sealed class MainMenuToggle : MainMenuSelectable, IRayEnterHandler, IRayExitHandler, IPointerClickHandler
     {
+#pragma warning disable 649
         [SerializeField]
         Toggle m_Toggle;
+#pragma warning restore 649
 
         CanvasGroup m_CanvasGroup;
 

diff --git a/Menus/MainMenu/Scripts/MainMenuUI.cs b/Menus/MainMenu/Scripts/MainMenuUI.cs
@@ -42,9 +42,10 @@ enum VisibilityState
         const float k_RotationEpsilon = 1f;
         const int k_FaceCount = 4;
 
-        readonly string k_UncategorizedFaceName = "Uncategorized";
-        readonly Color k_MenuFacesHiddenColor = new Color(1f, 1f, 1f, 0.5f);
+        const string k_UncategorizedFaceName = "Uncategorized";
+        static readonly Color k_MenuFacesHiddenColor = new Color(1f, 1f, 1f, 0.5f);
 
+#pragma warning disable 649
         [SerializeField]
         MainMenuButton m_ButtonTemplatePrefab;
 
@@ -62,6 +63,7 @@ enum VisibilityState
 
         [SerializeField]
         Transform m_AlternateMenu;
+#pragma warning restore 649
 
         int m_TargetFaceIndex;
 

diff --git a/Menus/MainMenu/Shaders/AngledVerticalGradientUIClip.shader b/Menus/MainMenu/Shaders/AngledVerticalGradientUIClip.shader
@@ -14,6 +14,9 @@
         _ColorMask("Color Mask", Float) = 15
 
         [Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip("Use Alpha Clip", Float) = 0
+
+        // Unused _MainTex property, added to prevent runtime exceptions for elements whose parent is a ScrollRect
+        [HideInInspector] _MainTex("Main Texture - unused", 2D) = "white" {}
     }
 
     SubShader

diff --git a/Menus/RadialMenu/Materials/RadialMenuFrame.mat b/Menus/RadialMenu/Materials/RadialMenuFrame.mat
@@ -4,7 +4,7 @@
 Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: RadialMenuFrame
   m_Shader: {fileID: 4800000, guid: b10f0b677131a2945855a113a27b7093, type: 3}

diff --git a/Menus/RadialMenu/Materials/RadialMenuFrameOuterBorder.mat b/Menus/RadialMenu/Materials/RadialMenuFrameOuterBorder.mat
@@ -4,7 +4,7 @@
 Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: RadialMenuFrameOuterBorder
   m_Shader: {fileID: 4800000, guid: b10f0b677131a2945855a113a27b7093, type: 3}

diff --git a/Menus/RadialMenu/Materials/RadialMenuIcon.mat b/Menus/RadialMenu/Materials/RadialMenuIcon.mat
@@ -4,7 +4,7 @@
 Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: RadialMenuIcon
   m_Shader: {fileID: 4800000, guid: bb5c2bef6f6cd59459628622758d17ff, type: 3}

diff --git a/Menus/RadialMenu/Materials/RadialMenuSlotInset.mat b/Menus/RadialMenu/Materials/RadialMenuSlotInset.mat
@@ -4,7 +4,7 @@
 Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: RadialMenuSlotInset
   m_Shader: {fileID: 4800000, guid: c8cf0b95851289d40aecbbb604f214fd, type: 3}

diff --git a/Menus/RadialMenu/Materials/RadialMenuSlotsMask.mat b/Menus/RadialMenu/Materials/RadialMenuSlotsMask.mat
@@ -4,7 +4,7 @@
 Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: RadialMenuSlotsMask
   m_Shader: {fileID: 4800000, guid: da29182e4499c6740bf4e5dc3198313a, type: 3}

diff --git a/Menus/RadialMenu/RadialMenu.cs b/Menus/RadialMenu/RadialMenu.cs
@@ -14,6 +14,7 @@ sealed class RadialMenu : MonoBehaviour, IInstantiateUI, IAlternateMenu, IUsesMe
         const float k_ActivationThreshold = 0.5f; // Do not consume thumbstick or activate menu if the control vector's magnitude is below this threshold
         const string k_SpatialDescription = "Perform actions based on selected-object context";
 
+#pragma warning disable 649
         [SerializeField]
         ActionMap m_ActionMap;
 
@@ -28,6 +29,7 @@ sealed class RadialMenu : MonoBehaviour, IInstantiateUI, IAlternateMenu, IUsesMe
 
         [SerializeField]
         HapticPulse m_ButtonClickedPulse;
+#pragma warning restore 649
 
         RadialMenuUI m_RadialMenuUI;
         List<ActionMenuData> m_MenuActions;

diff --git a/Menus/RadialMenu/Scripts/RadialMenuSlot.cs b/Menus/RadialMenu/Scripts/RadialMenuSlot.cs
@@ -11,8 +11,6 @@ namespace UnityEditor.Experimental.EditorVR.Menus
 {
     sealed class RadialMenuSlot : MonoBehaviour, ISetTooltipVisibility, ITooltip, ITooltipPlacement, IRayEnterHandler, IRayExitHandler
     {
-        static Color s_FrameOpaqueColor;
-        static GradientPair s_GradientPair;
         static readonly Vector3 k_HiddenLocalScale = new Vector3(1f, 0f, 1f);
         const float k_IconHighlightedLocalYOffset = 0.006f;
         const string k_MaterialAlphaProperty = "_Alpha";
@@ -22,6 +20,10 @@ sealed class RadialMenuSlot : MonoBehaviour, ISetTooltipVisibility, ITooltip, IT
         const string k_MaterialColorProperty = "_Color";
         const string k_MaterialStencilRefProperty = "_StencilRef";
 
+        static Color s_FrameOpaqueColor;
+        static GradientPair s_GradientPair;
+
+#pragma warning disable 649
         [SerializeField]
         MeshRenderer m_InsetMeshRenderer;
 
@@ -54,6 +56,7 @@ sealed class RadialMenuSlot : MonoBehaviour, ISetTooltipVisibility, ITooltip, IT
 
         [SerializeField]
         Transform m_TooltipSource;
+#pragma warning restore 649
 
         bool m_Pressed;
         bool m_Highlighted;
@@ -107,7 +110,7 @@ public bool pressed
                 // Proceed only if value is true after previously being false
                 if (m_Highlighted && value != m_Pressed && value && gameObject.activeSelf)
                 {
-                    m_Pressed = value;
+                    m_Pressed = true;
 
                     this.StopCoroutine(ref m_IconHighlightCoroutine);
 
@@ -169,7 +172,7 @@ public bool visible
         {
             set
             {
-                if (value && m_Visible == value) // Allow false to fall through and perform hiding regardless of visibility
+                if (value && m_Visible) // Allow false to fall through and perform hiding regardless of visibility
                     return;
 
                 m_Visible = value;
@@ -394,23 +397,20 @@ IEnumerator Highlight()
             HighlightIcon();
 
             var opacity = Time.deltaTime;
-            var topColor = m_OriginalInsetGradientPair.a;
-            var bottomColor = m_OriginalInsetGradientPair.b;
             var initialFrameColor = m_FrameMaterial.color;
-            var currentFrameColor = initialFrameColor;
             while (opacity > 0)
             {
                 if (m_Highlighted)
                 {
                     opacity = Mathf.Clamp01(opacity + Time.deltaTime * 4); // stay highlighted
-                    currentFrameColor = Color.Lerp(initialFrameColor, s_FrameOpaqueColor, opacity);
+                    var currentFrameColor = Color.Lerp(initialFrameColor, s_FrameOpaqueColor, opacity);
                     m_FrameMaterial.SetColor(k_MaterialColorProperty, currentFrameColor);
                 }
                 else
                     opacity = Mathf.Clamp01(opacity - Time.deltaTime * 2);
 
-                topColor = Color.Lerp(m_OriginalInsetGradientPair.a, s_GradientPair.a, opacity * 2f);
-                bottomColor = Color.Lerp(m_OriginalInsetGradientPair.b, s_GradientPair.b, opacity);
+                var topColor = Color.Lerp(m_OriginalInsetGradientPair.a, s_GradientPair.a, opacity * 2f);
+                var bottomColor = Color.Lerp(m_OriginalInsetGradientPair.b, s_GradientPair.b, opacity);
 
                 m_InsetMaterial.SetColor(k_MaterialColorTopProperty, topColor);
                 m_InsetMaterial.SetColor(k_MaterialColorBottomProperty, bottomColor);

diff --git a/Menus/RadialMenu/Scripts/RadialMenuUI.cs b/Menus/RadialMenu/Scripts/RadialMenuUI.cs
@@ -12,6 +12,7 @@ sealed class RadialMenuUI : MonoBehaviour, IConnectInterfaces, IRequestStencilRe
     {
         const int k_SlotCount = 16;
 
+#pragma warning disable 649
         [SerializeField]
         Sprite m_MissingActionIcon;
 
@@ -20,6 +21,7 @@ sealed class RadialMenuUI : MonoBehaviour, IConnectInterfaces, IRequestStencilRe
 
         [SerializeField]
         Transform m_SlotContainer;
+#pragma warning restore 649
 
         List<RadialMenuSlot> m_RadialMenuSlots;
         Coroutine m_VisibilityCoroutine;