Merge branch 'master' into hook1.5.4

Author: yczhangsjtu

Runtime/Plugins/platform/android/editing/TextInputPlugin.java

@@ -43,7 +43,7 @@ public TextInputPlugin() {
         ViewGroup contentView = (ViewGroup)UnityPlayer.currentActivity.findViewById(android.R.id.content);
         mView = new TextInputView(UnityPlayer.currentActivity);
         mView.requestFocus();
-        contentView.addView(mView, 0, 0);
+        contentView.addView(mView, 1, 1);
         mImm = (InputMethodManager) mView.getContext().getSystemService(
                 Context.INPUT_METHOD_SERVICE);
     }

Runtime/Plugins/platform/android/view/UIWidgetsViewController.java

@@ -34,17 +34,29 @@ public static UIWidgetsViewController getInstance() {
     private UIWidgetsViewMetrics viewMetrics;
     private boolean keyboardOpen;
 
+    private float statusHeight;
+    private float navigationBarHeight;
+    
     private void setup() {
         //Log.i("tag", "On Setup 2");
 
         keyboardOpen = false;
         viewMetrics = new UIWidgetsViewMetrics();
-        
+        setupHeights();
         updateViewMetrics();
 
         setupViewMetricsChangedListener();
     }
 
+    private void setupHeights() {
+        final View unityView = ((ViewGroup)UnityPlayer.currentActivity.findViewById(android.R.id.content)).getChildAt(0);
+        Rect rect = new Rect();
+        unityView.getWindowVisibleDisplayFrame(rect);
+        
+        statusHeight = rect.top;
+        navigationBarHeight = unityView.getRootView().getHeight() - rect.bottom;
+    }
+    
     public static UIWidgetsViewMetrics getMetrics() {
         UIWidgetsViewController controller = getInstance();
         return controller.viewMetrics;
@@ -143,6 +155,10 @@ public void updateViewMetrics() {
         viewMetrics.insets_bottom = navigationBarHidden? calculateBottomKeyboardInset(rect) : rect.bottom;
         viewMetrics.insets_left = 0;
 
+        //adjust
+        viewMetrics.insets_bottom -= navigationBarHeight;
+        viewMetrics.padding_top -= statusHeight;
+        
         //Log.i("UIWidgetsDebug", "checks: " + navigationBarHidden + " " + rect.bottom);
         //Log.i("UIWidgetsDebug", " padding: " + viewMetrics.padding_top + " " + viewMetrics.padding_right + " " + viewMetrics.padding_bottom + " " + viewMetrics.padding_left);
         //Log.i("UIWidgetsDebug", " insets: " + viewMetrics.insets_top + " " + viewMetrics.insets_right + " " + viewMetrics.insets_bottom + " " + viewMetrics.insets_left);

Runtime/Resources/UIWidgets_canvas.cginc

@@ -3,6 +3,7 @@ float _mat[9];
 
 half4 _color;
 fixed _alpha;
+fixed _strokeMult;
 half4x4 _shaderMat;
 sampler2D _shaderTex;
 half4 _leftColor;
@@ -178,3 +179,11 @@ fixed4 frag_mf (v2f i) : SV_Target {
 
      return color;
 }
+
+float strokeMask(float u, float v) {
+    return min(1.0, (1.0 - abs(u * 2.0 - 1.0)) * 1.0) * min(1.0, v);
+}
+
+fixed4 frag_stroke_alpha(v2f i) : SV_Target {
+    return prealpha(shader_color(i)) * strokeMask(i.ftcoord.x, i.ftcoord.y);
+}

Runtime/Resources/UIWidgets_canvas_shadowBox.shader

@@ -0,0 +1,85 @@
+Shader "UIWidgets/ShadowBox"
+{
+    //originally from http://madebyevan.com/shaders/fast-rounded-rectangle-shadows/
+    Properties
+    {
+        _SrcBlend("_SrcBlend", Int) = 1 // One
+        _DstBlend("_DstBlend", Int) = 10 // OneMinusSrcAlpha
+        _StencilComp("_StencilComp", Float) = 8 // - Equal, 8 - Always 
+    }
+    SubShader
+    {
+        ZTest Always
+        ZWrite Off
+        Blend [_SrcBlend] [_DstBlend]
+        
+        Stencil {
+            Ref 128
+            Comp [_StencilComp]
+        }
+        
+        Pass {
+            CGPROGRAM
+            
+            float4 _sb_box;
+            float4 _viewport;
+            float _sb_sigma;
+            float4 _sb_color;
+            float _mat[9];
+            
+            struct appdata
+            {
+                float4 vertex : POSITION;
+            };
+
+            struct v2f
+            {
+                float4 vertex : SV_POSITION;
+                float2 coord : TEXCOORD0;
+            };
+            
+            float4 erf(float4 x) 
+            {
+                float4 s = sign(x);
+                float4 a = abs(x);
+                x = 1.0 + (0.278393 + (0.230389 + 0.078108 * (a * a)) * a) * a;
+                x = x * x;
+                return s - s / (x * x);
+                return s;
+            }
+            
+            float boxShadow(float2 lower, float2 upper, float2 pnt, float sigma)
+            {
+                float4 query = float4(pnt - lower, pnt - upper);
+                float4 integral = 0.5 + 0.5 * erf(query * (sqrt(0.5) / sigma));
+                return (integral.z - integral.x) * (integral.w - integral.y);
+            }
+            
+            v2f vert(appdata v){
+                v2f o;
+                float padding = 3.0 * _sb_sigma;
+                o.coord = lerp(_sb_box.xy - padding, _sb_box.zw + padding, v.vertex.xy);
+                float3x3 mat = float3x3(_mat[0], _mat[1], _mat[2], _mat[3], _mat[4], _mat[5], 0, 0, 1);
+                float2 p = mul(mat, float3(o.coord.xy, 1.0)).xy - _viewport.xy;
+                
+            #if UNITY_UV_STARTS_AT_TOP
+                o.vertex = float4(2.0 * p.x / _viewport.z - 1.0, 2.0 * p.y / _viewport.w - 1.0, 0, 1);
+            #else
+                o.vertex = float4(2.0 * p.x / _viewport.z - 1.0, 1.0 - 2.0 * p.y / _viewport.w, 0, 1);
+            #endif
+                return o;
+            }
+            
+            float4 frag(v2f i) : SV_TARGET {
+                float4 fragColor = _sb_color;
+                fragColor.a = fragColor.a * boxShadow(_sb_box.xy, _sb_box.zw, i.coord, _sb_sigma);
+                return fragColor;
+            }
+            
+            #pragma vertex vert
+            #pragma fragment frag
+            
+            ENDCG
+        }
+    }
+}

Runtime/Resources/UIWidgets_canvas_shadowBox.shader.meta

@@ -0,0 +1,117 @@
+Shader "UIWidgets/ShadowRBox"
+{
+    //originally from http://madebyevan.com/shaders/fast-rounded-rectangle-shadows/
+    Properties
+    {
+        _SrcBlend("_SrcBlend", Int) = 1 // One
+        _DstBlend("_DstBlend", Int) = 10 // OneMinusSrcAlpha
+        _StencilComp("_StencilComp", Float) = 8 // - Equal, 8 - Always 
+    }
+    SubShader
+    {
+        ZTest Always
+        ZWrite Off
+        Blend [_SrcBlend] [_DstBlend]
+        
+        Stencil {
+            Ref 128
+            Comp [_StencilComp]
+        }
+        
+        Pass {
+            CGPROGRAM
+            
+            float4 _sb_box;
+            float4 _viewport;
+            float _sb_sigma;
+            float4 _sb_color;
+            float _sb_corner;
+            float _mat[9];
+            
+            struct appdata
+            {
+                float4 vertex : POSITION;
+            };
+
+            struct v2f
+            {
+                float4 vertex : SV_POSITION;
+                float2 coord : TEXCOORD0;
+            };
+            
+            float gaussian(float x, float sigma)
+            {
+                float pi = 3.141592653589793;
+                return exp(-(x*x) / (2.0 * sigma * sigma)) / (sqrt(2.0 * pi) * sigma);
+            }
+            
+            float2 erf(float2 x) 
+            {
+                float2 s = sign(x);
+                float2 a = abs(x);
+                x = 1.0 + (0.278393 + (0.230389 + 0.078108 * (a * a)) * a) * a;
+                x = x * x;
+                return s - s / (x * x);
+                return s;
+            }
+            
+            float roundedBoxShadowX(float x, float y, float sigma, float corner, float2 halfSize)
+            {
+                float delta = min(halfSize.y - corner - abs(y), 0.0);
+                float curved = halfSize.x - corner + sqrt(max(0.0, corner * corner - delta * delta));
+                float2 integral = 0.5 + 0.5 * erf((x + float2(-curved, curved)) * (sqrt(0.5)/sigma));
+                return integral.y - integral.x;
+            }
+            
+            float roundedBoxShadow(float2 lower, float2 upper, float2 pnt, float sigma, float corner)
+            {
+                float2 center = (lower + upper) * 0.5;
+                float2 halfSize = (upper - lower) * 0.5;
+                pnt -= center;
+                
+                float low = pnt.y - halfSize.y;
+                float high = pnt.y + halfSize.y;
+                float start = clamp(-3.0 * sigma, low, high);
+                float end = clamp(3.0 * sigma, low, high);
+                
+                float step = (end - start) / 4.0;
+                float y = start + step * 0.5;
+                float value = 0.0;
+                
+                for(int i=0; i<4;i++)
+                {
+                    value += roundedBoxShadowX(pnt.x, pnt.y - y, sigma, corner, halfSize) * gaussian(y, sigma) * step;
+                    y += step;
+                }
+                
+                return value;
+            }
+            
+            v2f vert(appdata v){
+                v2f o;
+                float padding = 3.0 * _sb_sigma;
+                o.coord = lerp(_sb_box.xy - padding, _sb_box.zw + padding, v.vertex.xy);
+                float3x3 mat = float3x3(_mat[0], _mat[1], _mat[2], _mat[3], _mat[4], _mat[5], 0, 0, 1);
+                float2 p = mul(mat, float3(o.coord.xy, 1.0)).xy - _viewport.xy;
+                
+            #if UNITY_UV_STARTS_AT_TOP
+                o.vertex = float4(2.0 * p.x / _viewport.z - 1.0, 2.0 * p.y / _viewport.w - 1.0, 0, 1);
+            #else
+                o.vertex = float4(2.0 * p.x / _viewport.z - 1.0, 1.0 - 2.0 * p.y / _viewport.w, 0, 1);
+            #endif
+                return o;
+            }
+            
+            float4 frag(v2f i) : SV_TARGET {
+                float4 fragColor = _sb_color;
+                fragColor.a = fragColor.a * roundedBoxShadow(_sb_box.xy, _sb_box.zw, i.coord, _sb_sigma, _sb_corner);
+                return fragColor;
+            }
+            
+            #pragma vertex vert
+            #pragma fragment frag
+            
+            ENDCG
+        }
+    }
+}

Runtime/Resources/UIWidgets_canvas_shadowRBox.shader

@@ -0,0 +1,65 @@
+Shader "UIWidgets/canvas_strokeAlpha"
+{
+    Properties {
+       _SrcBlend("_SrcBlend", Int) = 1 // One
+       _DstBlend("_DstBlend", Int) = 10 // OneMinusSrcAlpha
+       _StencilComp("_StencilComp", Float) = 3 // - Equal, 8 - Always 
+    }
+   
+    SubShader {
+        ZTest Always
+        ZWrite Off
+        Blend [_SrcBlend] [_DstBlend]
+        
+        Stencil {
+            Ref 128
+            Comp [_StencilComp]
+            Pass IncrSat
+        }
+
+        Pass { // 0, color
+            CGPROGRAM
+            #define UIWIDGETS_COLOR
+            #include "UIWidgets_canvas.cginc"
+            #pragma vertex vert
+            #pragma fragment frag_stroke_alpha
+            ENDCG
+        }
+        
+        Pass { // 1, linear
+            CGPROGRAM
+            #define UIWIDGETS_LINEAR
+            #include "UIWidgets_canvas.cginc"
+            #pragma vertex vert
+            #pragma fragment frag_stroke_alpha
+            ENDCG
+        }
+
+        Pass { // 2, radial
+            CGPROGRAM
+            #define UIWIDGETS_RADIAL
+            #include "UIWidgets_canvas.cginc"
+            #pragma vertex vert
+            #pragma fragment frag_stroke_alpha
+            ENDCG
+        }
+
+        Pass { // 3, sweep
+            CGPROGRAM
+            #define UIWIDGETS_SWEEP
+            #include "UIWidgets_canvas.cginc"
+            #pragma vertex vert
+            #pragma fragment frag_stroke_alpha
+            ENDCG
+        }
+        
+        Pass { // 4, image
+            CGPROGRAM
+            #define UIWIDGETS_IMAGE
+            #include "UIWidgets_canvas.cginc"
+            #pragma vertex vert
+            #pragma fragment frag_stroke_alpha
+            ENDCG
+        }
+    }
+}