From 7d817e784f1c35be812882e137ec3167932ba217 Mon Sep 17 00:00:00 2001 From: mob-sakai Date: Fri, 1 May 2020 11:42:22 +0900 Subject: [PATCH] refactor: move shaders for TMPro --- .../{Samples => Shaders}/TextMeshProSupport.meta | 0 .../TextMeshProSupport/TMP_SDF (SoftMaskable).shader | 2 +- .../TextMeshProSupport/TMP_SDF (SoftMaskable).shader.meta | 0 .../TextMeshProSupport/TMP_SDF-Mobile (SoftMaskable).shader | 2 +- .../TMP_SDF-Mobile (SoftMaskable).shader.meta | 0 .../TextMeshProSupport/TMP_Sprite (SoftMaskable).shader | 2 +- .../TextMeshProSupport/TMP_Sprite (SoftMaskable).shader.meta | 0 7 files changed, 3 insertions(+), 3 deletions(-) rename Packages/SoftMaskForUGUI/{Samples => Shaders}/TextMeshProSupport.meta (100%) rename Packages/SoftMaskForUGUI/{Samples => Shaders}/TextMeshProSupport/TMP_SDF (SoftMaskable).shader (99%) mode change 100755 => 100644 rename Packages/SoftMaskForUGUI/{Samples => Shaders}/TextMeshProSupport/TMP_SDF (SoftMaskable).shader.meta (100%) rename Packages/SoftMaskForUGUI/{Samples => Shaders}/TextMeshProSupport/TMP_SDF-Mobile (SoftMaskable).shader (98%) mode change 100755 => 100644 rename Packages/SoftMaskForUGUI/{Samples => Shaders}/TextMeshProSupport/TMP_SDF-Mobile (SoftMaskable).shader.meta (100%) rename Packages/SoftMaskForUGUI/{Samples => Shaders}/TextMeshProSupport/TMP_Sprite (SoftMaskable).shader (96%) mode change 100755 => 100644 rename Packages/SoftMaskForUGUI/{Samples => Shaders}/TextMeshProSupport/TMP_Sprite (SoftMaskable).shader.meta (100%) diff --git a/Packages/SoftMaskForUGUI/Samples/TextMeshProSupport.meta b/Packages/SoftMaskForUGUI/Shaders/TextMeshProSupport.meta similarity index 100% rename from Packages/SoftMaskForUGUI/Samples/TextMeshProSupport.meta rename to Packages/SoftMaskForUGUI/Shaders/TextMeshProSupport.meta diff --git a/Packages/SoftMaskForUGUI/Samples/TextMeshProSupport/TMP_SDF (SoftMaskable).shader b/Packages/SoftMaskForUGUI/Shaders/TextMeshProSupport/TMP_SDF (SoftMaskable).shader old mode 100755 new mode 100644 similarity index 99% rename from Packages/SoftMaskForUGUI/Samples/TextMeshProSupport/TMP_SDF (SoftMaskable).shader rename to Packages/SoftMaskForUGUI/Shaders/TextMeshProSupport/TMP_SDF (SoftMaskable).shader index 0b3e8bc..60aef70 --- a/Packages/SoftMaskForUGUI/Samples/TextMeshProSupport/TMP_SDF (SoftMaskable).shader +++ b/Packages/SoftMaskForUGUI/Shaders/TextMeshProSupport/TMP_SDF (SoftMaskable).shader @@ -127,7 +127,7 @@ SubShader { #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" #include "Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc" - #include "./../SoftMask.cginc" + #include "Packages/com.coffee.softmask-for-ugui/Shaders/SoftMask.cginc" #pragma shader_feature __ SOFTMASK_EDITOR struct vertex_t { diff --git a/Packages/SoftMaskForUGUI/Samples/TextMeshProSupport/TMP_SDF (SoftMaskable).shader.meta b/Packages/SoftMaskForUGUI/Shaders/TextMeshProSupport/TMP_SDF (SoftMaskable).shader.meta similarity index 100% rename from Packages/SoftMaskForUGUI/Samples/TextMeshProSupport/TMP_SDF (SoftMaskable).shader.meta rename to Packages/SoftMaskForUGUI/Shaders/TextMeshProSupport/TMP_SDF (SoftMaskable).shader.meta diff --git a/Packages/SoftMaskForUGUI/Samples/TextMeshProSupport/TMP_SDF-Mobile (SoftMaskable).shader b/Packages/SoftMaskForUGUI/Shaders/TextMeshProSupport/TMP_SDF-Mobile (SoftMaskable).shader old mode 100755 new mode 100644 similarity index 98% rename from Packages/SoftMaskForUGUI/Samples/TextMeshProSupport/TMP_SDF-Mobile (SoftMaskable).shader rename to Packages/SoftMaskForUGUI/Shaders/TextMeshProSupport/TMP_SDF-Mobile (SoftMaskable).shader index 43b34db..b521cd5 --- a/Packages/SoftMaskForUGUI/Samples/TextMeshProSupport/TMP_SDF-Mobile (SoftMaskable).shader +++ b/Packages/SoftMaskForUGUI/Shaders/TextMeshProSupport/TMP_SDF-Mobile (SoftMaskable).shader @@ -95,7 +95,7 @@ SubShader { #include "UnityUI.cginc" #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" - #include "./../SoftMask.cginc" + #include "Packages/com.coffee.softmask-for-ugui/Shaders/SoftMask.cginc" #pragma shader_feature __ SOFTMASK_EDITOR struct vertex_t { diff --git a/Packages/SoftMaskForUGUI/Samples/TextMeshProSupport/TMP_SDF-Mobile (SoftMaskable).shader.meta b/Packages/SoftMaskForUGUI/Shaders/TextMeshProSupport/TMP_SDF-Mobile (SoftMaskable).shader.meta similarity index 100% rename from Packages/SoftMaskForUGUI/Samples/TextMeshProSupport/TMP_SDF-Mobile (SoftMaskable).shader.meta rename to Packages/SoftMaskForUGUI/Shaders/TextMeshProSupport/TMP_SDF-Mobile (SoftMaskable).shader.meta diff --git a/Packages/SoftMaskForUGUI/Samples/TextMeshProSupport/TMP_Sprite (SoftMaskable).shader b/Packages/SoftMaskForUGUI/Shaders/TextMeshProSupport/TMP_Sprite (SoftMaskable).shader old mode 100755 new mode 100644 similarity index 96% rename from Packages/SoftMaskForUGUI/Samples/TextMeshProSupport/TMP_Sprite (SoftMaskable).shader rename to Packages/SoftMaskForUGUI/Shaders/TextMeshProSupport/TMP_Sprite (SoftMaskable).shader index d96d35c..8451d05 --- a/Packages/SoftMaskForUGUI/Samples/TextMeshProSupport/TMP_Sprite (SoftMaskable).shader +++ b/Packages/SoftMaskForUGUI/Shaders/TextMeshProSupport/TMP_Sprite (SoftMaskable).shader @@ -56,7 +56,7 @@ Shader "TextMeshPro/Sprite (SoftMaskable)" #pragma multi_compile __ UNITY_UI_CLIP_RECT #pragma multi_compile __ UNITY_UI_ALPHACLIP - #include "./../SoftMask.cginc" + #include "Packages/com.coffee.softmask-for-ugui/Shaders/SoftMask.cginc" #pragma shader_feature __ SOFTMASK_EDITOR struct appdata_t diff --git a/Packages/SoftMaskForUGUI/Samples/TextMeshProSupport/TMP_Sprite (SoftMaskable).shader.meta b/Packages/SoftMaskForUGUI/Shaders/TextMeshProSupport/TMP_Sprite (SoftMaskable).shader.meta similarity index 100% rename from Packages/SoftMaskForUGUI/Samples/TextMeshProSupport/TMP_Sprite (SoftMaskable).shader.meta rename to Packages/SoftMaskForUGUI/Shaders/TextMeshProSupport/TMP_Sprite (SoftMaskable).shader.meta