pengtaihao
/
SoftMaskForUGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.0.0-preview.12 

# [1.0.0-preview.12](https://github.com/mob-sakai/SoftMaskForUGUI/compare/v1.0.0-preview.11...v1.0.0-preview.12) (2020-09-28)

### Bug Fixes

* clickable area inverted on Metal ([3c189ff](3c189ffed6))
* in Unity 2018.x, sample import failed on Windows ([207ea9c](207ea9c1dc))
pull/122/head
semantic-release-bot 2020-09-28 01:35:56 +00:00
parent 9b6205070f
commit db266a8cf0
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -1,3 +1,11 @@
# [1.0.0-preview.12](https://github.com/mob-sakai/SoftMaskForUGUI/compare/v1.0.0-preview.11...v1.0.0-preview.12) (2020-09-28)
### Bug Fixes
* clickable area inverted on Metal ([3c189ff](https://github.com/mob-sakai/SoftMaskForUGUI/commit/3c189ffed61baa6806aadc6ff89c41b9102491b5))
* in Unity 2018.x, sample import failed on Windows ([207ea9c](https://github.com/mob-sakai/SoftMaskForUGUI/commit/207ea9c1dc4117ab6c00e70290d5f7651fa906d8))
# [1.0.0-preview.11](https://github.com/mob-sakai/SoftMaskForUGUI/compare/v1.0.0-preview.10...v1.0.0-preview.11) (2020-09-27)

5
Scripts/Editor/ImportSampleMenu.cs
View File

@ -25,11 +25,12 @@ namespace Coffee.UISoftMask
private static void ImportSample(string jsonGuid, string sampleName)
{
var jsonPath = AssetDatabase.GUIDToAssetPath(jsonGuid);
var packageRoot = Path.GetDirectoryName(jsonPath).Replace('\\', '/');
var json = File.ReadAllText(jsonPath);
var version = Regex.Match(json, "\"version\"\\s*:\\s*\"([^\"]+)\"").Groups[1].Value;
var displayName = Regex.Match(json, "\"displayName\"\\s*:\\s*\"([^\"]+)\"").Groups[1].Value;
var src = string.Format("{0}/Samples~/{1}", Path.GetDirectoryName(jsonPath), sampleName);
var srcAlt = string.Format("{0}/Samples/{1}", Path.GetDirectoryName(jsonPath), sampleName);
var src = string.Format("{0}/Samples~/{1}", packageRoot, sampleName);
var srcAlt = string.Format("{0}/Samples/{1}", packageRoot, sampleName);
var dst = string.Format("Assets/Samples/{0}/{1}/{2}", displayName, version, sampleName);
var previousPath = GetPreviousSamplePath(displayName, sampleName);

4
Scripts/SoftMask.cs
View File

@ -42,6 +42,7 @@ namespace Coffee.UISoftMask
};
private static bool s_UVStartsAtTop;
private static bool s_IsMetal;
private static Shader s_SoftMaskShader;
private static Texture2D s_ReadTexture;
private static readonly List<SoftMask> s_ActiveSoftMasks = new List<SoftMask>();
@ -329,7 +330,7 @@ namespace Coffee.UISoftMask
if (!isActiveAndEnabled || (g == graphic && !g.raycastTarget)) return true;
int x = (int) ((softMaskBuffer.width - 1) * Mathf.Clamp01(sp.x / Screen.width));
int y = s_UVStartsAtTop
int y = s_UVStartsAtTop && !s_IsMetal
? (int) ((softMaskBuffer.height - 1) * (1 - Mathf.Clamp01(sp.y / Screen.height)))
: (int) ((softMaskBuffer.height - 1) * Mathf.Clamp01(sp.y / Screen.height));
return 0.5f < GetPixelValue(x, y, interactions);
@ -355,6 +356,7 @@ namespace Coffee.UISoftMask
if (s_StencilCompId == 0)
{
s_UVStartsAtTop = SystemInfo.graphicsUVStartsAtTop;
s_IsMetal = SystemInfo.graphicsDeviceType == GraphicsDeviceType.Metal;
s_StencilCompId = Shader.PropertyToID("_StencilComp");
s_ColorMaskId = Shader.PropertyToID("_ColorMask");
s_MainTexId = Shader.PropertyToID("_MainTex");

2
package.json
View File

@ -2,7 +2,7 @@
"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.11",
"version": "1.0.0-preview.12",
"unity": "2017.1",
"license": "MIT",
"repository": {