Add comment on AssetGridItem.Magnetize; Rename listClipFrag to listCl…

…ipCheckExtents
Unity-Technologies · Sep 16, 2016 · 864d6ba · 864d6ba
1 parent d6a4363
commit 864d6ba
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/Manipulators.meta b/Manipulators.meta
diff --git a/Manipulators/Materials.meta b/Manipulators/Materials.meta
diff --git a/Workspaces/Project/Scripts/AssetGridItem.cs b/Workspaces/Project/Scripts/AssetGridItem.cs
@@ -251,6 +251,7 @@ private void OnGrabStarted(BaseHandle baseHandle, HandleEventData eventData)
 		StartCoroutine(Magnetize());
 	}
 
+	// Smoothly interpolate grabbed object into position, instead of "popping."
 	private IEnumerator Magnetize()
 	{
 		var startTime = Time.realtimeSinceStartup;

diff --git a/Workspaces/Project/Shaders/ListClip.cginc b/Workspaces/Project/Shaders/ListClip.cginc
@@ -15,7 +15,7 @@ void listClipVert(inout appdata_full v, out Input o)
 	o.localPos = listClipLocalPos(v.vertex);
 }
 
-void listClipFrag(float3 localPos)
+void listClipCheckExtents(float3 localPos)
 {
 	// Clip if position is outside of clip bounds
 	float3 diff = abs(localPos);

diff --git a/Workspaces/Project/Shaders/ListClip.shader b/Workspaces/Project/Shaders/ListClip.shader
@@ -36,7 +36,7 @@
 
 		void surf (Input IN, inout SurfaceOutputStandard o)
 		{
-			listClipFrag(IN.localPos);
+			listClipCheckExtents(IN.localPos);
 
 			fixed4 c = tex2D(_MainTex, IN.uv_MainTex);
 			c *= _Color * c.a;

diff --git a/Workspaces/Project/Shaders/ListClipText.shader b/Workspaces/Project/Shaders/ListClipText.shader
@@ -43,7 +43,7 @@
 
 		void surf(Input IN, inout SurfaceOutputStandard o)
 		{
-			listClipFrag(IN.localPos);
+			listClipCheckExtents(IN.localPos);
 
 			o.Emission = IN.color;
 			o.Alpha = tex2D(_MainTex, IN.uv_MainTex).a * IN.color.a;

diff --git a/Workspaces/Project/Shaders/ListClipTransparent.shader b/Workspaces/Project/Shaders/ListClipTransparent.shader
@@ -37,7 +37,7 @@
 
 		void surf(Input IN, inout SurfaceOutputStandard o)
 		{
-			listClipFrag(IN.localPos);
+			listClipCheckExtents(IN.localPos);
 
 			fixed4 c = tex2D(_MainTex, IN.uv_MainTex) *_Color;
 			o.Emission = c.rgb;