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

fix #41; Doesn't work with Screen-Space Overlay

pull/87/head
mob-sakai 2019-03-15 02:17:38 +09:00
parent a89aad0f88
commit bd6f85965e
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Scripts/SoftMask.cs
View File

@ -467,7 +467,7 @@ namespace Coffee.UIExtensions
var cam = c.worldCamera ?? Camera.main; var cam = c.worldCamera ?? Camera.main;
if (c && c.renderMode != RenderMode.ScreenSpaceOverlay && cam) if (c && c.renderMode != RenderMode.ScreenSpaceOverlay && cam)
{ {
_cb.SetViewProjectionMatrices(cam.worldToCameraMatrix, cam.projectionMatrix); _cb.SetViewProjectionMatrices(cam.worldToCameraMatrix, GL.GetGPUProjectionMatrix(cam.projectionMatrix, true));
} }
else else
{ {

7
Scripts/SoftMaskable.cs
View File

@ -215,10 +215,11 @@ namespace Coffee.UIExtensions
} }
else else
{ {
var scale = c.transform.localScale.x;
var size = (c.transform as RectTransform).sizeDelta;
var pos = c.transform.localPosition; var pos = c.transform.localPosition;
var pv = Matrix4x4.TRS(new Vector3(0, 0, 0), Quaternion.identity, new Vector3(1 / pos.x, 1 / pos.y, -2 / 2000f)); mat.SetMatrix(s_GameVPId, Matrix4x4.TRS(new Vector3(0, 0, 0.5f), Quaternion.identity, new Vector3(2 / size.x, 2 / size.y, 0.0005f * scale)));
mat.SetMatrix(s_GameVPId, pv); mat.SetMatrix(s_GameTVPId, Matrix4x4.TRS(new Vector3(0, 0, 0), Quaternion.identity, new Vector3(1 / pos.x, 1 / pos.y, -2/2000f)) * Matrix4x4.Translate(-pos));
mat.SetMatrix(s_GameTVPId, pv * Matrix4x4.Translate(-pos));
} }
} }
} }

5
SoftMask.cginc
View File

@ -36,9 +36,10 @@ float SoftMaskInternal(float4 clipPos)
fixed isSceneView = 1 - Approximately(UNITY_MATRIX_VP, _GameVP); fixed isSceneView = 1 - Approximately(UNITY_MATRIX_VP, _GameVP);
float4 cpos = mul(_GameTVP, mul(UNITY_MATRIX_M, wpos)); float4 cpos = mul(_GameTVP, mul(UNITY_MATRIX_M, wpos));
view = lerp(view, cpos.xy / cpos.w * 0.5 + 0.5, isSceneView); view = lerp(view, cpos.xy / cpos.w * 0.5 + 0.5, isSceneView);
#if UNITY_UV_STARTS_AT_TOP
view.y = lerp(view.y, 1 - view.y, step(0, _ProjectionParams.x));
#endif #endif
#elif UNITY_UV_STARTS_AT_TOP
#if UNITY_UV_STARTS_AT_TOP && !defined(SHADER_API_D3D11) && !defined(SHADER_API_D3D11_9X) && !defined(SHADER_API_D3D9)
view.y = 1.0 - view.y; view.y = 1.0 - view.y;
#endif #endif