Update examples

fairygui · Jul 5, 2018 · e0612f7 · e0612f7
1 parent ef20c39
commit e0612f7
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 18 deletions.
diff --git 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
@@ -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
diff --git a/Examples.Unity5/Assets/Plugins/Editor/FairyGUI.Editor.dll.mdb b/Examples.Unity5/Assets/Plugins/Editor/FairyGUI.Editor.dll.mdb
diff --git a/Examples.Unity5/Assets/Plugins/Editor/FairyGUI.Editor.pdb b/Examples.Unity5/Assets/Plugins/Editor/FairyGUI.Editor.pdb
diff --git a/Examples.Unity5/Assets/Plugins/FairyGUI.dll b/Examples.Unity5/Assets/Plugins/FairyGUI.dll
diff --git a/Examples.Unity5/Assets/Plugins/FairyGUI.dll.mdb b/Examples.Unity5/Assets/Plugins/FairyGUI.dll.mdb
diff --git a/Examples.Unity5/Assets/Plugins/FairyGUI.pdb b/Examples.Unity5/Assets/Plugins/FairyGUI.pdb