Skip to content

Commit

Permalink
Big overhaul to the specular, fixed matcap light colors
Browse files Browse the repository at this point in the history 
Updated specular color calculation
Updated specular dot calculation
Updated specular intensity calculation

Updated a bunch of shadow threshold calculations

Changed ILM to automatically work as a linear texture while sRGB is checked.

Fixed the name of the Decal shader
  • Loading branch information
@Aerthas
Aerthas committed Nov 20, 2020
1 parent 49e90ea commit 297f9af
Show file tree
Hide file tree
Showing 14 changed files with 669 additions and 645 deletions.
22 changes: 22 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,25 @@ Misc/Custom light example.mat
Arc System Works Shader/FakeLightRotConverter.cs
*.unitypackage
Arc System Works Shader/Arc System Works - Merged Light Prism.shader
Genshin Works Shader/Custom Functions/GColor Replacer.asset
Genshin Works Shader/Custom Functions/GDebug.asset
Genshin Works Shader/Custom Functions/Genshin Lighting System.asset
Genshin Works Shader/Custom Functions/GFakeLightDir.asset
Genshin Works Shader/Custom Functions/GFresnel System.asset
Genshin Works Shader/Custom Functions/GMatrix Rotation.asset
Genshin Works Shader/Custom Functions/GOutline.asset
Genshin Works Shader/Custom Functions/GPermanent Shadows.asset
Genshin Works Shader/Custom Functions/GReplace Color Function.asset
Genshin Works Shader/Custom Functions/GShading System.asset
Genshin Works Shader/Editor/GenshinShaderGUI.cs
Genshin Works Shader/Editor/GenshinStyles.cs
Genshin Works Shader/Editor/GenshinToggles.cs
Genshin Works Shader/Genshin Works - Decal - Created by Silent.shader
Genshin Works Shader/Genshin Works - Merged Light.shader
Genshin Works Shader/Genshin Works - Outline.shader
Genshin Works Shader/Presets/FighterZ_Cell.mat
Genshin Works Shader/Presets/FighterZ_Goku.mat
Genshin Works Shader/Presets/Granblue_Percival.mat
Genshin Works Shader/Presets/Granblue_Zooey.mat
Genshin Works Shader/Presets/GuiltyGear_Sol_Badguy.mat
Genshin Works Shader/Resources/Paypal_Icon.png
29 changes: 15 additions & 14 deletions Arc System Works Shader/Arc System Works - Decal - Created by Silent.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Shader ".Aerthas/Arc System Works/Decal v3.0.7 - Created by Silent"
float4 color18 = IsGammaSpace() ? float4(1,1,1,0) : float4(1,1,1,0);


finalColor = (( _Enable == 1.0 ) ? ( unity_ColorSpaceDouble * tex2D( _MainTex, uv_MainTex ) * _DiscolorationModifier ) : color18 );
finalColor = (( _Enable == 1.0 ) ? ( tex2D( _MainTex, uv_MainTex ) * _DiscolorationModifier * unity_ColorSpaceDouble ) : color18 );
return finalColor;
}
ENDCG
Expand All @@ -125,21 +125,22 @@ Shader ".Aerthas/Arc System Works/Decal v3.0.7 - Created by Silent"
}
/*ASEBEGIN
Version=17800
2560;213;2259;946;1150.924;513.5056;1;True;True
Node;AmplifyShaderEditor.ColorSpaceDouble;3;-528,-192;Inherit;False;0;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4
Node;AmplifyShaderEditor.SamplerNode;1;-592,-32;Inherit;True;Property;_MainTex;MainTex;1;0;Create;True;0;0;False;0;-1;None;c3dba02165458b4429798840a4b67c84;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;6;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4
Node;AmplifyShaderEditor.RangedFloatNode;12;-576,160;Inherit;False;Property;_DiscolorationModifier;Discoloration Modifier;2;0;Create;True;0;0;False;0;1.03;1.03;1;2;0;1;FLOAT;0
Node;AmplifyShaderEditor.RangedFloatNode;13;304,-128;Inherit;False;Property;_Enable;Enable;0;1;[Toggle];Create;True;0;0;False;0;1;1;0;0;0;1;FLOAT;0
Node;AmplifyShaderEditor.ColorNode;18;240,32;Inherit;False;Constant;_Color0;Color 0;4;0;Create;True;0;0;False;0;1,1,1,0;0,0,0,0;True;0;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4
Node;AmplifyShaderEditor.SimpleMultiplyOpNode;2;16,-48;Inherit;False;3;3;0;COLOR;1,1,1,0;False;1;COLOR;0,0,0,0;False;2;FLOAT;0;False;1;COLOR;0
Node;AmplifyShaderEditor.TFHCCompareEqual;16;528,-96;Inherit;False;4;0;FLOAT;0;False;1;FLOAT;1;False;2;COLOR;0,0,0,0;False;3;COLOR;0,0,0,0;False;1;COLOR;0
Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;10;816,-96;Float;False;True;-1;2;ASWDecalGUI;100;1;.Aerthas/Arc System Works/Decal v3.0.7 - Created by Silent;0770190933193b94aaa3065e307002fa;True;Unlit;0;0;Unlit;2;True;1;0;False;-1;3;False;-1;0;0;False;-1;0;False;-1;True;0;False;-1;0;False;-1;True;False;True;2;False;-1;True;True;True;True;True;0;False;-1;True;False;255;False;-1;255;False;-1;255;False;-1;7;False;-1;1;False;-1;1;False;-1;1;False;-1;7;False;-1;1;False;-1;1;False;-1;1;False;-1;True;1;False;-1;True;3;False;-1;True;False;0;False;-1;0;False;-1;True;2;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;2;0;False;False;False;False;False;False;False;False;False;True;1;LightMode=ForwardBase;False;0;;0;0;Standard;1;Vertex Position,InvertActionOnDeselection;1;0;1;True;False;;0
WireConnection;2;0;3;0
WireConnection;2;1;1;0
WireConnection;2;2;12;0
-2099;289;2060;858;896.0042;353.8138;1;True;True
Node;AmplifyShaderEditor.ColorSpaceDouble;3;-504,137;Inherit;False;0;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4
Node;AmplifyShaderEditor.SamplerNode;1;-551,-198;Inherit;True;Property;_MainTex;MainTex;1;0;Create;True;0;0;False;0;-1;None;2ac25f92107ae4f4bad3d3ab433f9df9;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;6;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4
Node;AmplifyShaderEditor.RangedFloatNode;12;-545,35;Inherit;False;Property;_DiscolorationModifier;Discoloration Modifier;2;0;Create;True;0;0;False;0;1.03;1.03;1;2;0;1;FLOAT;0
Node;AmplifyShaderEditor.SimpleMultiplyOpNode;2;27,-25;Inherit;False;3;3;0;COLOR;1,1,1,0;False;1;FLOAT;0;False;2;COLOR;0,0,0,0;False;1;COLOR;0
Node;AmplifyShaderEditor.RangedFloatNode;13;305,-107;Inherit;False;Property;_Enable;Enable;0;1;[Toggle];Create;True;0;0;False;0;1;1;0;0;0;1;FLOAT;0
Node;AmplifyShaderEditor.ColorNode;18;241,53;Inherit;False;Constant;_Color0;Color 0;4;0;Create;True;0;0;False;0;1,1,1,0;0,0,0,0;True;0;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4
Node;AmplifyShaderEditor.TFHCCompareEqual;16;529,-75;Inherit;False;4;0;FLOAT;0;False;1;FLOAT;1;False;2;COLOR;0,0,0,0;False;3;COLOR;0,0,0,0;False;1;COLOR;0
Node;AmplifyShaderEditor.GammaToLinearNode;19;579.9958,85.18616;Inherit;False;0;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0
Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;10;957,-70;Float;False;True;-1;2;ASWDecalGUI;100;1;.Aerthas/Arc System Works/Decal v3.0.7 - Created by Silent;0770190933193b94aaa3065e307002fa;True;Unlit;0;0;Unlit;2;True;1;0;False;-1;3;False;-1;0;0;False;-1;0;False;-1;True;0;False;-1;0;False;-1;True;False;True;2;False;-1;True;True;True;True;True;0;False;-1;True;False;255;False;-1;255;False;-1;255;False;-1;7;False;-1;1;False;-1;1;False;-1;1;False;-1;7;False;-1;1;False;-1;1;False;-1;1;False;-1;True;1;False;-1;True;3;False;-1;True;False;0;False;-1;0;False;-1;True;2;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;2;0;False;False;False;False;False;False;False;False;False;True;1;LightMode=ForwardBase;False;0;;0;0;Standard;1;Vertex Position,InvertActionOnDeselection;1;0;1;True;False;;0
WireConnection;2;0;1;0
WireConnection;2;1;12;0
WireConnection;2;2;3;0
WireConnection;16;0;13;0
WireConnection;16;2;2;0
WireConnection;16;3;18;0
WireConnection;10;0;16;0
ASEEND*/
//CHKSM=32FA96BA04130A89690736F2EAE5A881B0ADB5DA
//CHKSM=714E4E8A5C351B1D7E9DC020C7C470739C1AE823
Loading

0 comments on commit 297f9af

Please sign in to comment.