Skip to content

Commit

Permalink
- Added powerful new functions to Anims
Browse files Browse the repository at this point in the history
- Improved Core components sprites (All core components can now be scaled up to 2x without any loss in quality, some can be scaled to 4x)
- Renamed some variables in SelectionBoxConfig to make more sense
  • Loading branch information
DecSmith42 committed Dec 12, 2014
1 parent a00c8f4 commit 4ed8334
Show file tree
Hide file tree
Showing 61 changed files with 400 additions and 50 deletions.
5 changes: 5 additions & 0 deletions Assets/00_NotPackaged.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/00_NotPackaged/Blur.mat
Binary file not shown.
4 changes: 4 additions & 0 deletions Assets/00_NotPackaged/Blur.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

200 changes: 200 additions & 0 deletions Assets/00_NotPackaged/Blur.shader
Original file line number Diff line number Diff line change
@@ -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
}
}
}
}
5 changes: 5 additions & 0 deletions Assets/00_NotPackaged/Blur.shader.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/MaterialUI/ComponentPrefabs/Button - Flat.prefab
Binary file not shown.
Binary file modified Assets/MaterialUI/ComponentPrefabs/Button - Raised.prefab
Binary file not shown.
Binary file modified Assets/MaterialUI/ComponentPrefabs/Panel.prefab
Binary file not shown.
Binary file modified Assets/MaterialUI/ComponentPrefabs/RadioGroup.prefab
Binary file not shown.
Binary file modified Assets/MaterialUI/ComponentPrefabs/Round Button - Flat.prefab
Binary file not shown.
Binary file modified Assets/MaterialUI/ComponentPrefabs/Round Button - Raised.prefab
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Assets/MaterialUI/ComponentPrefabs/SelectionBox.prefab
Binary file not shown.
Binary file modified Assets/MaterialUI/ComponentPrefabs/Slider.prefab
Binary file not shown.
Binary file modified Assets/MaterialUI/ComponentPrefabs/Switch.prefab
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4ed8334

Please sign in to comment.