[unity] Minor SkeletonGraphic fixes.

dengswing · Jul 15, 2016 · 5611de2 · 5611de2
1 parent 0e883f3
commit 5611de2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Editor/SkeletonGraphicInspector.cs b/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Editor/SkeletonGraphicInspector.cs
@@ -108,6 +108,7 @@ static void MatchRectTransformWithBounds (MenuCommand command) {
 			var skeletonGraphic = (SkeletonGraphic)command.context;
 			var mesh = skeletonGraphic.SpineMeshGenerator.LastGeneratedMesh;
 
+			mesh.RecalculateBounds();
 			var bounds = mesh.bounds;
 			var size = bounds.size;
 			var center = bounds.center;
@@ -120,19 +121,6 @@ static void MatchRectTransformWithBounds (MenuCommand command) {
 			skeletonGraphic.rectTransform.pivot = p;
 		}
 
-		public static Material DefaultSkeletonGraphicMaterial {
-			get {
-				var guids = AssetDatabase.FindAssets("SkeletonGraphicDefault t:material");
-				if (guids.Length <= 0)
-					return null;
-				var firstAssetPath = AssetDatabase.GUIDToAssetPath(guids[0]);
-				if (string.IsNullOrEmpty(firstAssetPath))
-					return null;
-				var firstMaterial = AssetDatabase.LoadAssetAtPath<Material>(firstAssetPath);
-				return firstMaterial;
-			}
-		}
-
 		[MenuItem("GameObject/Spine/SkeletonGraphic (UnityUI)", false, 15)]
 		static public void SkeletonGraphicCreateMenuItem () {
 			var parentGameObject = Selection.activeObject as GameObject;
@@ -219,6 +207,19 @@ static GameObject NewSkeletonGraphicGameObject (string gameObjectName) {
 			return go;
 		}
 
+		public static Material DefaultSkeletonGraphicMaterial {
+			get {
+				var guids = AssetDatabase.FindAssets("SkeletonGraphicDefault t:material");
+				if (guids.Length <= 0) return null;
+
+				var firstAssetPath = AssetDatabase.GUIDToAssetPath(guids[0]);
+				if (string.IsNullOrEmpty(firstAssetPath)) return null;
+
+				var firstMaterial = AssetDatabase.LoadAssetAtPath<Material>(firstAssetPath);
+				return firstMaterial;
+			}
+		}
+
 		#endregion
 
 	#endif

diff --git a/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Shaders/SkeletonGraphic.shader b/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Shaders/SkeletonGraphic.shader
@@ -1,3 +1,5 @@
+// This is a premultiply-alpha adaptation of the built-in Unity shader "UI/Default" to allow Unity UI stencil masking.
+
 Shader "Spine/SkeletonGraphic (Premultiply Alpha)"
 {
 	Properties
@@ -84,7 +86,7 @@ Shader "Spine/SkeletonGraphic (Premultiply Alpha)"
 			fixed4 frag(v2f IN) : SV_Target
 			{
 				half4 color = tex2D(_MainTex, IN.texcoord) * IN.color;
-				clip (color.a - 0.01);
+				//clip(color.a - 0.01);
 				return color;
 			}
 		ENDCG