浏览代码

Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017

/main
Florent Guinier 7 年前
当前提交
c94e9640
共有 11 个文件被更改,包括 1193 次插入15 次删除
  1. 2
      MaterialGraphProject/Assets/Brandon/Cellular/Cellular.ShaderGraph
  2. 2
      MaterialGraphProject/Assets/Brandon/Cellular/Cellular.unity
  3. 6
      MaterialGraphProject/Assets/Brandon/Cellular/Cellular_Material.mat
  4. 2
      MaterialGraphProject/Assets/Brandon/Electricity/Electricity.mat
  5. 157
      MaterialGraphProject/Assets/Brandon/Cellular/Cellular.shader
  6. 10
      MaterialGraphProject/Assets/Brandon/Cellular/Cellular.shader.meta
  7. 9
      MaterialGraphProject/Assets/Brandon/Cellular/Cellular_Material.mat.meta
  8. 1001
      MaterialGraphProject/Assets/Brandon/Electricity/Electricity.shader
  9. 10
      MaterialGraphProject/Assets/Brandon/Electricity/Electricity.shader.meta
  10. 9
      MaterialGraphProject/Assets/Brandon/Cellular/Cellular.mat.meta
  11. 0
      /MaterialGraphProject/Assets/Brandon/Cellular/Cellular_Material.mat

2
MaterialGraphProject/Assets/Brandon/Cellular/Cellular.ShaderGraph
文件差异内容过多而无法显示
查看文件

2
MaterialGraphProject/Assets/Brandon/Cellular/Cellular.unity


m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 2100000, guid: f44c20fcf9739384b8d33931f158bab9, type: 2}
- {fileID: 2100000, guid: 9f6a36086f28fc54ba905afa25a84e6a, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

6
MaterialGraphProject/Assets/Brandon/Cellular/Cellular_Material.mat


m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Cellular
m_Shader: {fileID: 4800000, guid: 9ab5e16c2083a4fe689209a8c1ae425e, type: 3}
m_Name: Cellular_Material
m_Shader: {fileID: 4800000, guid: b1fd770cc7814084f9a27232d7fba579, type: 3}
m_LightmapFlags: 0
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_CustomRenderQueue: -1
stringTagMap: {}

2
MaterialGraphProject/Assets/Brandon/Electricity/Electricity.mat


m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Electricity
m_Shader: {fileID: 4800000, guid: 9ab5e16c2083a4fe689209a8c1ae425e, type: 3}
m_Shader: {fileID: 4800000, guid: 073d4fc800a96ba49a525f9363f6cd18, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 1
m_EnableInstancingVariants: 0

157
MaterialGraphProject/Assets/Brandon/Cellular/Cellular.shader


Shader "Brandon/Cellular"
{
Properties
{
}
SubShader
{
Tags
{
"RenderType" = "Opaque"
"Queue" = "Geometry"
}
Blend One Zero
Cull Back
ZTest LEqual
ZWrite On
LOD 200
CGPROGRAM
#pragma target 3.0
#pragma surface surf Standard vertex:vert
#pragma glsl
#pragma debug
inline float4 unity_remap_float(float4 arg1, float2 arg2, float2 arg3)
{
return arg3.x + (arg1 - arg2.x) * (arg3.y - arg3.x) / (arg2.y - arg2.x);
}
inline float2 unity_voronoi_noise_randomVector(float2 uv, float offset)
{
float2x2 m = float2x2(15.27, 47.63, 99.41, 89.98);
uv = frac(sin(mul(uv, m)) * 46839.32);
return float2(sin(uv.y*+offset)*0.5 + 0.5, cos(uv.x*offset)*0.5 + 0.5);
}
inline void unity_voronoinoise_float(float2 uv, float angleOffset, out float n1, out float n2, out float n3)
{
float2 g = floor(uv);
float2 f = frac(uv);
float t = 8.0;
float3 res = float3(8.0, 0.0, 0.0);
for (int y = -1; y <= 1; y++)
{
for (int x = -1; x <= 1; x++)
{
float2 lattice = float2(x,y);
float2 offset = unity_voronoi_noise_randomVector(lattice + g, angleOffset);
float d = distance(lattice + offset, f);
if (d < res.x)
{
res = float3(d, offset.x, offset.y);
n1 = res.x;
n2 = res.y;
n3 = 1.0 - res.x;
}
}
}
}
inline float unity_particle_float(float2 uv, float scaleFactor)
{
uv = uv * 2.0 - 1.0;
return abs(1.0 / length(uv * scaleFactor));
}
inline float unity_oneminus_float(float arg1)
{
return arg1 * -1 + 1;
}
inline float unity_multiply_float(float arg1, float arg2)
{
return arg1 * arg2;
}
inline float3 unity_multiply_float(float3 arg1, float3 arg2)
{
return arg1 * arg2;
}
inline float2 unity_uvpanner_float(float2 UV, float HorizontalOffset, float VerticalOffset)
{
return float2(UV.x + HorizontalOffset, UV.y + VerticalOffset);
}
inline float3 unity_add_float(float3 arg1, float3 arg2)
{
return arg1 + arg2;
}
inline float3 unity_rgbtolinear_float(float3 arg1)
{
float3 linearRGBLo = arg1 / 12.92;
float3 linearRGBHi = pow(max(abs((arg1 + 0.055) / 1.055), 1.192092896e-07), float3(2.4, 2.4, 2.4));
return float3(arg1 <= 0.04045) ? linearRGBLo : linearRGBHi;
}
struct Input
{
float4 color : COLOR;
half4 meshUV0;
};
void vert(inout appdata_full v, out Input o)
{
UNITY_INITIALIZE_OUTPUT(Input,o);
o.meshUV0 = v.texcoord;
}
void surf(Input IN, inout SurfaceOutputStandard o)
{
half4 uv0 = IN.meshUV0;
float3 Vector3_ff318061_3405_4489_b0c0_004f3556b379_Uniform = float3 (3, 2.5, 5);
float4 UV_257dbdde_fb0e_45d2_b1d5_3245a77a7446_UV = uv0;
float4 Remap_e2de5e87_5108_4e55_91d0_202c89bfdc77_Output = unity_remap_float(UV_257dbdde_fb0e_45d2_b1d5_3245a77a7446_UV, float2 (0,1), float2 (-10,10));
float VoronoiNoise_6363f48c_fb0a_4d4a_b0a0_e9c095b25f14_n1;
float VoronoiNoise_6363f48c_fb0a_4d4a_b0a0_e9c095b25f14_n2;
float VoronoiNoise_6363f48c_fb0a_4d4a_b0a0_e9c095b25f14_n3;
unity_voronoinoise_float(Remap_e2de5e87_5108_4e55_91d0_202c89bfdc77_Output, _Time.y, VoronoiNoise_6363f48c_fb0a_4d4a_b0a0_e9c095b25f14_n1, VoronoiNoise_6363f48c_fb0a_4d4a_b0a0_e9c095b25f14_n2, VoronoiNoise_6363f48c_fb0a_4d4a_b0a0_e9c095b25f14_n3);
float4 UV_b1e148d9_f64d_4409_bc93_047246acb763_UV = uv0;
float Particle_bc661883_3410_41aa_9c40_9841d35071d1_Output = unity_particle_float(UV_b1e148d9_f64d_4409_bc93_047246acb763_UV, 2.44);
float OneMinus_ed098cd5_7e1f_43c8_aa71_e28f93649eb3_Output = unity_oneminus_float(Particle_bc661883_3410_41aa_9c40_9841d35071d1_Output);
float Multiply_f23a464e_ad77_4844_96be_5f17a4ee2ad5_Output = unity_multiply_float(VoronoiNoise_6363f48c_fb0a_4d4a_b0a0_e9c095b25f14_n1, OneMinus_ed098cd5_7e1f_43c8_aa71_e28f93649eb3_Output);
float Saturate_4f751b04_b16e_426b_8661_93bba25e78ea_Output = saturate(Multiply_f23a464e_ad77_4844_96be_5f17a4ee2ad5_Output);
float3 Multiply_51e47dbb_3a27_43fb_85f3_075820b6f397_Output = unity_multiply_float(Vector3_ff318061_3405_4489_b0c0_004f3556b379_Uniform, Saturate_4f751b04_b16e_426b_8661_93bba25e78ea_Output);
float4 UV_f53721a3_b62f_474c_8348_cd27dce64004_UV = uv0;
float4 Remap_fc254320_74c6_4929_9c55_12b74013aa50_Output = unity_remap_float(UV_f53721a3_b62f_474c_8348_cd27dce64004_UV, float2 (0,1), float2 (-10,10));
float VoronoiNoise_5d4bee83_6fb2_48e2_b332_76a7ce558de7_n1;
float VoronoiNoise_5d4bee83_6fb2_48e2_b332_76a7ce558de7_n2;
float VoronoiNoise_5d4bee83_6fb2_48e2_b332_76a7ce558de7_n3;
unity_voronoinoise_float(Remap_fc254320_74c6_4929_9c55_12b74013aa50_Output, _Time.z, VoronoiNoise_5d4bee83_6fb2_48e2_b332_76a7ce558de7_n1, VoronoiNoise_5d4bee83_6fb2_48e2_b332_76a7ce558de7_n2, VoronoiNoise_5d4bee83_6fb2_48e2_b332_76a7ce558de7_n3);
float2 UVPanner_a7d52543_81f8_4b8f_9f48_a83f6390465f_Output = unity_uvpanner_float(Remap_fc254320_74c6_4929_9c55_12b74013aa50_Output, 0.45, 0.45);
float Particle_ff7ecb20_7b31_4549_a468_0da4421a2b0e_Output = unity_particle_float(UVPanner_a7d52543_81f8_4b8f_9f48_a83f6390465f_Output, -0.78);
float SmoothStep_d93b46f2_249b_4b3a_93a9_70e542a367ea_Output = smoothstep(0.15, 0.4, Particle_ff7ecb20_7b31_4549_a468_0da4421a2b0e_Output);
float Multiply_3002b60e_2a73_4b04_9567_798629fb7fb7_Output = unity_multiply_float(VoronoiNoise_5d4bee83_6fb2_48e2_b332_76a7ce558de7_n3, SmoothStep_d93b46f2_249b_4b3a_93a9_70e542a367ea_Output);
float Saturate_848599e3_7853_4ad1_9dc9_d854e0c98884_Output = saturate(Multiply_3002b60e_2a73_4b04_9567_798629fb7fb7_Output);
float3 Vector3_ed4329c2_0a82_4467_816a_99ed1694361d_Uniform = float3 (2, 4, 8);
float3 Multiply_196a897c_4a8f_4c02_87f1_4818aeec305d_Output = unity_multiply_float(Saturate_848599e3_7853_4ad1_9dc9_d854e0c98884_Output, Vector3_ed4329c2_0a82_4467_816a_99ed1694361d_Uniform);
float3 Add_371d52ad_c3e8_484a_8546_7079c5df37df_Output = unity_add_float(Multiply_51e47dbb_3a27_43fb_85f3_075820b6f397_Output, Multiply_196a897c_4a8f_4c02_87f1_4818aeec305d_Output);
float3 RGBtoLinear_b45ced7c_417b_406b_9524_9699354a5af9_Output = unity_rgbtolinear_float(Add_371d52ad_c3e8_484a_8546_7079c5df37df_Output);
float Vector1_514d9c2d_f80f_4ffd_824e_58e3f2d8a162_Uniform = 1;
o.Emission = RGBtoLinear_b45ced7c_417b_406b_9524_9699354a5af9_Output;
o.Alpha = Vector1_514d9c2d_f80f_4ffd_824e_58e3f2d8a162_Uniform;
}
ENDCG
}
FallBack "Diffuse"
CustomEditor "LegacyIlluminShaderGUI"
}

10
MaterialGraphProject/Assets/Brandon/Cellular/Cellular.shader.meta


fileFormatVersion: 2
guid: b1fd770cc7814084f9a27232d7fba579
timeCreated: 1495747644
licenseType: Pro
ShaderImporter:
defaultTextures: []
nonModifiableTextures: []
userData:
assetBundleName:
assetBundleVariant:

9
MaterialGraphProject/Assets/Brandon/Cellular/Cellular_Material.mat.meta


fileFormatVersion: 2
guid: 9f6a36086f28fc54ba905afa25a84e6a
timeCreated: 1495747143
licenseType: Pro
NativeFormatImporter:
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

1001
MaterialGraphProject/Assets/Brandon/Electricity/Electricity.shader
文件差异内容过多而无法显示
查看文件

10
MaterialGraphProject/Assets/Brandon/Electricity/Electricity.shader.meta


fileFormatVersion: 2
guid: 073d4fc800a96ba49a525f9363f6cd18
timeCreated: 1495748683
licenseType: Pro
ShaderImporter:
defaultTextures: []
nonModifiableTextures: []
userData:
assetBundleName:
assetBundleVariant:

9
MaterialGraphProject/Assets/Brandon/Cellular/Cellular.mat.meta


fileFormatVersion: 2
guid: f44c20fcf9739384b8d33931f158bab9
timeCreated: 1495745477
licenseType: Pro
NativeFormatImporter:
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

/MaterialGraphProject/Assets/Brandon/Cellular/Cellular.mat → /MaterialGraphProject/Assets/Brandon/Cellular/Cellular_Material.mat

正在加载...
取消
保存