PR feedback

Author: mtschoen-unity

Scripts/Interfaces/FunctionalityInjection/IRequestFeedback.cs

@@ -48,6 +48,7 @@ public static void ClearFeedbackRequests(this IRequestFeedback obj)
         /// <summary>
         /// Get a pooled FeedbackRequest object from the system
         /// </summary>
+        /// <param name="type">The type of request object desired</param>
         public static FeedbackRequest GetFeedbackRequestObject(this IRequestFeedback obj, Type type)
         {
             return getFeedbackRequestObject(type);

Scripts/Utilities/ObjectUtils.cs

@@ -149,7 +149,9 @@ public static Bounds GetBounds(Transform transform)
                     b.center = k_Transforms[0].position;
 
                 foreach (var t in k_Transforms)
+                {
                     b.Encapsulate(t.position);
+                }
             }
 
             return b;

Workspaces/Common/Scripts/FilterUI.cs

@@ -189,7 +189,6 @@ void OnFilterClick(FilterButtonUI clickedButton)
             switch (clickedButton.text.text)
             {
                 case k_AllText:
-
                     m_SummaryText.text = clickedButton.text.text;
                     m_DescriptionText.text = "All objects are visible";
                     break;

Workspaces/PolyWorkspace/PolyWorkspace.cs

@@ -25,9 +25,6 @@ namespace UnityEditor.Experimental.EditorVR.Workspaces
     [MainMenuItem("Poly", "Workspaces", "Import models from Google Poly")]
     sealed class PolyWorkspace : Workspace, ISerializeWorkspace
     {
-        const float k_XBounds = 1.094f;
-        const float k_YBounds = 0.2f;
-
         const float k_MinScale = 0.05f;
         const float k_MaxScale = 0.2f;
 
@@ -44,6 +41,10 @@ sealed class PolyWorkspace : Workspace, ISerializeWorkspace
         const string k_Medium = "Medium";
         const string k_Simple = "Simple";
 
+        static readonly Vector3 k_MinBounds = new Vector3(1.094f, 0.2f, 0.5f);
+        static readonly Vector3 k_ScrollHandleScale = new Vector3(1.03f, 0.02f, 1.02f); // Extra space for scrolling
+        static readonly Vector3 k_ScrollHandlePosition = new Vector3(0f, -0.015f, 0f); // Offset from content for collision purposes
+
         [Serializable]
         class Preferences
         {
@@ -89,7 +90,7 @@ public List<PolyGridAsset> assetData
         public override void Setup()
         {
             // Initial bounds must be set before the base.Setup() is called
-            minBounds = new Vector3(k_XBounds, k_YBounds, 0.5f);
+            minBounds = k_MinBounds;
             m_CustomStartingBounds = minBounds;
 
             base.Setup();
@@ -124,8 +125,8 @@ public override void Setup()
             var scrollHandle = m_PolyUI.scrollHandle;
             var scrollHandleTransform = scrollHandle.transform;
             scrollHandleTransform.SetParent(m_WorkspaceUI.topFaceContainer);
-            scrollHandleTransform.localScale = new Vector3(1.03f, 0.02f, 1.02f); // Extra space for scrolling
-            scrollHandleTransform.localPosition = new Vector3(0f, -0.015f, 0f); // Offset from content for collision purposes
+            scrollHandleTransform.localScale = k_ScrollHandleScale;
+            scrollHandleTransform.localPosition = k_ScrollHandlePosition;
 
             scrollHandle.dragStarted += OnScrollDragStarted;
             scrollHandle.dragging += OnScrollDragging;

Workspaces/PolyWorkspace/Scripts/PolyGridAsset.cs

@@ -36,7 +36,7 @@ public class PolyGridAsset : ListViewItemData<string>, IWeb
         public Texture2D thumbnail { get { return m_Thumbnail; } }
         public bool initialized { get { return m_Initialized; } }
         public long complexity { get { return m_Complexity; } }
-        public override string index { get { return m_Asset.name; } }
+        public override string index { get { return m_Asset.name; } } // PolyAsset.name is the GUID
 
         public event Action<PolyGridAsset, GameObject> modelImportCompleted;
         public event Action<PolyGridAsset, Texture2D> thumbnailImportCompleted;

Workspaces/PolyWorkspace/Scripts/PolyGridItem.cs

@@ -94,15 +94,13 @@ class PolyGridItem : DraggableListItem<PolyGridAsset, string>, IPlaceSceneObject
         Action<float> m_CompleteHoverTransition;
         Action<float> m_SetThumbnailScale;
         Action<float> m_SetImportingScale;
-
         Action<Color> m_SetImportingColor;
 
         void Awake()
         {
             m_CompleteHoverTransition = CompleteHoverTransition;
             m_SetThumbnailScale = SetThumbnailScale;
             m_SetImportingScale = SetImportingScale;
-
             m_SetImportingColor = SetImportingColor;
         }
 
@@ -422,7 +420,8 @@ IEnumerator AnimateVisibility(bool visible, Action<PolyGridItem> callback)
             while (currentTime < k_TransitionDuration)
             {
                 currentTime += Time.deltaTime;
-                transform.localScale = Vector3.Lerp(currentScale, targetScale, currentTime / k_TransitionDuration);
+                transform.localScale = Vector3.Lerp(currentScale, targetScale,
+                    MathUtilsExt.SmoothInOutLerpFloat(currentTime / k_TransitionDuration));
                 yield return null;
             }
 
@@ -446,8 +445,7 @@ IEnumerator ShowGrabbedObject()
                 currentPreviewOffset = m_PreviewObjectClone.localPosition;
 
             var currentTime = 0f;
-            var currentVelocity = 0f;
-            const float kDuration = 1f;
+            const float duration = 1f;
 
             var targetScale = Vector3.one * k_IconPreviewScale;
             var pivotOffset = Vector3.zero;
@@ -484,13 +482,14 @@ IEnumerator ShowGrabbedObject()
                 }
             }
 
-            while (currentTime < kDuration - 0.05f)
+            while (currentTime < duration)
             {
                 if (m_DragObject == null)
                     yield break; // Exit coroutine if m_GrabbedObject is destroyed before the loop is finished
 
-                currentTime = MathUtilsExt.SmoothDamp(currentTime, kDuration, ref currentVelocity, 0.5f, Mathf.Infinity, Time.deltaTime);
-                m_DragObject.localScale = Vector3.Lerp(currentLocalScale, targetScale, currentTime);
+                currentTime += Time.deltaTime;
+                m_DragObject.localScale = Vector3.Lerp(currentLocalScale, targetScale,
+                    MathUtilsExt.SmoothInOutLerpFloat(currentTime / duration));
 
                 if (m_PreviewObjectClone)
                 {
@@ -501,7 +500,8 @@ IEnumerator ShowGrabbedObject()
                 yield return null;
             }
 
-            m_DragObject.localScale = targetScale;
+            m_DragObject.localScale = targetScale;
+            //No need to hard-set the preview object position/rotation because they will set in OnDragging in parent class
         }
 
         static IEnumerator HideGrabbedObject(GameObject itemToHide)

Workspaces/ProjectWorkspace/ProjectWorkspace.cs

@@ -19,6 +19,9 @@ sealed class ProjectWorkspace : Workspace, IUsesProjectFolderData, IFilterUI, IS
         const float k_MinScale = 0.04f;
         const float k_MaxScale = 0.09f;
 
+        static readonly Vector3 k_MinBounds = new Vector3(MinBounds.x, k_YBounds, 0.5f);
+        static readonly Vector3 k_CustomStartingBounds = new Vector3(0.8f, k_YBounds, 0.5f);
+
         bool m_AssetGridDragging;
         bool m_FolderPanelDragging;
 
@@ -95,8 +98,8 @@ public List<string> expandedFolders
         public override void Setup()
         {
             // Initial bounds must be set before the base.Setup() is called
-            minBounds = new Vector3(MinBounds.x, k_YBounds, 0.5f);
-            m_CustomStartingBounds = new Vector3(0.8f, k_YBounds, 0.5f);
+            minBounds = k_MinBounds;
+            m_CustomStartingBounds = k_CustomStartingBounds;
 
             base.Setup();
 

Workspaces/ProjectWorkspace/Shaders/StandardDecal.shader

@@ -32,14 +32,9 @@ Shader "EditorVR/Standard Decal"
 
 		void surf (Input IN, inout SurfaceOutputStandard o)
 		{
-            if (IN.uv_MainTex.x > 1 || IN.uv_MainTex.x < 0
-                || IN.uv_MainTex.y > 1 || IN.uv_MainTex.y < 0)
-                o.Emission = 0;
-            else {
-			    fixed4 c = tex2D(_MainTex, IN.uv_MainTex);
-			    c *= _Color * c.a;
-			    o.Emission = c.rgb;
-            }
+			fixed4 c = tex2D(_MainTex, IN.uv_MainTex);
+			c *= _Color * c.a;
+			o.Emission = c.rgb;
 		}
 		ENDCG
 	}