commit 807aa8c3c6e62c5d033064e3190ae432fb66db03 Merge: 34f74aa 3777d06 Author: Clement <clement@jo85.com> Date: Thu Jan 18 12:02:57 2024 +0100 Merge pull request 'add Atomes Factory' (#10) from feature/AtomesFactory into develop Reviewed-on: #10 Reviewed-by: Clement <clement@jo85.com> commit 3777d06a0ee942994fdfe90d71fc5056c37346d9 Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 12:00:00 2024 +0100 Rename Classname commit 16bd5bfb6cd51e253e22417ab8196a58e1726849 Merge: da9d57b 34f74aa Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 11:46:03 2024 +0100 Merge remote-tracking branch 'origin/develop' into feature/AtomesFactory commit da9d57b0bba34dbe24f5e7f744ce60f430832ff4 Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 11:44:22 2024 +0100 vue foria config commit 5346e596c8a0db7684b64920c328abee459926d9 Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 11:28:02 2024 +0100 [feature/AtomesFactory] - remove testing file commit f613217658cf2f1f48ceeeaa3183e515de857213 Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 10:38:59 2024 +0100 [feature/AtomesFactory] - Add json for atomes commit bc2b9e02fdb692d56937bd37cc3d821ffb717424 Author: Mathis <mathis.ragot@epitech.eu> Date: Fri Jan 12 15:37:09 2024 +0100 add Atomes Factory commit 34f74aa44366c6d5f9e0d647a7837704edbd5fad Merge: 8b6d07f f181fd9 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:50:43 2024 +0100 Merge pull request 'feature/multi_targets' (#7) from feature/multi_targets into develop Reviewed-on: #7 Reviewed-by: Clement <clement@jo85.com> commit f181fd993504c811a4546e56f83eb05ed62a625d Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:50:10 2024 +0100 fix du mauvais nom de scene dans le script ChangeScene.cs commit 1c76868eee12406d6c39fa64da8462e35019a39e Merge: f1ec062 8b6d07f Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:39:02 2024 +0100 Merge remote-tracking branch 'origin/develop' into feature/multi_targets commit f1ec062047ba68d48493b25273ba5893f42a890f Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:37:29 2024 +0100 ajout du font fallback commit 9c23975b204ceb09bd3ccc57b847cf0a8158fb95 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:36:49 2024 +0100 rajouts des fonts text mesh pro commit aff9df22cfbed9e8b317cafe4269fce891a5bbe5 Merge: a791273 73394e5 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:03:32 2024 +0100 Merge remote-tracking branch 'origin/develop' into feature/multi_targets commit a7912733e5fed60b9514c778fd9f40661dc66b64 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 10:54:51 2024 +0100 Ajout dans le canvas d'éléments UI (nom, description....) commit 0313fe28a1b718152015a401fda32069e94303c0 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 09:57:07 2024 +0100 Suppression du build de la CI commit 5237a32bb4759c43104e9397cb43b328a99b7c62 Author: Nicolas <nicolas.sansd@gmail.com> Date: Thu Jan 11 16:18:35 2024 +0100 ajout de la keystore de debug (user) + changement de la target version d'android commit afa265dd3141ef3fd96bff685ca655594453a876 Author: Nicolas <nicolas.sansd@gmail.com> Date: Thu Jan 11 11:26:53 2024 +0100 Affichage des molécules unitairement et en mode fusion commit 84136dcc5c3b00603ba8531901418125a832a255 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Dec 22 15:05:47 2023 +0100 MAJ du fichier d'action build.yaml commit ce3c95654431f25e22810481f3b10b24f158decd Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Dec 22 15:02:10 2023 +0100 MAJ du fichier d'action build.yaml commit 8f105732f7aaa41689894ab388675ae0b79f66f6 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Dec 22 14:36:52 2023 +0100 Ajout de la multitarget pour générer un préfab
102 lines
3.5 KiB
HLSL
102 lines
3.5 KiB
HLSL
void VertShader(inout appdata_full v, out Input data)
|
|
{
|
|
v.vertex.x += _VertexOffsetX;
|
|
v.vertex.y += _VertexOffsetY;
|
|
|
|
UNITY_INITIALIZE_OUTPUT(Input, data);
|
|
|
|
float bold = step(v.texcoord1.y, 0);
|
|
|
|
// Generate normal for backface
|
|
float3 view = ObjSpaceViewDir(v.vertex);
|
|
v.normal *= sign(dot(v.normal, view));
|
|
|
|
#if USE_DERIVATIVE
|
|
data.param.y = 1;
|
|
#else
|
|
float4 vert = v.vertex;
|
|
float4 vPosition = UnityObjectToClipPos(vert);
|
|
float2 pixelSize = vPosition.w;
|
|
|
|
pixelSize /= float2(_ScaleX, _ScaleY) * mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy);
|
|
float scale = rsqrt(dot(pixelSize, pixelSize));
|
|
scale *= abs(v.texcoord1.y) * _GradientScale * (_Sharpness + 1);
|
|
scale = lerp(scale * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(v.normal.xyz), normalize(WorldSpaceViewDir(vert)))));
|
|
data.param.y = scale;
|
|
#endif
|
|
|
|
data.param.x = (lerp(_WeightNormal, _WeightBold, bold) / 4.0 + _FaceDilate) * _ScaleRatioA * 0.5; //
|
|
|
|
v.texcoord1.xy = UnpackUV(v.texcoord1.x);
|
|
data.viewDirEnv = mul((float3x3)_EnvMatrix, WorldSpaceViewDir(v.vertex));
|
|
}
|
|
|
|
void PixShader(Input input, inout SurfaceOutput o)
|
|
{
|
|
|
|
#if USE_DERIVATIVE
|
|
float2 pixelSize = float2(ddx(input.uv_MainTex.y), ddy(input.uv_MainTex.y));
|
|
pixelSize *= _TextureWidth * .75;
|
|
float scale = rsqrt(dot(pixelSize, pixelSize)) * _GradientScale * (_Sharpness + 1);
|
|
#else
|
|
float scale = input.param.y;
|
|
#endif
|
|
|
|
// Signed distance
|
|
float c = tex2D(_MainTex, input.uv_MainTex).a;
|
|
float sd = (.5 - c - input.param.x) * scale + .5;
|
|
float outline = _OutlineWidth*_ScaleRatioA * scale;
|
|
float softness = _OutlineSoftness*_ScaleRatioA * scale;
|
|
|
|
// Color & Alpha
|
|
float4 faceColor = _FaceColor;
|
|
float4 outlineColor = _OutlineColor;
|
|
faceColor *= input.color;
|
|
outlineColor.a *= input.color.a;
|
|
faceColor *= tex2D(_FaceTex, float2(input.uv2_FaceTex.x + _FaceUVSpeedX * _Time.y, input.uv2_FaceTex.y + _FaceUVSpeedY * _Time.y));
|
|
outlineColor *= tex2D(_OutlineTex, float2(input.uv2_OutlineTex.x + _OutlineUVSpeedX * _Time.y, input.uv2_OutlineTex.y + _OutlineUVSpeedY * _Time.y));
|
|
faceColor = GetColor(sd, faceColor, outlineColor, outline, softness);
|
|
faceColor.rgb /= max(faceColor.a, 0.0001);
|
|
|
|
#if BEVEL_ON
|
|
float3 delta = float3(1.0 / _TextureWidth, 1.0 / _TextureHeight, 0.0);
|
|
|
|
float4 smp4x = {tex2D(_MainTex, input.uv_MainTex - delta.xz).a,
|
|
tex2D(_MainTex, input.uv_MainTex + delta.xz).a,
|
|
tex2D(_MainTex, input.uv_MainTex - delta.zy).a,
|
|
tex2D(_MainTex, input.uv_MainTex + delta.zy).a };
|
|
|
|
// Face Normal
|
|
float3 n = GetSurfaceNormal(smp4x, input.param.x);
|
|
|
|
// Bumpmap
|
|
float3 bump = UnpackNormal(tex2D(_BumpMap, input.uv2_FaceTex.xy)).xyz;
|
|
bump *= lerp(_BumpFace, _BumpOutline, saturate(sd + outline * 0.5));
|
|
bump = lerp(float3(0, 0, 1), bump, faceColor.a);
|
|
n = normalize(n - bump);
|
|
|
|
// Cubemap reflection
|
|
fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDirEnv, mul((float3x3)unity_ObjectToWorld, n)));
|
|
float3 emission = reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a;
|
|
#else
|
|
float3 n = float3(0, 0, -1);
|
|
float3 emission = float3(0, 0, 0);
|
|
#endif
|
|
|
|
#if GLOW_ON
|
|
float4 glowColor = GetGlowColor(sd, scale);
|
|
glowColor.a *= input.color.a;
|
|
emission += glowColor.rgb*glowColor.a;
|
|
faceColor = BlendARGB(glowColor, faceColor);
|
|
faceColor.rgb /= max(faceColor.a, 0.0001);
|
|
#endif
|
|
|
|
// Set Standard output structure
|
|
o.Albedo = faceColor.rgb;
|
|
o.Normal = -n;
|
|
o.Emission = emission;
|
|
o.Specular = lerp(_FaceShininess, _OutlineShininess, saturate(sd + outline * 0.5));
|
|
o.Gloss = 1;
|
|
o.Alpha = faceColor.a;
|
|
}
|