diff --git a/Assets/00_NotPackaged.meta b/Assets/00_NotPackaged.meta new file mode 100644 index 00000000..ff76daf5 --- /dev/null +++ b/Assets/00_NotPackaged.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: f36ac3ef981bf944c8fcb97c43c401e7 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/00_NotPackaged/Blur.mat b/Assets/00_NotPackaged/Blur.mat new file mode 100644 index 00000000..5f24d789 Binary files /dev/null and b/Assets/00_NotPackaged/Blur.mat differ diff --git a/Assets/00_NotPackaged/Blur.mat.meta b/Assets/00_NotPackaged/Blur.mat.meta new file mode 100644 index 00000000..f85219f9 --- /dev/null +++ b/Assets/00_NotPackaged/Blur.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: ea202c8cc08b52240968cfb5972c2bf2 +NativeFormatImporter: + userData: diff --git a/Assets/00_NotPackaged/Blur.shader b/Assets/00_NotPackaged/Blur.shader new file mode 100644 index 00000000..4f5693d0 --- /dev/null +++ b/Assets/00_NotPackaged/Blur.shader @@ -0,0 +1,200 @@ +Shader "Custom/Blur" { + Properties { + _Color ("Main Color", Color) = (1,1,1,1) + _Size ("Blur Size", Range(0, 10)) = 1 + } + + Category { + + // We must be transparent, so other objects are drawn before this one. + Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Opaque" } + + + SubShader { + + // Horizontal blur + GrabPass { + Tags { "LightMode" = "Always" } + } + Pass { + Tags { "LightMode" = "Always" } + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma fragmentoption ARB_precision_hint_fastest + #include "UnityCG.cginc" + + struct appdata_t { + float4 vertex : POSITION; + float2 texcoord: TEXCOORD0; + }; + + struct v2f { + float4 vertex : POSITION; + float4 uvgrab : TEXCOORD0; + }; + + v2f vert (appdata_t v) { + v2f o; + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + #if UNITY_UV_STARTS_AT_TOP + float scale = -1.0; + #else + float scale = 1.0; + #endif + o.uvgrab.xy = (float2(o.vertex.x, o.vertex.y*scale) + o.vertex.w) * 0.5; + o.uvgrab.zw = o.vertex.zw; + return o; + } + + sampler2D _GrabTexture; + float4 _GrabTexture_TexelSize; + float _Size; + + half4 frag( v2f i ) : COLOR { +// half4 col = tex2Dproj( _GrabTexture, UNITY_PROJ_COORD(i.uvgrab)); +// return col; + + half4 sum = half4(0,0,0,0); + + #define GRABPIXEL(weight,kernelx) tex2Dproj( _GrabTexture, UNITY_PROJ_COORD(float4(i.uvgrab.x + _GrabTexture_TexelSize.x * kernelx*_Size, i.uvgrab.y, i.uvgrab.z, i.uvgrab.w))) * weight + + sum += GRABPIXEL(0.05, -4.0); + sum += GRABPIXEL(0.09, -3.0); + sum += GRABPIXEL(0.12, -2.0); + sum += GRABPIXEL(0.15, -1.0); + sum += GRABPIXEL(0.18, 0.0); + sum += GRABPIXEL(0.15, +1.0); + sum += GRABPIXEL(0.12, +2.0); + sum += GRABPIXEL(0.09, +3.0); + sum += GRABPIXEL(0.05, +4.0); + + return sum; + } + ENDCG + } + + // Vertical blur + GrabPass { + Tags { "LightMode" = "Always" } + } + Pass { + Tags { "LightMode" = "Always" } + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma fragmentoption ARB_precision_hint_fastest + #include "UnityCG.cginc" + + struct appdata_t { + float4 vertex : POSITION; + float2 texcoord: TEXCOORD0; + }; + + struct v2f { + float4 vertex : POSITION; + float4 uvgrab : TEXCOORD0; + }; + + v2f vert (appdata_t v) { + v2f o; + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + #if UNITY_UV_STARTS_AT_TOP + float scale = -1.0; + #else + float scale = 1.0; + #endif + o.uvgrab.xy = (float2(o.vertex.x, o.vertex.y*scale) + o.vertex.w) * 0.5; + o.uvgrab.zw = o.vertex.zw; + return o; + } + + sampler2D _GrabTexture; + float4 _GrabTexture_TexelSize; + float _Size; + + half4 frag( v2f i ) : COLOR { +// half4 col = tex2Dproj( _GrabTexture, UNITY_PROJ_COORD(i.uvgrab)); +// return col; + + half4 sum = half4(0,0,0,0); + + #define GRABPIXEL(weight,kernely) tex2Dproj( _GrabTexture, UNITY_PROJ_COORD(float4(i.uvgrab.x, i.uvgrab.y + _GrabTexture_TexelSize.y * kernely*_Size, i.uvgrab.z, i.uvgrab.w))) * weight + + //G(X) = (1/(sqrt(2*PI*deviation*deviation))) * exp(-(x*x / (2*deviation*deviation))) + + sum += GRABPIXEL(0.05, -4.0); + sum += GRABPIXEL(0.09, -3.0); + sum += GRABPIXEL(0.12, -2.0); + sum += GRABPIXEL(0.15, -1.0); + sum += GRABPIXEL(0.18, 0.0); + sum += GRABPIXEL(0.15, +1.0); + sum += GRABPIXEL(0.12, +2.0); + sum += GRABPIXEL(0.09, +3.0); + sum += GRABPIXEL(0.05, +4.0); + + return sum; + } + ENDCG + } + + // Distortion + GrabPass { + Tags { "LightMode" = "Always" } + } + Pass { + Tags { "LightMode" = "Always" } + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma fragmentoption ARB_precision_hint_fastest + #include "UnityCG.cginc" + + struct appdata_t { + float4 vertex : POSITION; +// float2 texcoord: TEXCOORD0; + }; + + struct v2f { + float4 vertex : POSITION; + float4 uvgrab : TEXCOORD0; +// float2 uvmain : TEXCOORD2; + }; + +// float4 _MainTex_ST; + + v2f vert (appdata_t v) { + v2f o; + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + #if UNITY_UV_STARTS_AT_TOP + float scale = -1.0; + #else + float scale = 1.0; + #endif + o.uvgrab.xy = (float2(o.vertex.x, o.vertex.y*scale) + o.vertex.w) * 0.5; +// o.uvgrab.zw = o.vertex.zw; +// o.uvmain = TRANSFORM_TEX( v.texcoord, _MainTex ); + return o; + } + + fixed4 _Color; + sampler2D _GrabTexture; + float4 _GrabTexture_TexelSize; + + half4 frag( v2f i ) : COLOR { +// float2 offset = _GrabTexture_TexelSize.xy; +// i.uvgrab.xy = offset * i.uvgrab.z + i.uvgrab.xy; + + half4 col = tex2Dproj( _GrabTexture, UNITY_PROJ_COORD(i.uvgrab)); + half4 tint = _Color; + + return col * tint; + } + ENDCG + } + } + } +} \ No newline at end of file diff --git a/Assets/00_NotPackaged/Blur.shader.meta b/Assets/00_NotPackaged/Blur.shader.meta new file mode 100644 index 00000000..bc58edc6 --- /dev/null +++ b/Assets/00_NotPackaged/Blur.shader.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: b7a1391330e101945a97a9e90f4f8003 +ShaderImporter: + defaultTextures: [] + userData: diff --git a/Assets/MaterialUI/ComponentPrefabs/Button - Flat.prefab b/Assets/MaterialUI/ComponentPrefabs/Button - Flat.prefab index 76da9556..592bc047 100644 Binary files a/Assets/MaterialUI/ComponentPrefabs/Button - Flat.prefab and b/Assets/MaterialUI/ComponentPrefabs/Button - Flat.prefab differ diff --git a/Assets/MaterialUI/ComponentPrefabs/Button - Raised.prefab b/Assets/MaterialUI/ComponentPrefabs/Button - Raised.prefab index 10d998b7..18894cfa 100644 Binary files a/Assets/MaterialUI/ComponentPrefabs/Button - Raised.prefab and b/Assets/MaterialUI/ComponentPrefabs/Button - Raised.prefab differ diff --git a/Assets/MaterialUI/ComponentPrefabs/Panel.prefab b/Assets/MaterialUI/ComponentPrefabs/Panel.prefab index 839afbf9..ef7da41c 100644 Binary files a/Assets/MaterialUI/ComponentPrefabs/Panel.prefab and b/Assets/MaterialUI/ComponentPrefabs/Panel.prefab differ diff --git a/Assets/MaterialUI/ComponentPrefabs/RadioGroup.prefab b/Assets/MaterialUI/ComponentPrefabs/RadioGroup.prefab index 269d7de6..87e9db82 100644 Binary files a/Assets/MaterialUI/ComponentPrefabs/RadioGroup.prefab and b/Assets/MaterialUI/ComponentPrefabs/RadioGroup.prefab differ diff --git a/Assets/MaterialUI/ComponentPrefabs/Round Button - Flat.prefab b/Assets/MaterialUI/ComponentPrefabs/Round Button - Flat.prefab index 3eb45b24..09c1a75b 100644 Binary files a/Assets/MaterialUI/ComponentPrefabs/Round Button - Flat.prefab and b/Assets/MaterialUI/ComponentPrefabs/Round Button - Flat.prefab differ diff --git a/Assets/MaterialUI/ComponentPrefabs/Round Button - Raised.prefab b/Assets/MaterialUI/ComponentPrefabs/Round Button - Raised.prefab index 72dc51e8..8f7f9f19 100644 Binary files a/Assets/MaterialUI/ComponentPrefabs/Round Button - Raised.prefab and b/Assets/MaterialUI/ComponentPrefabs/Round Button - Raised.prefab differ diff --git a/Assets/MaterialUI/ComponentPrefabs/Round Button - Small - Flat.prefab b/Assets/MaterialUI/ComponentPrefabs/Round Button - Small - Flat.prefab index 9a926820..cbbad190 100644 Binary files a/Assets/MaterialUI/ComponentPrefabs/Round Button - Small - Flat.prefab and b/Assets/MaterialUI/ComponentPrefabs/Round Button - Small - Flat.prefab differ diff --git a/Assets/MaterialUI/ComponentPrefabs/Round Button - Small - Raised.prefab b/Assets/MaterialUI/ComponentPrefabs/Round Button - Small - Raised.prefab index c9d6c53a..2e1dfb42 100644 Binary files a/Assets/MaterialUI/ComponentPrefabs/Round Button - Small - Raised.prefab and b/Assets/MaterialUI/ComponentPrefabs/Round Button - Small - Raised.prefab differ diff --git a/Assets/MaterialUI/ComponentPrefabs/SelectionBox.prefab b/Assets/MaterialUI/ComponentPrefabs/SelectionBox.prefab index 98075d03..f3f24fcf 100644 Binary files a/Assets/MaterialUI/ComponentPrefabs/SelectionBox.prefab and b/Assets/MaterialUI/ComponentPrefabs/SelectionBox.prefab differ diff --git a/Assets/MaterialUI/ComponentPrefabs/Slider.prefab b/Assets/MaterialUI/ComponentPrefabs/Slider.prefab index 0ff14332..e70f6c21 100644 Binary files a/Assets/MaterialUI/ComponentPrefabs/Slider.prefab and b/Assets/MaterialUI/ComponentPrefabs/Slider.prefab differ diff --git a/Assets/MaterialUI/ComponentPrefabs/Switch.prefab b/Assets/MaterialUI/ComponentPrefabs/Switch.prefab index bbc99187..18a60566 100644 Binary files a/Assets/MaterialUI/ComponentPrefabs/Switch.prefab and b/Assets/MaterialUI/ComponentPrefabs/Switch.prefab differ diff --git a/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_100%.png.meta b/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_100%.png.meta index 562d2ee4..7dfe8f77 100644 --- a/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_100%.png.meta +++ b/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_100%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_150%.png.meta b/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_150%.png.meta index 2ba223e2..de241849 100644 --- a/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_150%.png.meta +++ b/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_150%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_200%.png.meta b/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_200%.png.meta index 48c213f0..1ccce8fa 100644 --- a/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_200%.png.meta +++ b/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_200%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_25%.png.meta b/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_25%.png.meta index cb404ea5..ca008b32 100644 --- a/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_25%.png.meta +++ b/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_25%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_250%.png.meta b/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_250%.png.meta index cde54d13..875d1b29 100644 --- a/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_250%.png.meta +++ b/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_250%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_300%.png.meta b/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_300%.png.meta index 4136c508..d00b0302 100644 --- a/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_300%.png.meta +++ b/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_300%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_350%.png.meta b/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_350%.png.meta index baa61434..ded682a0 100644 --- a/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_350%.png.meta +++ b/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_350%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_400%.png.meta b/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_400%.png.meta index 5e868fb2..1e506bef 100644 --- a/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_400%.png.meta +++ b/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_400%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_50%.png.meta b/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_50%.png.meta index 6599d9db..7fe660f1 100644 --- a/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_50%.png.meta +++ b/Assets/MaterialUI/Images/Components/Circle_Stroke/20px/circle_stroke_20px_50%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_200%.png.meta b/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_200%.png.meta index 1092741c..788ef04c 100644 --- a/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_200%.png.meta +++ b/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_200%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_250%.png.meta b/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_250%.png.meta index a38ba0a7..6f7dd5c4 100644 --- a/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_250%.png.meta +++ b/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_250%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_300%.png.meta b/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_300%.png.meta index 80c973b1..427ef95c 100644 --- a/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_300%.png.meta +++ b/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_300%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_350%.png.meta b/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_350%.png.meta index 91a8dba4..b5c3730d 100644 --- a/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_350%.png.meta +++ b/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_350%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_400%.png.meta b/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_400%.png.meta index 3aa0620f..730059ef 100644 --- a/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_400%.png.meta +++ b/Assets/MaterialUI/Images/Components/RoundedSquare/roundedsquare_400%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Slider/slider_popup_100%.png.meta b/Assets/MaterialUI/Images/Components/Slider/slider_popup_100%.png.meta index 6a8a21e7..0b37e878 100644 --- a/Assets/MaterialUI/Images/Components/Slider/slider_popup_100%.png.meta +++ b/Assets/MaterialUI/Images/Components/Slider/slider_popup_100%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Slider/slider_popup_150%.png.meta b/Assets/MaterialUI/Images/Components/Slider/slider_popup_150%.png.meta index 3103c299..30295a13 100644 --- a/Assets/MaterialUI/Images/Components/Slider/slider_popup_150%.png.meta +++ b/Assets/MaterialUI/Images/Components/Slider/slider_popup_150%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Slider/slider_popup_200%.png.meta b/Assets/MaterialUI/Images/Components/Slider/slider_popup_200%.png.meta index fec7956b..6b718c46 100644 --- a/Assets/MaterialUI/Images/Components/Slider/slider_popup_200%.png.meta +++ b/Assets/MaterialUI/Images/Components/Slider/slider_popup_200%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Slider/slider_popup_25%.png.meta b/Assets/MaterialUI/Images/Components/Slider/slider_popup_25%.png.meta index 9d8a9cee..19d59acb 100644 --- a/Assets/MaterialUI/Images/Components/Slider/slider_popup_25%.png.meta +++ b/Assets/MaterialUI/Images/Components/Slider/slider_popup_25%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Slider/slider_popup_250%.png.meta b/Assets/MaterialUI/Images/Components/Slider/slider_popup_250%.png.meta index d05f3e30..89a29cf5 100644 --- a/Assets/MaterialUI/Images/Components/Slider/slider_popup_250%.png.meta +++ b/Assets/MaterialUI/Images/Components/Slider/slider_popup_250%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Slider/slider_popup_300%.png.meta b/Assets/MaterialUI/Images/Components/Slider/slider_popup_300%.png.meta index 8b52f8ce..a91e7862 100644 --- a/Assets/MaterialUI/Images/Components/Slider/slider_popup_300%.png.meta +++ b/Assets/MaterialUI/Images/Components/Slider/slider_popup_300%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Slider/slider_popup_350%.png.meta b/Assets/MaterialUI/Images/Components/Slider/slider_popup_350%.png.meta index 4dcf0e51..1bb125f9 100644 --- a/Assets/MaterialUI/Images/Components/Slider/slider_popup_350%.png.meta +++ b/Assets/MaterialUI/Images/Components/Slider/slider_popup_350%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Slider/slider_popup_400%.png.meta b/Assets/MaterialUI/Images/Components/Slider/slider_popup_400%.png.meta index f870a742..4cf33a71 100644 --- a/Assets/MaterialUI/Images/Components/Slider/slider_popup_400%.png.meta +++ b/Assets/MaterialUI/Images/Components/Slider/slider_popup_400%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Slider/slider_popup_50%.png.meta b/Assets/MaterialUI/Images/Components/Slider/slider_popup_50%.png.meta index 8b5d6a2d..05d2135f 100644 --- a/Assets/MaterialUI/Images/Components/Slider/slider_popup_50%.png.meta +++ b/Assets/MaterialUI/Images/Components/Slider/slider_popup_50%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Switch/switch_back_100%.png.meta b/Assets/MaterialUI/Images/Components/Switch/switch_back_100%.png.meta index 625c332d..00ceabe8 100644 --- a/Assets/MaterialUI/Images/Components/Switch/switch_back_100%.png.meta +++ b/Assets/MaterialUI/Images/Components/Switch/switch_back_100%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Switch/switch_back_150%.png.meta b/Assets/MaterialUI/Images/Components/Switch/switch_back_150%.png.meta index 04f032d7..6c44a9df 100644 --- a/Assets/MaterialUI/Images/Components/Switch/switch_back_150%.png.meta +++ b/Assets/MaterialUI/Images/Components/Switch/switch_back_150%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Switch/switch_back_200%.png.meta b/Assets/MaterialUI/Images/Components/Switch/switch_back_200%.png.meta index 15d11e37..0e332343 100644 --- a/Assets/MaterialUI/Images/Components/Switch/switch_back_200%.png.meta +++ b/Assets/MaterialUI/Images/Components/Switch/switch_back_200%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Switch/switch_back_25%.png.meta b/Assets/MaterialUI/Images/Components/Switch/switch_back_25%.png.meta index 74757063..d93e13f2 100644 --- a/Assets/MaterialUI/Images/Components/Switch/switch_back_25%.png.meta +++ b/Assets/MaterialUI/Images/Components/Switch/switch_back_25%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Switch/switch_back_250%.png.meta b/Assets/MaterialUI/Images/Components/Switch/switch_back_250%.png.meta index 25a84249..329a1019 100644 --- a/Assets/MaterialUI/Images/Components/Switch/switch_back_250%.png.meta +++ b/Assets/MaterialUI/Images/Components/Switch/switch_back_250%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Switch/switch_back_300%.png.meta b/Assets/MaterialUI/Images/Components/Switch/switch_back_300%.png.meta index 68d305a5..e54c5bad 100644 --- a/Assets/MaterialUI/Images/Components/Switch/switch_back_300%.png.meta +++ b/Assets/MaterialUI/Images/Components/Switch/switch_back_300%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Switch/switch_back_350%.png.meta b/Assets/MaterialUI/Images/Components/Switch/switch_back_350%.png.meta index aa11c523..58b0f33c 100644 --- a/Assets/MaterialUI/Images/Components/Switch/switch_back_350%.png.meta +++ b/Assets/MaterialUI/Images/Components/Switch/switch_back_350%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Switch/switch_back_400%.png.meta b/Assets/MaterialUI/Images/Components/Switch/switch_back_400%.png.meta index b0529c7b..6d8f28c2 100644 --- a/Assets/MaterialUI/Images/Components/Switch/switch_back_400%.png.meta +++ b/Assets/MaterialUI/Images/Components/Switch/switch_back_400%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Components/Switch/switch_back_50%.png.meta b/Assets/MaterialUI/Images/Components/Switch/switch_back_50%.png.meta index 823a2593..5a72a278 100644 --- a/Assets/MaterialUI/Images/Components/Switch/switch_back_50%.png.meta +++ b/Assets/MaterialUI/Images/Components/Switch/switch_back_50%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_100%.png.meta b/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_100%.png.meta index 3ea7d6d0..dda84b02 100644 --- a/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_100%.png.meta +++ b/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_100%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_150%.png.meta b/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_150%.png.meta index be5593a5..f4a4a978 100644 --- a/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_150%.png.meta +++ b/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_150%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_200%.png.meta b/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_200%.png.meta index e9dd7459..323e268b 100644 --- a/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_200%.png.meta +++ b/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_200%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_25%.png.meta b/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_25%.png.meta index 6241b846..4916ed20 100644 --- a/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_25%.png.meta +++ b/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_25%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_250%.png.meta b/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_250%.png.meta index d88cc096..65bd7b0f 100644 --- a/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_250%.png.meta +++ b/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_250%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_300%.png.meta b/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_300%.png.meta index 22b6b23d..9bef7102 100644 --- a/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_300%.png.meta +++ b/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_300%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_350%.png.meta b/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_350%.png.meta index c26966b2..52d51f0a 100644 --- a/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_350%.png.meta +++ b/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_350%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_400%.png.meta b/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_400%.png.meta index 077acc50..da79b717 100644 --- a/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_400%.png.meta +++ b/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_400%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_50%.png.meta b/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_50%.png.meta index bb1355ed..c78aa83b 100644 --- a/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_50%.png.meta +++ b/Assets/MaterialUI/Images/Icons/List_Dropdown/list_dropdown_50%.png.meta @@ -24,7 +24,7 @@ TextureImporter: textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: 2 aniso: -1 mipBias: -1 wrapMode: 1 diff --git a/Assets/MaterialUI/Scripts/Components/SelectionBoxConfig.cs b/Assets/MaterialUI/Scripts/Components/SelectionBoxConfig.cs index 4516ab37..e170b366 100644 --- a/Assets/MaterialUI/Scripts/Components/SelectionBoxConfig.cs +++ b/Assets/MaterialUI/Scripts/Components/SelectionBoxConfig.cs @@ -36,8 +36,9 @@ public class SelectionBoxConfig : MonoBehaviour public enum PopDirection {Popup, Center, Popdown}; public PopDirection expandDirection = PopDirection.Center; public bool autoMaxItemHeight; - public float approxPercentageOfHeight = 50f; - public int maxItemHeight; + public float percentageOfScreenHeight = 50f; + [Space(12f)] + public int manualMaxItemHeight; [Space(12f)] @@ -203,7 +204,7 @@ public void ExpandList () if (autoMaxItemHeight) { - float tempFloat = (Screen.height / 100f * approxPercentageOfHeight / 36f); + float tempFloat = (Screen.height / 100f * percentageOfScreenHeight / 36f); if (tempFloat >= listItems.Length) @@ -219,10 +220,10 @@ public void ExpandList () scrollbarCanvasGroup.blocksRaycasts = true; } } - else if (maxItemHeight > 0) + else if (manualMaxItemHeight > 0) { - listheight = (maxItemHeight * 36f) - 8f; + listheight = (manualMaxItemHeight * 36f) - 8f; scrollbarEnabled = true; scrollbar.enabled = true; scrollbarCanvasGroup.interactable = true; diff --git a/Assets/Plugins/MaterialUI/Anims.cs b/Assets/Plugins/MaterialUI/Anims.cs index 7a2f5335..209f89c0 100644 --- a/Assets/Plugins/MaterialUI/Anims.cs +++ b/Assets/Plugins/MaterialUI/Anims.cs @@ -13,6 +13,28 @@ public class Anims : MonoBehaviour { + +// Linear - Good for anything that needs a constant speed + + public static float Linear (float startValue, float endValue, float time, float duration) + { + float differenceValue = endValue - startValue; + time = Mathf.Clamp (time, 0f, duration); + time /= duration; + return differenceValue * time + startValue; + } + +// Ease Out - Starts fast, slows down near the end + + public static float EaseOutCubed (float startValue, float endValue, float time, float duration) + { + float differenceValue = endValue - startValue; + time = Mathf.Clamp (time, 0f, duration); + time /= duration; + time--; + return differenceValue * (time * time * time + 1) + startValue; + } + public static float EaseOutQuint (float startValue, float endValue, float time, float duration) { float differenceValue = endValue - startValue; @@ -22,6 +44,25 @@ public static float EaseOutQuint (float startValue, float endValue, float time, return differenceValue * (time * time * time * time * time + 1) + startValue; } + public static float EaseOutSept (float startValue, float endValue, float time, float duration) + { + float differenceValue = endValue - startValue; + time = Mathf.Clamp (time, 0f, duration); + time /= duration; + time--; + return differenceValue * (time * time * time * time * time * time * time + 1) + startValue; + } + +// Ease In - Starts slow, speeds up as it goes + + public static float EaseInCubed (float startValue, float endValue, float time, float duration) + { + float differenceValue = endValue - startValue; + time = Mathf.Clamp (time, 0f, duration); + time /= duration; + return differenceValue * time * time * time + startValue; + } + public static float EaseInQuint (float startValue, float endValue, float time, float duration) { float differenceValue = endValue - startValue; @@ -30,11 +71,35 @@ public static float EaseInQuint (float startValue, float endValue, float time, f return differenceValue * time * time * time * time * time + startValue; } - public static float EaseInOutQuint (float startValue, float endValue, float time, float duration) + public static float EaseInSept (float startValue, float endValue, float time, float duration) { float differenceValue = endValue - startValue; time = Mathf.Clamp (time, 0f, duration); + time /= duration; + return differenceValue * time * time * time * time * time * time * time + startValue; + } + +// Ease InOut - Starts slow, speeds up until halfway then slows down again near the end + + public static float EaseInOutCubed (float startValue, float endValue, float time, float duration) + { + float differenceValue = endValue - startValue; + time = Mathf.Clamp (time, 0f, duration); + + time /= duration / 2f; + if (time < 1f) + { + return differenceValue / 2 * time * time * time + startValue; + } + time -= 2f; + return differenceValue / 2 * (time * time * time + 2) + startValue; + } + public static float EaseInOutQuint (float startValue, float endValue, float time, float duration) + { + float differenceValue = endValue - startValue; + time = Mathf.Clamp (time, 0f, duration); + time /= duration / 2f; if (time < 1f) { @@ -44,11 +109,61 @@ public static float EaseInOutQuint (float startValue, float endValue, float time return differenceValue / 2 * (time * time * time * time * time + 2) + startValue; } - public static float Linear (float startValue, float endValue, float time, float duration) + public static float EaseInOutSept (float startValue, float endValue, float time, float duration) { float differenceValue = endValue - startValue; time = Mathf.Clamp (time, 0f, duration); - time /= duration; - return differenceValue * time + startValue; + + time /= duration / 2f; + if (time < 1f) + { + return differenceValue / 2 * time * time * time * time * time * time * time + startValue; + } + time -= 2f; + return differenceValue / 2 * (time * time * time * time * time * time * time + 2) + startValue; + } + +// Soft Ease Out - Similar to EaseOut, but starts a bit slower and speeds up in the first bit + + public static float SoftEaseOutCubed (float startValue, float endValue, float time, float duration) + { + float differenceValue = endValue - startValue; + time = Mathf.Clamp (time, 0f, duration); + + time /= duration / 2f; + if (time < 0.559f) + { + return differenceValue / 2 * time * time * time * time * time * time * time * 16 + startValue; + } + time -= 2f; + return differenceValue / 2 * (time * time * time * 0.5772f + 2) + startValue; + } + + public static float SoftEaseOutQuint (float startValue, float endValue, float time, float duration) + { + float differenceValue = endValue - startValue; + time = Mathf.Clamp (time, 0f, duration); + + time /= duration / 2f; + if (time < 0.497f) + { + return differenceValue / 2 * time * time * time * time * time * 16 + startValue; + } + time -= 2f; + return differenceValue / 2 * (time * time * time * time * time * 0.1975f + 2) + startValue; + } + + public static float SoftEaseOutSept (float startValue, float endValue, float time, float duration) + { + float differenceValue = endValue - startValue; + time = Mathf.Clamp (time, 0f, duration); + + time /= duration / 2f; + if (time < 0.341f) + { + return differenceValue / 2 * time * time * time * 16 + startValue; + } + time -= 2f; + return differenceValue / 2 * (time * time * time * time * time * time * time * 0.03948f + 2) + startValue; } } diff --git a/Assets/Plugins/MaterialUI/Test.cs b/Assets/Plugins/MaterialUI/Test.cs new file mode 100644 index 00000000..1edfad11 --- /dev/null +++ b/Assets/Plugins/MaterialUI/Test.cs @@ -0,0 +1,12 @@ +using UnityEngine; + +public class Test : MonoBehaviour{ + public RectTransform target; + + void Start () { + Vector3 leftMosPos = target.localPosition; + leftMosPos.x = target.rect.x; + + GetComponent().localPosition = leftMosPos; + } +} \ No newline at end of file diff --git a/Assets/Plugins/MaterialUI/Test.cs.meta b/Assets/Plugins/MaterialUI/Test.cs.meta new file mode 100644 index 00000000..3f836c53 --- /dev/null +++ b/Assets/Plugins/MaterialUI/Test.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fa73b80e31e7c8e448d0a7777b5626c6 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: