Skip to content

Commit

Permalink
Merge pull request #48 from soupday/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@soupday
soupday authored Mar 6, 2023
2 parents aab0f2b + 436248b commit ea265d2
Show file tree
Hide file tree
Showing 24 changed files with 1,076 additions and 529 deletions.
2 changes: 1 addition & 1 deletion 3D/Material Templates/Amplify/RL_Template_HQ_Hair_3D_Amplify.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Material:
- _AOStrength: 1
- _AlphaClip: 1
- _AlphaPower: 1
- _AlphaRemap: 0.5
- _AlphaRemap: 0.75
- _BaseColorStrength: 1
- _BlendStrength: 1
- _ClipQuality: 1
Expand Down
4 changes: 2 additions & 2 deletions 3D/Material Templates/Amplify/RL_Template_HQ_Hair_Coverage_3D_Amplify.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ Material:
- _AOOccludeAll: 0
- _AOStrength: 1
- _AlphaClip: 0.25
- _AlphaPower: 0.5
- _AlphaRemap: 1
- _AlphaPower: 1
- _AlphaRemap: 0.75
- _BaseColorStrength: 1
- _BlendStrength: 1
- _DiffuseStrength: 1
Expand Down
2 changes: 1 addition & 1 deletion 3D/Material Templates/Amplify/Tessellation/RL_Template_HQ_Hair_3D_Amplify_T.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Material:
- _AOStrength: 1
- _AlphaClip: 1
- _AlphaPower: 1
- _AlphaRemap: 0.6
- _AlphaRemap: 0.75
- _BaseColorStrength: 1
- _BlendStrength: 1
- _ClipQuality: 1
Expand Down
4 changes: 2 additions & 2 deletions 3D/Material Templates/Amplify/Tessellation/RL_Template_HQ_Hair_Coverage_3D_Amplify_T.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ Material:
- _AOOccludeAll: 0
- _AOStrength: 1
- _AlphaClip: 0.25
- _AlphaPower: 0.5
- _AlphaRemap: 1
- _AlphaPower: 1
- _AlphaRemap: 0.75
- _BaseColorStrength: 1
- _BlendStrength: 1
- _DiffuseStrength: 1
Expand Down
2 changes: 1 addition & 1 deletion 3D/Material Templates/RL_Template_HQ_Hair_3D.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Material:
- _AOStrength: 1
- _AlphaClip: 0.5
- _AlphaPower: 1
- _AlphaRemap: 1
- _AlphaRemap: 0.75
- _BaseColorStrength: 1
- _BlendStrength: 1
- _DepthPostpass: 0.2
Expand Down
104 changes: 71 additions & 33 deletions 3D/Shaders/Amplify/RL_Amplify_HeadShaderWrinkle_Baked_3D.shader
View file

Large diffs are not rendered by default.

109 changes: 70 additions & 39 deletions 3D/Shaders/Amplify/RL_Amplify_SkinShader_Variants_3D.shader
View file

Large diffs are not rendered by default.

32 changes: 18 additions & 14 deletions 3D/Shaders/Amplify/RL_Amplify_WrinkleMapSystem.asset
View file

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions 3D/Shaders/Amplify/RL_Amplify_WrinkleMaskBlend.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ MonoBehaviour:
m_Name: RL_Amplify_WrinkleMaskBlend
m_EditorClassIdentifier:
m_functionInfo: "// Made with Amplify Shader Editor v1.9.1.5\n// Available at the
Unity Asset Store - http://u3d.as/y3X \n/*ASEBEGIN\nVersion=19105\nNode;AmplifyShaderEditor.LerpOp;18;-414.8555,56.44666;Inherit;False;3;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.LerpOp;19;-386.4705,273.6534;Inherit;False;3;0;FLOAT3;0,0,0;False;1;FLOAT3;0,0,0;False;2;FLOAT;0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.LerpOp;17;-412.2947,-295.5495;Inherit;False;3;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;2;FLOAT;0;False;1;COLOR;0\nNode;AmplifyShaderEditor.FunctionInput;13;-695.0119,28.14616;Inherit;False;Smoothness
Blend;1;5;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionOutput;9;72.60135,78.67609;Inherit;False;False;-1;Normal;2;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.FunctionOutput;8;53.60136,-28.32395;Inherit;False;False;-1;Smoothness;1;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionOutput;7;70.60136,-131.8239;Inherit;False;True;-1;Diffuse;0;False;1;0;COLOR;0,0,0,0;False;1;COLOR;0\nNode;AmplifyShaderEditor.FunctionInput;15;-693.5788,-266.1748;Inherit;False;Diffuse
Blend;5;4;False;1;0;COLOR;0,0,0,0;False;1;COLOR;0\nNode;AmplifyShaderEditor.FunctionInput;10;-674.9424,-366.7728;Inherit;False;Diffuse;5;0;False;1;0;COLOR;0,0,0,0;False;1;COLOR;0\nNode;AmplifyShaderEditor.FunctionInput;12;-666.6767,333.7483;Inherit;False;Normal;3;2;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.FunctionInput;14;-691.8113,433.0462;Inherit;False;Normal
Blend;3;6;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.FunctionInput;11;-657.5759,-57.76627;Inherit;False;Smoothness;1;1;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.SimpleMultiplyOpNode;23;-1117.603,50.98128;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.SaturateNode;22;-1302.823,-90.28536;Inherit;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionInput;16;-1713.802,69.57533;Inherit;False;Mask;1;3;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionNode;21;-1513.482,-86.02872;Inherit;False;Inverse
Lerp;-1;;1;09cbe79402f023141a4dc1fddd4c9511;0;3;1;FLOAT;0;False;2;FLOAT;0;False;3;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionInput;20;-1708.279,-100.9836;Inherit;False;Flow;1;7;False;1;0;FLOAT;0;False;1;FLOAT;0\nWireConnection;18;0;11;0\nWireConnection;18;1;13;0\nWireConnection;18;2;23;0\nWireConnection;19;0;12;0\nWireConnection;19;1;14;0\nWireConnection;19;2;23;0\nWireConnection;17;0;10;0\nWireConnection;17;1;15;0\nWireConnection;17;2;23;0\nWireConnection;9;0;19;0\nWireConnection;8;0;18;0\nWireConnection;7;0;17;0\nWireConnection;23;0;22;0\nWireConnection;23;1;16;0\nWireConnection;22;0;21;0\nWireConnection;21;2;20;0\nWireConnection;21;3;16;0\nASEEND*/\n//CHKSM=86FBC723141181D1FDEFA5D72C86FE903EDB07EE"
Unity Asset Store - http://u3d.as/y3X \n/*ASEBEGIN\nVersion=19105\nNode;AmplifyShaderEditor.FunctionInput;15;-693.5788,-266.1748;Inherit;False;Diffuse
Blend;5;4;False;1;0;COLOR;0,0,0,0;False;1;COLOR;0\nNode;AmplifyShaderEditor.SimpleMultiplyOpNode;23;-1117.603,50.98128;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.SaturateNode;22;-1302.823,-90.28536;Inherit;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionInput;16;-1713.802,69.57533;Inherit;False;Mask;1;3;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionInput;20;-1708.279,-100.9836;Inherit;False;Flow;1;7;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.SimpleAddOpNode;24;-1494.583,-47.14618;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionInput;10;-660.9424,-170.7728;Inherit;False;Diffuse;5;0;False;1;0;COLOR;0,0,0,0;False;1;COLOR;0\nNode;AmplifyShaderEditor.SimpleSubtractOpNode;26;-426.204,-234.2034;Inherit;False;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0\nNode;AmplifyShaderEditor.WireNode;32;-687.204,-65.20337;Inherit;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.WireNode;33;-697.204,212.7966;Inherit;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionInput;13;-719.0115,10.54616;Inherit;False;Smoothness
Blend;1;5;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionInput;11;-686.5756,97.63375;Inherit;False;Smoothness;1;1;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.SimpleSubtractOpNode;27;-434.2041,32.19665;Inherit;False;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.SimpleSubtractOpNode;28;-432.6042,333.7961;Inherit;False;2;0;FLOAT3;0,0,0;False;1;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.FunctionInput;14;-688.6119,300.2457;Inherit;False;Normal
Blend;3;6;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.FunctionInput;12;-669.4773,389.9479;Inherit;False;Normal;3;2;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.WireNode;34;-712.0688,485.1304;Inherit;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.SimpleMultiplyOpNode;31;-247.6041,425.5956;Inherit;False;2;2;0;FLOAT3;0,0,0;False;1;FLOAT;0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.SimpleMultiplyOpNode;30;-250.2041,113.3965;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.SimpleMultiplyOpNode;29;-238.804,-168.8035;Inherit;False;2;2;0;COLOR;0,0,0,0;False;1;FLOAT;0;False;1;COLOR;0\nNode;AmplifyShaderEditor.FunctionOutput;9;51.7305,224.7716;Inherit;False;False;-1;Normal;2;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.FunctionOutput;8;32.73053,117.7715;Inherit;False;False;-1;Smoothness;1;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionOutput;7;49.7305,14.2716;Inherit;False;True;-1;Diffuse;0;False;1;0;COLOR;0,0,0,0;False;1;COLOR;0\nWireConnection;23;0;22;0\nWireConnection;23;1;16;0\nWireConnection;22;0;24;0\nWireConnection;24;0;20;0\nWireConnection;24;1;16;0\nWireConnection;26;0;15;0\nWireConnection;26;1;10;0\nWireConnection;32;0;23;0\nWireConnection;33;0;23;0\nWireConnection;27;0;13;0\nWireConnection;27;1;11;0\nWireConnection;28;0;14;0\nWireConnection;28;1;12;0\nWireConnection;34;0;23;0\nWireConnection;31;0;28;0\nWireConnection;31;1;34;0\nWireConnection;30;0;27;0\nWireConnection;30;1;33;0\nWireConnection;29;0;26;0\nWireConnection;29;1;32;0\nWireConnection;9;0;31;0\nWireConnection;8;0;30;0\nWireConnection;7;0;29;0\nASEEND*/\n//CHKSM=7A3148F09D6D16ADF4DEADB745F2657269E3ECA9"
m_functionName:
m_description:
m_additionalIncludes:
Expand Down
Loading

0 comments on commit ea265d2

Please sign in to comment.