feat: TextMeshPro support

BREAKING CHANGE: TextMeshPro support is now an option. If a shader or material has errors after a version upgrade, you will need to import the asset. Please see the README for more information.
mob-sakai · Jun 4, 2020 · 5b0906b · 5b0906b
1 parent 1b3a25e
commit 5b0906b
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 35 deletions.
diff --git a/...skForUGUI/Shaders/TextMeshProSupport.meta → ...kForUGUI/Samples/TextMeshPro Support.meta b/...skForUGUI/Shaders/TextMeshProSupport.meta → ...kForUGUI/Samples/TextMeshPro Support.meta
diff --git a/...hProSupport/TMP_SDF (SoftMaskable).shader → ...Pro Support/TMP_SDF (SoftMaskable).shader b/...hProSupport/TMP_SDF (SoftMaskable).shader → ...Pro Support/TMP_SDF (SoftMaskable).shader
diff --git a/...upport/TMP_SDF (SoftMaskable).shader.meta → ...upport/TMP_SDF (SoftMaskable).shader.meta b/...upport/TMP_SDF (SoftMaskable).shader.meta → ...upport/TMP_SDF (SoftMaskable).shader.meta
diff --git a/...port/TMP_SDF-Mobile (SoftMaskable).shader → ...port/TMP_SDF-Mobile (SoftMaskable).shader b/...port/TMP_SDF-Mobile (SoftMaskable).shader → ...port/TMP_SDF-Mobile (SoftMaskable).shader
diff --git a/...TMP_SDF-Mobile (SoftMaskable).shader.meta → ...TMP_SDF-Mobile (SoftMaskable).shader.meta b/...TMP_SDF-Mobile (SoftMaskable).shader.meta → ...TMP_SDF-Mobile (SoftMaskable).shader.meta
diff --git a/...oSupport/TMP_Sprite (SoftMaskable).shader → ... Support/TMP_Sprite (SoftMaskable).shader b/...oSupport/TMP_Sprite (SoftMaskable).shader → ... Support/TMP_Sprite (SoftMaskable).shader
diff --git a/...ort/TMP_Sprite (SoftMaskable).shader.meta → ...ort/TMP_Sprite (SoftMaskable).shader.meta b/...ort/TMP_Sprite (SoftMaskable).shader.meta → ...ort/TMP_Sprite (SoftMaskable).shader.meta
diff --git a/Packages/SoftMaskForUGUI/Scripts/Editor/ImportSampleMenu.cs b/Packages/SoftMaskForUGUI/Scripts/Editor/ImportSampleMenu.cs
@@ -8,13 +8,18 @@ namespace Coffee.UISoftMask
 {
     public static class ImportSampleMenu
     {
-        [MenuItem("Assets/Samples/Import UISoftMask Sample")]
-        private static void ImportSample()
+        private const string jsonGuid = "c43fd233e88b347cdabc530c23ffe30a";
+
+        [MenuItem("Assets/Samples/UISoftMask/Import Demo")]
+        private static void ImportDemo()
         {
-            const string jsonGuid = "c43fd233e88b347cdabc530c23ffe30a";
-            const string dirName = "Demo";
+            ImportSample(jsonGuid, "Demo");
+        }
 
-            ImportSample(jsonGuid, dirName);
+        [MenuItem("Assets/Samples/UISoftMask/Import TextMeshPro Support")]
+        private static void ImportTextMeshProSupport()
+        {
+            ImportSample(jsonGuid, "TextMeshProSupport");
         }
 
         private static void ImportSample(string jsonGuid, string sampleName)

diff --git a/Packages/SoftMaskForUGUI/package.json b/Packages/SoftMaskForUGUI/package.json
@@ -1,29 +1,34 @@
 {
-	"name": "com.coffee.softmask-for-ugui",
-	"displayName": "UI Soft Mask",
-	"description": "UI Soft Mask is a smooth masking component for Unity UI (uGUI) elements.\nBy using SoftMask instead of the default Mask component, you can beautifully represent the rounded edges of UI elements.",
-	"version": "1.0.0-preview.2",
-	"unity": "2017.1",
-	"license": "MIT",
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/mob-sakai/SoftMaskForUGUI.git"
-	},
-	"author": {
-		"name": "mob-sakai",
-		"email": "[email protected]",
-		"url": "https://github.com/mob-sakai"
-	},
-	"dependencies": {},
-	"keywords": [
-		"ui",
-		"softmask"
-	],
-	"samples": [
-		{
-			"displayName": "Demo",
-			"description": "UI Soft Mask Demo",
-			"path": "Samples~/Demo"
-		}
-	]
-}
+  "name": "com.coffee.softmask-for-ugui",
+  "displayName": "UI Soft Mask",
+  "description": "UI Soft Mask is a smooth masking component for Unity UI (uGUI) elements.\nBy using SoftMask instead of the default Mask component, you can beautifully represent the rounded edges of UI elements.",
+  "version": "1.0.0-preview.2",
+  "unity": "2017.1",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/mob-sakai/SoftMaskForUGUI.git"
+  },
+  "author": {
+    "name": "mob-sakai",
+    "email": "[email protected]",
+    "url": "https://github.com/mob-sakai"
+  },
+  "dependencies": {},
+  "keywords": [
+    "ui",
+    "softmask"
+  ],
+  "samples": [
+    {
+      "displayName": "Demo",
+      "description": "UI Soft Mask Demo",
+      "path": "Samples~/Demo"
+    },
+    {
+      "displayName": "TextMeshPro Support",
+      "description": "TextMeshPro Support",
+      "path": "Samples~/TextMeshPro Support"
+    }
+  ]
+}