diff --git a/Examples.Unity5/Assets/FairyGUI/Resources/Shaders/FairyGUI-Text-Brighter.shader b/Examples.Unity5/Assets/FairyGUI/Resources/Shaders/FairyGUI-Text-Brighter.shader index 76907660..7df68271 100644 --- a/Examples.Unity5/Assets/FairyGUI/Resources/Shaders/FairyGUI-Text-Brighter.shader +++ b/Examples.Unity5/Assets/FairyGUI/Resources/Shaders/FairyGUI-Text-Brighter.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced '_Object2World' with 'unity_ObjectToWorld' + Shader "FairyGUI/Text Brighter" { Properties @@ -122,11 +124,11 @@ Shader "FairyGUI/Text Brighter" o.texcoord = texcoord; #ifdef CLIPPED - o.clipPos = mul(_Object2World, v.vertex).xy * _ClipBox.zw + _ClipBox.xy; + o.clipPos = mul(unity_ObjectToWorld, v.vertex).xy * _ClipBox.zw + _ClipBox.xy; #endif #ifdef SOFT_CLIPPED - o.clipPos = mul(_Object2World, v.vertex).xy * _ClipBox.zw + _ClipBox.xy; + o.clipPos = mul(unity_ObjectToWorld, v.vertex).xy * _ClipBox.zw + _ClipBox.xy; #endif return o; @@ -138,13 +140,8 @@ Shader "FairyGUI/Text Brighter" col.a *= tex2D(_MainTex, i.texcoord).a * i.flags.x; #ifdef GRAYED - if(i.flags.y==1) - { - fixed grey = dot(col.rgb, fixed3(0.299, 0.587, 0.114)); - col.rgb = fixed3(grey, grey, grey); - } - else - col.rgb = fixed3(0.8, 0.8, 0.8); + fixed grey = dot(col.rgb, fixed3(0.299, 0.587, 0.114)); + col.rgb = fixed3(grey, grey, grey); #endif #ifdef SOFT_CLIPPED diff --git a/Examples.Unity5/Assets/FairyGUI/Resources/Shaders/FairyGUI-Text.shader b/Examples.Unity5/Assets/FairyGUI/Resources/Shaders/FairyGUI-Text.shader index 60aa5c29..ae846ec5 100644 --- a/Examples.Unity5/Assets/FairyGUI/Resources/Shaders/FairyGUI-Text.shader +++ b/Examples.Unity5/Assets/FairyGUI/Resources/Shaders/FairyGUI-Text.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced '_Object2World' with 'unity_ObjectToWorld' + Shader "FairyGUI/Text" { Properties @@ -116,11 +118,11 @@ Shader "FairyGUI/Text" #endif #ifdef CLIPPED - o.clipPos = mul(_Object2World, v.vertex).xy * _ClipBox.zw + _ClipBox.xy; + o.clipPos = mul(unity_ObjectToWorld, v.vertex).xy * _ClipBox.zw + _ClipBox.xy; #endif #ifdef SOFT_CLIPPED - o.clipPos = mul(_Object2World, v.vertex).xy * _ClipBox.zw + _ClipBox.xy; + o.clipPos = mul(unity_ObjectToWorld, v.vertex).xy * _ClipBox.zw + _ClipBox.xy; #endif return o; @@ -132,13 +134,8 @@ Shader "FairyGUI/Text" col.a *= tex2D(_MainTex, i.texcoord).a; #ifdef GRAYED - if(i.flag==1) - { - fixed grey = dot(col.rgb, fixed3(0.299, 0.587, 0.114)); - col.rgb = fixed3(grey, grey, grey); - } - else - col.rgb = fixed3(0.8, 0.8, 0.8); + fixed grey = dot(col.rgb, fixed3(0.299, 0.587, 0.114)); + col.rgb = fixed3(grey, grey, grey); #endif #ifdef SOFT_CLIPPED diff --git a/Examples.Unity5/Assets/Plugins/Editor/FairyGUI.Editor.dll b/Examples.Unity5/Assets/Plugins/Editor/FairyGUI.Editor.dll index 70acad68..67a10b9b 100644 Binary files a/Examples.Unity5/Assets/Plugins/Editor/FairyGUI.Editor.dll and b/Examples.Unity5/Assets/Plugins/Editor/FairyGUI.Editor.dll differ diff --git a/Examples.Unity5/Assets/Plugins/Editor/FairyGUI.Editor.dll.mdb b/Examples.Unity5/Assets/Plugins/Editor/FairyGUI.Editor.dll.mdb index da06ba1a..6d1999b1 100644 Binary files a/Examples.Unity5/Assets/Plugins/Editor/FairyGUI.Editor.dll.mdb and b/Examples.Unity5/Assets/Plugins/Editor/FairyGUI.Editor.dll.mdb differ diff --git a/Examples.Unity5/Assets/Plugins/Editor/FairyGUI.Editor.pdb b/Examples.Unity5/Assets/Plugins/Editor/FairyGUI.Editor.pdb index a7bef601..e439c367 100644 Binary files a/Examples.Unity5/Assets/Plugins/Editor/FairyGUI.Editor.pdb and b/Examples.Unity5/Assets/Plugins/Editor/FairyGUI.Editor.pdb differ diff --git a/Examples.Unity5/Assets/Plugins/FairyGUI.dll b/Examples.Unity5/Assets/Plugins/FairyGUI.dll index 675c7a50..e0689dee 100644 Binary files a/Examples.Unity5/Assets/Plugins/FairyGUI.dll and b/Examples.Unity5/Assets/Plugins/FairyGUI.dll differ diff --git a/Examples.Unity5/Assets/Plugins/FairyGUI.dll.mdb b/Examples.Unity5/Assets/Plugins/FairyGUI.dll.mdb index badc08d0..30bb484f 100644 Binary files a/Examples.Unity5/Assets/Plugins/FairyGUI.dll.mdb and b/Examples.Unity5/Assets/Plugins/FairyGUI.dll.mdb differ diff --git a/Examples.Unity5/Assets/Plugins/FairyGUI.pdb b/Examples.Unity5/Assets/Plugins/FairyGUI.pdb index 3df5ebe1..f4bb818e 100644 Binary files a/Examples.Unity5/Assets/Plugins/FairyGUI.pdb and b/Examples.Unity5/Assets/Plugins/FairyGUI.pdb differ