pengtaihao
/
com.unity.uiextensions
mirror of https://github.com/Unity-UI-Extensions/com.unity.uiextensions
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed Line endings on shaders (?) 

Removed unnecessary usings (who knew there were so many, I'm normally so tidy :P)
pull/413/head
Simon Jackson 2017-05-05 14:25:48 +01:00
parent dc809858b9
commit 35b88a2487
55 changed files with 86 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Editor/BezierLineRendererEditor.cs
View File

@ -2,8 +2,6 @@
///Sourced from - https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/issues/127/uilinerenderer-mesh-not-updating-in-editor ///Sourced from - https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/issues/127/uilinerenderer-mesh-not-updating-in-editor
using UnityEditor; using UnityEditor;
using UnityEngine;
using UnityEngine.UI.Extensions;
namespace UnityEngine.UI.Extensions namespace UnityEngine.UI.Extensions
{ {

1
Examples/UIVerticalScrollerDemo/Scripts/ScrollingCalendar.cs
View File

@ -7,7 +7,6 @@
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
using System;
using UnityEngine.UI.Extensions; using UnityEngine.UI.Extensions;

1
Scripts/Controls/Accordion/Tweening/FloatTween.cs
View File

@ -1,7 +1,6 @@
///Credit ChoMPHi ///Credit ChoMPHi
///Sourced from - http://forum.unity3d.com/threads/accordion-type-layout.271818/ ///Sourced from - http://forum.unity3d.com/threads/accordion-type-layout.271818/
using System.Collections;
using UnityEngine.Events; using UnityEngine.Events;
namespace UnityEngine.UI.Extensions.Tweens namespace UnityEngine.UI.Extensions.Tweens

1
Scripts/Controls/Accordion/Tweening/ITweenValue.cs
View File

@ -1,7 +1,6 @@
///Credit ChoMPHi ///Credit ChoMPHi
///Sourced from - http://forum.unity3d.com/threads/accordion-type-layout.271818/ ///Sourced from - http://forum.unity3d.com/threads/accordion-type-layout.271818/
using System.Collections;
namespace UnityEngine.UI.Extensions.Tweens namespace UnityEngine.UI.Extensions.Tweens
{ {

1
Scripts/Controls/ColorPicker/ColorImage.cs
View File

@ -1,7 +1,6 @@
///Credit judah4 ///Credit judah4
///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/ ///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/
using System.Globalization;
namespace UnityEngine.UI.Extensions.ColorPicker namespace UnityEngine.UI.Extensions.ColorPicker
{ {

1
Scripts/Controls/ColorPicker/ColorLabel.cs
View File

@ -1,7 +1,6 @@
///Credit judah4 ///Credit judah4
///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/ ///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/
using System.Globalization;
namespace UnityEngine.UI.Extensions.ColorPicker namespace UnityEngine.UI.Extensions.ColorPicker
{ {

1
Scripts/Controls/ColorPicker/ColorPickerPresets.cs
View File

@ -1,7 +1,6 @@
///Credit judah4 ///Credit judah4
///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/ ///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/
using System.Globalization;
namespace UnityEngine.UI.Extensions.ColorPicker namespace UnityEngine.UI.Extensions.ColorPicker
{ {

4
Scripts/Controls/ColorPicker/Events/ColorChangedEvent.cs
View File

@ -1,5 +1,5 @@
using UnityEngine; using System;
using System; using UnityEngine;
using UnityEngine.Events; using UnityEngine.Events;
[Serializable] [Serializable]

3
Scripts/Controls/ColorPicker/Events/HSVChangedEvent.cs
View File

@ -1,5 +1,4 @@
using UnityEngine; using UnityEngine.Events;
using UnityEngine.Events;
public class HSVChangedEvent : UnityEvent<float, float, float> public class HSVChangedEvent : UnityEvent<float, float, float>
{ {

1
Scripts/Controls/ColorPicker/SVBoxSlider.cs
View File

@ -1,7 +1,6 @@
///Credit judah4 ///Credit judah4
///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/ ///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/
using System.Globalization;
namespace UnityEngine.UI.Extensions.ColorPicker namespace UnityEngine.UI.Extensions.ColorPicker
{ {

1
Scripts/Controls/ColorPicker/TiltWindow.cs
View File

@ -1,7 +1,6 @@
///Credit judah4 ///Credit judah4
///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/ ///Sourced from - http://forum.unity3d.com/threads/color-picker.267043/
using System.Globalization;
namespace UnityEngine.UI.Extensions namespace UnityEngine.UI.Extensions
{ {

4
Scripts/Controls/ComboBox/AutoCompleteComboBox.cs
View File

@ -22,7 +22,7 @@ namespace UnityEngine.UI.Extensions
private InputField _mainInput; private InputField _mainInput;
private RectTransform _inputRT; private RectTransform _inputRT;
private Button _arrow_Button; //private Button _arrow_Button;
private RectTransform _rectTransform; private RectTransform _rectTransform;
@ -136,7 +136,7 @@ namespace UnityEngine.UI.Extensions
_inputRT = _rectTransform.FindChild("InputField").GetComponent<RectTransform>(); _inputRT = _rectTransform.FindChild("InputField").GetComponent<RectTransform>();
_mainInput = _inputRT.GetComponent<InputField>(); _mainInput = _inputRT.GetComponent<InputField>();
_arrow_Button = _rectTransform.FindChild ("ArrowBtn").GetComponent<Button> (); //_arrow_Button = _rectTransform.FindChild ("ArrowBtn").GetComponent<Button> ();
_overlayRT = _rectTransform.FindChild("Overlay").GetComponent<RectTransform>(); _overlayRT = _rectTransform.FindChild("Overlay").GetComponent<RectTransform>();
_overlayRT.gameObject.SetActive(false); _overlayRT.gameObject.SetActive(false);

2
Scripts/Controls/ReorderableList/ReorderableList.cs
View File

@ -2,8 +2,6 @@
/// Sourced from - http://forum.unity3d.com/threads/free-reorderable-list.364600/ /// Sourced from - http://forum.unity3d.com/threads/free-reorderable-list.364600/
using System; using System;
using System.Collections;
using System.Linq;
using UnityEngine.Events; using UnityEngine.Events;
namespace UnityEngine.UI.Extensions namespace UnityEngine.UI.Extensions

1
Scripts/Controls/ReorderableList/ReorderableListElement.cs
View File

@ -4,7 +4,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
namespace UnityEngine.UI.Extensions namespace UnityEngine.UI.Extensions

3
Scripts/Effects/UIFlippable.cs
View File

@ -1,8 +1,5 @@
using System;
/// Credit ChoMPHi /// Credit ChoMPHi
/// Sourced from - http://forum.unity3d.com/threads/script-flippable-for-ui-graphics.291711/ /// Sourced from - http://forum.unity3d.com/threads/script-flippable-for-ui-graphics.291711/
using System.Collections.Generic;
namespace UnityEngine.UI.Extensions namespace UnityEngine.UI.Extensions
{ {

3
Scripts/Layout/CurvedLayout.cs
View File

@ -7,7 +7,8 @@
/// ///
/// </summary> /// </summary>
namespace UnityEngine.UI.Extensions { namespace UnityEngine.UI.Extensions
{
/// <summary> /// <summary>
/// TODO: /// TODO:
/// - add automatic child sizing, like in the HorizontalOrVerticalLayoutGroup.cs /// - add automatic child sizing, like in the HorizontalOrVerticalLayoutGroup.cs

1
Scripts/Layout/TileSizeFitter.cs
View File

@ -1,7 +1,6 @@
/// Credit Ges /// Credit Ges
/// Sourced from - http://forum.unity3d.com/threads/scripts-useful-4-6-scripts-collection.264161/page-3#post-2280109 /// Sourced from - http://forum.unity3d.com/threads/scripts-useful-4-6-scripts-collection.264161/page-3#post-2280109
using System.Collections;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
namespace UnityEngine.UI.Extensions namespace UnityEngine.UI.Extensions

3
Scripts/Primitives/UICornerCut.cs
View File

@ -16,7 +16,8 @@
/// ///
/// </summary> /// </summary>
namespace UnityEngine.UI.Extensions { namespace UnityEngine.UI.Extensions
{
[AddComponentMenu("UI/Extensions/Primitives/Cut Corners")] [AddComponentMenu("UI/Extensions/Primitives/Cut Corners")]
public class UICornerCut : UIPrimitiveBase public class UICornerCut : UIPrimitiveBase
{ {

1
Scripts/Primitives/UIGridRenderer.cs
View File

@ -1,7 +1,6 @@
/// Credit John Hattan (http://thecodezone.com/) /// Credit John Hattan (http://thecodezone.com/)
/// Sourced from - https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/issues/117/uigridrenderer /// Sourced from - https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/issues/117/uigridrenderer
using System.Collections.Generic;
namespace UnityEngine.UI.Extensions namespace UnityEngine.UI.Extensions
{ {

4
Scripts/Utilities/ExtensionsToggleGroup.cs
View File

@ -1,8 +1,8 @@
using System; using System;
using System.Linq;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine.EventSystems; using System.Linq;
using UnityEngine.Events; using UnityEngine.Events;
using UnityEngine.EventSystems;
namespace UnityEngine.UI namespace UnityEngine.UI
{ {

2
Scripts/Utilities/Serialization/Surrogates/GameObjectSurrogate.cs
View File

@ -1,5 +1,3 @@
using System.Runtime.Serialization;
namespace UnityEngine.UI.Extensions namespace UnityEngine.UI.Extensions
{ {
/// <summary> /// <summary>

2
Scripts/Utilities/Serialization/Surrogates/Texture2DSurrogate.cs
View File

@ -1,5 +1,3 @@
using System.Runtime.Serialization;
namespace UnityEngine.UI.Extensions namespace UnityEngine.UI.Extensions
{ {
/// <summary> /// <summary>

2
Scripts/Utilities/Serialization/Surrogates/TransformSurrogate.cs
View File

@ -1,5 +1,3 @@
using System.Runtime.Serialization;
namespace UnityEngine.UI.Extensions namespace UnityEngine.UI.Extensions
{ {
/// <summary> /// <summary>

1
Scripts/Utilities/TestCompression.cs
View File

@ -1,5 +1,4 @@
using UnityEngine; using UnityEngine;
using System.Collections;
public class TestCompression : MonoBehaviour { public class TestCompression : MonoBehaviour {

4
Scripts/Utilities/UIScrollToSelection.cs
View File

@ -1,4 +1,5 @@
/// Credit zero3growlithe using System.Collections.Generic;
/// Credit zero3growlithe
/// sourced from: http://forum.unity3d.com/threads/scripts-useful-4-6-scripts-collection.264161/page-2#post-2011648 /// sourced from: http://forum.unity3d.com/threads/scripts-useful-4-6-scripts-collection.264161/page-2#post-2011648
/*USAGE: /*USAGE:
@ -6,7 +7,6 @@ Simply place the script on the ScrollRect that contains the selectable children
and drag'n'drop the RectTransform of the options "container" that we'll be scrolling.*/ and drag'n'drop the RectTransform of the options "container" that we'll be scrolling.*/
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using System.Collections.Generic;
namespace UnityEngine.UI.Extensions namespace UnityEngine.UI.Extensions
{ {

1
Scripts/VR Extensions/VRCursor.cs
View File

@ -1,7 +1,6 @@
/// Credit Ralph Barbagallo (www.flarb.com /www.ralphbarbagallo.com / @flarb) /// Credit Ralph Barbagallo (www.flarb.com /www.ralphbarbagallo.com / @flarb)
/// Sourced from - http://forum.unity3d.com/threads/vr-cursor-possible-unity-4-6-gui-bug-or-is-it-me /// Sourced from - http://forum.unity3d.com/threads/vr-cursor-possible-unity-4-6-gui-bug-or-is-it-me
using System.Collections;
namespace UnityEngine.UI.Extensions namespace UnityEngine.UI.Extensions
{ {
[AddComponentMenu("UI/Extensions/VR Cursor")] [AddComponentMenu("UI/Extensions/VR Cursor")]

6
Shaders/SoftMaskShader.shader
View File

@ -1,4 +1,6 @@
Shader "UI Extensions/SoftMaskShader" // Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
Shader "UI Extensions/SoftMaskShader"
{ {
Properties Properties
{ {
@ -92,7 +94,7 @@
v2f OUT; v2f OUT;
float4 wolrdPos = IN.vertex; float4 wolrdPos = IN.vertex;
OUT.maskTexcoord = TRANSFORM_TEX(wolrdPos.xy, _AlphaMask); OUT.maskTexcoord = TRANSFORM_TEX(wolrdPos.xy, _AlphaMask);
OUT.vertex = mul(UNITY_MATRIX_MVP, IN.vertex); OUT.vertex = UnityObjectToClipPos(IN.vertex);
OUT.texcoord = IN.texcoord; OUT.texcoord = IN.texcoord;
#ifdef UNITY_HALF_TEXEL_OFFSET #ifdef UNITY_HALF_TEXEL_OFFSET

6
Shaders/UIAdditive.shader
View File

@ -1,4 +1,6 @@
Shader "UI Extensions/UIAdditive" // Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
Shader "UI Extensions/UIAdditive"
{ {
Properties Properties
{ {
@ -68,7 +70,7 @@
v2f vert(appdata_t IN) v2f vert(appdata_t IN)
{ {
v2f OUT; v2f OUT;
OUT.vertex = mul(UNITY_MATRIX_MVP, IN.vertex); OUT.vertex = UnityObjectToClipPos(IN.vertex);
OUT.texcoord = IN.texcoord; OUT.texcoord = IN.texcoord;
#ifdef UNITY_HALF_TEXEL_OFFSET #ifdef UNITY_HALF_TEXEL_OFFSET
OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1); OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);

6
Shaders/UIImageCrop.shader
View File

@ -1,4 +1,6 @@
/// Credit 00christian00 // Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
/// Credit 00christian00
/// Sourced from - http://forum.unity3d.com/threads/any-way-to-show-part-of-an-image-without-using-mask.360085/#post-2332030 /// Sourced from - http://forum.unity3d.com/threads/any-way-to-show-part-of-an-image-without-using-mask.360085/#post-2332030
Shader "UI Extensions/UI Image Crop" { Shader "UI Extensions/UI Image Crop" {
@ -46,7 +48,7 @@ Shader "UI Extensions/UI Image Crop" {
v2f o; v2f o;
o.color=v.color; o.color=v.color;
o.color.a=0.1; o.color.a=0.1;
o.pos = mul (UNITY_MATRIX_MVP, v.pos); o.pos = UnityObjectToClipPos (v.pos);
o.uv=TRANSFORM_TEX(v.uv, _MainTex); o.uv=TRANSFORM_TEX(v.uv, _MainTex);

6
Shaders/UILinearDodge.shader
View File

@ -1,4 +1,6 @@
Shader "UI Extensions/UILinearDodge" // Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
Shader "UI Extensions/UILinearDodge"
{ {
Properties Properties
{ {
@ -69,7 +71,7 @@
v2f vert(appdata_t IN) v2f vert(appdata_t IN)
{ {
v2f OUT; v2f OUT;
OUT.vertex = mul(UNITY_MATRIX_MVP, IN.vertex); OUT.vertex = UnityObjectToClipPos(IN.vertex);
OUT.texcoord = IN.texcoord; OUT.texcoord = IN.texcoord;
#ifdef UNITY_HALF_TEXEL_OFFSET #ifdef UNITY_HALF_TEXEL_OFFSET
OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1); OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);

6
Shaders/UIMultiply.shader
View File

@ -1,4 +1,6 @@
Shader "UI Extensions/UIMultiply" // Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
Shader "UI Extensions/UIMultiply"
{ {
Properties Properties
{ {
@ -68,7 +70,7 @@
v2f vert(appdata_t IN) v2f vert(appdata_t IN)
{ {
v2f OUT; v2f OUT;
OUT.vertex = mul(UNITY_MATRIX_MVP, IN.vertex); OUT.vertex = UnityObjectToClipPos(IN.vertex);
OUT.texcoord = IN.texcoord; OUT.texcoord = IN.texcoord;
#ifdef UNITY_HALF_TEXEL_OFFSET #ifdef UNITY_HALF_TEXEL_OFFSET
OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1); OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);

6
Shaders/UIScreen.shader
View File

@ -1,4 +1,6 @@
Shader "UI Extensions/UIScreen" // Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
Shader "UI Extensions/UIScreen"
{ {
Properties Properties
{ {
@ -69,7 +71,7 @@
v2f vert(appdata_t IN) v2f vert(appdata_t IN)
{ {
v2f OUT; v2f OUT;
OUT.vertex = mul(UNITY_MATRIX_MVP, IN.vertex); OUT.vertex = UnityObjectToClipPos(IN.vertex);
OUT.texcoord = IN.texcoord; OUT.texcoord = IN.texcoord;
#ifdef UNITY_HALF_TEXEL_OFFSET #ifdef UNITY_HALF_TEXEL_OFFSET
OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1); OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);

6
Shaders/UISoftAdditive.shader
View File

@ -1,4 +1,6 @@
Shader "UI Extensions/UISoftAdditive" // Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
Shader "UI Extensions/UISoftAdditive"
{ {
Properties Properties
{ {
@ -68,7 +70,7 @@
v2f vert(appdata_t IN) v2f vert(appdata_t IN)
{ {
v2f OUT; v2f OUT;
OUT.vertex = mul(UNITY_MATRIX_MVP, IN.vertex); OUT.vertex = UnityObjectToClipPos(IN.vertex);
OUT.texcoord = IN.texcoord; OUT.texcoord = IN.texcoord;
#ifdef UNITY_HALF_TEXEL_OFFSET #ifdef UNITY_HALF_TEXEL_OFFSET
OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1); OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);